diff --git a/.version b/.version index 7bc03e791d4..7c3643d5fb2 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -15.05 \ No newline at end of file +15.06 \ No newline at end of file diff --git a/README.md b/README.md index 86a5568727e..672fc7495de 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,31 @@ -[logo -](https://nixos.org/nixos) +[logo](https://nixos.org/nixos) -[![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs) +[![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) +[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs) +[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs) -Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package -manager. +Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package +manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/) +build daemon as so-called channels. To get channel information via git, add +[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: -[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside `nixos/` folder. +``` +% git remote add channels git://github.com/NixOS/nixpkgs-channels.git +``` + +For stability and maximum binary package support, it is recommended to maintain +custom changes on top of one of the channels, e.g. `nixos-14.12` for the latest +release and `nixos-unstable` for the latest successful build of master: + +``` +% git remote update channels +% git rebase channels/nixos-14.12 +``` + +For pull-requests, please rebase onto nixpkgs `master`. + +[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside +`nixos/` folder. * [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation) * [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 61d373738f9..b041a73d818 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -5,7 +5,7 @@ Coding conventions -
Syntax +
Syntax @@ -169,8 +169,8 @@ stdenv.mkDerivation { ... args: with args; ... - or - + or + { stdenv, fetchurl, perl, ... }: ... @@ -207,7 +207,7 @@ args.stdenv.mkDerivation (args // {
-
Package naming +
Package naming In Nixpkgs, there are generally three different names associated with a package: @@ -256,6 +256,12 @@ bound to the variable name e2fsprogs in a package named hello-svn by nix-env. + If package is fetched from git's commit then + the version part of the name must be the date of that + (fetched) commit. The date must be in "YYYY-MM-DD" format. + Also add "git" to the name - e.g., + "pkgname-git-2014-09-23". + Dashes in the package name should be preserved in new variable names, rather than converted to underscores (which was convention up to around 2013 and most names @@ -286,7 +292,7 @@ dashes between words — not in camel case. For instance, it should be allPackages.nix or AllPackages.nix. -
Hierarchy +
Hierarchy Each package should be stored in its own directory somewhere in the pkgs/ tree, i.e. in @@ -598,6 +604,51 @@ evaluate correctly.
- - +
Fetching Sources + There are multiple ways to fetch a package source in nixpkgs. The + general guidline is that you should package sources with a high degree of + availability. Right now there is only one fetcher which has mirroring + support and that is fetchurl. Note that you should also + prefer protocols which have a corresponding proxy environment variable. + + You can find many source fetch helpers in pkgs/build-support/fetch*. + + In the file pkgs/top-level/all-packages.nix you can + find fetch helpers, these have names on the form + fetchFrom*. The intention of these are to provide + snapshot fetches but using the same api as some of the version controlled + fetchers from pkgs/build-support/. As an example going + from bad to good: + + Uses git:// which won't be proxied. + + src = fetchgit { + url = "git://github.com/NixOS/nix.git"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; + } + + + This is ok, but an archive fetch will still be faster. + + src = fetchgit { + url = "https://github.com/NixOS/nix.git"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; + } + + + Fetches a snapshot archive and you get the rev you want. + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9"; + } + + + + +
diff --git a/doc/language-support.xml b/doc/language-support.xml index 87f500a491b..14e8aa7a7ba 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -13,7 +13,7 @@ in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. -
Perl +
Perl Nixpkgs provides a function buildPerlPackage, a generic package builder function for any Perl package that has a @@ -151,7 +151,7 @@ ClassC3Componentised = buildPerlPackage rec { -
Generation from CPAN +
Generation from CPAN Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program @@ -191,7 +191,7 @@ you need it.
-
Python +
Python Currently supported interpreters are python26, python27, @@ -245,14 +245,14 @@ are provided with all modules included. Name of the folder in ${python}/lib/ for corresponding interpreter. - + interpreter Alias for ${python}/bin/${executable}. - + buildEnv @@ -260,29 +260,29 @@ are provided with all modules included. See for usage and documentation. - + sitePackages Alias for lib/${libPrefix}/site-packages. - + executable Name of the interpreter executable, ie python3.4. - + -
<varname>buildPythonPackage</varname> function - +
<varname>buildPythonPackage</varname> function + The function is implemented in pkgs/development/python-modules/generic/default.nix. Example usage: - + twisted = buildPythonPackage { name = "twisted-8.1.0"; @@ -308,27 +308,27 @@ twisted = buildPythonPackage { python27Packages, python32Packages, python33Packages, python34Packages and pypyPackages. - + buildPythonPackage mainly does four things: - + In the configurePhase, it patches setup.py to always include setuptools before distutils for monkeypatching machinery to take place. - + - In the buildPhase, it calls + In the buildPhase, it calls ${python.interpreter} setup.py build ... - + - In the installPhase, it calls + In the installPhase, it calls ${python.interpreter} setup.py install ... - + In the postFixup phase, wrapPythonPrograms bash function is called to wrap all programs in $out/bin/* @@ -337,23 +337,23 @@ twisted = buildPythonPackage { - - By default doCheck = true is set and tests are run with + + By default doCheck = true is set and tests are run with ${python.interpreter} setup.py test command in checkPhase. - + propagatedBuildInputs packages are propagated to user environment. - + By default meta.platforms is set to the same value as the interpreter unless overriden otherwise. - + <varname>buildPythonPackage</varname> parameters (all parameters from <varname>mkDerivation</varname> function are still supported) - + namePrefix @@ -363,7 +363,7 @@ twisted = buildPythonPackage { if you're packaging an application or a command line tool. - + disabled @@ -373,21 +373,21 @@ twisted = buildPythonPackage { for examples. - + setupPyInstallFlags List of flags passed to setup.py install command. - + setupPyBuildFlags List of flags passed to setup.py build command. - + pythonPath @@ -396,21 +396,21 @@ twisted = buildPythonPackage { (contrary to propagatedBuildInputs). - + preShellHook Hook to execute commands before shellHook. - + postShellHook Hook to execute commands after shellHook. - + distutilsExtraCfg @@ -419,15 +419,29 @@ twisted = buildPythonPackage { configuration). - + + + makeWrapperArgs + + A list of strings. Arguments to be passed to + makeWrapper, which wraps generated binaries. By + default, the arguments to makeWrapper set + PATH and PYTHONPATH environment + variables before calling the binary. Additional arguments here can + allow a developer to set environment variables which will be + available when the binary is run. For example, + makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]. + + + - +
-
<function>python.buildEnv</function> function +
<function>python.buildEnv</function> function Create Python environments using low-level pkgs.buildEnv function. Example default.nix: - + {}; @@ -436,31 +450,31 @@ python.buildEnv.override { ignoreCollisions = true; }]]> - + Running nix-build will create /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env with wrapped binaries in bin/. - + <function>python.buildEnv</function> arguments - + extraLibs List of packages installed inside the environment. - + postBuild Shell command executed after the build of environment. - + ignoreCollisions @@ -470,7 +484,7 @@ python.buildEnv.override {
-
Tools +
Tools Packages inside nixpkgs are written by hand. However many tools exist in community to help save time. No tool is preferred at the moment. @@ -497,20 +511,20 @@ exist in community to help save time. No tool is preferred at the moment.
-
Development +
Development To develop Python packages buildPythonPackage has additional logic inside shellPhase to run ${python.interpreter} setup.py develop for the package. - + shellPhase is executed only if setup.py exists. - + Given a default.nix: - + {}; @@ -522,18 +536,18 @@ buildPythonPackage { src = ./.; }]]> - + Running nix-shell with no arguments should give you the environment in which the package would be build with nix-build. - + Shortcut to setup environments with C headers/libraries and python packages: - + $ nix-shell -p pythonPackages.pyramid zlib libjpeg git - + There is a boolean value lib.inNixShell set to true if nix-shell is invoked. @@ -541,7 +555,7 @@ buildPythonPackage {
-
FAQ +
FAQ @@ -562,12 +576,12 @@ buildPythonPackage { Known bug in setuptools install_data does not respect --prefix. Example of such package using the feature is pkgs/tools/X11/xpra/default.nix. As workaround install it as an extra preInstall step: - + ${python.interpreter} setup.py install_data --install-dir=$out --root=$out sed -i '/ = data_files/d' setup.py - + Rationale of non-existent global site-packages @@ -583,7 +597,7 @@ sed -i '/ = data_files/d' setup.py
-
Contributing guidelines +
Contributing guidelines Following rules are desired to be respected: @@ -611,12 +625,12 @@ sed -i '/ = data_files/d' setup.py
-
Ruby +
Ruby There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a Gemfile, let bundler create a Gemfile.lock, and then convert this into a nix expression that contains all Gem dependencies automatically. For example, to package sensu, we did: - + -
Go +
Go The function buildGoPackage builds standard Go packages. @@ -662,20 +676,19 @@ standard Go packages. net = buildGoPackage rec { name = "go.net-${rev}"; - goPackagePath = "code.google.com/p/go.net"; + goPackagePath = "golang.org/x/net"; subPackages = [ "ipv4" "ipv6" ]; - rev = "28ff664507e4"; - src = fetchhg { + rev = "e0403b4e005"; + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "1lkz4c9pyz3yz2yz18hiycvlfhgy3jxp68bs7mv7bcfpaj729qav"; + owner = "golang"; + repo = "net"; + sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp"; }; - renameImports = [ - "code.google.com/p/go.crypto golang.org/x/crypto" - "code.google.com/p/goprotobuf github.com/golang/protobuf" - ]; + goPackageAliases = [ "code.google.com/p/go.net" ]; propagatedBuildInputs = [ goPackages.text ]; buildFlags = "--tags release"; + disabled = isGo13; }; @@ -703,17 +716,18 @@ the following arguments are of special significance to the function: - + - renameImports is a list of import paths to be renamed before - building the package. The path to be renamed can be a regular expression. + goPackageAliases is a list of alternative import paths + that are valid for this library. + Packages that depend on this library will automatically rename + import paths that match any of the aliases to goPackagePath. In this example imports will be renamed from - code.google.com/p/go.crypto to - golang.org/x/crypto and from - code.google.com/p/goprotobuf to - github.com/golang/protobuf. + code.google.com/p/go.net to + golang.org/x/net in every package that depend on the + go.net library. @@ -732,6 +746,18 @@ the following arguments are of special significance to the function: + + + If disabled is true, + nix will refuse to build this package. + + + In this example the package will not be built for go 1.3. The isGo13 + is an utility function that returns true if go used to build the + package has version 1.3.x. + + + @@ -761,7 +787,7 @@ done
-
Java +
Java Ant-based Java packages are typically built from source as follows: @@ -842,7 +868,7 @@ Runtime) instead of the OpenJRE.
-
Lua +
Lua Lua packages are built by the buildLuaPackage function. This function is @@ -864,7 +890,7 @@ fileSystem = buildLuaPackage { src = fetchurl { url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz"; - }; + }; meta = { homepage = "https://github.com/keplerproject/luafilesystem"; hydraPlatforms = stdenv.lib.platforms.linux; @@ -875,7 +901,7 @@ fileSystem = buildLuaPackage { - Though, more complicated package should be placed in a seperate file in + Though, more complicated package should be placed in a seperate file in pkgs/development/lua-modules. @@ -889,7 +915,7 @@ fileSystem = buildLuaPackage {
-
Coq +
Coq Coq libraries should be installed in $(out)/lib/coq/${coq.coq-version}/user-contrib/. diff --git a/doc/meta.xml b/doc/meta.xml index a0ed3069b68..14a01ccb3c0 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -82,7 +82,8 @@ hello-2.3 A program that produces a familiar, friendly greeting -
Standard meta-attributes +
Standard +meta-attributes It is expected that each meta-attribute is one of the following: diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 8a35e640324..ecaf619472d 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -141,7 +141,7 @@ $ make menuconfig ARCH=arch -
+
X.org diff --git a/doc/packageconfig.xml b/doc/packageconfig.xml index 44ce1974c6c..4e0fcc3b6a4 100644 --- a/doc/packageconfig.xml +++ b/doc/packageconfig.xml @@ -67,7 +67,8 @@ lib/licenses.nix of the nix package tree. -
Modify packages via <literal>packageOverrides</literal> +
Modify +packages via <literal>packageOverrides</literal> diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 6fdebda09f9..58310834fd2 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -15,7 +15,8 @@ environment does everything automatically. If can easily customise or override the various build phases. -
Using <literal>stdenv</literal> +
Using +<literal>stdenv</literal> To build a package with the standard environment, you use the function stdenv.mkDerivation, instead of the @@ -124,7 +125,8 @@ genericBuild
-
Tools provided by <literal>stdenv</literal> +
Tools provided by +<literal>stdenv</literal> The standard environment provides the following packages: @@ -225,7 +227,7 @@ genericBuild
-
Phases +
Phases The generic builder has a number of phases. Package builds are split into phases to make it easier to override @@ -243,7 +245,8 @@ is convenient to override a phase from the derivation, while the latter is convenient from a build script. -
Controlling phases +
Controlling +phases There are a number of variables that control what phases are executed and in what order: @@ -327,7 +330,7 @@ executed and in what order:
-
The unpack phase +
The unpack phase The unpack phase is responsible for unpacking the source code of the package. The default implementation of @@ -434,7 +437,7 @@ Additional file types can be supported by setting the
-
The patch phase +
The patch phase The patch phase applies the list of patches defined in the patches variable. @@ -477,7 +480,7 @@ Additional file types can be supported by setting the
-
The configure phase +
The configure phase The configure phase prepares the source tree for building. The default configurePhase runs @@ -573,7 +576,7 @@ script) if it exists.
-
The build phase +
The build phase The build phase is responsible for actually building the package (e.g. compiling it). The default buildPhase @@ -657,7 +660,7 @@ called, respectively.
-
The check phase +
The check phase The check phase checks whether the package was built correctly by running its test suite. The default @@ -717,7 +720,7 @@ doCheck = true;
-
The install phase +
The install phase The install phase is responsible for installing the package in the Nix store under out. The default @@ -772,7 +775,7 @@ installTargets = "install-bin install-doc";
-
The fixup phase +
The fixup phase The fixup phase performs some (Nix-specific) post-processing actions on the files installed under $out by the @@ -895,7 +898,8 @@ following:
-
The distribution phase +
The distribution +phase The distribution phase is intended to produce a source distribution of the package. The default @@ -1199,7 +1203,7 @@ echo @foo@
-
Purity in Nixpkgs +
Purity in Nixpkgs [measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them] diff --git a/lib/customisation.nix b/lib/customisation.nix index 91a25055df2..ca3dd4980da 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -158,4 +158,27 @@ rec { drv' = (lib.head outputsList).value; in lib.deepSeq drv' drv'; + + /* Tests whether a derivation can be used by the current platform + Returns the derivation if true, otherwise null. */ + shouldUsePkgSystem = system: pkg_: let pkg = (builtins.tryEval pkg_).value; + in if lib.any (x: x == system) (pkg.meta.platforms or []) + then pkg + else null; + + /* Returns a configure flag string in an autotools format + trueStr: Prepended when cond is true + falseStr: Prepended when cond is false + cond: The condition for the prepended string type and value + name: The flag name + val: The value of the flag only set when cond is true */ + mkFlag = trueStr: falseStr: cond: name: val: + if cond == null then null else + "--${if cond != false then trueStr else falseStr}${name}" + + "${if val != null && cond != false then "=${val}" else ""}"; + + /* Flag setting helpers for autotools like packages */ + mkEnable = mkFlag "enable-" "disable-"; + mkWith = mkFlag "with-" "without-"; + mkOther = mkFlag "" "" true; } diff --git a/lib/licenses.nix b/lib/licenses.nix index 08376b7e7e0..2b259c68069 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -85,6 +85,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Creative Commons Zero v1.0 Universal"; }; + cc-by-sa-25 = spdx { + spdxId = "CC-BY-SA-2.5"; + fullName = "Creative Commons Attribution Share Alike 2.5"; + }; + cc-by-30 = spdx { spdxId = "CC-BY-3.0"; fullName = "Creative Commons Attribution 3.0"; @@ -403,6 +408,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "The Unlicense"; }; + vim = spdx { + spdxId = "Vim"; + fullName = "Vim License"; + }; + vsl10 = spdx { spdxId = "VSL-1.0"; fullName = "Vovida Software License v1.0"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 641610e6d4f..059bfaecbb4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -8,6 +8,7 @@ abaldeau = "Andreas Baldeau "; abbradar = "Nikolay Amiantov "; aforemny = "Alexander Foremny "; + aflatter = "Alexander Flatter "; aherrmann = "Andreas Herrmann "; ak = "Alexander Kjeldaas "; akc = "Anders Claesson "; @@ -43,6 +44,7 @@ bosu = "Boris Sukholitko "; bramd = "Bram Duvigneau "; bstrik = "Berno Strik "; + c0dehero = "CodeHero "; calrama = "Moritz Maxeiner "; campadrenalin = "Philip Horger "; cdepillabout = "Dennis Gosnell "; @@ -70,6 +72,7 @@ eikek = "Eike Kettner "; ellis = "Ellis Whitehead "; emery = "Emery Hemingway "; + ericbmerritt = "Eric Merritt "; ertes = "Ertugrul Söylemez "; exlevan = "Alexey Levan "; falsifian = "James Cook "; @@ -97,6 +100,7 @@ iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; iElectric = "Domen Kozar "; + ikervagyok = "Balázs Lengyel "; iyzsong = "Song Wenwu "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; @@ -110,6 +114,7 @@ joelteon = "Joel Taylor "; jpbernardy = "Jean-Philippe Bernardy "; jwiegley = "John Wiegley "; + jwilberding = "Jordan Wilberding "; jzellner = "Jeff Zellner "; kkallio = "Karn Kallio "; koral = "Koral "; @@ -133,6 +138,8 @@ meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; michelk = "Michel Kuhlmann "; + mirdhyn = "Merlin Gaillard "; + mschristiansen = "Mikkel Christiansen "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; MP2E = "Cray Elliott "; @@ -149,10 +156,12 @@ offline = "Jaka Hudoklin "; olcai = "Erik Timan "; orbitz = "Malcolm Matalka "; + osener = "Ozan Sener "; page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; pakhfn = "Fedor Pakhomov "; pashev = "Igor Pashev "; + pesterhazy = "Paulus Esterhazy "; phausmann = "Philipp Hausmann "; philandstuff = "Philip Potter "; phreedom = "Evgeny Egorochkin "; @@ -162,6 +171,7 @@ pkmx = "Chih-Mao Chen "; plcplc = "Philip Lykke Carlsen "; pmahoney = "Patrick Mahoney "; + pmiddend = "Philipp Middendorf "; prikhi = "Pavan Rikhi "; pSub = "Pascal Wittmann "; puffnfresh = "Brian McKenna "; @@ -195,6 +205,7 @@ smironov = "Sergey Mironov "; sprock = "Roger Mason "; spwhitt = "Spencer Whitt "; + stephenmw = "Stephen Weinberg "; sztupi = "Attila Sztupak "; tailhook = "Paul Colomiets "; taktoa = "Remy Goldschmidt "; @@ -222,6 +233,7 @@ winden = "Antonio Vargas Gonzalez "; wizeman = "Ricardo M. Correia "; wjlroe = "William Roe "; + womfoo = "Kranium Gikos Mendoza "; wkennington = "William A. Kennington III "; wmertens = "Wout Mertens "; wscott = "Wayne Scott "; diff --git a/maintainers/scripts/hydra_eval_check b/maintainers/scripts/hydra_eval_check index e16a40455a3..c8e03424f32 100755 --- a/maintainers/scripts/hydra_eval_check +++ b/maintainers/scripts/hydra_eval_check @@ -6,6 +6,7 @@ hydra_eval_jobs \ --argstr system i686-linux \ --argstr system x86_64-darwin \ --argstr system i686-cygwin \ + --argstr system x86_64-cygwin \ --argstr system i686-freebsd \ --arg officialRelease false \ --arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \ diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 3ac07da19f1..879a31e32c5 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -24,6 +24,9 @@ $ mkdir -p /my/sources $ cd /my/sources $ nix-env -i git $ git clone git://github.com/NixOS/nixpkgs.git +$ cd nixpkgs +$ git remote add channels git://github.com/NixOS/nixpkgs-channels.git +$ git remote update channels This will check out the latest NixOS sources to @@ -31,7 +34,12 @@ This will check out the latest NixOS sources to and the Nixpkgs sources to /my/sources/nixpkgs. (The NixOS source tree lives in a subdirectory of the Nixpkgs -repository.) +repository.) The remote channels refers to a +read-only repository that tracks the Nixpkgs/NixOS channels (see for more information about channels). Thus, +the Git branch channels/nixos-14.12 will contain +the latest built and tested version available in the +nixos-14.12 channel. It’s often inconvenient to develop directly on the master branch, since if somebody has just committed (say) a change to GCC, @@ -40,28 +48,32 @@ rebuild everything from source. So you may want to create a local branch based on your current NixOS version: -$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh -Fetching channels from https://nixos.org/channels: - * [new branch] cbe467e -> channels/remotes/nixos-unstable -Fetching channels from nixos-version: - * [new branch] 9ff4738 -> channels/current-system -Fetching channels from ~/.nix-defexpr: - * [new branch] 0d4acad -> channels/root/nixos -$ git checkout -b local channels/current-system +$ nixos-version +14.04.273.ea1952b (Baboon) + +$ git checkout -b local ea1952b -Or, to base your local branch on the latest version available in the +Or, to base your local branch on the latest version available in a NixOS channel: -$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh -$ git checkout -b local channels/remotes/nixos-unstable +$ git remote update channels +$ git checkout -b local channels/nixos-14.12 -You can then use git rebase to sync your local -branch with the upstream branch, and use git -cherry-pick to copy commits from your local branch to the -upstream branch. +(Replace nixos-14.12 with the name of the channel +you want to use.) You can use git merge or +git rebase to keep your local branch in sync with +the channel, e.g. + + +$ git remote update channels +$ git merge channels/nixos-14.12 + + +You can use git cherry-pick to copy commits from +your local branch to the upstream branch. If you want to rebuild your system using your (modified) sources, you need to tell nixos-rebuild about them diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index bbb655eed2a..b9da712b86f 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -154,6 +154,15 @@ startAll; log. + + getScreenText + Return a textual representation of what is currently + visible on the machine's screen using optical character + recognition. + This requires passing to the test + attribute set. + + sendMonitorCommand Send a command to the QEMU monitor. This is rarely @@ -237,6 +246,15 @@ startAll; connections. + + waitForText + Wait until the supplied regular expressions matches + the textual contents of the screen by using optical character recognition + (see getScreenText). + This requires passing to the test + attribute set. + + waitForWindow Wait until an X11 window has appeared whose name diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c4691aa663f..755b4bf4154 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -17,6 +17,7 @@ brltty +marathon @@ -61,6 +62,15 @@ was accordingly renamed to bomi + + + HPLIP (printer, scanner, and fax drivers for HP devices) has + been updated to version 3.15.4. This release + adds support for the arm6l-linux and + arm7l-linux platforms. + + + diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index e0791692d3e..db2c1a68692 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -9,6 +9,7 @@ use FileHandle; use Cwd; use File::Basename; use File::Path qw(make_path); +use File::Slurp; my $showGraphics = defined $ENV{'DISPLAY'}; @@ -493,6 +494,44 @@ sub screenshot { } +# Take a screenshot and return the result as text using optical character +# recognition. +sub getScreenText { + my ($self) = @_; + + system("command -v tesseract &> /dev/null") == 0 + or die "getScreenText used but enableOCR is false"; + + my $text; + $self->nest("performing optical character recognition", sub { + my $tmpbase = Cwd::abs_path(".")."/ocr"; + my $tmpin = $tmpbase."in.ppm"; + my $tmpout = "$tmpbase.ppm"; + + $self->sendMonitorCommand("screendump $tmpin"); + system("ppmtopgm $tmpin | pamscale 4 -filter=lanczos > $tmpout") == 0 + or die "cannot scale screenshot"; + unlink $tmpin; + system("tesseract $tmpout $tmpbase") == 0 or die "OCR failed"; + unlink $tmpout; + $text = read_file("$tmpbase.txt"); + unlink "$tmpbase.txt"; + }); + return $text; +} + + +# Wait until a specific regexp matches the textual contents of the screen. +sub waitForText { + my ($self, $regexp) = @_; + $self->nest("waiting for $regexp to appear on the screen", sub { + retry sub { + return 1 if $self->getScreenText =~ /$regexp/; + } + }); +} + + # Wait until it is possible to connect to the X server. Note that # testing the existence of /tmp/.X11-unix/X0 is insufficient. sub waitForX { diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index c14f15a1ad5..ee254ae187f 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -28,7 +28,7 @@ rec { wrapProgram $out/bin/nixos-test-driver \ --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \ - --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl" + --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; @@ -68,7 +68,12 @@ rec { makeTest = - { testScript, makeCoverageReport ? false, name ? "unnamed", ... } @ t: + { testScript + , makeCoverageReport ? false + , enableOCR ? false + , name ? "unnamed" + , ... + } @ t: let testDriverName = "nixos-test-driver-${name}"; @@ -86,6 +91,8 @@ rec { vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); + ocrProg = tesseract.override { enableLanguages = [ "eng" ]; }; + # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. @@ -102,12 +109,14 @@ rec { vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)" wrapProgram $out/bin/nixos-test-driver \ --add-flags "$vms" \ + ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ --set testScript '"$testScript"' \ --set VLANS '"${toString vlans}"' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ --add-flags "$vms" \ + ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --set tests '"startAll; joinAll;"' \ --set VLANS '"${toString vlans}"' \ ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} diff --git a/nixos/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix index ad797087932..b9f69879a10 100644 --- a/nixos/modules/config/fonts/corefonts.nix +++ b/nixos/modules/config/fonts/corefonts.nix @@ -1,3 +1,6 @@ +# This module is deprecated, since you can just say ‘fonts.fonts = [ +# pkgs.corefonts ];’ instead. + { config, lib, pkgs, ... }: with lib; @@ -9,6 +12,7 @@ with lib; fonts = { enableCoreFonts = mkOption { + visible = false; default = false; description = '' Whether to include Microsoft's proprietary Core Fonts. These fonts diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index c41e4ea604d..04f274e99e1 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.pulseaudio != null); + enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); ids = config.ids; diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix index 3338e5119ac..9cdd8a74a18 100644 --- a/nixos/modules/installer/tools/nixos-checkout.nix +++ b/nixos/modules/installer/tools/nixos-checkout.nix @@ -1,5 +1,5 @@ -# This module generates the nixos-checkout script, which replaces the -# Nixpkgs source trees in /etc/nixos/nixpkgs with a Git checkout. +# This module generates the nixos-checkout script, which performs a +# checkout of the Nixpkgs Git repository. { config, lib, pkgs, ... }: @@ -37,8 +37,19 @@ let mv nixpkgs nixpkgs-$backupTimestamp fi - # Check out the NixOS and Nixpkgs sources. - git clone git://github.com/NixOS/nixpkgs.git nixpkgs + # Check out the Nixpkgs sources. + if ! [ -e nixpkgs/.git ]; then + echo "Creating repository in $prefix/nixpkgs..." + git init --quiet nixpkgs + else + echo "Updating repository in $prefix/nixpkgs..." + fi + cd nixpkgs + git remote add origin git://github.com/NixOS/nixpkgs.git || true + git remote add channels git://github.com/NixOS/nixpkgs-channels.git || true + git remote set-url origin --push git@github.com:NixOS/nixpkgs.git + git remote update + git checkout master ''; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0039ca74ba8..cc1976e236b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -196,7 +196,6 @@ nylon = 168; apache-kafka = 169; panamax = 170; - marathon = 171; exim = 172; #fleet = 173; # unused #input = 174; # unused @@ -217,6 +216,7 @@ lambdabot = 191; asterisk = 192; plex = 193; + bird = 195; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -390,7 +390,6 @@ gitlab = 165; nylon = 168; panamax = 170; - #marathon = 171; # unused exim = 172; fleet = 173; input = 174; @@ -412,6 +411,7 @@ #asterisk = 192; # unused plex = 193; sabnzbd = 194; + bird = 195; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e869b350e71..d7b8b34aefe 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -62,6 +62,7 @@ ./programs/environment.nix ./programs/info.nix ./programs/ibus.nix + ./programs/kbdlight.nix ./programs/light.nix ./programs/nano.nix ./programs/screen.nix @@ -201,6 +202,7 @@ ./services/misc/mediatomb.nix ./services/misc/mesos-master.nix ./services/misc/mesos-slave.nix + ./services/misc/mwlib.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix ./services/misc/nixos-manual.nix @@ -221,6 +223,7 @@ ./services/monitoring/bosun.nix ./services/monitoring/cadvisor.nix ./services/monitoring/collectd.nix + ./services/monitoring/das_watchdog.nix ./services/monitoring/dd-agent.nix ./services/monitoring/graphite.nix ./services/monitoring/monit.nix @@ -251,6 +254,7 @@ ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix ./services/networking/bind.nix + ./services/networking/bird.nix ./services/networking/bitlbee.nix ./services/networking/btsync.nix ./services/networking/charybdis.nix @@ -264,6 +268,7 @@ ./services/networking/dhcpd.nix ./services/networking/dnscrypt-proxy.nix ./services/networking/dnsmasq.nix + ./services/networking/docker-registry-server.nix ./services/networking/ejabberd.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix @@ -289,6 +294,7 @@ ./services/networking/nat.nix ./services/networking/networkmanager.nix ./services/networking/ngircd.nix + ./services/networking/nix-serve.nix ./services/networking/notbit.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix @@ -303,6 +309,7 @@ ./services/networking/privoxy.nix ./services/networking/prosody.nix ./services/networking/quassel.nix + ./services/networking/racoon.nix ./services/networking/radicale.nix ./services/networking/radvd.nix ./services/networking/rdnssd.nix @@ -403,12 +410,14 @@ ./services/x11/xserver.nix ./system/activation/activation-script.nix ./system/activation/top-level.nix + ./system/boot/coredump.nix ./system/boot/emergency-mode.nix ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix ./system/boot/loader/loader.nix ./system/boot/loader/generations-dir/generations-dir.nix + ./system/boot/loader/generic-extlinux-compatible ./system/boot/loader/grub/grub.nix ./system/boot/loader/grub/ipxe.nix ./system/boot/loader/grub/memtest.nix @@ -433,6 +442,7 @@ ./tasks/filesystems.nix ./tasks/filesystems/btrfs.nix ./tasks/filesystems/cifs.nix + ./tasks/filesystems/exfat.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix ./tasks/filesystems/jfs.nix @@ -461,5 +471,6 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/virtualbox-guest.nix + ./virtualisation/vmware-guest.nix ./virtualisation/xen-dom0.nix ] diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 69729923e03..3b18ae129b9 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -8,4 +8,5 @@ with lib; { environment.noXlibs = mkDefault true; i18n.supportedLocales = [ config.i18n.defaultLocale ]; + services.nixosManual.enable = mkDefault false; } diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix new file mode 100644 index 00000000000..0172368e968 --- /dev/null +++ b/nixos/modules/programs/kbdlight.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.kbdlight; + +in +{ + options.programs.kbdlight.enable = mkEnableOption "kbdlight"; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.kbdlight ]; + security.setuidPrograms = [ "kbdlight" ]; + }; +} diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 2b70a795f4f..3b5ae07e82f 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -166,7 +166,7 @@ in script = "exec venus-planet ${configFile}"; serviceConfig.User = "${cfg.user}"; serviceConfig.Group = "${cfg.group}"; - environment.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; startAt = cfg.dates; }; diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index e60cb5cdb67..dec5a62dcf0 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -22,7 +22,7 @@ in security.pki.certificateFiles = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ \"\${pkgs.cacert}/etc/ca-bundle.crt\" ]"; + example = literalExample "[ \"\${pkgs.cacert}/ca-bundle.crt\" ]"; description = '' A list of files containing trusted root certificates in PEM format. These are concatenated to form @@ -53,7 +53,7 @@ in config = { - security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ca-bundle.crt" ]; + security.pki.certificateFiles = [ "${pkgs.cacert}/ca-bundle.crt" ]; # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility. environment.etc."ssl/certs/ca-certificates.crt".source = caBundle; @@ -66,8 +66,6 @@ in environment.sessionVariables = { SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; - # FIXME: unneeded - remove eventually. - OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; # FIXME: unneeded - remove eventually. GIT_SSL_CAINFO = "/etc/ssl/certs/ca-certificates.crt"; }; diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index c4127543f10..4a5ebebc682 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -3,9 +3,9 @@ with lib; let - inherit (pkgs) postgresql gzip; + inherit (pkgs) gzip; - location = config.services.postgresqlBackup.location ; + location = config.services.postgresqlBackup.location; postgresqlBackupCron = db: '' diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 168615153fe..90555ebc468 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -143,6 +143,7 @@ in { ''; User = "apache-kafka"; PermissionsStartOnly = true; + SuccessExitStatus = "0 143"; }; preStart = '' mkdir -m 0700 -p ${concatStringsSep " " cfg.logDirs} diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 26fb3fdb00c..811aa812c8d 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -12,6 +12,8 @@ let attribsArg = optionalString (cfg.attributes != {}) "--attributes=${mkAttributes cfg.attributes}"; + containerizers = [ "mesos" ] ++ (optional cfg.withDocker "docker"); + in { options.services.mesos = { @@ -22,8 +24,14 @@ in { type = types.uniq types.bool; }; + ip = mkOption { + description = "IP address to listen on."; + default = "0.0.0.0"; + type = types.string; + }; + port = mkOption { - description = "Mesos Slave port"; + description = "Port to listen on."; default = 5051; type = types.int; }; @@ -43,6 +51,12 @@ in { type = types.bool; }; + withDocker = mkOption { + description = "Enable the docker containerizer."; + default = config.virtualisation.docker.enable; + type = types.bool; + }; + workDir = mkOption { description = "The Mesos work directory."; default = "/var/lib/mesos/slave"; @@ -92,17 +106,18 @@ in { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; - environment.MESOS_CONTAINERIZERS = "docker,mesos"; + environment.MESOS_CONTAINERIZERS = concatStringsSep "," containerizers; serviceConfig = { ExecStart = '' ${pkgs.mesos}/bin/mesos-slave \ + --ip=${cfg.ip} \ --port=${toString cfg.port} \ --master=${cfg.master} \ - ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ - ${attribsArg} \ --work_dir=${cfg.workDir} \ --logging_level=${cfg.logLevel} \ - --docker=${pkgs.docker}/libexec/docker/docker \ + ${attribsArg} \ + ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ + ${optionalString cfg.withDocker "--docker=${pkgs.docker}/libexec/docker/docker"} \ ${toString cfg.extraCmdLineOptions} ''; PermissionsStartOnly = true; diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix new file mode 100644 index 00000000000..fb4a24253df --- /dev/null +++ b/nixos/modules/services/misc/mwlib.nix @@ -0,0 +1,258 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.mwlib; + pypkgs = pkgs.python27Packages; + + inherit (pypkgs) python mwlib; + + user = mkOption { + default = "nobody"; + type = types.str; + description = "User to run as."; + }; + +in +{ + + options.services.mwlib = { + + nserve = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable nserve. Nserve is a HTTP + server. The Collection extension is talking to + that program directly. Nserve uses at least + one qserve instance in order to distribute + and manage jobs. + ''; + }; # nserve.enable + + port = mkOption { + default = 8899; + type = types.int; + description = "Specify port to listen on."; + }; # nserve.port + + address = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "Specify network interface to listen on."; + }; # nserve.address + + qserve = mkOption { + default = [ "${cfg.qserve.address}:${toString cfg.qserve.port}" ]; + type = types.listOf types.str; + description = "Register qserve instance."; + }; # nserve.qserve + + inherit user; + }; # nserve + + qserve = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + A job queue server used to distribute and manage + jobs. You should start one qserve instance + for each machine that is supposed to render pdf + files. Unless you’re operating the Wikipedia + installation, one machine should suffice. + ''; + }; # qserve.enable + + port = mkOption { + default = 14311; + type = types.int; + description = "Specify port to listen on."; + }; # qserve.port + + address = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "Specify network interface to listen on."; + }; # qserve.address + + datadir = mkOption { + default = "/var/lib/mwlib-qserve"; + type = types.path; + description = "qserve data directory (FIXME: unused?)"; + }; # qserve.datadir + + allow = mkOption { + default = [ "127.0.0.1" ]; + type = types.listOf types.str; + description = "List of allowed client IPs. Empty means any."; + }; # qserve.allow + + inherit user; + }; # qserve + + nslave = { + enable = mkOption { + default = cfg.qserve.enable; + type = types.bool; + description = '' + Pulls new jobs from exactly one qserve instance + and calls the zip and render programs + in order to download article collections and + convert them to different output formats. Nslave + uses a cache directory to store the generated + documents. Nslave also starts an internal http + server serving the content of the cache directory. + ''; + }; # nslave.enable + + cachedir = mkOption { + default = "/var/cache/mwlib-nslave"; + type = types.path; + description = "Directory to store generated documents."; + }; # nslave.cachedir + + numprocs = mkOption { + default = 10; + type = types.int; + description = "Number of parallel jobs to be executed."; + }; # nslave.numprocs + + http = mkOption { + default = {}; + description = '' + Internal http server serving the content of the cache directory. + You have to enable it, or use your own way for serving files + and set the http.url option accordingly. + ''; + type = types.submodule ({ + options = { + enable = mkOption { + default = true; + type = types.bool; + description = "Enable internal http server."; + }; # nslave.http.enable + + port = mkOption { + default = 8898; + type = types.int; + description = "Port to listen to when serving files from cache."; + }; # nslave.http.port + + address = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "Specify network interface to listen on."; + }; # nslave.http.address + + url = mkOption { + default = "http://localhost:${toString cfg.nslave.http.port}/cache"; + type = types.str; + description = '' + Specify URL for accessing generated files from cache. + The Collection extension of Mediawiki won't be able to + download files without it. + ''; + }; # nslave.http.url + }; + }); # types.submodule + }; # nslave.http + + inherit user; + }; # nslave + + }; # options.services + + config = { + + systemd.services.mwlib-nserve = mkIf cfg.nserve.enable + { + description = "mwlib network interface"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "mwlib-qserve.service" ]; + + serviceConfig = { + ExecStart = concatStringsSep " " ( + [ + "${mwlib}/bin/nserve" + "--port ${toString cfg.nserve.port}" + "--interface ${cfg.nserve.address}" + ] ++ cfg.nserve.qserve + ); + User = cfg.nserve.user; + }; + }; # systemd.services.mwlib-nserve + + systemd.services.mwlib-qserve = mkIf cfg.qserve.enable + { + description = "mwlib job queue server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + + preStart = '' + mkdir -pv '${cfg.qserve.datadir}' + chown -Rc ${cfg.qserve.user}:`id -ng ${cfg.qserve.user}` '${cfg.qserve.datadir}' + chmod -Rc u=rwX,go= '${cfg.qserve.datadir}' + ''; + + serviceConfig = { + ExecStart = concatStringsSep " " ( + [ + "${mwlib}/bin/mw-qserve" + "-p ${toString cfg.qserve.port}" + "-i ${cfg.qserve.address}" + "-d ${cfg.qserve.datadir}" + ] ++ map (a: "-a ${a}") cfg.qserve.allow + ); + User = cfg.qserve.user; + PermissionsStartOnly = true; + }; + }; # systemd.services.mwlib-qserve + + systemd.services.mwlib-nslave = mkIf cfg.nslave.enable + { + description = "mwlib worker"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + + preStart = '' + mkdir -pv '${cfg.nslave.cachedir}' + chown -Rc ${cfg.nslave.user}:`id -ng ${cfg.nslave.user}` '${cfg.nslave.cachedir}' + chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}' + ''; + + environment = { + PYTHONPATH = concatMapStringsSep ":" + (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages") + [ "mwlib-rl" "mwlib-ext" "pygments" ]; + }; + + serviceConfig = { + ExecStart = concatStringsSep " " ( + [ + "${mwlib}/bin/nslave" + "--cachedir ${cfg.nslave.cachedir}" + "--numprocs ${toString cfg.nslave.numprocs}" + "--url ${cfg.nslave.http.url}" + ] ++ ( + if cfg.nslave.http.enable then + [ + "--serve-files-port ${toString cfg.nslave.http.port}" + "--serve-files-address ${cfg.nslave.http.address}" + ] else + [ + "--no-serve-files" + ] + )); + User = cfg.nslave.user; + PermissionsStartOnly = true; + }; + }; # systemd.services.mwlib-nslave + + }; # config +} diff --git a/nixos/modules/services/monitoring/das_watchdog.nix b/nixos/modules/services/monitoring/das_watchdog.nix new file mode 100644 index 00000000000..785b4289dff --- /dev/null +++ b/nixos/modules/services/monitoring/das_watchdog.nix @@ -0,0 +1,34 @@ +# A general watchdog for the linux operating system that should run in the +# background at all times to ensure a realtime process won't hang the machine +{ config, lib, pkgs, ... }: + +with lib; + +let + + inherit (pkgs) das_watchdog; + +in { + ###### interface + + options = { + services.das_watchdog.enable = mkEnableOption "Whether to enable realtime watchdog"; + }; + + ###### implementation + + config = mkIf config.services.das_watchdog.enable { + environment.systemPackages = [ das_watchdog ]; + systemd.services.das_watchdog = { + description = "Watchdog to ensure a realtime process won't hang the machine"; + after = [ "multi-user.target" "sound.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "root"; + Type = "oneshot"; + ExecStart = "${das_watchdog}/bin/das_watchdog"; + RemainAfterExit = true; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix new file mode 100644 index 00000000000..e7e1db19152 --- /dev/null +++ b/nixos/modules/services/networking/bird.nix @@ -0,0 +1,76 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption singleton types; + inherit (pkgs) bird; + cfg = config.services.bird; + + configFile = pkgs.writeText "bird.conf" '' + ${cfg.config} + ''; +in + +{ + + ###### interface + + options = { + + services.bird = { + + enable = mkEnableOption "BIRD Internet Routing Daemon"; + + config = mkOption { + type = types.string; + description = '' + BIRD Internet Routing Daemon configuration file. + + ''; + }; + + user = mkOption { + type = types.string; + default = "ircd"; + description = '' + BIRD Internet Routing Daemon user. + ''; + }; + + group = mkOption { + type = types.string; + default = "ircd"; + description = '' + BIRD Internet Routing Daemon group. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = cfg.user; + description = "BIRD Internet Routing Daemon user"; + uid = config.ids.uids.bird; + group = cfg.group; + }; + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.bird; + }; + + systemd.services.bird = { + description = "BIRD Internet Routing Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${bird}/bin/bird -d -c ${configFile} -s /var/run/bird.ctl -u ${cfg.user} -g ${cfg.group}"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 92f6396b358..5802d8b95b3 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -126,6 +126,8 @@ in description = "Dynamic DNS Client"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + + environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; serviceConfig = { # Uncomment this if too many problems occur: # Type = "forking"; diff --git a/nixos/modules/services/networking/docker-registry-server.nix b/nixos/modules/services/networking/docker-registry-server.nix new file mode 100644 index 00000000000..093d20ecb16 --- /dev/null +++ b/nixos/modules/services/networking/docker-registry-server.nix @@ -0,0 +1,98 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nodeDockerRegistry; + +in { + options.services.nodeDockerRegistry = { + enable = mkEnableOption "Whether to enable docker registry service."; + + port = mkOption { + description = "Docker registry listening port."; + default = 8080; + type = types.int; + }; + + users = mkOption { + description = "Docker registry list of users."; + default = []; + options = [{ + user = mkOption { + description = "Docker registry user username."; + type = types.str; + }; + + pass = mkOption { + description = "Docker registry user password."; + type = types.str; + }; + }]; + type = types.listOf types.optionSet; + }; + + onTag = mkOption { + description = "Docker registry hook triggered when an image is tagged."; + default = ""; + type = types.str; + }; + + onImage = mkOption { + description = "Docker registry hook triggered when an image metadata is uploaded."; + default = ""; + type = types.str; + }; + + onLayer = mkOption { + description = "Docker registry hook triggered when an when an image layer is uploaded."; + default = ""; + type = types.str; + }; + + onVerify = mkOption { + description = "Docker registry hook triggered when an image layer+metadata has been verified."; + default = ""; + type = types.str; + }; + + onIndex = mkOption { + description = "Docker registry hook triggered when an when an image file system data has been indexed."; + default = ""; + type = types.str; + }; + + dataDir = mkOption { + description = "Docker registry data directory"; + default = "/var/lib/docker-registry"; + type = types.path; + }; + }; + + config = mkIf cfg.enable { + systemd.services.docker-registry-server = { + description = "Docker Registry Service."; + wantedBy = ["multi-user.target"]; + after = ["network.target"]; + script = '' + ${pkgs.nodePackages.docker-registry-server}/bin/docker-registry-server \ + --dir ${cfg.dataDir} \ + --port ${toString cfg.port} \ + ${concatMapStringsSep " " (u: "--user ${u.user}:${u.pass}") cfg.users} \ + ${optionalString (cfg.onTag != "") "--on-tag '${cfg.onTag}'"} \ + ${optionalString (cfg.onImage != "") "--on-image '${cfg.onImage}'"} \ + ${optionalString (cfg.onVerify != "") "--on-verify '${cfg.onVerify}'"} \ + ${optionalString (cfg.onIndex != "") "--on-index '${cfg.onIndex}'"} + ''; + + serviceConfig.User = "docker-registry"; + }; + + users.extraUsers.docker-registry = { + uid = config.ids.uids.docker-registry; + description = "Docker registry user"; + createHome = true; + home = cfg.dataDir; + }; + }; +} diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix new file mode 100644 index 00000000000..c2c579c3177 --- /dev/null +++ b/nixos/modules/services/networking/nix-serve.nix @@ -0,0 +1,56 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.nix-serve; +in +{ + options = { + services.nix-serve = { + enable = mkEnableOption "nix-serve, the standalone Nix binary cache server"; + + port = mkOption { + type = types.int; + default = 5000; + description = '' + Port number where nix-serve will listen on. + ''; + }; + + bindAddress = mkOption { + type = types.string; + default = "0.0.0.0"; + description = '' + IP address where nix-serve will bind its listening socket. + ''; + }; + + extraParams = mkOption { + type = types.string; + default = ""; + description = '' + Extra command line parameters for nix-serve. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.nix-serve = { + description = "nix-serve binary cache server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ config.nix.package pkgs.bzip2 ]; + environment.NIX_REMOTE = "daemon"; + + serviceConfig = { + ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + + "--port ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; + User = "nobody"; + Group = "nogroup"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix new file mode 100644 index 00000000000..00986bbbd84 --- /dev/null +++ b/nixos/modules/services/networking/racoon.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.racoon; +in { + options.services.racoon = { + enable = mkEnableOption "Whether to enable racoon."; + + config = mkOption { + description = "Contents of racoon configuration file."; + default = ""; + type = types.str; + }; + + configPath = mkOption { + description = "Location of racoon config if config is not provided."; + default = "/etc/racoon/racoon.conf"; + type = types.path; + }; + }; + + config = mkIf cfg.enable { + systemd.services.racoon = { + description = "Racoon Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.ipsecTools}/bin/racoon -f ${ + if (cfg.config != "") then pkgs.writeText "racoon.conf" cfg.config + else cfg.configPath + }"; + ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config"; + PIDFile = "/var/run/racoon.pid"; + Type = "forking"; + Restart = "always"; + }; + preStart = "rm /var/run/racoon.pid || true"; + }; + }; +} diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 6cc86b4e4b5..14d516ddbb6 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -268,6 +268,16 @@ in }; }; + moduliFile = mkOption { + example = "services.openssh.moduliFile = /etc/my-local-ssh-moduli;"; + type = types.path; + description = '' + Path to moduli file to install in + /etc/ssh/moduli. If this option is unset, then + the moduli file shipped with OpenSSH will be used. + ''; + }; + }; users.extraUsers = mkOption { @@ -286,8 +296,10 @@ in description = "SSH privilege separation user"; }; + services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli"; + environment.etc = authKeysFiles ++ [ - { source = "${cfgc.package}/etc/ssh/moduli"; + { source = cfg.moduliFile; target = "ssh/moduli"; } { text = knownHostsText; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index f9ca796ea65..2d43c3d962d 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -154,6 +154,7 @@ in users.extraUsers = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; + isSystemUser = true; }) ); diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 8513d1174c3..ab93334f5fc 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -12,27 +12,56 @@ in { options.services.marathon = { enable = mkOption { - description = "Whether to enable the marathon mesos framework."; - default = false; type = types.uniq types.bool; + default = false; + description = '' + Whether to enable the marathon mesos framework. + ''; }; httpPort = mkOption { - description = "Marathon listening port"; - default = 8080; type = types.int; + default = 8080; + description = '' + Marathon listening port for HTTP connections. + ''; }; master = mkOption { - description = "Marathon mesos master zookeeper address"; - default = "zk://${head cfg.zookeeperHosts}/mesos"; type = types.str; + default = "zk://${concatStringsSep "," cfg.zookeeperHosts}/mesos"; + example = "zk://1.2.3.4:2181,2.3.4.5:2181,3.4.5.6:2181/mesos"; + description = '' + Mesos master address. See for details. + ''; }; zookeeperHosts = mkOption { - description = "Marathon mesos zookepper addresses"; - default = [ "localhost:2181" ]; type = types.listOf types.str; + default = [ "localhost:2181" ]; + example = [ "1.2.3.4:2181" "2.3.4.5:2181" "3.4.5.6:2181" ]; + description = '' + ZooKeeper hosts' addresses. + ''; + }; + + extraCmdLineOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--https_port=8443" "--zk_timeout=10000" "--marathon_store_timeout=2000" ]; + description = '' + Extra command line options to pass to Marathon. + See for all possible flags. + ''; + }; + + environment = mkOption { + default = { }; + type = types.attrs; + example = { JAVA_OPTS = "-Xmx512m"; MESOSPHERE_HTTP_CREDENTIALS = "username:password"; }; + description = '' + Environment variables passed to Marathon. + ''; }; }; @@ -41,17 +70,19 @@ in { config = mkIf cfg.enable { systemd.services.marathon = { description = "Marathon Service"; + environment = cfg.environment; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ]; serviceConfig = { - ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${head cfg.zookeeperHosts}/marathon"; + ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}"; User = "marathon"; + Restart = "always"; + RestartSec = "2"; }; }; users.extraUsers.marathon = { - uid = config.ids.uids.marathon; description = "Marathon mesos framework user"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index d53f119c955..cf6d2cab349 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -45,7 +45,7 @@ in { environment.gnome3.packageSet = mkOption { default = null; - example = literalExample "pkgs.gnome3_12"; + example = literalExample "pkgs.gnome3_16"; description = "Which GNOME 3 package set to use."; apply = p: if p == null then pkgs.gnome3 else p; }; @@ -109,9 +109,6 @@ in { # Override default mimeapps export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share - # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility. - export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ - # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 4aeaed8cd32..f6de8c02b18 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -65,7 +65,7 @@ let greeters-directory = ${cfg.greeter.package} sessions-directory = ${dmcfg.session.desktops} - [SeatDefaults] + [Seat:*] xserver-command = ${xserverWrapper} session-wrapper = ${dmcfg.session.script} greeter-session = ${cfg.greeter.name} @@ -143,8 +143,26 @@ in services.dbus.enable = true; services.dbus.packages = [ lightdm ]; - security.pam.services.lightdm = { allowNullPassword = true; startSession = true; }; - security.pam.services.lightdm-greeter = { allowNullPassword = true; startSession = true; }; + security.pam.services.lightdm = { + allowNullPassword = true; + startSession = true; + }; + security.pam.services.lightdm-greeter = { + allowNullPassword = true; + startSession = true; + text = '' + auth required pam_env.so + auth required pam_permit.so + + account required pam_permit.so + + password required pam_deny.so + + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_unix.so + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + ''; + }; users.extraUsers.lightdm = { createHome = true; diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix new file mode 100644 index 00000000000..25b11ed9c8a --- /dev/null +++ b/nixos/modules/system/boot/coredump.nix @@ -0,0 +1,51 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + + options = { + + systemd.coredump = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enables storing core dumps in systemd. + Note that this alone is not enough to enable core dumps. The maximum + file size for core dumps must be specified in limits.conf as well. See + as well as the limits.conf(5) + man page. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + example = "Storage=journal"; + description = '' + Extra config options for systemd-coredump. See coredump.conf(5) man page + for available options. + ''; + }; + }; + + }; + + config = mkIf config.systemd.coredump.enable { + + environment.etc."systemd/coredump.conf".text = + '' + [Coredump] + ${config.systemd.coredump.extraConfig} + ''; + + # Have the kernel pass core dumps to systemd's coredump helper binary. + # From systemd's 50-coredump.conf file. See: + # + boot.kernel.sysctl."kernel.core_pattern" = "|${pkgs.systemd}/lib/systemd/systemd-coredump %p %u %g %s %t %e"; + + }; + +} diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix new file mode 100644 index 00000000000..af39c7bb684 --- /dev/null +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -0,0 +1,44 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + blCfg = config.boot.loader; + cfg = blCfg.generic-extlinux-compatible; + + timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; + + builder = import ./extlinux-conf-builder.nix { inherit pkgs; }; +in +{ + options = { + boot.loader.generic-extlinux-compatible = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to generate an extlinux-compatible configuration file + under /boot/extlinux.conf. For instance, + U-Boot's generic distro boot support uses this file format. + + See U-boot's documentation + for more information. + ''; + }; + + configurationLimit = mkOption { + default = 20; + example = 10; + type = types.int; + description = '' + Maximum number of configurations in the boot menu. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + system.build.installBootLoader = "${builder} -g ${toString cfg.configurationLimit} -t ${timeoutStr} -c"; + system.boot.loader.id = "generic-extlinux-compatible"; + }; +} diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix new file mode 100644 index 00000000000..261192c6d24 --- /dev/null +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix @@ -0,0 +1,8 @@ +{ pkgs }: + +pkgs.substituteAll { + src = ./extlinux-conf-builder.sh; + isExecutable = true; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; +} diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh new file mode 100644 index 00000000000..8f2a496de8b --- /dev/null +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -0,0 +1,132 @@ +#! @bash@/bin/sh -e + +shopt -s nullglob + +export PATH=/empty +for i in @path@; do PATH=$PATH:$i/bin; done + +usage() { + echo "usage: $0 -t -c [-d ] [-g ]" >&2 + exit 1 +} + +timeout= # Timeout in centiseconds +default= # Default configuration +target=/boot # Target directory +numGenerations=0 # Number of other generations to include in the menu + +while getopts "t:c:d:g:" opt; do + case "$opt" in + t) # U-Boot interprets '0' as infinite and negative as instant boot + if [ "$OPTARG" -lt 0 ]; then + timeout=0 + elif [ "$OPTARG" = 0 ]; then + timeout=-10 + else + timeout=$((OPTARG * 10)) + fi + ;; + c) default="$OPTARG" ;; + d) target="$OPTARG" ;; + g) numGenerations="$OPTARG" ;; + \?) usage ;; + esac +done + +[ "$timeout" = "" -o "$default" = "" ] && usage + +mkdir -p $target/nixos +mkdir -p $target/extlinux + +# Convert a path to a file in the Nix store such as +# /nix/store/-/file to --. +cleanName() { + local path="$1" + echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g' +} + +# Copy a file from the Nix store to $target/nixos. +declare -A filesCopied + +copyToKernelsDir() { + local src=$(readlink -f "$1") + local dst="$target/nixos/$(cleanName $src)" + # Don't copy the file if $dst already exists. This means that we + # have to create $dst atomically to prevent partially copied + # kernels or initrd if this script is ever interrupted. + if ! test -e $dst; then + local dstTmp=$dst.tmp.$$ + cp -r $src $dstTmp + mv $dstTmp $dst + fi + filesCopied[$dst]=1 + result=$dst +} + +# Copy its kernel, initrd and dtbs to $target/nixos, and echo out an +# extlinux menu entry +addEntry() { + local path=$(readlink -f "$1") + local tag="$2" # Generation number or 'default' + + if ! test -e $path/kernel -a -e $path/initrd; then + return + fi + + copyToKernelsDir "$path/kernel"; kernel=$result + copyToKernelsDir "$path/initrd"; initrd=$result + # XXX UGLY: maybe the system config should have a top-level "dtbs" entry? + copyToKernelsDir $(readlink -m "$path/kernel/../dtbs"); dtbs=$result + + timestampEpoch=$(stat -L -c '%Z' $path) + + timestamp=$(date "+%Y-%m-%d %H:%M" -d @$timestampEpoch) + nixosVersion="$(cat $path/nixos-version)" + extraParams="$(cat $path/kernel-params)" + + echo + echo "LABEL nixos-$tag" + if [ "$tag" = "default" ]; then + echo " MENU LABEL NixOS - Default" + else + echo " MENU LABEL NixOS - Configuration $tag ($timestamp - $nixosVersion)" + fi + echo " LINUX ../nixos/$(basename $kernel)" + echo " INITRD ../nixos/$(basename $initrd)" + echo " FDTDIR ../nixos/$(basename $dtbs)" + echo " APPEND systemConfig=$path init=$path/init $extraParams" +} + +tmpFile="$target/extlinux/extlinux.conf.tmp.$$" + +cat > $tmpFile <> $tmpFile + +mv -f $tmpFile $target/extlinux/extlinux.conf + +# Remove obsolete files from $target/nixos. +for fn in $target/nixos/*; do + if ! test "${filesCopied[$fn]}" = 1; then + echo "Removing no longer needed boot file: $fn" + chmod +w -- "$fn" + rm -rf -- "$fn" + fi +done diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 585c8854fee..22af11b484e 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -21,13 +21,13 @@ let grubEfi = # EFI version of Grub v2 - if (cfg.devices != ["nodev"]) && cfg.efiSupport && (cfg.version == 2) + if cfg.efiSupport && (cfg.version == 2) then realGrub.override { efiSupport = cfg.efiSupport; } else null; f = x: if x == null then "" else "" + x; - grubConfig = pkgs.writeText "grub-config.xml" (builtins.toXML + grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML { splashImage = f config.boot.loader.grub.splashImage; grub = f grub; grubTarget = f (grub.grubTarget or ""); @@ -35,11 +35,14 @@ let fullVersion = (builtins.parseDrvName realGrub.name).version; grubEfi = f grubEfi; grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; - inherit (efi) efiSysMountPoint canTouchEfiVariables; + bootPath = args.path; + efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint; + inherit (args) devices; + inherit (efi) canTouchEfiVariables; inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout - default devices fsIdentifier efiSupport; + default fsIdentifier efiSupport; path = (makeSearchPath "bin" ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) @@ -48,6 +51,9 @@ let ]); }); + bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {} + (concatMap (args: args.devices) cfg.mirroredBoots); + in { @@ -101,6 +107,53 @@ in ''; }; + mirroredBoots = mkOption { + default = [ ]; + example = [ + { path = "/boot1"; devices = [ "/dev/sda" ]; } + { path = "/boot2"; devices = [ "/dev/sdb" ]; } + ]; + description = '' + Mirror the boot configuration to multiple partitions and install grub + to the respective devices corresponding to those partitions. + ''; + + type = types.listOf types.optionSet; + + options = { + + path = mkOption { + example = "/boot1"; + type = types.str; + description = '' + The path to the boot directory where grub will be written. Generally + this boot parth should double as an efi path. + ''; + }; + + efiSysMountPoint = mkOption { + default = null; + example = "/boot1/efi"; + type = types.nullOr types.str; + description = '' + The path to the efi system mount point. Usually this is the same + partition as the above path and can be left as null. + ''; + }; + + devices = mkOption { + default = [ ]; + example = [ "/dev/sda" "/dev/sdb" ]; + type = types.listOf types.str; + description = '' + The path to the devices which will have the grub mbr written. + Note these are typically device paths and not paths to partitions. + ''; + }; + + }; + }; + configurationName = mkOption { default = ""; example = "Stable 2.6.21"; @@ -284,20 +337,25 @@ in sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. - else ./winkler-gnu-blue-640x480.png); + else "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"); } (mkIf cfg.enable { boot.loader.grub.devices = optional (cfg.device != "") cfg.device; - system.build.installBootLoader = - if cfg.devices == [] then - throw "You must set the option ‘boot.loader.grub.device’ to make the system bootable." - else - "PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} " + - (if cfg.enableCryptodisk then "GRUB_ENABLE_CRYPTODISK=y " else "") + - "${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig}"; + boot.loader.grub.mirroredBoots = optionals (cfg.devices != [ ]) [ + { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; } + ]; + + system.build.installBootLoader = pkgs.writeScript "install-grub.sh" ('' + #!${pkgs.stdenv.shell} + set -e + export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} + ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} + '' + flip concatMapStrings cfg.mirroredBoots (args: '' + ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} $@ + '')); system.build.grub = grub; @@ -312,13 +370,37 @@ in ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}" '') config.boot.loader.grub.extraFiles); - assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2; - message = "Only grub version 2 provides zfs support";}] - ++ flip map cfg.devices (dev: { - assertion = dev == "nodev" || hasPrefix "/" dev; - message = "Grub devices must be absolute paths, not ${dev}"; - }); - + assertions = [ + { + assertion = !cfg.zfsSupport || cfg.version == 2; + message = "Only grub version 2 provides zfs support"; + } + { + assertion = cfg.mirroredBoots != [ ]; + message = "You must set the option ‘boot.loader.grub.devices’ or " + + "'boot.loader.grub.mirroredBoots' to make the system bootable."; + } + { + assertion = all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters); + message = "You cannot have duplicated devices in mirroredBoots"; + } + ] ++ flip concatMap cfg.mirroredBoots (args: [ + { + assertion = args.devices != [ ]; + message = "A boot path cannot have an empty devices string in ${arg.path}"; + } + { + assertion = hasPrefix "/" args.path; + message = "Boot paths must be absolute, not ${args.path}"; + } + { + assertion = if args.efiSysMountPoint == null then true else hasPrefix "/" args.efiSysMountPoint; + message = "Efi paths must be absolute, not ${args.efiSysMountPoint}"; + } + ] ++ flip map args.devices (device: { + assertion = device == "nodev" || hasPrefix "/" device; + message = "Grub devices must be absolute paths, not ${dev} in ${args.path}"; + })); }) ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 81009e9fb82..fcf5871203d 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -54,6 +54,7 @@ my $defaultEntry = int(get("default")); my $fsIdentifier = get("fsIdentifier"); my $grubEfi = get("grubEfi"); my $grubTargetEfi = get("grubTargetEfi"); +my $bootPath = get("bootPath"); my $canTouchEfiVariables = get("canTouchEfiVariables"); my $efiSysMountPoint = get("efiSysMountPoint"); $ENV{'PATH'} = get("path"); @@ -62,16 +63,16 @@ die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; print STDERR "updating GRUB $grubVersion menu...\n"; -mkpath("/boot/grub", 0, 0700); +mkpath("$bootPath/grub", 0, 0700); -# Discover whether /boot is on the same filesystem as / and +# Discover whether the bootPath is on the same filesystem as / and # /nix/store. If not, then all kernels and initrds must be copied to -# /boot. -if (stat("/boot")->dev != stat("/nix/store")->dev) { +# the bootPath. +if (stat($bootPath)->dev != stat("/nix/store")->dev) { $copyKernels = 1; } -# Discover information about the location of /boot +# Discover information about the location of the bootPath struct(Fs => { device => '$', type => '$', @@ -206,7 +207,7 @@ sub GrubFs { } return Grub->new(path => $path, search => $search); } -my $grubBoot = GrubFs("/boot"); +my $grubBoot = GrubFs($bootPath); my $grubStore; if ($copyKernels == 0) { $grubStore = GrubFs("/nix/store"); @@ -221,7 +222,7 @@ if ($grubVersion == 1) { timeout $timeout "; if ($splashImage) { - copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n"; + copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n"; $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n"; } } @@ -253,10 +254,15 @@ else { set timeout=$timeout fi + # Setup the graphics stack for bios and efi systems + insmod vbe + insmod efi_gop + insmod efi_uga + insmod font if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then - set gfxmode=640x480 insmod gfxterm - insmod vbe + set gfxmode=auto + set gfxpayload=keep terminal_output gfxterm fi "; @@ -264,7 +270,7 @@ else { if ($splashImage) { # FIXME: GRUB 1.97 doesn't resize the background image if it # doesn't match the video resolution. - copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n"; + copy $splashImage, "$bootPath/background.png" or die "cannot copy $splashImage to $bootPath\n"; $conf .= " insmod png if background_image " . $grubBoot->path . "/background.png; then @@ -285,14 +291,14 @@ $conf .= "$extraConfig\n"; $conf .= "\n"; my %copied; -mkpath("/boot/kernels", 0, 0755) if $copyKernels; +mkpath("$bootPath/kernels", 0, 0755) if $copyKernels; sub copyToKernelsDir { my ($path) = @_; return $grubStore->path . substr($path, length("/nix/store")) unless $copyKernels; $path =~ /\/nix\/store\/(.*)/ or die; my $name = $1; $name =~ s/\//-/g; - my $dst = "/boot/kernels/$name"; + my $dst = "$bootPath/kernels/$name"; # Don't copy the file if $dst already exists. This means that we # have to create $dst atomically to prevent partially copied # kernels or initrd if this script is ever interrupted. @@ -396,14 +402,14 @@ if ($extraPrepareConfig ne "") { } # Atomically update the GRUB config. -my $confFile = $grubVersion == 1 ? "/boot/grub/menu.lst" : "/boot/grub/grub.cfg"; +my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/grub.cfg"; my $tmpFile = $confFile . ".tmp"; writeFile($tmpFile, $conf); rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n"; -# Remove obsolete files from /boot/kernels. -foreach my $fn (glob "/boot/kernels/*") { +# Remove obsolete files from $bootPath/kernels. +foreach my $fn (glob "$bootPath/kernels/*") { next if defined $copied{$fn}; print STDERR "removing obsolete file $fn\n"; unlink $fn; @@ -422,7 +428,7 @@ struct(GrubState => { }); sub readGrubState { my $defaultGrubState = GrubState->new(version => "", efi => "", devices => "", efiMountPoint => "" ); - open FILE, "; chomp($version); @@ -491,10 +497,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { next if $dev eq "nodev"; print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n"; if ($grubTarget eq "") { - system("$grub/sbin/grub-install", "--recheck", Cwd::abs_path($dev)) == 0 + system("$grub/sbin/grub-install", "--recheck", "--boot-directory=$bootPath", Cwd::abs_path($dev)) == 0 or die "$0: installation of GRUB on $dev failed\n"; } else { - system("$grub/sbin/grub-install", "--recheck", "--target=$grubTarget", Cwd::abs_path($dev)) == 0 + system("$grub/sbin/grub-install", "--recheck", "--boot-directory=$bootPath", "--target=$grubTarget", Cwd::abs_path($dev)) == 0 or die "$0: installation of GRUB on $dev failed\n"; } } @@ -505,10 +511,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; if ($canTouchEfiVariables eq "true") { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--efi-directory=$efiSysMountPoint") == 0 + system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint") == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; } else { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0 + system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; } } @@ -516,7 +522,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) # update GRUB state file if ($requireNewInstall != 0) { - open FILE, ">/boot/grub/state" or die "cannot create /boot/grub/state: $!\n"; + open FILE, ">$bootPath/grub/state" or die "cannot create $bootPath/grub/state: $!\n"; print FILE get("fullVersion"), "\n" or die; print FILE $efiTarget, "\n" or die; print FILE join( ":", @deviceTargets ), "\n" or die; diff --git a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png deleted file mode 100644 index 35bbb57b51e..00000000000 Binary files a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png and /dev/null differ diff --git a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README deleted file mode 100644 index 9616362dce2..00000000000 --- a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README +++ /dev/null @@ -1,6 +0,0 @@ -This is a resized version of - - http://www.gnu.org/graphics/winkler-gnu-blue.png - -by Kyle Winkler and released under the Free Art License -(http://artlibre.org/licence.php/lalgb.html). diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix new file mode 100644 index 00000000000..963bc940b4f --- /dev/null +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.exfat-utils pkgs.fuse_exfat ]; + + }; +} diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 778cdc5d30d..bd340869d69 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -45,6 +45,16 @@ with lib; ''; }; + fakeButtons = mkOption { + default = false; + type = types.bool; + description = '' + Switch to "bare" PS/2 mouse support in case Trackpoint buttons are not recognized + properly. This can happen for example on models like the L430, T450, T450s, on + which the Trackpoint buttons are actually a part of the Synaptics touchpad. + ''; + }; + }; }; @@ -52,11 +62,13 @@ with lib; ###### implementation - config = mkMerge [ - (mkIf config.hardware.trackpoint.enable { + config = + let cfg = config.hardware.trackpoint; in + mkMerge [ + (mkIf cfg.enable { services.udev.extraRules = '' - ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}" + ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}" ''; system.activationScripts.trackpoint = @@ -65,20 +77,22 @@ with lib; ''; }) - (mkIf config.hardware.trackpoint.emulateWheel { - services.xserver.config = - '' - Section "InputClass" - Identifier "Trackpoint Wheel Emulation" - MatchProduct "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" - MatchDevicePath "/dev/input/event*" - Option "EmulateWheel" "true" - Option "EmulateWheelButton" "2" - Option "Emulate3Buttons" "false" - Option "XAxisMapping" "6 7" - Option "YAxisMapping" "4 5" - EndSection - ''; + (mkIf (cfg.emulateWheel) { + services.xserver.inputClassSections = + ['' + Identifier "Trackpoint Wheel Emulation" + MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}" + MatchDevicePath "/dev/input/event*" + Option "EmulateWheel" "true" + Option "EmulateWheelButton" "2" + Option "Emulate3Buttons" "false" + Option "XAxisMapping" "6 7" + Option "YAxisMapping" "4 5" + '']; + }) + + (mkIf cfg.fakeButtons { + boot.extraModprobeConfig = "options psmouse proto=bare"; }) ]; } diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix new file mode 100644 index 00000000000..47022c6887c --- /dev/null +++ b/nixos/modules/virtualisation/azure-common.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + imports = [ ../profiles/headless.nix ]; + + boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; + boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; + + # Generate a GRUB menu. + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.version = 2; + boot.loader.grub.timeout = 0; + + # Don't put old configurations in the GRUB menu. The user has no + # way to select them anyway. + boot.loader.grub.configurationLimit = 0; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + # Allow root logins only using the SSH key that the user specified + # at instance creation time, ping client connections to avoid timeouts + services.openssh.enable = true; + services.openssh.permitRootLogin = "without-password"; + services.openssh.extraConfig = '' + ClientAliveInterval 180 + ''; + + # Force getting the hostname from Azure + networking.hostName = mkDefault ""; + + # Always include cryptsetup so that NixOps can use it. + # sg_scan is needed to finalize disk removal on older kernels + environment.systemPackages = [ pkgs.cryptsetup pkgs.sg3_utils ]; + + networking.usePredictableInterfaceNames = false; + + services.udev.extraRules = '' + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:0", ATTR{removable}=="0", SYMLINK+="disk/by-lun/0", + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:1", ATTR{removable}=="0", SYMLINK+="disk/by-lun/1", + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:2", ATTR{removable}=="0", SYMLINK+="disk/by-lun/2" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:3", ATTR{removable}=="0", SYMLINK+="disk/by-lun/3" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:4", ATTR{removable}=="0", SYMLINK+="disk/by-lun/4" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:5", ATTR{removable}=="0", SYMLINK+="disk/by-lun/5" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:6", ATTR{removable}=="0", SYMLINK+="disk/by-lun/6" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:7", ATTR{removable}=="0", SYMLINK+="disk/by-lun/7" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:8", ATTR{removable}=="0", SYMLINK+="disk/by-lun/8" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:9", ATTR{removable}=="0", SYMLINK+="disk/by-lun/9" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:10", ATTR{removable}=="0", SYMLINK+="disk/by-lun/10" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:11", ATTR{removable}=="0", SYMLINK+="disk/by-lun/11" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:12", ATTR{removable}=="0", SYMLINK+="disk/by-lun/12" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:13", ATTR{removable}=="0", SYMLINK+="disk/by-lun/13" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:14", ATTR{removable}=="0", SYMLINK+="disk/by-lun/14" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:15", ATTR{removable}=="0", SYMLINK+="disk/by-lun/15" + + ''; + +} diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index ab5a9c51fa5..3f554d127c3 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -5,8 +5,6 @@ let diskSize = "4096"; in { - imports = [ ../profiles/headless.nix ]; - system.build.azureImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand "azure-image" @@ -24,7 +22,6 @@ in postVM = '' - echo Converting mkdir -p $out ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd rm $diskImage @@ -93,34 +90,11 @@ in '' ); - fileSystems."/".device = "/dev/disk/by-label/nixos"; + imports = [ ./azure-common.nix ]; # Azure metadata is available as a CD-ROM drive. fileSystems."/metadata".device = "/dev/sr0"; - boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; - boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; - - # Generate a GRUB menu. - boot.loader.grub.device = "/dev/sda"; - boot.loader.grub.version = 2; - boot.loader.grub.timeout = 0; - - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; - - # Allow root logins only using the SSH key that the user specified - # at instance creation time. - services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; - - # Force getting the hostname from Azure - networking.hostName = mkDefault ""; - - # Always include cryptsetup so that NixOps can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; - systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; @@ -157,8 +131,4 @@ in serviceConfig.StandardOutput = "journal+console"; }; - networking.usePredictableInterfaceNames = false; - - #users.extraUsers.root.openssh.authorizedKeys.keys = [ (builtins.readFile ) ]; - } diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 5be76b2682f..49170f2220b 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -45,7 +45,7 @@ in }; extraOptions = mkOption { - type = types.str; + type = types.separatedString " "; default = ""; description = '' diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 7410609e064..16aedbbb185 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -57,6 +57,17 @@ in ''; }; + virtualisation.libvirtd.extraOptions = + mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--verbose" ]; + description = + '' + Extra command line arguments passed to libvirtd on startup. + ''; + }; + virtualisation.libvirtd.onShutdown = mkOption { type = types.enum ["shutdown" "suspend" ]; @@ -140,7 +151,7 @@ in done ''; # */ - serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon --verbose''; + serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon ${concatStringsSep " " cfg.extraOptions}''; serviceConfig.Type = "forking"; serviceConfig.KillMode = "process"; # when stopping, leave the VMs alone diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix index 2523dacc0b5..20ec6b024e9 100644 --- a/nixos/modules/virtualisation/nova-image.nix +++ b/nixos/modules/virtualisation/nova-image.nix @@ -46,16 +46,20 @@ with lib; # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package}/bin/nix-store --load-db + chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group "" # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package}/bin/nix-env \ + chroot /mnt ${config.nix.package}/bin/nix-env --option build-users-group "" \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} # `nixos-rebuild' requires an /etc/NIXOS. mkdir -p /mnt/etc touch /mnt/etc/NIXOS + # `switch-to-configuration' requires a /bin/sh + mkdir -p /mnt/bin + ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh + # Install a configuration.nix. mkdir -p /mnt/etc/nixos cp ${./nova-config.nix} /mnt/etc/nixos/configuration.nix @@ -104,10 +108,6 @@ with lib; boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; */ - # Since Nova allows VNC access to instances, it's nice to start to - # start a few virtual consoles. - services.mingetty.ttys = [ "tty1" "tty2" ]; - # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index c1579d94657..69ca13a7147 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -7,35 +7,36 @@ with lib; let cfg = config.virtualisation.vswitch; -in +in { -{ - - options = { - - virtualisation.vswitch.enable = mkOption { + options.virtualisation.vswitch = { + enable = mkOption { type = types.bool; default = false; - description = - '' - Enable Open vSwitch. A configuration - daemon (ovs-server) will be started. + description = '' + Whether to enable Open vSwitch. A configuration daemon (ovs-server) + will be started. ''; }; - - virtualisation.vswitch.package = mkOption { + package = mkOption { type = types.package; default = pkgs.openvswitch; - description = - '' + description = '' Open vSwitch package to use. - ''; + ''; }; + ipsec = mkOption { + type = types.bool; + default = false; + description = '' + Whether to start racoon service for openvswitch. + ''; + }; }; - config = mkIf cfg.enable (let + config = mkIf cfg.enable (let # Where the communication sockets live runDir = "/var/run/openvswitch"; @@ -43,7 +44,7 @@ in # Where the config database live (can't be in nix-store) stateDir = "/var/db/openvswitch"; - # The path to the an initialized version of the database + # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { name = "vswitch.db"; unpackPhase = "true"; @@ -51,15 +52,12 @@ in buildInputs = with pkgs; [ cfg.package ]; - installPhase = - '' - ensureDir $out/ - ''; + installPhase = "mkdir -p $out"; }; - in { + in (mkMerge [{ - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ cfg.package pkgs.ipsecTools ]; boot.kernelModules = [ "tun" "openvswitch" ]; @@ -73,7 +71,7 @@ in path = [ cfg.package ]; restartTriggers = [ db cfg.package ]; # Create the config database - preStart = + preStart = '' mkdir -p ${runDir} mkdir -p /var/db/openvswitch @@ -85,23 +83,27 @@ in fi chmod -R +w /var/db/openvswitch ''; - serviceConfig.ExecStart = - '' - ${cfg.package}/bin/ovsdb-server \ - --remote=punix:${runDir}/db.sock \ - --private-key=db:Open_vSwitch,SSL,private_key \ - --certificate=db:Open_vSwitch,SSL,certificate \ - --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ - --unixctl=ovsdb.ctl.sock \ - /var/db/openvswitch/conf.db - ''; - serviceConfig.Restart = "always"; - serviceConfig.RestartSec = 3; - postStart = - '' + serviceConfig = { + ExecStart = + '' + ${cfg.package}/bin/ovsdb-server \ + --remote=punix:${runDir}/db.sock \ + --private-key=db:Open_vSwitch,SSL,private_key \ + --certificate=db:Open_vSwitch,SSL,certificate \ + --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ + --unixctl=ovsdb.ctl.sock \ + --pidfile=/var/run/openvswitch/ovsdb.pid \ + --detach \ + /var/db/openvswitch/conf.db + ''; + Restart = "always"; + RestartSec = 3; + PIDFile = "/var/run/openvswitch/ovsdb.pid"; + Type = "forking"; + }; + postStart = '' ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init - ''; - + ''; }; systemd.services.vswitchd = { @@ -109,9 +111,55 @@ in bindsTo = [ "ovsdb.service" ]; after = [ "ovsdb.service" ]; path = [ cfg.package ]; - serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd''; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/ovs-vswitchd \ + --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ + --detach + ''; + PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; + Type = "forking"; + }; }; - }); + } + (mkIf cfg.ipsec { + services.racoon.enable = true; + services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf"; + + networking.firewall.extraCommands = '' + iptables -I INPUT -t mangle -p esp -j MARK --set-mark 1/1 + iptables -I INPUT -t mangle -p udp --dport 4500 -j MARK --set-mark 1/1 + ''; + + systemd.services.ovs-monitor-ipsec = { + description = "Open_vSwitch Ipsec Daemon"; + wantedBy = [ "multi-user.target" ]; + requires = [ "racoon.service" ]; + after = [ "vswitchd.service" ]; + environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock"; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/ovs-monitor-ipsec \ + --root-prefix ${runDir}/ipsec \ + --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ + --monitor --detach \ + unix:/var/run/openvswitch/db.sock + ''; + PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; + Type = "forking"; + }; + + preStart = '' + rm -r ${runDir}/ipsec/etc/racoon/certs || true + mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/} + ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey + ln -fs ${pkgs.writeScript "racoon-restart" '' + #!${pkgs.stdenv.shell} + /var/run/current-system/sw/bin/systemctl $1 racoon + ''} ${runDir}/ipsec/etc/init.d/racoon + ''; + }; + })])); } diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix new file mode 100644 index 00000000000..3f19f6a28b2 --- /dev/null +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.vmwareGuest; + open-vm-tools = pkgs.open-vm-tools; +in +{ + options = { + services.vmwareGuest.enable = mkEnableOption "Enable VMWare Guest Support"; + }; + + config = mkIf cfg.enable { + assertions = [ { + assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; + message = "VMWare guest is not currently supported on ${pkgs.stdenv.system}"; + } ]; + + environment.systemPackages = [ open-vm-tools ]; + + systemd.services.vmware = + { description = "VMWare Guest Service"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; + }; + + services.xserver = { + videoDrivers = mkOverride 50 [ "vmware" ]; + + config = '' + Section "InputDevice" + Identifier "VMMouse" + Driver "vmmouse" + EndSection + ''; + + serverLayoutSection = '' + InputDevice "VMMouse" + ''; + + displayManager.sessionCommands = '' + ${open-vm-tools}/bin/vmware-user-suid-wrapper + ''; + }; + }; +} diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index cb1c200ab47..d501c2e7c53 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -53,6 +53,7 @@ in rec { (all nixos.tests.firewall) (all nixos.tests.gnome3) (all nixos.tests.installer.lvm) + (all nixos.tests.installer.luksroot) (all nixos.tests.installer.separateBoot) (all nixos.tests.installer.simple) (all nixos.tests.installer.simpleLabels) @@ -63,6 +64,7 @@ in rec { (all nixos.tests.installer.btrfsSubvolDefault) (all nixos.tests.ipv6) (all nixos.tests.kde4) + (all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) (all nixos.tests.nat.firewall) diff --git a/nixos/release.nix b/nixos/release.nix index 375b65d040e..3559926eefa 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -255,6 +255,7 @@ in rec { tests.i3wm = callTest tests/i3wm.nix {}; tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); + tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test); tests.installer.rebuildCD = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).rebuildCD.test); tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test); tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); @@ -270,6 +271,7 @@ in rec { tests.kde4 = callTest tests/kde4.nix {}; tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; + tests.lightdm = callTest tests/lightdm.nix {}; tests.login = callTest tests/login.nix {}; #tests.logstash = callTest tests/logstash.nix {}; tests.misc = callTest tests/misc.nix {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 026433fc7ee..2241bc9c3bc 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -9,6 +9,8 @@ import ./make-test.nix ( }: rec { name = "chromium"; + enableOCR = true; + machine.imports = [ ./common/x11.nix ]; machine.virtualisation.memorySize = 1024; @@ -106,15 +108,11 @@ import ./make-test.nix ( "ulimit -c unlimited; ". "$pkg/bin/chromium $args \"$url\" & disown" ); + $machine->waitForText(qr/Type to search or enter a URL to navigate/); $machine->waitUntilSucceeds("${xdo "check-startup" '' search --sync --onlyvisible --name "startup done" # close first start help popup key -delay 1000 Escape - # XXX: This is to make sure the popup is closed, but we better do - # screenshots to detect visual changes. - key -delay 2000 Escape - key -delay 3000 Escape - key -delay 4000 Escape windowfocus --sync windowactivate --sync ''}"); diff --git a/nixos/tests/gnome3_16.nix b/nixos/tests/gnome3_16.nix deleted file mode 100644 index 23a66aba50c..00000000000 --- a/nixos/tests/gnome3_16.nix +++ /dev/null @@ -1,34 +0,0 @@ -import ./make-test.nix { - name = "gnome3"; - - machine = - { config, pkgs, ... }: - - { imports = [ ./common/user-account.nix ]; - - services.xserver.enable = true; - - services.xserver.displayManager.auto.enable = true; - services.xserver.displayManager.auto.user = "alice"; - services.xserver.desktopManager.gnome3.enable = true; - - environment.gnome3.packageSet = pkgs.gnome3_16; - - virtualisation.memorySize = 512; - }; - - testScript = - '' - $machine->waitForX; - $machine->sleep(15); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->waitForWindow(qr/Terminal/); - $machine->sleep(20); - $machine->screenshot("screen"); - ''; - -} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index af87705b927..603dfbe224f 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -45,7 +45,8 @@ let # The configuration to install. makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier - , readOnly ? true, forceGrubReinstallCount ? 0 }: + , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0 + }: pkgs.writeText "configuration.nix" '' { config, lib, pkgs, modulesPath, ... }: @@ -70,6 +71,7 @@ let environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; nix.binaryCaches = [ http://cache.nixos.org/ ]; + ${replaceChars ["\n"] ["\n "] extraConfig} } ''; @@ -106,7 +108,9 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice, grubIdentifier }: + testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice + , grubIdentifier, preBootCommands, extraConfig + }: let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if grubVersion == 1 then "scsi" else "virtio"; @@ -116,7 +120,7 @@ let hdFlags =''hda => "harddisk", hdaInterface => "${iface}", ''; in '' - createDisk("harddisk", 4 * 1024); + createDisk("harddisk", 8 * 1024); my $machine = createMachine({ ${hdFlags} cdrom => glob("${iso}/iso/*.iso"), @@ -172,7 +176,7 @@ let $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; } }", "/mnt/etc/nixos/configuration.nix"); # Perform the installation. @@ -190,6 +194,9 @@ let # Now see if we can boot the installation. $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + # For example to enter LUKS passphrase + ${preBootCommands} + # Did /boot get mounted? $machine->waitForUnit("local-fs.target"); @@ -210,7 +217,7 @@ let # We need to a writable nix-store on next boot $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 1; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); # Check whether nixos-rebuild works. @@ -225,9 +232,10 @@ let # Check whether a writable store build works $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 2; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", "/etc/nixos/configuration.nix"); $machine->succeed("nixos-rebuild boot >&2"); $machine->shutdown; @@ -235,19 +243,25 @@ let # And just to be sure, check that the machine still boots after # "nixos-rebuild switch". $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + ${preBootCommands} $machine->waitForUnit("network.target"); $machine->shutdown; ''; makeInstallerTest = name: - { createPartitions, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }: + { createPartitions, preBootCommands ? "", extraConfig ? "" + , testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" + , grubIdentifier ? "uuid", enableOCR ? false + }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; + inherit enableOCR; testScript = testScriptFun { - inherit createPartitions testChannel grubVersion grubDevice grubIdentifier; + inherit createPartitions preBootCommands testChannel grubVersion + grubDevice grubIdentifier extraConfig; }; }; @@ -321,6 +335,44 @@ in { ''; }; + # Boot off an encrypted root partition + luksroot = makeInstallerTest "luksroot" + { createPartitions = '' + $machine->succeed( + "parted /dev/vda mklabel msdos", + "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted /dev/vda -- mkpart primary linux-swap 50M 1024M", + "parted /dev/vda -- mkpart primary 1024M -1s", # LUKS + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "modprobe dm_mod dm_crypt", + "echo -n supersecret | cryptsetup luksFormat -q /dev/vda3 -", + "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vda3 cryptroot", + "mkfs.ext3 -L nixos /dev/mapper/cryptroot", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount LABEL=boot /mnt/boot", + ); + ''; + # XXX: Currently, generate-config doesn't detect LUKS yet. + extraConfig = '' + boot.kernelParams = lib.mkAfter [ "console=tty0" ]; + boot.initrd.luks.devices = lib.singleton { + name = "cryptroot"; + device = "/dev/vda3"; + preLVM = true; + }; + ''; + enableOCR = true; + preBootCommands = '' + $machine->start; + $machine->waitForText(qr/Enter passphrase/); + $machine->sendChars("supersecret\n"); + ''; + }; + swraid = makeInstallerTest "swraid" { createPartitions = '' diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix new file mode 100644 index 00000000000..dba20a49dbd --- /dev/null +++ b/nixos/tests/lightdm.nix @@ -0,0 +1,25 @@ +import ./make-test.nix { + name = "lightdm"; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; + }; + + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.extraUsers.alice; + in '' + startAll; + $machine->waitForText(qr/${user.description}/); + $machine->screenshot("lightdm"); + $machine->sendChars("${user.password}\n"); + $machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m); + $machine->screenshot("session"); + ''; +} diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index e8c41140045..1e3a0057c65 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -68,6 +68,7 @@ import ./make-test.nix ({pkgs, ... }: { # Print the file on the client. $client->succeed("lp $file"); + $client->sleep(10); $client->succeed("lpq") =~ /active.*root.*$fn/ or die; # Ensure that a raw PCL file appeared in the server's queue @@ -75,11 +76,13 @@ import ./make-test.nix ({pkgs, ... }: { # course, since there is no actual USB printer attached, the # file will stay in the queue forever. $server->waitForFile("/var/spool/cups/d00001-001"); + $server->sleep(10); $server->succeed("lpq -a") =~ /$fn/ or die; # Delete the job on the client. It should disappear on the # server as well. $client->succeed("lprm"); + $client->sleep(10); $client->succeed("lpq -a") =~ /no entries/; Machine::retry sub { return 1 if $server->succeed("lpq -a") =~ /no entries/; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index b888b587be9..7be2b90551e 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -6,14 +6,14 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - core_version = "0.10.1"; + core_version = "0.10.2"; version = core_version; src = fetchurl { - url = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" - "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" - ]; - sha256 = "287873f9ba4fd49cd4e4be7eba070d2606878f1690c5be0273164d37cbf3c138"; + urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" + "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" + ]; + sha256 = "cddf96c71d0a35524fde93380981cf0cf0b51441454a3a68b9be491b9239bfec"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib diff --git a/pkgs/applications/altcoins/darkcoin.nix b/pkgs/applications/altcoins/darkcoin.nix index 56d22d0b53b..89ff12f8f74 100644 --- a/pkgs/applications/altcoins/darkcoin.nix +++ b/pkgs/applications/altcoins/darkcoin.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig +{ fetchzip, stdenv, pkgconfig , openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf , utillinux , withGui }: @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { name = "darkcoin" + (toString (optional (!withGui) "d")) + "-" + version; version = "0.10.99.99"; - src = fetchurl { + src = fetchzip { url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz"; - sha256 = "1a05a7l878klg4wqk9ykndkhyknrd7jp75v38k99qgk5fi8wa752"; + sha256 = "0sigvimqwc1mvaq43a8c2aq7fjla2ncafrals08qfq3jd6in8b4f"; }; buildInputs = [ pkgconfig glib openssl db48 boost zlib miniupnpc ] diff --git a/pkgs/applications/audio/LazyLimiter/default.nix b/pkgs/applications/audio/LazyLimiter/default.nix new file mode 100644 index 00000000000..d400bea3379 --- /dev/null +++ b/pkgs/applications/audio/LazyLimiter/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "LazyLimiter-${version}"; + version = "0.3.01"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "LazyLimiter"; + rev = "v${version}"; + sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 LazyLimiter.dsp + faust2lv2 -t 99999 LazyLimiter.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp LazyLimiter $out/bin/ + mkdir -p $out/lib/lv2 + cp -r LazyLimiter.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A fast yet clean lookahead limiter for jack and lv2"; + homepage = https://magnetophon.github.io/LazyLimiter/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/MBdistortion/default.nix b/pkgs/applications/audio/MBdistortion/default.nix new file mode 100644 index 00000000000..c70ab578259 --- /dev/null +++ b/pkgs/applications/audio/MBdistortion/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "MBdistortion-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "MBdistortion"; + rev = "v${version}"; + sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 MBdistortion.dsp + faust2lv2 -t 99999 MBdistortion.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp MBdistortion $out/bin/ + mkdir -p $out/lib/lv2 + cp -r MBdistortion.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "Mid-side multiband distortion for jack and lv2"; + homepage = https://github.com/magnetophon/MBdistortion; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/QmidiNet/default.nix new file mode 100644 index 00000000000..4ab871c22a0 --- /dev/null +++ b/pkgs/applications/audio/QmidiNet/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, qt4, alsaLib, jack2 }: + +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "qmidinet-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/qmidinet/${name}.tar.gz"; + sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa"; + }; + + buildInputs = [ qt4 alsaLib jack2 ]; + + meta = with stdenv.lib; { + description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; + homepage = http://qmidinet.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/VoiceOfFaust/default.nix b/pkgs/applications/audio/VoiceOfFaust/default.nix new file mode 100644 index 00000000000..17cb680c58c --- /dev/null +++ b/pkgs/applications/audio/VoiceOfFaust/default.nix @@ -0,0 +1,65 @@ + +{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, helmholtz, mrpeach, puredata-with-plugins }: +stdenv.mkDerivation rec { + name = "VoiceOfFaust-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "VoiceOfFaust"; + rev = "v${version}"; + sha256 = "14jjs7cnhg20pzijgblr7caspcpx8p8lpkbvjzc656s9lqn6m9sn"; + }; + + plugins = [ helmholtz mrpeach ]; + + pitchTracker = puredata-with-plugins plugins; + + buildInputs = [ faust2jack ]; + + runtimeInputs = [ pitchTracker ]; + + patchPhase = '' + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper + sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper + ''; + + buildPhase = '' + faust2jack -osc classicVocoder.dsp + faust2jack -osc CZringmod.dsp + faust2jack -osc FMsinger.dsp + faust2jack -osc FOFvocoder.dsp + faust2jack -osc Karplus-StrongSinger.dsp + faust2jack -osc -sch -t 99999 Karplus-StrongSingerMaxi.dsp + faust2jack -osc PAFvocoder.dsp + faust2jack -osc -sch -t 99999 stringSinger.dsp + faust2jack -osc subSinger.dsp + # doesn't compile on most systems, too big: + #faust2jack -osc -sch -t 99999 VocSynthFull.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp launchers/* $out/bin/ + cp classicVocoder $out/bin/ + cp CZringmod $out/bin/ + cp FMsinger $out/bin/ + cp FOFvocoder $out/bin/ + cp Karplus-StrongSinger $out/bin/ + cp Karplus-StrongSingerMaxi $out/bin/ + cp PAFvocoder $out/bin/ + cp stringSinger $out/bin/ + cp subSinger $out/bin/ + #cp VocSynthFull $out/bin/ + mkdir $out/PureData/ + cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd + ''; + + meta = { + description = "Turn your voice into a synthesizer"; + homepage = https://github.com/magnetophon/VoiceOfFaust; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} + diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 340a83e7963..3997855a75b 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation { ./patch.patch # patches taken from gentoo ]; - meta = { + meta = with stdenv.lib; { description = "A music composition and modular synthesis application"; homepage = http://beast.gtk.org; - license = ["GPL-2" "LGPL-2.1"]; + license = with licenses; [ gpl2 lgpl21 ]; }; } diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix new file mode 100644 index 00000000000..2084ab481fa --- /dev/null +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, jack2, gtk2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "bitmeter-${version}"; + version = "1.2"; + + src = fetchurl { + url = "http://devel.tlrmx.org/audio/source/${name}.tar.gz"; + sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; + }; + + buildInputs = [ jack2 gtk2 pkgconfig ]; + + meta = with stdenv.lib; { + homepage = http://devel.tlrmx.org/audio/bitmeter/; + description = "Also known as jack bitscope. Useful to detect denormals."; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index b27ac058602..d45ab818273 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, libpulseaudio, xlibs }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + alsaLib jack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext xlibs.xproto ]; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index bbce758be8a..04cc8008ea8 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }: stdenv.mkDerivation rec { - version = "1.3.5.0"; + version = "1.3.5.1"; name = "chuck-${version}"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "0rj2l5k6ncm4jaiq0igwfc2bzryzchk1is1jhk1n7wifxcf3d3k5"; + sha256 = "0lqzkphfd91kz95nf1wqy0z17r1m70c8inwvnb9fscbiaihwlhfi"; }; buildInputs = [ bison flex libsndfile which ] diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index cc13868e9d4..c9b16b65267 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -46,8 +46,8 @@ let usbmuxd ]; - unwrapped = stdenv.mkDerivation { - name = "clementine-unwrapped-${version}"; + free = stdenv.mkDerivation { + name = "clementine-free-${version}"; inherit patches src buildInputs; enableParallelBuilding = true; meta = with stdenv.lib; { @@ -91,7 +91,7 @@ with stdenv.lib; runCommand "clementine-${version}" { - inherit blob unwrapped; + inherit blob free; buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks dontPatchELF = true; dontStrip = true; @@ -109,7 +109,12 @@ runCommand "clementine-${version}" } '' mkdir -p $out/bin - makeWrapper "$unwrapped/bin/${exeName}" "$out/bin/${exeName}" \ + makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + + mkdir -p $out/share + for dir in applications icons kde4; do + ln -s "$free/share/$dir" "$out/share/$dir" + done '' diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index fd252754d66..a5cfdf227bb 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, pulseaudio}: +{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}: stdenv.mkDerivation rec { name = "cmus-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue pulseaudio ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ]; meta = { description = "Small, fast and powerful console music player for Linux and *BSD"; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 64f3f3586a3..693d8e2a6e5 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, libsndfile, flex, bison , alsaLib ? null -, pulseaudio ? null +, libpulseaudio ? null , tcltk ? null # maybe csound can be compiled with support for those, see configure output @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m"; }; - buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; + buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ]; meta = { description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ca8ce453e63..9dd4db68432 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -18,7 +18,7 @@ , osdSupport ? true, dbus ? null # output plugins , alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, pulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null , overloadSupport ? true, zlib ? null @@ -41,7 +41,7 @@ assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; assert osdSupport -> dbus != null; assert alsaSupport -> alsaLib != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert resamplerSupport -> libsamplerate != null; assert overloadSupport -> zlib != null; assert wavpackSupport -> wavpack != null; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ++ optional hotkeysSupport libX11 ++ optional osdSupport dbus ++ optional alsaSupport alsaLib - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional resamplerSupport libsamplerate ++ optional overloadSupport zlib ++ optional wavpackSupport wavpack diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index d71845ead37..b3a496c26a1 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.6.1"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "082ml6g63n6s3w704fjkma8085g2l10az3f6r78y9hpgpw3042jw"; + sha256 = "1f0vpwq7vydldrq9fdfipbkzqqndyxlx0n81ch1i9kw81xj3sxjq"; }; buildInputs = [ jack2 libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 2d738f55c28..cb1def12dfd 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas -, makeWrapper, gnome_icon_theme, dconf +, makeWrapper, gnome3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome_icon_theme dconf + itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf ]; meta = { diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index dd9b830be84..78383eec953 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, libsndfile, pulseaudio +, libsndfile, libpulseaudio }: let @@ -35,5 +35,5 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsndfile pulseaudio ]; + buildInputs = [ libsndfile libpulseaudio ]; } diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix new file mode 100644 index 00000000000..61c97953422 --- /dev/null +++ b/pkgs/applications/audio/eq10q/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }: +stdenv.mkDerivation rec { + name = "eq10q-2-${version}"; + version = "beta7.1"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/eq10q/${name}.tar.gz"; + sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; + }; + + buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ]; + + installFlags = '' + DESTDIR=$(out) + ''; + + fixupPhase = '' + cp -r $out/var/empty/local/lib $out + rm -R $out/var + ''; + + meta = { + description = "LV2 EQ plugins and more, with 64 bit processing"; + longDescription = '' + Up to 10-Bands parametric equalizer with mono and stereo versions. + Versatile noise-gate plugin with mono and stereo versions. + Compressor plugin with mono and stereo versions. + BassUp plugin - Enhanceing the bass guitar sound or other low frequency sounding instruments. + Improved high frequency response for peaking filter (in equalizers). + 64 bits floating point internal audio processing. + Nice GUI with powerful metering for every plugin. + ''; + homepage = http://eq10q.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 5a4793a09c1..8e80992d7ca 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: + libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { version = "3.22.02"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio - libsndfile libsamplerate pulseaudio pkgconfig alsaLib ]; + libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ]; meta = { description = "Digital modem program"; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8cba482194e..339cccfca70 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig -, pulseaudio }: +, libpulseaudio }: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-framework CoreAudio"; buildInputs = [ glib libsndfile pkgconfig ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ]; + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio jack2 ]; meta = with stdenv.lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 0c12778089b..ead15e9a918 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ALSA or JACK as sound input library. ''; homepage = http://home.gna.org/fmit/index.html; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix new file mode 100644 index 00000000000..d0de8c9f9a7 --- /dev/null +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, jack2, gtk2, lv2, faust, pkgconfig }: + +stdenv.mkDerivation rec { + version = "git-2015-05-21"; + name = "foo-yc20-${version}"; + src = fetchFromGitHub { + owner = "sampov2"; + repo = "foo-yc20"; + rev = "edd9d14c91229429b14270a181743e1046160ca8"; + sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq"; + }; + + buildInputs = [ jack2 gtk2 lv2 faust pkgconfig ]; + + makeFlags = "PREFIX=$(out)"; + + # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved + postInstallFixup = "rm -rf $out/lib/lv2"; + + meta = { + description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; + homepage = https://github.com/sampov2/foo-yc20; + license = "BSD"; + maintainers = stdenv.lib.maintainers.magnetophon; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index a3f356e75c4..0e7f8ad9957 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype +{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis , libsndfile, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig autoconf automake gnutls freetype SDL SDL_gfx SDL_ttf + pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index e8c14a9c763..853cdff4a51 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool, - ipodSupport ? true, libgpod, gnome3, hicolor_icon_theme }: + ipodSupport ? true, libgpod, gnome3 }: with pkgs.lib; @@ -16,8 +16,7 @@ in buildPythonPackage rec { buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool - gnome3.gnome_themes_standard gnome3.gnome_icon_theme - gnome3.gnome_icon_theme_symbolic hicolor_icon_theme + gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 9c08b2ab6d7..f01abb13e67 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta - gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme + gnome.gdl gnome.defaultIconTheme hicolor_icon_theme ]; patchPhase = '' diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 984d666ab95..9c1859cacf4 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python , avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom +, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -22,15 +23,14 @@ stdenv.mkDerivation rec { buildInputs = [ avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2 ladspaH librdf libsndfile lilv lv2 serd sord sratom + zita-convolver zita-resampler ]; configureFlags = [ "--shared-lib" "--no-desktop-update" - "--no-faust" # Need to package a release of faust, 0.9.58 or 0.9.65 "--enable-nls" - "--includeresampler" # Zita-resampler not packaged, use vendored version - "--includeconvolver" # Zita-convolver not packaged, use vendored version + "--no-faust" # todo: find out why --faust doesn't work ] ++ optional optimizationSupport "--optimization"; configurePhase = ''python waf configure --prefix=$out $configureFlags''; diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 2b808c3b015..804d6e7d4e4 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: +{ stdenv, fetchurl, fftw, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: stdenv.mkDerivation rec { name = "ir.lv2-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17a6h2mv9xv41jpbx6bdakkngin4kqzh2v67l4076ddq609k5a7v"; }; - buildInputs = [ gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ]; + buildInputs = [ fftw gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ]; buildPhase = '' make diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index b855bd29660..0f29ce34cac 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -25,29 +25,20 @@ stdenv.mkDerivation rec { "-I${zita-alsa-pcmi}/include" ]; - patchPhase = '' - cd source/ - sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.cc') - sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.cc') - sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.h') - sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.h') - ''; + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=''" + ]; - buildlPhase = '' - make PREFIX="$out" - ''; - - installPhase = '' - echo zita= ${zita-alsa-pcmi} - make PREFIX="$out" install - install -Dm644 ../README "$out/README" + preConfigure = '' + cd ./source/ ''; meta = with stdenv.lib; { homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; description = "JACK and ALSA Audio Analyser"; license = licenses.gpl2; - maintainers = [ maintainers.magnetophon ]; + maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index dca72f22b49..1f008e56c15 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { used to estimate the musical key of many different audio formats. ''; homepage = https://github.com/EvanPurkhiser/keyfinder-cli; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 33ce627e56e..bea869ea318 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { efficient workflow tool. ''; homepage = http://www.ibrahimshaath.co.uk/keyfinder/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix new file mode 100644 index 00000000000..c333492fd13 --- /dev/null +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "ladspa-sdk-${version}"; + version = "1.13"; + src = fetchurl { + url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; + }; + + patchPhase = '' + cd src + sed -i 's@/usr/@$(out)/@g' makefile + sed -i 's@-mkdirhier@mkdir -p@g' makefile + ''; + + meta = { + description = "The SDK for the LADSPA audio plugin standard"; + longDescription = '' + The LADSPA SDK, including the ladspa.h API header file, + ten example LADSPA plugins and + three example programs (applyplugin, analyseplugin and listplugins). + ''; + homepage = http://www.ladspa.org/ladspa_sdk/overview.html; + license = stdenv.lib.licenses.lgpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix similarity index 100% rename from pkgs/applications/audio/ladspa-plugins/ladspah.nix rename to pkgs/applications/audio/ladspa-sdk/ladspah.nix diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 6d28c038f23..830d42eb91b 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth , fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig -, pulseaudio, qt4, freetype +, libpulseaudio, qt4, freetype }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2 - libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4 + libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index a1e81be3cb3..0234a1d3fe5 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }: +, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio }: stdenv.mkDerivation rec { name = "mhwaveedit-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile - pkgconfig pulseaudio + pkgconfig libpulseaudio ]; configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 6f2bf8cdb1c..025d216910e 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, pulseaudio }: +{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }: stdenv.mkDerivation rec { version = "0.19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g"; }; - buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile pulseaudio ]; + buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; meta = { description = "General-purpose software audio FSK modem"; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix new file mode 100644 index 00000000000..7b17f21b613 --- /dev/null +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, lv2 }: + +stdenv.mkDerivation rec { + name = "mod-distortion-${version}"; + version = "git-2015-05-18"; + + src = fetchFromGitHub { + owner = "portalmod"; + repo = "mod-distortion"; + rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a"; + sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19"; + }; + + buildInputs = [ lv2 ]; + + installFlags = [ "LV2_PATH=$out/lib/lv2" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/portalmod/mod-distortion; + description = "Analog distortion emulation lv2 plugins"; + license = licenses.gpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index bf437584559..5069795cafe 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "00r2f7psd2jym2lxf3q3lz2lskz7091pz9glnxqam2bznwnlyxyp"; + sha256 = "1w85r23s0b30vh03xybnjikslqcf02gsciib9v10jw71nw32wzkm"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { ++ optional curlSupport "--with-curl" ++ optional taglibSupport "--with-taglib"; - buildInputs = [ boost mpd_clientlib ncurses pkgconfig readline libiconv ] + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ boost mpd_clientlib ncurses readline libiconv ] ++ optional curlSupport curl ++ optional visualizerSupport fftw ++ optional taglibSupport taglib; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index d665b83340c..31353cec6a9 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, pulseaudio }: +{ stdenv, fetchurl, boost, libpulseaudio }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4"; }; - buildInputs = [ boost pulseaudio ]; + buildInputs = [ boost libpulseaudio ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index f05c4068a60..06b4b44b596 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libglademm +{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm , dbus_glib, gconfmm, intltool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ pulseaudio gtkmm libglademm dbus_glib gconfmm ]; + buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 8e4c31302e2..8db0a94a990 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3 +{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 , libcanberra_gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; - buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper - gnome3.gnome_icon_theme ]; + buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 3e7bcb9d912..b76e1183c0e 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { configurePhase = "export CC=${CC}"; - meta = { + meta = with stdenv.lib; { description = "A console front-end for Pandora.com"; homepage = "http://6xq.net/projects/pianobar/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; # expat version - maintainers = stdenv.lib.maintainers.eduarrrd; + platforms = platforms.linux; + license = licenses.mit; # expat version + maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 508b6743cc3..fcfde86f7ee 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -3,7 +3,7 @@ , withQt ? true, qt4 , withLibvisual ? false, libvisual, SDL , withJack ? false, jack2 -, withPulseAudio ? true, pulseaudio +, withPulseAudio ? true, libpulseaudio }: assert withJack -> withQt; @@ -46,6 +46,6 @@ stdenv.mkDerivation { ++ optional withQt qt4 ++ optionals withLibvisual [ libvisual SDL ] ++ optional withJack jack2 - ++ optional withPulseAudio pulseaudio + ++ optional withPulseAudio libpulseaudio ; } diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 1a447be56b4..1b9323c1a7b 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -5,7 +5,7 @@ , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile , libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi # output plugins -, alsaLib, pulseaudio +, alsaLib, libpulseaudio # effect plugins , libsamplerate }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile libcdio cdparanoia libcddb faad2 ffmpeg wildmidi # output plugins - alsaLib pulseaudio + alsaLib libpulseaudio # effect plugins libsamplerate ]; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 763501a7465..d3d3a71febc 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -4,12 +4,12 @@ , sord, sratom, stdenv, suil }: stdenv.mkDerivation rec { - version = "0.6.6"; + version = "0.6.7"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "1n70hs4bx4hq3cp2p35jq5vlcans4fk2c35w72244vlqlajx05c0"; + sha256 = "0h5nblfkl4s412c9f02b40nb8c8jq8ypz67z2qn3hkvhx6i9yxsg"; }; buildInputs = diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 10f0a4cec41..15bb1e0a17d 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.6.1"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "18jh953a0480fnsflbm4j04xz02h7fqwk77v8hnv54vwwp5a1h08"; + sha256 = "1c62fpfl9xv93m04hfh72vzbljr0c5p409vzf3xxmvj9x610yx1w"; }; buildInputs = [ jack2 libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 104a458d6a0..9cd1a3d0345 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, pulseaudio, qt5, redland +, libsndfile, pkgconfig, libpulseaudio, qt5, redland , rubberband, serd, sord, vampSDK }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # optional jack2 # portaudio - pulseaudio + libpulseaudio libmad libogg # ? # fishsound diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 37fc45983d9..7b00e8ac060 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.6.1"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0v9zpa49cdj8ixpppgxz95dbn62v8mamxz6fpl7sdnzfn2l8jr4g"; + sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw"; }; buildInputs = [ qt4 jack2 lv2 ]; diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix new file mode 100644 index 00000000000..309a400c555 --- /dev/null +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, makeWrapper +, expat, fftwFloat, fontconfig, freetype, jack2, libclthreads, libclxclient +, libsndfile, libxcb, xlibs +}: + +stdenv.mkDerivation rec { + name = "tetraproc-${version}"; + version = "0.8.2"; + + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + expat jack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype + libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender + ]; + + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=''" + ]; + + preConfigure = '' + cd ./source/ + ''; + + postInstall = '' + # Make sure Jack is avalable in $PATH for tetraproc + wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin" + ''; + + meta = with stdenv.lib; { + description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/; + license = licenses.gpl2; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 8a613ee6861..94337989055 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -5,23 +5,24 @@ let ver_branch = "1.14"; - version = "1.14.0"; + version = "1.14.2"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0fkbzqncx34dhylrg5328fih7xywmsqj2p40smnx33nyf047jdgc"; + sha256 = "18dvipdkp6hc1hysyiwpd5nwq6db3mg98rwi3am2ly3hk2bpic18"; }; + patches = [ ./fix-paths.patch ]; + buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt qt4 ] ++ stdenv.lib.optional (qt5 != null) qt5.base; configureFlags = [ - "--enable-liblightdm-gobject" "--localstatedir=/var" "--sysconfdir=/etc" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://launchpad.net/lightdm; + homepage = https://launchpad.net/lightdm; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles wkennington ]; diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch new file mode 100644 index 00000000000..56930418cac --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/fix-paths.patch @@ -0,0 +1,61 @@ +diff --git a/common/user-list.c b/common/user-list.c +index 792c6d3..57fbfb7 100644 +--- a/common/user-list.c ++++ b/common/user-list.c +@@ -331,7 +331,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal) + + value = g_key_file_get_string (config, "UserList", "hidden-shells", NULL); + if (!value) +- value = g_strdup ("/bin/false /usr/sbin/nologin"); ++ value = g_strdup ("/run/current-system/sw/bin/nologin"); + hidden_shells = g_strsplit (value, " ", -1); + g_free (value); + +diff --git a/src/seat.c b/src/seat.c +index f9b149d..9029742 100644 +--- a/src/seat.c ++++ b/src/seat.c +@@ -343,7 +343,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, + + /* Set POSIX variables */ + process_set_clear_environment (script, TRUE); +- process_set_env (script, "SHELL", "/bin/sh"); ++ process_set_env (script, "SHELL", "/run/current-system/sw/bin/sh"); + + /* Variables required for regression tests */ + if (g_getenv ("LIGHTDM_TEST_ROOT")) +@@ -354,7 +354,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, + process_set_env (script, "PATH", g_getenv ("PATH")); + } + else +- process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin"); ++ process_set_env (script, "PATH", "/run/current-system/sw/bin"); + + if (user) + { +diff --git a/src/session-child.c b/src/session-child.c +index e85f57d..93db0bd 100644 +--- a/src/session-child.c ++++ b/src/session-child.c +@@ -410,7 +410,7 @@ session_child_run (int argc, char **argv) + else + { + /* Set POSIX variables */ +- pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin"); ++ pam_putenv (pam_handle, "PATH=/run/current-system/sw/bin"); + pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username)); + pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username)); + pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user))); +diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c +index 47f1c10..cc82652 100644 +--- a/src/shared-data-manager.c ++++ b/src/shared-data-manager.c +@@ -68,7 +68,7 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data) + + gchar *path = g_build_filename (USERS_DIR, user, NULL); + gchar *quoted_path = g_shell_quote (path); +- gchar *cmd = g_strdup_printf ("/bin/rm -rf %s", quoted_path); ++ gchar *cmd = g_strdup_printf ("/run/current-system/sw/bin/rm -rf %s", quoted_path); + + g_spawn_command_line_async (cmd, &error); + if (error) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a3cdbb6afb9..31142efcc89 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hackable text editor for the 21st Century"; homepage = https://atom.io/; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = [ maintainers.offline ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix new file mode 100644 index 00000000000..0a8d7081b23 --- /dev/null +++ b/pkgs/applications/editors/bviplus/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "bviplus-${version}"; + version = "0.9.4"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/bviplus/bviplus/${version}/bviplus-${version}.tgz"; + sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb"; + }; + buildInputs = [ + ncurses + ]; + makeFlags = "PREFIX=$(out)"; + meta = with lib; { + description = "ncurses based hex editor with a vim-like interface"; + homepage = "http://bviplus.sourceforge.net"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index db0d05584e1..a9f3e53fb59 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.7"; + name = "${emacsName}-mac-5.8"; #builder = ./builder.sh; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1a86l3556h24x9ml6r8n6xbrxymb9gr38sicny3f0m281myhlsvv"; + sha256 = "0ljhrag5lag8i72xfsmgk9lndqv0b3sahyyd48svj6jlg4jachir"; }; buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index a631939b55c..2e168b3abf7 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "idris-mode"; - version = "0.9.15"; + version = "0.9.18"; src = fetchurl { url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz"; - sha256 = "0ag7qqsv64rifk9ncdxv4gyylfbw6c8y2wq610l4pabqv2qrlh9r"; + sha256 = "06rw5lrxqqnw0kni3x9jm73x352d1vb683d41v8x3yzqfa2sxmwg"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix index 82028722f54..781806bedd6 100644 --- a/pkgs/applications/editors/emacs-modes/jabber/default.nix +++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26"; }; buildInputs = [ emacs ]; - meta = { + meta = with stdenv.lib; { description = "A Jabber client for Emacs"; longDescription = '' jabber.el is a Jabber client for Emacs. It may seem strange to have a @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { a special case of text editing. ''; homepage = http://emacs-jabber.sourceforge.net/; - license = [ "GPLv2+" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix index ab94dbae950..d57c591ec1e 100644 --- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix @@ -1,4 +1,4 @@ -{trivialBuild, fetchFromGitHub}: +{trivialBuild, lib, fetchFromGitHub}: trivialBuild rec { pname = "nyan-mode"; @@ -23,9 +23,9 @@ trivialBuild rec { cp -r mus $out ''; - meta = { + meta = with lib; { description = "An analog indicator of the position in the buffer"; homepage = https://github.com/TeMPOraL/nyan-mode/; - license = "GPLv3+"; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index 364daed439d..be03938f8a5 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "tuareg-mode-${version}"; src = fetchzip { url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; - sha256 = "1rd7ai1wn476zfkkxv2xk72bbzi4d9c17gngd35882q4b5vzp756"; + sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix new file mode 100644 index 00000000000..092b7ef6865 --- /dev/null +++ b/pkgs/applications/editors/heme/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "heme-${version}"; + version = "0.4.2"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/heme/heme/heme-${version}/heme-${version}.tar.gz"; + sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v"; + }; + postPatch = '' + substituteInPlace Makefile \ + --replace "/usr/local" "$out" \ + --replace "CFLAGS = " "CFLAGS = -I${ncurses}/include " \ + --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib " + ''; + preBuild = '' + mkdir -p $out/bin + mkdir -p $out/man/man1 + ''; + meta = with lib; { + description = "Portable and fast console hex editor for unix operating systems"; + homepage = "http://heme.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix new file mode 100644 index 00000000000..861bf88f7dd --- /dev/null +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + name = "hexcurse-${version}"; + version = "1.58"; + src = fetchFromGitHub { + owner = "LonnyGomes"; + repo = "hexcurse"; + rev = "hexcurse-${version}"; + sha256 = "0hm9mms2ija3wqba0mkk9i8fhb8q1pam6d6pjlingkzz6ygxnnp7"; + }; + buildInputs = [ + ncurses + ]; + meta = with lib; { + description = "ncurses-based console hexeditor written in C"; + homepage = "https://github.com/LonnyGomes/hexcurse"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix new file mode 100644 index 00000000000..b7acdb7f1d5 --- /dev/null +++ b/pkgs/applications/editors/ht/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "ht-${version}"; + version = "2.1.0"; + src = fetchurl { + url = "http://sourceforge.net/projects/hte/files/ht-source/ht-${version}.tar.bz2"; + sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i"; + }; + buildInputs = [ + ncurses + ]; + meta = with lib; { + description = "File editor/viewer/analyzer for executables"; + homepage = "http://hte.sourceforge.net"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 8d150ded4ab..d22f03d56d9 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -212,86 +212,86 @@ in android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "1.2.0.12"; - build = "141.1890965"; + version = "1.2.1.1"; + build = "141.1903250"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "01k96rql192ksnprc4yai97fcals7msf06m9bx1q7asn46887h7n"; + sha256 = "17n0hsw0655b2w7a3avj5hw6njhv4gayxnsj1bwi9p3dgzr5d5zp"; }; }; clion = buildClion rec { name = "clion-${version}"; - version = "1.0"; - build = "141.353"; + version = "1.0.3"; + build = "141.873"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "0xjdx13ljp1vy51a7rsj25wg3bsvry4kxq5cdng8zrc1g2y1fqw5"; + sha256 = "0ksxpml6fzj91hnzy59wlgz7q76dhc3715jalacq748y0i1jdh3f"; }; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "14.1.2"; - build = "IC-141.713.2"; + version = "14.1.3"; + build = "IC-141.1010.3"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1skxbax7gsxxf7519qasxwp9q0v9ff755ibqr1w47dv2al47kjzq"; + sha256 = "104ba057p49l41g9gdcgbywdxyqzkm4rfm7yivkcsddh5drsk4jv"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "14.1.2"; - build = "IU-141.713.2"; + version = "14.1.3"; + build = "IU-141.1010.3"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1ddy0f83rs3yx3w8v49cmlhkc8qxapdh702g26gzlapbpvfw58ay"; + sha256 = "1flg3rpb86xfcxlys5rxywa0z9c6j9h3qd8mkadx5pnay1f97pwi"; }; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "7.0.4"; - build = "139.1231"; + version = "7.1.2"; + build = "141.1119"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38"; + sha256 = "1gz14lv5jhnrnshp7lkx3wgrdf0y60abs4q78yhv2x9dc6ld1gmj"; }; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.0.6"; - build = "139.1659"; - description = "PyCharm 4.0 Community Edition"; + version = "4.5.1"; + build = "141.1245"; + description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "16lf2slssfgbds6zyp2rs0ssrg8aw5d2w7b755iqimiyfhyyv83s"; + sha256 = "1rjl8r863cm7bn3bkp8kbkb9f35rb344pycg5qlvjlvwvp2f448f"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.0.6"; - build = "139.1659"; - description = "PyCharm 4.0 Professional Edition"; + version = "4.5.1"; + build = "141.1245"; + description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0wavw41nzqnx75y3k3l5kq09i5d9j8hb4r6a0y3nxzqvmdfza55r"; + sha256 = "1wwyggl6941hd034xfsb3avjgvvah9lh0pdmzlndmvm677cdgzz1"; }; }; @@ -309,13 +309,13 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "10.0.2"; - build = "141.728"; + version = "10.0.3"; + build = "141.1237"; description = "Professional IDE for Web and JavaScript devlopment"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0ghv1r145qb5kmp2x375f5674b86d51w024fz390znlnniclizqx"; + sha256 = "06m852mbiij2dbmiz5y10bd4mhsdg5dmpy8arg75psl2j354spf8"; }; }; diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 0e97a036905..9f4d56bf8ad 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl} : +{ stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "joe-3.7"; + name = "joe-4.0"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; - sha256 = "0vqhffdjn3xwsfa383i6kdrpfwilq8b382ljjhy1v32smphmdr6a"; + sha256 = "0599xp90idl3dkplz72p33d2rfg0hb5yd38rhqdvz5zxfzzssmn5"; }; - meta = { + meta = with stdenv.lib; { + description = "A full featured terminal-based screen editor"; homepage = http://joe-editor.sourceforge.net; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index d4fa56898c3..6db7130896f 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "the next generation code editor"; homepage = http://www.lighttable.com/; - license = [ licenses.gpl3 ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 1c1c050b000..f19c1b65e13 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,65 +1,88 @@ -{ stdenv, fetchgit, fetchurl, unzip, callPackage, ncurses, gettext, pkgconfig, -cmake, pkgs, lpeg, lua, luajit, luaMessagePack, luabitop }: +{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack +, libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack +, luabitop, ncurses, perl, pkgconfig, unibilium +, withJemalloc ? true, jemalloc }: +let version = "2015-05-26"; in stdenv.mkDerivation rec { - name = "neovim-nightly"; + name = "neovim-${version}"; - version = "nightly"; - - src = fetchgit { - url = "https://github.com/neovim/neovim"; - rev = "68fcd8b696dae33897303c9f8265629a31afbf17"; - sha256 = "0hxkcy641jpn4qka44gfvhmb6q3dkjx6lvn9748lcl2gx2d36w4i"; + src = fetchFromGitHub { + sha256 = "0sszpqlq0yp6r62zgcjcmnllc058wzzh9ccvgb2jh9k19ksszyhc"; + rev = "5a9ad68b258f33ebd7fa0a5da47b308f50f1e5e7"; + repo = "neovim"; + owner = "neovim"; }; - libmsgpack = stdenv.mkDerivation rec { - version = "0.5.9"; - name = "libmsgpack-${version}"; + # FIXME: this is NOT the libvterm already in nixpkgs, but some NIH silliness: + neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec { + name = "neovim-libvterm-${version}"; - src = fetchgit { - rev = "ecf4b09acd29746829b6a02939db91dfdec635b4"; - url = "https://github.com/msgpack/msgpack-c"; - sha256 = "076ygqgxrc3vk2l20l8x2cgcv05py3am6mjjkknr418pf8yav2ww"; + src = fetchFromGitHub { + sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5"; + rev = "20ad1396c178c72873aeeb2870bd726f847acb70"; + repo = "libvterm"; + owner = "neovim"; }; - buildInputs = [ cmake ]; + buildInputs = [ libtool perl ]; + + makeFlags = "PREFIX=$(out)"; + + enableParallelBuilding = true; meta = with stdenv.lib; { - description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; - maintainers = [ maintainers.manveru ]; - license = licenses.asl20; - platforms = platforms.all; + description = "VT220/xterm/ECMA-48 terminal emulator library"; + homepage = http://www.leonerd.org.uk/code/libvterm/; + license = licenses.mit; + maintainers = with maintainers; [ nckx ]; + platforms = platforms.unix; }; }; enableParallelBuilding = true; buildInputs = [ - ncurses - pkgconfig cmake - pkgs.libuvVersions.v0_11_29 + glib + libtermkey + libuv luajit lua lpeg luaMessagePack luabitop libmsgpack + ncurses + neovimLibvterm + pkgconfig + unibilium + ] ++ stdenv.lib.optional withJemalloc jemalloc; + nativeBuildInputs = [ + gettext ]; - nativeBuildInputs = [ gettext ]; LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; - cmakeFlags = [ - "-DUSE_BUNDLED_MSGPACK=ON" - ]; meta = with stdenv.lib; { - description = "Aggressive refactor of Vim"; - homepage = http://www.neovim.org; - maintainers = with maintainers; [ manveru ]; + description = "Vim text editor fork focused on extensibility and agility"; + longDescription = '' + Neovim is a project that seeks to aggressively refactor Vim in order to: + - Simplify maintenance and encourage contributions + - Split the work between multiple developers + - Enable the implementation of new/modern user interfaces without any + modifications to the core source + - Improve extensibility with a new plugin architecture + ''; + homepage = http://www.neovim.io; + # "Contributions committed before b17d96 by authors who did not sign the + # Contributor License Agreement (CLA) remain under the Vim license. + # Contributions committed after b17d96 are licensed under Apache 2.0 unless + # those contributions were copied from Vim (identified in the commit logs + # by the vim-patch token). See LICENSE for details." + license = with licenses; [ asl20 vim ]; + maintainers = with maintainers; [ manveru nckx ]; platforms = platforms.unix; }; } - diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix index 692a728b12e..189682ec4e3 100644 --- a/pkgs/applications/editors/vanubi/default.nix +++ b/pkgs/applications/editors/vanubi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig vala which autoconf automake libtool glib gtk3 libwnck3 asciidoc - gnome3.gtksourceview gnome3.vte python3Packages.pygments ]; + gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; configureScript = "./autogen.sh"; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index e6c2cacc49a..ee3edaaf61b 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -190,6 +190,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; + license = licenses.vim; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 4f14aade5a5..7a1ce7aa1f2 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; + license = licenses.vim; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 784be80ecf4..a63dd0ab9e2 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vim - the text editor - for Mac OS X"; homepage = https://github.com/b4winckler/macvim; + license = licenses.vim; maintainers = with maintainers; [ cstrahan ]; platforms = platforms.darwin; }; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index b9e3d668d62..482e59833b3 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -118,6 +118,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; + license = licenses.vim; maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 0d4b9fd1dab..0170319871f 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -3,7 +3,7 @@ let name = "zed-${version}"; - version = "1.0.0"; + version = "1.1.0"; # When upgrading node.nix / node packages: # fetch package.json from Zed's repository @@ -31,7 +31,7 @@ let src = fetchgit { url = "git://github.com/zedapp/zed"; rev = "refs/tags/v${version}"; - sha256 = "1kdvj9mvdwm4cswqw6nn9j6kgqvs4d7vycpsmmfha9a2rkryw9zh"; + sha256 = "1zvlngv73h968jd2m42ylr9vfhf35n80wzy616cv2ic7gmr1fl9p"; }; buildInputs = [ makeWrapper zip ]; diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix index cd75f2d58fa..e74ff1ec45f 100644 --- a/pkgs/applications/editors/zed/node.nix +++ b/pkgs/applications/editors/zed/node.nix @@ -1,23 +1,24 @@ { self, fetchurl, fetchgit ? null, lib }: { - by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.1"; - by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-accepts-1.1.1"; + by-spec."accepts"."~1.2.7" = + self.by-version."accepts"."1.2.7"; + by-version."accepts"."1.2.7" = lib.makeOverridable self.buildNodePackage { + name = "accepts-1.2.7"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz"; - name = "accepts-1.1.1.tgz"; - sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz"; + name = "accepts-1.2.7.tgz"; + sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); - deps = [ - self.by-version."mime-types"."2.0.2" - self.by-version."negotiator"."0.4.8" - ]; + deps = { + "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12"; + "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "accepts" ]; @@ -25,7 +26,8 @@ by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "node-asn1-0.1.11"; + name = "asn1-0.1.11"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; @@ -35,46 +37,48 @@ ]; buildInputs = (self.nativeDeps."asn1" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "asn1" ]; }; - by-spec."assert-plus"."0.1.2" = - self.by-version."assert-plus"."0.1.2"; - by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-assert-plus-0.1.2"; + by-spec."assert-plus"."^0.1.5" = + self.by-version."assert-plus"."0.1.5"; + by-version."assert-plus"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "assert-plus-0.1.5"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - name = "assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + name = "assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; }) ]; buildInputs = (self.nativeDeps."assert-plus" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "assert-plus" ]; }; by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.9.0"; + self.by-version."async"."0.9.2"; + by-version."async"."0.9.2" = lib.makeOverridable self.buildNodePackage { + name = "async-0.9.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; + name = "async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }) ]; buildInputs = (self.nativeDeps."async" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "async" ]; @@ -82,7 +86,8 @@ by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-aws-sign2-0.5.0"; + name = "aws-sign2-0.5.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; @@ -92,64 +97,88 @@ ]; buildInputs = (self.nativeDeps."aws-sign2" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "aws-sign2" ]; }; - by-spec."block-stream"."*" = - self.by-version."block-stream"."0.0.7"; - by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-block-stream-0.0.7"; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "balanced-match-0.2.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; - name = "block-stream-0.0.7.tgz"; - sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; + }) + ]; + buildInputs = + (self.nativeDeps."balanced-match" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "balanced-match" ]; + }; + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.8"; + by-version."block-stream"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "block-stream-0.0.8"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"; + name = "block-stream-0.0.8.tgz"; + sha1 = "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b"; }) ]; buildInputs = (self.nativeDeps."block-stream" or []); - deps = [ - self.by-version."inherits"."2.0.1" - ]; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "block-stream" ]; }; by-spec."body-parser"."^1.6.3" = - self.by-version."body-parser"."1.9.0"; - by-version."body-parser"."1.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.9.0"; + self.by-version."body-parser"."1.12.4"; + by-version."body-parser"."1.12.4" = lib.makeOverridable self.buildNodePackage { + name = "body-parser-1.12.4"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.0.tgz"; - name = "body-parser-1.9.0.tgz"; - sha1 = "95d72943b1a4f67f56bbac9e0dcc837b68703605"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; + name = "body-parser-1.12.4.tgz"; + sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); - deps = [ - self.by-version."bytes"."1.0.0" - self.by-version."depd"."1.0.0" - self.by-version."iconv-lite"."0.4.4" - self.by-version."media-typer"."0.3.0" - self.by-version."on-finished"."2.1.0" - self.by-version."qs"."2.2.4" - self.by-version."raw-body"."1.3.0" - self.by-version."type-is"."1.5.2" - ]; + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; + }; peerDependencies = [ ]; passthru.names = [ "body-parser" ]; }; - "body-parser" = self.by-version."body-parser"."1.9.0"; + "body-parser" = self.by-version."body-parser"."1.12.4"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-boom-0.4.2"; + name = "boom-0.4.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; @@ -159,17 +188,40 @@ ]; buildInputs = (self.nativeDeps."boom" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; peerDependencies = [ ]; passthru.names = [ "boom" ]; }; - by-spec."bytes"."1" = + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "brace-expansion-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; + }) + ]; + buildInputs = + (self.nativeDeps."brace-expansion" or []); + deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "brace-expansion" ]; + }; + by-spec."bytes"."1.0.0" = self.by-version."bytes"."1.0.0"; by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-bytes-1.0.0"; + name = "bytes-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; @@ -179,30 +231,49 @@ ]; buildInputs = (self.nativeDeps."bytes" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "bytes" ]; }; - by-spec."bytes"."1.0.0" = - self.by-version."bytes"."1.0.0"; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.5"; - by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-combined-stream-0.0.5"; + by-spec."bytes"."2.0.1" = + self.by-version."bytes"."2.0.1"; + by-version."bytes"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "bytes-2.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; - name = "combined-stream-0.0.5.tgz"; - sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; + url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz"; + name = "bytes-2.0.1.tgz"; + sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97"; + }) + ]; + buildInputs = + (self.nativeDeps."bytes" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bytes" ]; + }; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "combined-stream-0.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }) ]; buildInputs = (self.nativeDeps."combined-stream" or []); - deps = [ - self.by-version."delayed-stream"."0.0.5" - ]; + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; peerDependencies = [ ]; passthru.names = [ "combined-stream" ]; @@ -210,7 +281,8 @@ by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.1.0"; + name = "commander-2.1.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; @@ -220,16 +292,77 @@ ]; buildInputs = (self.nativeDeps."commander" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "commander" ]; }; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "concat-map-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-map" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "concat-map" ]; + }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "content-disposition-0.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }) + ]; + buildInputs = + (self.nativeDeps."content-disposition" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "content-disposition" ]; + }; + by-spec."content-type"."~1.0.1" = + self.by-version."content-type"."1.0.1"; + by-version."content-type"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "content-type-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; + name = "content-type-1.0.1.tgz"; + sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; + }) + ]; + buildInputs = + (self.nativeDeps."content-type" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "content-type" ]; + }; by-spec."cookie"."0.1.2" = self.by-version."cookie"."0.1.2"; by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-0.1.2"; + name = "cookie-0.1.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; @@ -239,46 +372,48 @@ ]; buildInputs = (self.nativeDeps."cookie" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "cookie" ]; }; - by-spec."cookie-signature"."1.0.5" = - self.by-version."cookie-signature"."1.0.5"; - by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-signature-1.0.5"; + by-spec."cookie-signature"."1.0.6" = + self.by-version."cookie-signature"."1.0.6"; + by-version."cookie-signature"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "cookie-signature-1.0.6"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - name = "cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + name = "cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }) ]; buildInputs = (self.nativeDeps."cookie-signature" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "cookie-signature" ]; }; - by-spec."crc"."3.0.0" = - self.by-version."crc"."3.0.0"; - by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-crc-3.0.0"; + by-spec."crc"."3.2.1" = + self.by-version."crc"."3.2.1"; + by-version."crc"."3.2.1" = lib.makeOverridable self.buildNodePackage { + name = "crc-3.2.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz"; - name = "crc-3.0.0.tgz"; - sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22"; + url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + name = "crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; }) ]; buildInputs = (self.nativeDeps."crc" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "crc" ]; @@ -286,7 +421,8 @@ by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cryptiles-0.2.2"; + name = "cryptiles-0.2.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; @@ -296,48 +432,50 @@ ]; buildInputs = (self.nativeDeps."cryptiles" or []); - deps = [ - self.by-version."boom"."0.4.2" - ]; + deps = { + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + }; peerDependencies = [ ]; passthru.names = [ "cryptiles" ]; }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ctype-0.5.2"; + by-spec."ctype"."0.5.3" = + self.by-version."ctype"."0.5.3"; + by-version."ctype"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "ctype-0.5.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + name = "ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }) ]; buildInputs = (self.nativeDeps."ctype" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ctype" ]; }; - by-spec."debug"."~2.0.0" = - self.by-version."debug"."2.0.0"; - by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-2.0.0"; + by-spec."debug"."~2.2.0" = + self.by-version."debug"."2.2.0"; + by-version."debug"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-2.2.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; - name = "debug-2.0.0.tgz"; - sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }) ]; buildInputs = (self.nativeDeps."debug" or []); - deps = [ - self.by-version."ms"."0.6.2" - ]; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; peerDependencies = [ ]; passthru.names = [ "debug" ]; @@ -345,7 +483,8 @@ by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-delayed-stream-0.0.5"; + name = "delayed-stream-0.0.5"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; @@ -355,46 +494,28 @@ ]; buildInputs = (self.nativeDeps."delayed-stream" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "delayed-stream" ]; }; - by-spec."depd"."0.4.5" = - self.by-version."depd"."0.4.5"; - by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-0.4.5"; + by-spec."depd"."~1.0.1" = + self.by-version."depd"."1.0.1"; + by-version."depd"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "depd-1.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz"; - name = "depd-0.4.5.tgz"; - sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1"; + url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + name = "depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; }) ]; buildInputs = (self.nativeDeps."depd" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "depd" ]; - }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.0"; - by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; - name = "depd-1.0.0.tgz"; - sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; - }) - ]; - buildInputs = - (self.nativeDeps."depd" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "depd" ]; @@ -402,7 +523,8 @@ by-spec."destroy"."1.0.3" = self.by-version."destroy"."1.0.3"; by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-destroy-1.0.3"; + name = "destroy-1.0.3"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; @@ -412,27 +534,28 @@ ]; buildInputs = (self.nativeDeps."destroy" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "destroy" ]; }; - by-spec."ee-first"."1.0.5" = - self.by-version."ee-first"."1.0.5"; - by-version."ee-first"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-ee-first-1.0.5"; + by-spec."ee-first"."1.1.0" = + self.by-version."ee-first"."1.1.0"; + by-version."ee-first"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ee-first-1.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; - name = "ee-first-1.0.5.tgz"; - sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + name = "ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; }) ]; buildInputs = (self.nativeDeps."ee-first" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ee-first" ]; @@ -440,7 +563,8 @@ by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-escape-html-1.0.1"; + name = "escape-html-1.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; @@ -450,92 +574,97 @@ ]; buildInputs = (self.nativeDeps."escape-html" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "escape-html" ]; }; - by-spec."etag"."~1.4.0" = - self.by-version."etag"."1.4.0"; - by-version."etag"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-etag-1.4.0"; + by-spec."etag"."~1.6.0" = + self.by-version."etag"."1.6.0"; + by-version."etag"."1.6.0" = lib.makeOverridable self.buildNodePackage { + name = "etag-1.6.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz"; - name = "etag-1.4.0.tgz"; - sha1 = "3050991615857707c04119d075ba2088e0701225"; + url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz"; + name = "etag-1.6.0.tgz"; + sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207"; }) ]; buildInputs = (self.nativeDeps."etag" or []); - deps = [ - self.by-version."crc"."3.0.0" - ]; + deps = { + "crc-3.2.1" = self.by-version."crc"."3.2.1"; + }; peerDependencies = [ ]; passthru.names = [ "etag" ]; }; by-spec."express"."^4.8.3" = - self.by-version."express"."4.9.5"; - by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.9.5"; + self.by-version."express"."4.12.4"; + by-version."express"."4.12.4" = lib.makeOverridable self.buildNodePackage { + name = "express-4.12.4"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz"; - name = "express-4.9.5.tgz"; - sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688"; + url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz"; + name = "express-4.12.4.tgz"; + sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2"; }) ]; buildInputs = (self.nativeDeps."express" or []); - deps = [ - self.by-version."accepts"."1.1.1" - self.by-version."cookie-signature"."1.0.5" - self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.5" - self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.4.0" - self.by-version."finalhandler"."0.2.0" - self.by-version."fresh"."0.2.4" - self.by-version."media-typer"."0.3.0" - self.by-version."methods"."1.1.0" - self.by-version."on-finished"."2.1.0" - self.by-version."parseurl"."1.3.0" - self.by-version."path-to-regexp"."0.1.3" - self.by-version."proxy-addr"."1.0.3" - self.by-version."qs"."2.2.4" - self.by-version."range-parser"."1.0.2" - self.by-version."send"."0.9.3" - self.by-version."serve-static"."1.6.3" - self.by-version."type-is"."1.5.2" - self.by-version."vary"."1.0.0" - self.by-version."cookie"."0.1.2" - self.by-version."merge-descriptors"."0.0.2" - self.by-version."utils-merge"."1.0.0" - ]; + deps = { + "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.6.0" = self.by-version."etag"."1.6.0"; + "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; + "methods-1.1.1" = self.by-version."methods"."1.1.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.12.3" = self.by-version."send"."0.12.3"; + "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.9.5"; - by-spec."finalhandler"."0.2.0" = - self.by-version."finalhandler"."0.2.0"; - by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-finalhandler-0.2.0"; + "express" = self.by-version."express"."4.12.4"; + by-spec."finalhandler"."0.3.6" = + self.by-version."finalhandler"."0.3.6"; + by-version."finalhandler"."0.3.6" = lib.makeOverridable self.buildNodePackage { + name = "finalhandler-0.3.6"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz"; - name = "finalhandler-0.2.0.tgz"; - sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz"; + name = "finalhandler-0.3.6.tgz"; + sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b"; }) ]; buildInputs = (self.nativeDeps."finalhandler" or []); - deps = [ - self.by-version."debug"."2.0.0" - self.by-version."escape-html"."1.0.1" - ]; + deps = { + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + }; peerDependencies = [ ]; passthru.names = [ "finalhandler" ]; @@ -543,7 +672,8 @@ by-spec."forever-agent"."~0.5.0" = self.by-version."forever-agent"."0.5.2"; by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-forever-agent-0.5.2"; + name = "forever-agent-0.5.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; @@ -553,8 +683,8 @@ ]; buildInputs = (self.nativeDeps."forever-agent" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "forever-agent" ]; @@ -562,7 +692,8 @@ by-spec."form-data"."~0.1.0" = self.by-version."form-data"."0.1.4"; by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-form-data-0.1.4"; + name = "form-data-0.1.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; @@ -572,11 +703,11 @@ ]; buildInputs = (self.nativeDeps."form-data" or []); - deps = [ - self.by-version."combined-stream"."0.0.5" - self.by-version."mime"."1.2.11" - self.by-version."async"."0.9.0" - ]; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.9.2" = self.by-version."async"."0.9.2"; + }; peerDependencies = [ ]; passthru.names = [ "form-data" ]; @@ -584,7 +715,8 @@ by-spec."forwarded"."~0.1.0" = self.by-version."forwarded"."0.1.0"; by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-forwarded-0.1.0"; + name = "forwarded-0.1.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; @@ -594,8 +726,8 @@ ]; buildInputs = (self.nativeDeps."forwarded" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "forwarded" ]; @@ -603,7 +735,8 @@ by-spec."fresh"."0.2.4" = self.by-version."fresh"."0.2.4"; by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-fresh-0.2.4"; + name = "fresh-0.2.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; @@ -613,8 +746,8 @@ ]; buildInputs = (self.nativeDeps."fresh" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "fresh" ]; @@ -622,7 +755,8 @@ by-spec."fstream"."~0.1.28" = self.by-version."fstream"."0.1.31"; by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "node-fstream-0.1.31"; + name = "fstream-0.1.31"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; @@ -632,31 +766,56 @@ ]; buildInputs = (self.nativeDeps."fstream" or []); - deps = [ - self.by-version."graceful-fs"."3.0.2" - self.by-version."inherits"."2.0.1" - self.by-version."mkdirp"."0.5.0" - self.by-version."rimraf"."2.2.8" - ]; + deps = { + "graceful-fs-3.0.7" = self.by-version."graceful-fs"."3.0.7"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rimraf-2.3.4" = self.by-version."rimraf"."2.3.4"; + }; peerDependencies = [ ]; passthru.names = [ "fstream" ]; }; - by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.2"; - by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-graceful-fs-3.0.2"; + by-spec."glob"."^4.4.2" = + self.by-version."glob"."4.5.3"; + by-version."glob"."4.5.3" = lib.makeOverridable self.buildNodePackage { + name = "glob-4.5.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; - name = "graceful-fs-3.0.2.tgz"; - sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; + name = "glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + }) + ]; + buildInputs = + (self.nativeDeps."glob" or []); + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.8" = self.by-version."minimatch"."2.0.8"; + "once-1.3.2" = self.by-version."once"."1.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "glob" ]; + }; + by-spec."graceful-fs"."~3.0.2" = + self.by-version."graceful-fs"."3.0.7"; + by-version."graceful-fs"."3.0.7" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-3.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"; + name = "graceful-fs-3.0.7.tgz"; + sha1 = "e935be4b3e57892d289dc3bef7be8c02779d2b54"; }) ]; buildInputs = (self.nativeDeps."graceful-fs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "graceful-fs" ]; @@ -664,7 +823,8 @@ by-spec."hawk"."~1.0.0" = self.by-version."hawk"."1.0.0"; by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-hawk-1.0.0"; + name = "hawk-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; @@ -674,12 +834,12 @@ ]; buildInputs = (self.nativeDeps."hawk" or []); - deps = [ - self.by-version."hoek"."0.9.1" - self.by-version."boom"."0.4.2" - self.by-version."cryptiles"."0.2.2" - self.by-version."sntp"."0.2.4" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; + "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; + }; peerDependencies = [ ]; passthru.names = [ "hawk" ]; @@ -687,7 +847,8 @@ by-spec."hoek"."0.9.x" = self.by-version."hoek"."0.9.1"; by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-hoek-0.9.1"; + name = "hoek-0.9.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; @@ -697,57 +858,82 @@ ]; buildInputs = (self.nativeDeps."hoek" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "hoek" ]; }; by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.0"; - by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-http-signature-0.10.0"; + self.by-version."http-signature"."0.10.1"; + by-version."http-signature"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "http-signature-0.10.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; - name = "http-signature-0.10.0.tgz"; - sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + name = "http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; }) ]; buildInputs = (self.nativeDeps."http-signature" or []); - deps = [ - self.by-version."assert-plus"."0.1.2" - self.by-version."asn1"."0.1.11" - self.by-version."ctype"."0.5.2" - ]; + deps = { + "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "http-signature" ]; }; - by-spec."iconv-lite"."0.4.4" = - self.by-version."iconv-lite"."0.4.4"; - by-version."iconv-lite"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-iconv-lite-0.4.4"; + by-spec."iconv-lite"."0.4.8" = + self.by-version."iconv-lite"."0.4.8"; + by-version."iconv-lite"."0.4.8" = lib.makeOverridable self.buildNodePackage { + name = "iconv-lite-0.4.8"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; - name = "iconv-lite-0.4.4.tgz"; - sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + name = "iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }) ]; buildInputs = (self.nativeDeps."iconv-lite" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "iconv-lite" ]; }; + by-spec."inflight"."^1.0.4" = + self.by-version."inflight"."1.0.4"; + by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "inflight-1.0.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; + name = "inflight-1.0.4.tgz"; + sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a"; + }) + ]; + buildInputs = + (self.nativeDeps."inflight" or []); + deps = { + "once-1.3.2" = self.by-version."once"."1.3.2"; + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "inflight" ]; + }; by-spec."inherits"."2" = self.by-version."inherits"."2.0.1"; by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inherits-2.0.1"; + name = "inherits-2.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; @@ -757,48 +943,50 @@ ]; buildInputs = (self.nativeDeps."inherits" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "inherits" ]; }; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."0.1.3" = - self.by-version."ipaddr.js"."0.1.3"; - by-version."ipaddr.js"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-ipaddr.js-0.1.3"; + by-spec."ipaddr.js"."1.0.1" = + self.by-version."ipaddr.js"."1.0.1"; + by-version."ipaddr.js"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "ipaddr.js-1.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; - name = "ipaddr.js-0.1.3.tgz"; - sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; + name = "ipaddr.js-1.0.1.tgz"; + sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; }) ]; buildInputs = (self.nativeDeps."ipaddr.js" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ipaddr.js" ]; }; by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-json-stringify-safe-5.0.0"; + self.by-version."json-stringify-safe"."5.0.1"; + by-version."json-stringify-safe"."5.0.1" = lib.makeOverridable self.buildNodePackage { + name = "json-stringify-safe-5.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + name = "json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }) ]; buildInputs = (self.nativeDeps."json-stringify-safe" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "json-stringify-safe" ]; @@ -806,7 +994,8 @@ by-spec."media-typer"."0.3.0" = self.by-version."media-typer"."0.3.0"; by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-media-typer-0.3.0"; + name = "media-typer-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; @@ -816,54 +1005,77 @@ ]; buildInputs = (self.nativeDeps."media-typer" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "media-typer" ]; }; - by-spec."merge-descriptors"."0.0.2" = - self.by-version."merge-descriptors"."0.0.2"; - by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-merge-descriptors-0.0.2"; + by-spec."merge-descriptors"."1.0.0" = + self.by-version."merge-descriptors"."1.0.0"; + by-version."merge-descriptors"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "merge-descriptors-1.0.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - name = "merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + name = "merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; }) ]; buildInputs = (self.nativeDeps."merge-descriptors" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "merge-descriptors" ]; }; - by-spec."methods"."1.1.0" = - self.by-version."methods"."1.1.0"; - by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-methods-1.1.0"; + by-spec."methods"."~1.1.1" = + self.by-version."methods"."1.1.1"; + by-version."methods"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "methods-1.1.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; - name = "methods-1.1.0.tgz"; - sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; + url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; + name = "methods-1.1.1.tgz"; + sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; }) ]; buildInputs = (self.nativeDeps."methods" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "methods" ]; }; - by-spec."mime"."1.2.11" = + by-spec."mime"."1.3.4" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = lib.makeOverridable self.buildNodePackage { + name = "mime-1.3.4"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }) + ]; + buildInputs = + (self.nativeDeps."mime" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; + by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-1.2.11"; + name = "mime-1.2.11"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; @@ -873,59 +1085,81 @@ ]; buildInputs = (self.nativeDeps."mime" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "mime" ]; }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.1.0" = - self.by-version."mime-db"."1.1.0"; - by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-db-1.1.0"; + by-spec."mime-db"."~1.10.0" = + self.by-version."mime-db"."1.10.0"; + by-version."mime-db"."1.10.0" = lib.makeOverridable self.buildNodePackage { + name = "mime-db-1.10.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz"; - name = "mime-db-1.1.0.tgz"; - sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.10.0.tgz"; + name = "mime-db-1.10.0.tgz"; + sha1 = "e6308063c758ebd12837874c3d1ea9170766b03b"; }) ]; buildInputs = (self.nativeDeps."mime-db" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-types"."~2.0.2" = - self.by-version."mime-types"."2.0.2"; - by-version."mime-types"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-types-2.0.2"; + by-spec."mime-types"."~2.0.11" = + self.by-version."mime-types"."2.0.12"; + by-version."mime-types"."2.0.12" = lib.makeOverridable self.buildNodePackage { + name = "mime-types-2.0.12"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.2.tgz"; - name = "mime-types-2.0.2.tgz"; - sha1 = "c74b779f2896c367888622bd537aaaad4c0a2c08"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.12.tgz"; + name = "mime-types-2.0.12.tgz"; + sha1 = "87ae9f124e94f8e440c93d1a72d0dccecdb71135"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); - deps = [ - self.by-version."mime-db"."1.1.0" - ]; + deps = { + "mime-db-1.10.0" = self.by-version."mime-db"."1.10.0"; + }; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.8"; + by-version."minimatch"."2.0.8" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-2.0.8"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz"; + name = "minimatch-2.0.8.tgz"; + sha1 = "0bc20f6bf3570a698ef0ddff902063c6cabda6bf"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.8"; + name = "minimist-0.0.8"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; @@ -935,47 +1169,49 @@ ]; buildInputs = (self.nativeDeps."minimist" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "minimist" ]; }; by-spec."mkdirp"."0.5" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; + self.by-version."mkdirp"."0.5.1"; + by-version."mkdirp"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.5.1"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + name = "mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }) ]; buildInputs = (self.nativeDeps."mkdirp" or []); - deps = [ - self.by-version."minimist"."0.0.8" - ]; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; peerDependencies = [ ]; passthru.names = [ "mkdirp" ]; }; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ms-0.6.2"; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "ms-0.7.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }) ]; buildInputs = (self.nativeDeps."ms" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ms" ]; @@ -983,7 +1219,8 @@ by-spec."nan"."~1.0.0" = self.by-version."nan"."1.0.0"; by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-nan-1.0.0"; + name = "nan-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; @@ -993,46 +1230,48 @@ ]; buildInputs = (self.nativeDeps."nan" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "nan" ]; }; - by-spec."negotiator"."0.4.8" = - self.by-version."negotiator"."0.4.8"; - by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage { - name = "node-negotiator-0.4.8"; + by-spec."negotiator"."0.5.3" = + self.by-version."negotiator"."0.5.3"; + by-version."negotiator"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "negotiator-0.5.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz"; - name = "negotiator-0.4.8.tgz"; - sha1 = "96010b23b63c387f47a4bed96762a831cda39eab"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + name = "negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }) ]; buildInputs = (self.nativeDeps."negotiator" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "negotiator" ]; }; by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-node-uuid-1.4.1"; + self.by-version."node-uuid"."1.4.3"; + by-version."node-uuid"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.3"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + name = "node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; }) ]; buildInputs = (self.nativeDeps."node-uuid" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "node-uuid" ]; @@ -1040,7 +1279,8 @@ by-spec."oauth-sign"."~0.3.0" = self.by-version."oauth-sign"."0.3.0"; by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-oauth-sign-0.3.0"; + name = "oauth-sign-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; @@ -1050,38 +1290,59 @@ ]; buildInputs = (self.nativeDeps."oauth-sign" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "oauth-sign" ]; }; - by-spec."on-finished"."2.1.0" = - self.by-version."on-finished"."2.1.0"; - by-version."on-finished"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-on-finished-2.1.0"; + by-spec."on-finished"."~2.2.1" = + self.by-version."on-finished"."2.2.1"; + by-version."on-finished"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "on-finished-2.2.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; - name = "on-finished-2.1.0.tgz"; - sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + name = "on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; }) ]; buildInputs = (self.nativeDeps."on-finished" or []); - deps = [ - self.by-version."ee-first"."1.0.5" - ]; + deps = { + "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; + }; peerDependencies = [ ]; passthru.names = [ "on-finished" ]; }; - by-spec."on-finished"."~2.1.0" = - self.by-version."on-finished"."2.1.0"; + by-spec."once"."^1.3.0" = + self.by-version."once"."1.3.2"; + by-version."once"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "once-1.3.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz"; + name = "once-1.3.2.tgz"; + sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; + }) + ]; + buildInputs = + (self.nativeDeps."once" or []); + deps = { + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "once" ]; + }; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-options-0.0.6"; + name = "options-0.0.6"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; @@ -1091,8 +1352,8 @@ ]; buildInputs = (self.nativeDeps."options" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "options" ]; @@ -1100,7 +1361,8 @@ by-spec."parseurl"."~1.3.0" = self.by-version."parseurl"."1.3.0"; by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-parseurl-1.3.0"; + name = "parseurl-1.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; @@ -1110,8 +1372,8 @@ ]; buildInputs = (self.nativeDeps."parseurl" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "parseurl" ]; @@ -1119,7 +1381,8 @@ by-spec."path-to-regexp"."0.1.3" = self.by-version."path-to-regexp"."0.1.3"; by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-path-to-regexp-0.1.3"; + name = "path-to-regexp-0.1.3"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; @@ -1129,67 +1392,50 @@ ]; buildInputs = (self.nativeDeps."path-to-regexp" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "path-to-regexp" ]; }; - by-spec."proxy-addr"."~1.0.3" = - self.by-version."proxy-addr"."1.0.3"; - by-version."proxy-addr"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-proxy-addr-1.0.3"; + by-spec."proxy-addr"."~1.0.8" = + self.by-version."proxy-addr"."1.0.8"; + by-version."proxy-addr"."1.0.8" = lib.makeOverridable self.buildNodePackage { + name = "proxy-addr-1.0.8"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.3.tgz"; - name = "proxy-addr-1.0.3.tgz"; - sha1 = "17d824aac844707441249da6d1ea5e889007cdd6"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; + name = "proxy-addr-1.0.8.tgz"; + sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; }) ]; buildInputs = (self.nativeDeps."proxy-addr" or []); - deps = [ - self.by-version."forwarded"."0.1.0" - self.by-version."ipaddr.js"."0.1.3" - ]; + deps = { + "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; + "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "proxy-addr" ]; }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.1"; - by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-punycode-1.3.1"; + by-spec."qs"."2.4.2" = + self.by-version."qs"."2.4.2"; + by-version."qs"."2.4.2" = lib.makeOverridable self.buildNodePackage { + name = "qs-2.4.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; - name = "punycode-1.3.1.tgz"; - sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; - }) - ]; - buildInputs = - (self.nativeDeps."punycode" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "punycode" ]; - }; - by-spec."qs"."2.2.4" = - self.by-version."qs"."2.2.4"; - by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-2.2.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; - name = "qs-2.2.4.tgz"; - sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8"; + url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; + name = "qs-2.4.2.tgz"; + sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; }) ]; buildInputs = (self.nativeDeps."qs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "qs" ]; @@ -1197,7 +1443,8 @@ by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-0.6.6"; + name = "qs-0.6.6"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; @@ -1207,8 +1454,8 @@ ]; buildInputs = (self.nativeDeps."qs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "qs" ]; @@ -1216,7 +1463,8 @@ by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-range-parser-1.0.2"; + name = "range-parser-1.0.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; @@ -1226,29 +1474,30 @@ ]; buildInputs = (self.nativeDeps."range-parser" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "range-parser" ]; }; - by-spec."raw-body"."1.3.0" = - self.by-version."raw-body"."1.3.0"; - by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-raw-body-1.3.0"; + by-spec."raw-body"."~2.0.1" = + self.by-version."raw-body"."2.0.1"; + by-version."raw-body"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "raw-body-2.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; - name = "raw-body-1.3.0.tgz"; - sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; + url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz"; + name = "raw-body-2.0.1.tgz"; + sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e"; }) ]; buildInputs = (self.nativeDeps."raw-body" or []); - deps = [ - self.by-version."bytes"."1.0.0" - self.by-version."iconv-lite"."0.4.4" - ]; + deps = { + "bytes-2.0.1" = self.by-version."bytes"."2.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + }; peerDependencies = [ ]; passthru.names = [ "raw-body" ]; @@ -1256,7 +1505,8 @@ by-spec."request"."~2.34.0" = self.by-version."request"."2.34.0"; by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.34.0"; + name = "request-2.34.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; @@ -1266,92 +1516,96 @@ ]; buildInputs = (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."5.0.0" - self.by-version."forever-agent"."0.5.2" - self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" - self.by-version."tough-cookie"."0.12.1" - self.by-version."form-data"."0.1.4" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign2"."0.5.0" - ]; + deps = { + "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; + "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + }; peerDependencies = [ ]; passthru.names = [ "request" ]; }; "request" = self.by-version."request"."2.34.0"; by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; + self.by-version."rimraf"."2.3.4"; + by-version."rimraf"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.3.4"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz"; + name = "rimraf-2.3.4.tgz"; + sha1 = "82d9bc1b2fcf31e205ac7b28138a025d08e9159a"; }) ]; buildInputs = (self.nativeDeps."rimraf" or []); - deps = [ - ]; + deps = { + "glob-4.5.3" = self.by-version."glob"."4.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; - by-spec."send"."0.9.3" = - self.by-version."send"."0.9.3"; - by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.9.3"; + by-spec."send"."0.12.3" = + self.by-version."send"."0.12.3"; + by-version."send"."0.12.3" = lib.makeOverridable self.buildNodePackage { + name = "send-0.12.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; - name = "send-0.9.3.tgz"; - sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; + url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz"; + name = "send-0.12.3.tgz"; + sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc"; }) ]; buildInputs = (self.nativeDeps."send" or []); - deps = [ - self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.5" - self.by-version."destroy"."1.0.3" - self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.4.0" - self.by-version."fresh"."0.2.4" - self.by-version."mime"."1.2.11" - self.by-version."ms"."0.6.2" - self.by-version."on-finished"."2.1.0" - self.by-version."range-parser"."1.0.2" - ]; + deps = { + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.6.0" = self.by-version."etag"."1.6.0"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; peerDependencies = [ ]; passthru.names = [ "send" ]; }; - by-spec."serve-static"."~1.6.3" = - self.by-version."serve-static"."1.6.3"; - by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.6.3"; + by-spec."serve-static"."~1.9.3" = + self.by-version."serve-static"."1.9.3"; + by-version."serve-static"."1.9.3" = lib.makeOverridable self.buildNodePackage { + name = "serve-static-1.9.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz"; - name = "serve-static-1.6.3.tgz"; - sha1 = "b214235d4d4516db050ea9f7b429b46212e79132"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz"; + name = "serve-static-1.9.3.tgz"; + sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57"; }) ]; buildInputs = (self.nativeDeps."serve-static" or []); - deps = [ - self.by-version."escape-html"."1.0.1" - self.by-version."parseurl"."1.3.0" - self.by-version."send"."0.9.3" - self.by-version."utils-merge"."1.0.0" - ]; + deps = { + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.12.3" = self.by-version."send"."0.12.3"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; peerDependencies = [ ]; passthru.names = [ "serve-static" ]; @@ -1359,7 +1613,8 @@ by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-sntp-0.2.4"; + name = "sntp-0.2.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; @@ -1369,9 +1624,9 @@ ]; buildInputs = (self.nativeDeps."sntp" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; peerDependencies = [ ]; passthru.names = [ "sntp" ]; @@ -1379,7 +1634,8 @@ by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.20"; by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { - name = "node-tar-0.1.20"; + name = "tar-0.1.20"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; @@ -1389,11 +1645,11 @@ ]; buildInputs = (self.nativeDeps."tar" or []); - deps = [ - self.by-version."block-stream"."0.0.7" - self.by-version."fstream"."0.1.31" - self.by-version."inherits"."2.0.1" - ]; + deps = { + "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "tar" ]; @@ -1402,7 +1658,8 @@ by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-tinycolor-0.0.1"; + name = "tinycolor-0.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; @@ -1412,28 +1669,28 @@ ]; buildInputs = (self.nativeDeps."tinycolor" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tinycolor" ]; }; by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."0.12.1"; - by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "node-tough-cookie-0.12.1"; + self.by-version."tough-cookie"."1.1.0"; + by-version."tough-cookie"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "tough-cookie-1.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; - name = "tough-cookie-0.12.1.tgz"; - sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"; + name = "tough-cookie-1.1.0.tgz"; + sha1 = "126d2490e66ae5286b6863debd4a341076915954"; }) ]; buildInputs = (self.nativeDeps."tough-cookie" or []); - deps = [ - self.by-version."punycode"."1.3.1" - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tough-cookie" ]; @@ -1441,7 +1698,8 @@ by-spec."tunnel-agent"."~0.3.0" = self.by-version."tunnel-agent"."0.3.0"; by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-tunnel-agent-0.3.0"; + name = "tunnel-agent-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; @@ -1451,29 +1709,30 @@ ]; buildInputs = (self.nativeDeps."tunnel-agent" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tunnel-agent" ]; }; - by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.2"; - by-version."type-is"."1.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-type-is-1.5.2"; + by-spec."type-is"."~1.6.2" = + self.by-version."type-is"."1.6.2"; + by-version."type-is"."1.6.2" = lib.makeOverridable self.buildNodePackage { + name = "type-is-1.6.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.2.tgz"; - name = "type-is-1.5.2.tgz"; - sha1 = "8291bbe845a904acfaffd05a41fdeb234bfa9e5f"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz"; + name = "type-is-1.6.2.tgz"; + sha1 = "694e83e5d110417e681cea278227f264ae406e33"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); - deps = [ - self.by-version."media-typer"."0.3.0" - self.by-version."mime-types"."2.0.2" - ]; + deps = { + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12"; + }; peerDependencies = [ ]; passthru.names = [ "type-is" ]; @@ -1481,7 +1740,8 @@ by-spec."utils-merge"."1.0.0" = self.by-version."utils-merge"."1.0.0"; by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-utils-merge-1.0.0"; + name = "utils-merge-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; @@ -1491,8 +1751,8 @@ ]; buildInputs = (self.nativeDeps."utils-merge" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "utils-merge" ]; @@ -1500,7 +1760,8 @@ by-spec."vary"."~1.0.0" = self.by-version."vary"."1.0.0"; by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-vary-1.0.0"; + name = "vary-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; @@ -1510,16 +1771,37 @@ ]; buildInputs = (self.nativeDeps."vary" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "vary" ]; }; + by-spec."wrappy"."1" = + self.by-version."wrappy"."1.0.1"; + by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "wrappy-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; + name = "wrappy-1.0.1.tgz"; + sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; + }) + ]; + buildInputs = + (self.nativeDeps."wrappy" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "wrappy" ]; + }; by-spec."ws"."~0.4.32" = self.by-version."ws"."0.4.32"; by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage { name = "ws-0.4.32"; + bin = true; src = [ (fetchurl { url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; @@ -1529,12 +1811,12 @@ ]; buildInputs = (self.nativeDeps."ws" or []); - deps = [ - self.by-version."commander"."2.1.0" - self.by-version."nan"."1.0.0" - self.by-version."tinycolor"."0.0.1" - self.by-version."options"."0.0.6" - ]; + deps = { + "commander-2.1.0" = self.by-version."commander"."2.1.0"; + "nan-1.0.0" = self.by-version."nan"."1.0.0"; + "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; + "options-0.0.6" = self.by-version."options"."0.0.6"; + }; peerDependencies = [ ]; passthru.names = [ "ws" ]; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index f3141a30bf1..08e804b7ae9 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -2,7 +2,7 @@ pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }: stdenv.mkDerivation rec { - name = "qgis-2.8.1"; + name = "qgis-2.8.2"; buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla fcgi libspatialindex libspatialite postgresql ] ++ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "19acb74e4e2739238b87bf64f2750e10e366e9d61d070a4b8ca341ce01ca9741"; + sha256 = "fd3c01e48224f611c3bb279b0af9cc1dff3844cdc93f7b45e4f37cf8f350bc4b"; }; postInstall = '' diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7ae24b38c01..011e75fbc1c 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -17,10 +17,6 @@ let else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; - mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}"; - mkWith = mkFlag "with" "without"; - mkEnable = mkFlag "enable" "disable"; - hasX11 = libX11 != null && libXext != null && libXt != null; in @@ -37,38 +33,38 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - (mkEnable (libcl != null) "opencl") - (mkWith true "modules") - (mkWith true "gcc-arch=${arch}") - #(mkEnable true "hdri") This breaks some dependencies - (mkWith (perl != null) "perl") - (mkWith (jemalloc != null) "jemalloc") - (mkWith true "frozenpaths") - (mkWith (bzip2 != null) "bzlib") - (mkWith hasX11 "x") - (mkWith (zlib != null) "zlib") - (mkWith false "dps") - (mkWith (fftw != null) "fftw") - (mkWith (libfpx != null) "fpx") - (mkWith (djvulibre != null) "djvu") - (mkWith (fontconfig != null) "fontconfig") - (mkWith (freetype != null) "freetype") - (mkWith (ghostscript != null) "gslib") - (mkWith (graphviz != null) "gvc") - (mkWith (jbigkit != null) "jbig") - (mkWith (libjpeg != null) "jpeg") - (mkWith (lcms2 != null) "lcms2") - (mkWith false "lcms") - (mkWith (openjpeg != null) "openjp2") - (mkWith (liblqr1 != null) "lqr") - (mkWith (xz != null) "lzma") - (mkWith (openexr != null) "openexr") - (mkWith (pango != null) "pango") - (mkWith (libpng != null) "png") - (mkWith (librsvg != null) "rsvg") - (mkWith (libtiff != null) "tiff") - (mkWith (libwebp != null) "webp") - (mkWith (libxml2 != null) "xml") + (mkEnable (libcl != null) "opencl" null) + (mkWith true "modules" null) + (mkWith true "gcc-arch" arch) + #(mkEnable true "hdri" null) This breaks some dependencies + (mkWith (perl != null) "perl" null) + (mkWith (jemalloc != null) "jemalloc" null) + (mkWith true "frozenpaths" null) + (mkWith (bzip2 != null) "bzlib" null) + (mkWith hasX11 "x" null) + (mkWith (zlib != null) "zlib" null) + (mkWith false "dps" null) + (mkWith (fftw != null) "fftw" null) + (mkWith (libfpx != null) "fpx" null) + (mkWith (djvulibre != null) "djvu" null) + (mkWith (fontconfig != null) "fontconfig" null) + (mkWith (freetype != null) "freetype" null) + (mkWith (ghostscript != null) "gslib" null) + (mkWith (graphviz != null) "gvc" null) + (mkWith (jbigkit != null) "jbig" null) + (mkWith (libjpeg != null) "jpeg" null) + (mkWith (lcms2 != null) "lcms2" null) + (mkWith false "lcms" null) + (mkWith (openjpeg != null) "openjp2" null) + (mkWith (liblqr1 != null) "lqr" null) + (mkWith (xz != null) "lzma" null) + (mkWith (openexr != null) "openexr" null) + (mkWith (pango != null) "pango" null) + (mkWith (libpng != null) "png" null) + (mkWith (librsvg != null) "rsvg" null) + (mkWith (libtiff != null) "tiff" null) + (mkWith (libwebp != null) "webp" null) + (mkWith (libxml2 != null) "xml" null) ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index af499c51f97..348ba5c3c2c 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://apitrace.github.io; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; - license = with licenses; mit; + license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 0589de8726a..3398fed6595 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.4"; + version = "1.6.6"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0ald6qqg7abgr8hj2qk45260cqh3fddzqbxc1p7ll0ac2vl0bxy5"; + sha256 = "1991zm0ly2j69vq9jsijfrjw0vnchh3il7m4ylsblzk73614nppq"; }; buildInputs = diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 927ca2ab679..bacfa500ede 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "fbida-2.09"; + name = "fbida-2.10"; src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; - sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x"; + sha256 = "1dkc1d6qlfa1gn94wcbyr7ayiy728q52fvbipwmnl2mlc6n3lnks"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -29,7 +29,10 @@ stdenv.mkDerivation rec { makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="]; }; - meta = { + meta = with stdenv.lib; { description = "Image viewing and manipulation programs"; + homepage = https://www.kraxel.org/blog/linux/fbida/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index ad636772237..ac0a2ec0d4c 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,11 +2,11 @@ , libXinerama, curl, libexif }: stdenv.mkDerivation rec { - name = "feh-2.12.1"; + name = "feh-2.13.1"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "18b6yjk88ybqxsa5knk6qwi2xy7fclbzl5cpzwg0wmkr3phfq9lh"; + sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46"; }; buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ]; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 5f43abfcfc1..8ece9ba2453 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -59,12 +59,12 @@ rec { sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure ''; - meta = { + meta = with stdenv.lib; { description = "The GIMP Animation Package"; homepage = http://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # falls inside "free". - license = [ "GPLv3" "free" ]; + license = with licenses; [ gpl3 free ]; }; }; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index ca52a4f2766..41531ed0de8 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs share/extensions '' # Clang gets misdetected, so hardcode the right answer - + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + + stdenv.lib.optionalString stdenv.cc.isClang '' substituteInPlace src/ui/tool/node.h \ --replace "#if __cplusplus >= 201103L" "#if true" ''; diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index b4becafdb0b..3ec25b503eb 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, lzip, texinfo }: stdenv.mkDerivation rec { - name = "ocrad-0.24"; + name = "ocrad-0.25"; src = fetchurl { url = "mirror://gnu/ocrad/${name}.tar.lz"; - sha256 = "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv"; + sha256 = "1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477"; }; buildInputs = [ lzip texinfo ]; @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optical character recognition (OCR) program & library"; - longDescription = '' GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. It reads images in pbm (bitmap), pgm @@ -29,7 +28,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub ]; platforms = platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index fc1b5795d40..e6e72cfd6e6 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, xulrunner }: stdenv.mkDerivation rec { - version = "2.0.10"; + version = "2.0.11"; name = "pencil-${version}"; src = fetchurl { url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "b5dcb12986108bf3eb13cdd1ee1fc1f8d1a88c7fadf2a5c44e7a59a254f2b0dd"; + sha256 = "a35d1353de6665cbd4a5bd821dcdf7439f2a3c1fcbccee0f01ec8dd1bb67c4f3"; + }; buildPhase = ""; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index f58fe0e28c1..13636e1f1fe 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchurl, zlib }: -let version = "1.11"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "potrace-${version}"; + version = "1.12"; src = fetchurl { - url = "http://potrace.sourceforge.net/download/potrace-${version}.tar.gz"; - sha256 = "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as"; + url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; + sha256 = "0fqpfq5wwqz8j6pfh4p2pbflf6r86s4h63r8jawzrsyvpbbz3fxh"; }; - configureFlags = ["--with-libpotrace"]; + configureFlags = [ "--with-libpotrace" ]; buildInputs = [ zlib ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 629126503c9..27dde61a08c 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils -, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme }: +, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme, cacert }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ @@ -13,7 +13,7 @@ let sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn"; }; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; buildInputs = [ pkgconfig glib libsoup ]; }; @@ -51,8 +51,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg makeWrapper gnome_doc_utils - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme ]; + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index b47a8215fd4..ad825eceec2 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2 , makeWrapper, pkgconfig, saneBackends, systemd, vala }: -let version = "3.16.0.1"; in +let version = "3.17.2"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "0p1knmbrdwrnjjk5x0szh3ja2lfamaaynj2ai92zgci2ma5xh2ma"; - url = "https://launchpad.net/simple-scan/3.16/${version}/+download/${name}.tar.xz"; + sha256 = "07r32hsafb8is2fs0flk7dvi5agyzf9jqs96sbgia2pizmyl1s1m"; + url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz"; }; meta = with stdenv.lib; { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { interface is well tested. ''; homepage = https://launchpad.net/simple-scan; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 83aff09e2aa..b531c41e2d8 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff }: +{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff +, enableLanguages ? null +}: + +with stdenv.lib; let majVersion = "3.02"; version = "${majVersion}.02"; - f = lang : sha256 : let - src = fetchurl { - url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz"; - inherit sha256; - }; - in - "tar xfvz ${src} -C $out/share/ --strip=1"; + mkLang = lang: sha256: let + src = fetchurl { + url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz"; + inherit sha256; + }; + in "tar xfvz ${src} -C $out/share/ --strip=1"; - extraLanguages = '' - ${f "cat" "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"} - ${f "rus" "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"} - ${f "spa" "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"} - ${f "nld" "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"} - ${f "eng" "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"} - ${f "slv" "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"} - ${f "jpn" "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"} - ''; + wantLang = name: const (enableLanguages == null || elem name enableLanguages); + + extraLanguages = mapAttrsToList mkLang (filterAttrs wantLang { + cat = "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"; + rus = "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"; + spa = "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"; + nld = "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"; + eng = "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"; + slv = "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"; + jpn = "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"; + }); in stdenv.mkDerivation rec { @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { 'LIBLEPT_HEADERSDIR=${leptonica}/include' ''; - postInstall = extraLanguages; + postInstall = concatStringsSep "; " extraLanguages; meta = { description = "OCR engine"; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index a6c299d1ab3..724bddda6cf 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Quicker to unpack locally than load Hydra hydraPlatforms = []; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; }; } diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 5e41712a14f..661c8c3acb5 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -34,7 +34,6 @@ let "Kexiv2" = "libkexiv2"; "Kdcraw" = "libkdcraw"; "Kipi" = "libkipi"; - "LibKMahjongg" = "libkmahjongg"; "LibKonq" = "kde-baseapps"; "Marble" = "marble"; }; @@ -72,9 +71,10 @@ let BISON = bison; Baloo = kde4.baloo; Boost = boost156; + CFitsio = cfitsio; + CUPS = cups; Canberra = libcanberra; Cdparanoia = cdparanoia; - CUPS = cups; DBusMenuQt = libdbusmenu_qt; DjVuLibre = djvulibre; ENCHANT = enchant; @@ -96,13 +96,16 @@ let GSL = gsl; HUNSPELL = hunspell; HUpnp = herqq; + INDI = indilib; Intltool = intltool; Jasper = jasper; KActivities = kde4.kactivities; + KDEGames = kde4.libkdegames; LCMS2 = lcms2; Ldap = openldap; LibAttica = attica; LibGcrypt = libgcrypt; + LibKMahjongg = kde4.libkmahjongg; LibSSH = libssh; LibSpectre = libspectre; LibVNCServer = libvncserver; @@ -114,10 +117,11 @@ let OpenEXR = openexr; Poppler = poppler_qt4; Prison = prison; - PulseAudio = pulseaudio; + PulseAudio = libpulseaudio; PythonLibrary = python; Qalculate = libqalculate; QCA2 = qca2; + Qca-qt5 = qca-qt5.override { inherit qt5; }; QImageBlitz = qimageblitz; QJSON = qjson; Qt4 = qt4; @@ -134,6 +138,7 @@ let TunePimp = libtunepimp; UDev = udev; USB = libusb; + Xplanet = xplanet; Xscreensaver = xscreensaver; Xsltproc = libxslt; } @@ -298,6 +303,12 @@ let buildInputs = super.kgpg.buildInputs ++ [boost]; }; + khangman = super.khangman // { + buildInputs = + super.khangman.buildInputs + ++ [ kf5.kio ]; + }; + kmix = with pkgs; super.kmix // { nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig]; cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ]; @@ -316,7 +327,14 @@ let krfb = super.krfb // { buildInputs = super.krfb.buildInputs - ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; + ++ [pkgs.xlibs.libXtst kdeApps.ktp-common-internals]; + }; + + kstars = super.kstars // { + buildInputs = + super.kstars.buildInputs + ++ (with kf5; [ kparts ]) + ++ [ pkgs.cfitsio ]; }; ktp-accounts-kcm = super.ktp-accounts-kcm // { @@ -328,7 +346,14 @@ let ktp-common-internals = super.ktp-common-internals // { buildInputs = super.ktp-common-internals.buildInputs - ++ (with kf5; [ kdelibs4support kparts ]); + ++ (with kf5; [ kdelibs4support kparts ]) + ++ [ pkgs.libotr ]; # needed for ktp-text-ui + }; + + lokalize = super.lokalize // { + buildInputs = + super.lokalize.buildInputs + ++ [ kf5.kdbusaddons ]; }; libkdcraw = with pkgs; super.libkdcraw // { @@ -360,6 +385,12 @@ let buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends]; }; + okular = super.okular // { + nativeBuildInputs = + super.okular.nativeBuildInputs + ++ [ pkgs.pkgconfig ]; + }; + rocs = super.rocs // { buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]); }; diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix index 09d89ef7045..bdf5b3cfc56 100644 --- a/pkgs/applications/kde-apps-15.04/manifest.nix +++ b/pkgs/applications/kde-apps-15.04/manifest.nix @@ -2035,6 +2035,2040 @@ name = "kjumpingcube-15.04.0.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "okular-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0j337gxam8fflqmaq9ggjgdjqmz53ank-okular-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/okular-15.04.1.tar.xz"; + sha256 = "0yg9ivscx8nrdb9gq6xq6fm3y8lksnkcjdi0908axmqr8gxnh5c5"; + name = "okular-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktux-15.04.1.tar.xz" ".tar"; + store = "/nix/store/909abb7a2m5zlw96wycw77ry7na2y6fc-ktux-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktux-15.04.1.tar.xz"; + sha256 = "07v559yw4dpryfi7x4c7305dac9i5pkaj0m5dxbgsvsyc5qmmv18"; + name = "ktux-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcalc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gy0khp88rwah803y4r9q6jfghkjf857h-kcalc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcalc-15.04.1.tar.xz"; + sha256 = "1w279713fipi82skai7f31q5yzn6yjm3bhd236igd9a24blzr2xa"; + name = "kcalc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kollision-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sr1wh5xb0kj4yw5qy5qqf5mfrbwva980-kollision-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kollision-15.04.1.tar.xz"; + sha256 = "0pq8pvqjynfmkafaxx9hl4dd8i0blq8vkzpnkhn3zkd450bwjdpc"; + name = "kollision-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgamma-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3nifa51gknij2kxwlhsi70qz5xmc36dg-kgamma-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgamma-15.04.1.tar.xz"; + sha256 = "1w0sb9yk3wj38jqhbr1g72jagy99v2ihrm81r4wp274i602h9s2s"; + name = "kgamma-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapptemplate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/illwb8qn9c9s67m5y4f5cx0d5f3l860k-kapptemplate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kapptemplate-15.04.1.tar.xz"; + sha256 = "09s0bk8kp338iy2bpq3gaa3sa52qk42zw4wxccgvxj9hjhh894nk"; + name = "kapptemplate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalgebra-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0dz4823nkpmlvxby7ki3vb0ppfshwz45-kalgebra-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kalgebra-15.04.1.tar.xz"; + sha256 = "17qxij5kdk0vymqfq1csmp071sscjc19pw9y39g59njk4bbdih3m"; + name = "kalgebra-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-icons-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ck0pb49q3kv6jzkmwliw1sdp8qbpzplr-oxygen-icons-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/oxygen-icons-15.04.1.tar.xz"; + sha256 = "0asr2k1i0bm8pm9kj12c9s5bkwvz25pgsv167hb2cvfgm8ahyvlj"; + name = "oxygen-icons-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6w7jbq7m0kfjc37rnd6yf0ww3xdmb27x-kdesdk-kioslaves-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-kioslaves-15.04.1.tar.xz"; + sha256 = "1pb258bhqikc9nmzs10y98gzd6na0sqyhgfzm1rq1hkmg4dkslwa"; + name = "kdesdk-kioslaves-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "pairs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ky762jidy4zxzwbllfxz46h7bq76v2df-pairs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/pairs-15.04.1.tar.xz"; + sha256 = "078j19w99v50zck64mrir0pr1r45k136lprdndxrpdmxq3zx36px"; + name = "pairs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "svgpart-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qgdyrm00y38n3xidjc5hqyi1aid7hn0y-svgpart-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/svgpart-15.04.1.tar.xz"; + sha256 = "0mwbbx490i1z038jxkl8pyjaisks2k18nn5ccs1d65k5p67pcf3b"; + name = "svgpart-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "amor-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qjyg81gbsdbdwc4vzxhfwvbc2r5jqbxc-amor-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/amor-15.04.1.tar.xz"; + sha256 = "071wnfp1p9xd6asir4ssvb19jcfbwqg472znl5bw7n09qp5i7w9m"; + name = "amor-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zi9amimbp5ag5frcx0myg5ksc25whknc-kde-l10n-bs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bs-15.04.1.tar.xz"; + sha256 = "1il3l1fmavigjndy8pwb0m9jvz0wzm39p0pm10b12vv394623i5f"; + name = "kde-l10n-bs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zs5dds7lhag23vwc2f83bd9wchi6k0zh-kde-l10n-he-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-he-15.04.1.tar.xz"; + sha256 = "1jn8b5m4i9gxyfi2acjxjqcq0rzp9b70miji17vjc8q1a7241pmg"; + name = "kde-l10n-he-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8nlrz9m17ljb459zm6zq5nx8nnpwly16-kde-l10n-ug-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ug-15.04.1.tar.xz"; + sha256 = "184xqway79p33fi8mc1xx6h0lply1r8xsj4qjjqnd30sg5hzn0lp"; + name = "kde-l10n-ug-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zgij63xalg6c9i3nm1bc6ap6zvspm8p2-kde-l10n-nb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nb-15.04.1.tar.xz"; + sha256 = "1zlarins81lj11ljr1k1ma27wy6jyl7q33p2xisjwqi4qw6jmhza"; + name = "kde-l10n-nb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xy0x7in8bkpn6z6ac2v6cx3rvzij2jma-kde-l10n-de-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-de-15.04.1.tar.xz"; + sha256 = "0gki5x7nlpvhxqwg6gqajh5swql6vvi9c37lys7ng2hpqc5xy7pf"; + name = "kde-l10n-de-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.1.tar.xz" ".tar"; + store = "/nix/store/pr9ckm8k6y78gqb5y33ny8zm6hgbm6iy-kde-l10n-it-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-it-15.04.1.tar.xz"; + sha256 = "1grfxlcc896zgq74q6cqy6l878bkyhchr4n8jcjiqzl7xn3p2q5c"; + name = "kde-l10n-it-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rqbgin8gv0jy20hgl2j0pp56k93k4hp6-kde-l10n-sv-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sv-15.04.1.tar.xz"; + sha256 = "1wzpisiqdcsw698j1bf22gzjqawwmmcpslx6yhmrn8462k5iq0d7"; + name = "kde-l10n-sv-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5vbrfwv9s2klrxw3k6vz4833qvldarp0-kde-l10n-ja-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ja-15.04.1.tar.xz"; + sha256 = "0jsnx9sjs1wz2f8i9bbl2v59f56azggqbl610idj0xdjn7zhk311"; + name = "kde-l10n-ja-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.1.tar.xz" ".tar"; + store = "/nix/store/j9mbwhpxw612xc9bilzhdgsayi9bqwjl-kde-l10n-lv-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lv-15.04.1.tar.xz"; + sha256 = "1c6g0rkd209j2q9m2q5rcf8j24gnc1g11kq87cjyj88jvidc0jpl"; + name = "kde-l10n-lv-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wziwfgk9xh3k79xz9pvpfjvjavjalc37-kde-l10n-mr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-mr-15.04.1.tar.xz"; + sha256 = "02hd8p6fzralbhz622nzxyn13p1lqxzyi229vc8ni7qz9mqia02k"; + name = "kde-l10n-mr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vg6xw3206sf0nys7179l6a04ymiwqy3w-kde-l10n-nds-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nds-15.04.1.tar.xz"; + sha256 = "10hija63jh38pqm9j9lln2n705sfm13zn2h3rv4jl0q7m75hdl0m"; + name = "kde-l10n-nds-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2fk00654fxijdpmzqpf5qwbbxdlfxs25-kde-l10n-zh_CN-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_CN-15.04.1.tar.xz"; + sha256 = "16rsjrwfafvrgl48dnpbd2lnzja186zq7sq83dafg9hs636md6ff"; + name = "kde-l10n-zh_CN-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i30703ryicxz0zf6fk08mzpcr7wvyps8-kde-l10n-ca-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca-15.04.1.tar.xz"; + sha256 = "1008mb8ygak03dg0xxwsb54px0qashh1nnrpj0wwfqvgfbqa19fm"; + name = "kde-l10n-ca-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/mdcybgna88hx6jlmyj2m6ss32yw4i7z3-kde-l10n-nl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nl-15.04.1.tar.xz"; + sha256 = "1s6zrnbhnpqwpb1mgrnayqvzggb1wrmc4w166y8j9bvjc0jahlfp"; + name = "kde-l10n-nl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k179rl7a4avlv20w4spxzl19mk567jv3-kde-l10n-sr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sr-15.04.1.tar.xz"; + sha256 = "1k6q4l7xllrs26xvrhfp8lbq0rgp49aq3r9y85crdmf5xy1zk4bc"; + name = "kde-l10n-sr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8i9bjzsxfxh4n5w385k0figmm9cwfy65-kde-l10n-ro-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ro-15.04.1.tar.xz"; + sha256 = "1svqhp23y5xmnmrba8vzamac6zf4lz02gfck9xi8kq5zhs1zky7w"; + name = "kde-l10n-ro-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vd6ihrlxp8m0hf7x3b05sglmn9xggjy1-kde-l10n-hr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hr-15.04.1.tar.xz"; + sha256 = "00rn1947pw57cl4lwyx3hm7ic4w45lsh82m3sr3l8wa26qm6qz17"; + name = "kde-l10n-hr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8rp1dba5nc9b2b2m4dvl51rd74xrnkdn-kde-l10n-pl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pl-15.04.1.tar.xz"; + sha256 = "09rs6abbm4bj0wy2s0y7b44lacraq1ypxvmil5cxj95apk6qy4sa"; + name = "kde-l10n-pl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bnwiza33rhdlnc61bvfx521cy02d8scc-kde-l10n-cs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-cs-15.04.1.tar.xz"; + sha256 = "1xl397n7vdfcpzg5qfcdbmw92p6ail90s15vvbxq2c4didysgrcz"; + name = "kde-l10n-cs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7mxx0v3fd90vi123hw0k9hinmzxh4z1z-kde-l10n-is-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-is-15.04.1.tar.xz"; + sha256 = "0c03jsb4lbp5wn0inzv3z86as0din40ypjh5jwj6zparjgg7v017"; + name = "kde-l10n-is-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lwqhr1l80ki47ysz51ckiz05z9wxfphv-kde-l10n-hi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hi-15.04.1.tar.xz"; + sha256 = "0gwin6w51iskb9wss97mg3pvwbfca67jqisz3v6qljy770p8d16j"; + name = "kde-l10n-hi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iqfv8rf2qlaif5k6km6i68qpdha2p8ib-kde-l10n-es-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-es-15.04.1.tar.xz"; + sha256 = "00j195zzqmirq3d64sq86n11fhp4gzd8wq7bvr4byg76crv1wsqv"; + name = "kde-l10n-es-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zkjp2bbs8d6j6k3wgwij5q1zaiaxvzhi-kde-l10n-eo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eo-15.04.1.tar.xz"; + sha256 = "1kpd83bf72hjp8dir6cv75rb9wjnljdwxk4ff1mp2ph7rzhm8hxf"; + name = "kde-l10n-eo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.1.tar.xz" ".tar"; + store = "/nix/store/09hg9zfgwdgvdaxx985kk1xf9hky3r7h-kde-l10n-zh_TW-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_TW-15.04.1.tar.xz"; + sha256 = "1k4f9031572mxkg5rk2i98angr9rqcbqkp3zrg7blfpndbqbhzzl"; + name = "kde-l10n-zh_TW-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5lzgd16vdwbziizylnx114dpaycm0xmy-kde-l10n-sk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sk-15.04.1.tar.xz"; + sha256 = "1j96parls7psj0nr0305wdpdjxdrh8bqgbs89mrbk8wgzj9agsh8"; + name = "kde-l10n-sk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hf6x95pyziykm6j2kxlaavr4585l19x5-kde-l10n-ru-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ru-15.04.1.tar.xz"; + sha256 = "1lqc7fvw4spca4va4id24ni19s4gzxzf5qrzfqgav4xf6hwndi3c"; + name = "kde-l10n-ru-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.1.tar.xz" ".tar"; + store = "/nix/store/x29ma96kp1mf389k6kjpl65fwqbkkjzk-kde-l10n-ga-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ga-15.04.1.tar.xz"; + sha256 = "1m1dihyak0z5h6932rmb09q3hhbyzkck0gwnp3gdqa84m1b8kmid"; + name = "kde-l10n-ga-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iacgwmkzrc75y7xf281zcfz7fha9c740-kde-l10n-kk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-kk-15.04.1.tar.xz"; + sha256 = "1lcan2x6f7v159zmix2h730pj21rlqmqxvizcd0jrwmnqxf9ww1k"; + name = "kde-l10n-kk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lk6ncn5aa4p373igs7j8g6mwa4a2iqma-kde-l10n-pt-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt-15.04.1.tar.xz"; + sha256 = "07pqq7yggq2cjsn60wygbzz37dprp30dhabqj6il6gahl9y5y1fj"; + name = "kde-l10n-pt-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.1.tar.xz" ".tar"; + store = "/nix/store/adcsrsz6kj7605a7whakszmsjrb3r0nc-kde-l10n-pt_BR-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt_BR-15.04.1.tar.xz"; + sha256 = "0c5z73pr7m4pq52pjk7q097755g2kswjzjcq5pwc94za0yj055l2"; + name = "kde-l10n-pt_BR-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i9kc413jrn1l9rywv7vsbhgsvz7lffis-kde-l10n-ko-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ko-15.04.1.tar.xz"; + sha256 = "1i34awq71si561p6ggahk6phav9p7rlyc34lg38w7mlqb0d6bjqq"; + name = "kde-l10n-ko-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s9rqm9a1rvwx7zikmm5fwydsaggsgk25-kde-l10n-da-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-da-15.04.1.tar.xz"; + sha256 = "0h5784ba12yh5szyilbw6l4alac4kvgq9bmzpmga032jpc0g9k0l"; + name = "kde-l10n-da-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4pxnpsmz3siicy40i3m1x4ji852ps53s-kde-l10n-et-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-et-15.04.1.tar.xz"; + sha256 = "0x208lv7qrhflgz5qmpp64wqx4avb3mbjr625nqpk8c5w9swqify"; + name = "kde-l10n-et-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0bdylm7gbn4ddfw95mz3zwvpizjfflgz-kde-l10n-fa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fa-15.04.1.tar.xz"; + sha256 = "11lsciiys8dk6mzvd5fp4kypk2355ppdd20fkqd99vp2z3rknv9r"; + name = "kde-l10n-fa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1pxdddwrqh1lwq69ybfc3bq4wqyp4wsp-kde-l10n-nn-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nn-15.04.1.tar.xz"; + sha256 = "1vn9bcjba6wcym0cvfwhzyn7n4aa9jc3w7apahc72sqzq1irjapl"; + name = "kde-l10n-nn-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k8jamljw1l6zrpqwl4ai6103rcxlkxr6-kde-l10n-en_GB-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-en_GB-15.04.1.tar.xz"; + sha256 = "10gypxkclg037crrv5ifyrj5yahjmfr8x7h41b2zrxy2mvibfpw8"; + name = "kde-l10n-en_GB-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cr32nv49a2k622v9g0x8c3wbq0ydv9g4-kde-l10n-gl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-gl-15.04.1.tar.xz"; + sha256 = "1wjw21vifqzr35rpmffavxljbw6h9ci7awllj447sgqyw2c59pls"; + name = "kde-l10n-gl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kxabywd2fc6249jy9pwqkjmbigi11hca-kde-l10n-ar-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ar-15.04.1.tar.xz"; + sha256 = "0ngff802m80bi28khp9m60j5j2fh8f3nghp81l8a27kmlzl0np9j"; + name = "kde-l10n-ar-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7xgibrqzv5gsvswx0k5y52pawd5fd14k-kde-l10n-eu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eu-15.04.1.tar.xz"; + sha256 = "0fpfahmlniyhsxlx7p1ln9ldy3zjxak8cqi24p2rv8xcm3238dlf"; + name = "kde-l10n-eu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/fk5q2f8nwj9cw94k036yf1fgn5kg4g1c-kde-l10n-tr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-tr-15.04.1.tar.xz"; + sha256 = "1r40gg4cz5s7g5c54a8c6mmx6v27lqx1sbygm5cb9xsqqp0il1yi"; + name = "kde-l10n-tr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca@valencia-15.04.1.tar.xz"; + sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd"; + name = "kde-l10n-ca_valencia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zqkgqclj5c9ssqnzycg6449740s6n1rm-kde-l10n-km-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-km-15.04.1.tar.xz"; + sha256 = "0prmwyjjmw5mimbi5dkzcmgynazi5lvrjkinfl9z49l2dcqmwkks"; + name = "kde-l10n-km-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hicn3pxa99ihaj704v6f1l1kfmxdfm98-kde-l10n-pa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pa-15.04.1.tar.xz"; + sha256 = "1civainv5170xvn20vx8rmghkfdlc6554nncq22l55q2f78pgg29"; + name = "kde-l10n-pa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/m08cm6y7gnpyhdszbza3id8j08v1qvsn-kde-l10n-fi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fi-15.04.1.tar.xz"; + sha256 = "1q3b25h983y2jin4llml0s4wm5ja0rplsczr5zci99vyi1jv2i3w"; + name = "kde-l10n-fi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c5ssvbyi0gdr7da99a3mg0snwwmqzi1c-kde-l10n-id-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-id-15.04.1.tar.xz"; + sha256 = "0gs7l2i71hzwyn12gjrdqr5lm996vglrbqbvn0jmzyp6zjzha6ah"; + name = "kde-l10n-id-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hslbisaanz2z17mvspp4jbsx95pgwsgh-kde-l10n-lt-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lt-15.04.1.tar.xz"; + sha256 = "02qmdg0gkcmcgj9gffawij8c64fjs7s70yysnlnp3wmb7vy4ppqh"; + name = "kde-l10n-lt-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3lzxjwp4rrgp3rn6f3x42ylfk1qf4g12-kde-l10n-wa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-wa-15.04.1.tar.xz"; + sha256 = "139v2k0jvm7xndwhgrs0x15l1plb49qpzbdny928gjymxq5x66ar"; + name = "kde-l10n-wa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yzfn0nlwhlm1q6x04ydz4p4rdinwazpn-kde-l10n-fr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fr-15.04.1.tar.xz"; + sha256 = "1x36334bi1q4sii7j24xr39jxw6k22p4m1c2mz43s0ix0gzyx6n0"; + name = "kde-l10n-fr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/v3qlbc9qq7m6pa8m1iz6qw3wam7c8qh4-kde-l10n-bg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bg-15.04.1.tar.xz"; + sha256 = "1frd276wzvhwczdws589xy4bpg58yill263lfg8bjvg1v00pr6j8"; + name = "kde-l10n-bg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sjnpw624x3hm8spj91lfy2aqilfn9vv4-kde-l10n-uk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-uk-15.04.1.tar.xz"; + sha256 = "041zhdfmdbca74cgc69dzspn670i9cv32mhb8319q85xp1jr3wbs"; + name = "kde-l10n-uk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k5f977w8bgbi72wcf00p1wng4wr58y2q-kde-l10n-sl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sl-15.04.1.tar.xz"; + sha256 = "078r48vgbi72wrx5hnjbgkakp108v79lyb6jpllcn7a8sd71cm6s"; + name = "kde-l10n-sl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rck5qqcnw6id22p4ak703wbpygwxl3gx-kde-l10n-hu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hu-15.04.1.tar.xz"; + sha256 = "1vbbv0lmim0368kc328x430s69fybsg3mh5wnadfrkmlzliigh3l"; + name = "kde-l10n-hu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ydwfc2skbipdis45li6vj1qahaxdqxxj-kde-l10n-el-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-el-15.04.1.tar.xz"; + sha256 = "131064jjxqqi50ywljic71fdismqpqg9h1yjyv8wxs9rl1mb8s90"; + name = "kde-l10n-el-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l89gan31lfivzmmjq1wvqgk6jaqvi6bw-kde-l10n-ia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ia-15.04.1.tar.xz"; + sha256 = "092s5b2abb8amiqcvg95p84b91jncxcmbad3yhkxw2lkzllrl83y"; + name = "kde-l10n-ia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksystemlog-15.04.1.tar.xz" ".tar"; + store = "/nix/store/42gd0z1f41kc9jfk2sdqyx7lr5dzyh6l-ksystemlog-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksystemlog-15.04.1.tar.xz"; + sha256 = "0zf7vzlxvby6kf8ccydy4dxwwkmr3lhhpklgiywz6m26i4iapjdg"; + name = "ksystemlog-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdeedu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8pcp0gamz0v2vfjgvjr2avgchwzrs128-libkdeedu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdeedu-15.04.1.tar.xz"; + sha256 = "1y3zmhbbwl98cm8whkpafsrk4n9pn7ass6pyn9pnwz8g1lc853ig"; + name = "libkdeedu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcharselect-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gwccqzp4a5glln0zpp179j932l9cdwbd-kcharselect-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcharselect-15.04.1.tar.xz"; + sha256 = "1v4j2jn05vynnzpk11r2vg79v8ih945vkv37xw4isvfcicd5bjjh"; + name = "kcharselect-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krfb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k67yxmxak82q0bigh94har3zd57g8ijb-krfb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/krfb-15.04.1.tar.xz"; + sha256 = "0mscrcvbhmhm7a330rwxywxpk09h4255j0ah3f5lq08zwhrpzd9r"; + name = "krfb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "palapeli-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zyqcyz9b4g57ww1cwz6hmhga1nwhmcjd-palapeli-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/palapeli-15.04.1.tar.xz"; + sha256 = "17xxsmrksxvf4km7a1dbcx2fsbiiwkhszdr17gywlz6b1k2rpybj"; + name = "palapeli-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwalletmanager-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c7m3wis5dcxivjswlzcw8pp216pq813a-kwalletmanager-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kwalletmanager-15.04.1.tar.xz"; + sha256 = "0j197d8cmmgv8mz1scgp9qdq87sx318nkb7jymc28cc6d49mrwgx"; + name = "kwalletmanager-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgeography-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bzaka1rvr5lr71h054w8zw10xlqpgd70-kgeography-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgeography-15.04.1.tar.xz"; + sha256 = "0g4wxd3qzsp99m4h5aga5cwky1xffwpys3lm29083agl8gvyrs0p"; + name = "kgeography-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "blinken-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wdnknychhn65zahmpka1x60n082mqjfg-blinken-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/blinken-15.04.1.tar.xz"; + sha256 = "0vavcjbsc4lx0a715pwqshc5l03h3nlpk8lpbbswik47rs10k156"; + name = "blinken-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "rocs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/im5b97nl4p7f5f1pkzrhjbqbhx6p5ap7-rocs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/rocs-15.04.1.tar.xz"; + sha256 = "1cplxlv8a7vsa18j7m629h06v4a0z123mhmg8blzqwh0wwsj71r8"; + name = "rocs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.8.tar.xz" ".tar"; + store = "/nix/store/mxcxsdllc81x1w8y4p40b1s5gkkbzsqm-kdepimlibs-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepimlibs-4.14.8.tar.xz"; + sha256 = "0522aby3gm99n18g7p59vi0rzz0ysj9rzljlci5j873mv7yff242"; + name = "kdepimlibs-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knetwalk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kmp1kna6sixbxjdzcnn1agarx8xq9ps4-knetwalk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/knetwalk-15.04.1.tar.xz"; + sha256 = "1hq7cldh4n9kbfhc1bj3mra9dgafk6hkn5pazp2rfipmfmxj3w3b"; + name = "knetwalk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "marble-15.04.1.tar.xz" ".tar"; + store = "/nix/store/klfb6qwspc6raf7kw49s3y5xgdxn9l77-marble-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/marble-15.04.1.tar.xz"; + sha256 = "0aqgh7s07ryhyz0a62pzj3a73ip26df1cw9g103x5iapia5lyp3p"; + name = "marble-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolf-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xd8id5gbv47bg5jrk8qammqviv861s60-kolf-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kolf-15.04.1.tar.xz"; + sha256 = "1r8zqlmwz2dr3pgh921z3j8pvcry7366qyr6kybkjhyjqr1rmhdh"; + name = "kolf-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbounce-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vhp18ifxb0v5nnfna3z8qnkpdksc51bd-kbounce-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbounce-15.04.1.tar.xz"; + sha256 = "0qxmvkwcanm50w8jd2fcf0q557ywz198ifgsx8piyxmjg8j0hal6"; + name = "kbounce-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "audiocd-kio-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3ma0rszdvi8hsz0r5f27yafarzmbr1l0-audiocd-kio-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/audiocd-kio-15.04.1.tar.xz"; + sha256 = "1gxr9ny09sqb80bhkd21wfl902j8kl5qlgvs9amasabgq7450rbq"; + name = "audiocd-kio-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwordquiz-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l1yn11z138jfwx11qz2hdvklsvray4ml-kwordquiz-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kwordquiz-15.04.1.tar.xz"; + sha256 = "0xjk9ihlvs8v79mwqry91lzr5kqnj80wfg84gab8djz7gsixgp0y"; + name = "kwordquiz-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmousetool-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wwv9f44nhm3rqhw2x67yb9fvxsc31shf-kmousetool-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmousetool-15.04.1.tar.xz"; + sha256 = "1833yjmgky80w8l06k31j5fd607kada5pi85rcc1730i3g18mqys"; + name = "kmousetool-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zsx5r10khmay1jfph7202zd9k0kqk68f-kdesdk-strigi-analyzers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-strigi-analyzers-15.04.1.tar.xz"; + sha256 = "1yhaixb6dqpw02v1y0zqj6yl2i4lr1m69ns20bb2qaz44kbril7k"; + name = "kdesdk-strigi-analyzers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksaneplugin-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6jdycwm8ads0midd532mh8g4rc3zis63-ksaneplugin-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksaneplugin-15.04.1.tar.xz"; + sha256 = "0wlirj6dqigdnz2xy5yab0cf6npzvx91zbyg9plfqig4h0m5vjrw"; + name = "ksaneplugin-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccessible-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f7ik0yppcn93na9m9dm7qxkfykm7n0im-kaccessible-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccessible-15.04.1.tar.xz"; + sha256 = "01jnaz0n81vyy8wghy21h5ignx4sllv56g3dpck86cj16dh2ymiz"; + name = "kaccessible-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ypf8qvq4gmys2llq8v7nzayi7nw782lj-kqtquickcharts-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kqtquickcharts-15.04.1.tar.xz"; + sha256 = "0spg0hfhsngipbdbm8c6yxfw538jk5rdfs83rp2hk7zhhkqvphmj"; + name = "kqtquickcharts-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbreakout-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i08nk9biny2fqal1kkzs9lwpxxp2rwf5-kbreakout-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbreakout-15.04.1.tar.xz"; + sha256 = "0fg6z8b2p43c0p11ijbha2f6dycc4f0z487sg6y8jr6vqszqwm6q"; + name = "kbreakout-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnakeduel-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r12i36mznnvlgwxm6x3vazwnvargpc60-ksnakeduel-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksnakeduel-15.04.1.tar.xz"; + sha256 = "00b0ssad8cvjbp30n5lif41ni1515r892xxfvmyl50ajn0s484g1"; + name = "ksnakeduel-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kreversi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qqw2j0bsr3s5rn9s0a32ia15ciqa0ggj-kreversi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kreversi-15.04.1.tar.xz"; + sha256 = "0czkvks9i7i4nl64afml9g029ahp9xxqyfv2jqphhyrz7al36l81"; + name = "kreversi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdcraw-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xca9i6zvlnrnn6cqvab1dj91id7ns8bz-libkdcraw-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdcraw-15.04.1.tar.xz"; + sha256 = "115b8m4f588mxmq8f4chg10nbb3wry3zvxgmji7pac49aszvdgj0"; + name = "libkdcraw-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "artikulate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/b5ybam6zgslfklbmr1nvj8xxb2n0ay27-artikulate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/artikulate-15.04.1.tar.xz"; + sha256 = "1498gndm0w96s7v109f8fc9y4bkb6bl9c0jaw24i1wn97hiiwigf"; + name = "artikulate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkipi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/czagm2ybdwy6z3672z5ck07pqjjkdh7z-libkipi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkipi-15.04.1.tar.xz"; + sha256 = "12rmhva1kcjvcb21rhb5r6kx5bhs3zp66zg05zp0r4r5kbcf7rir"; + name = "libkipi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiriki-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4dv1qqm1cvl2lym8yppwgiqj3bxbas7k-kiriki-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kiriki-15.04.1.tar.xz"; + sha256 = "0fqx790jz7pfajqjhpza2fz3vr7q8mxixx6nvv8shfsqxaqi1xf8"; + name = "kiriki-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kremotecontrol-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4wd2nryy9gg0x5p1vm5fv3hxl48bxcw2-kremotecontrol-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kremotecontrol-15.04.1.tar.xz"; + sha256 = "1nrnq46qa2m5rh4lj9sxrqb130jljfwafw6asz8gm32202xg4fqi"; + name = "kremotecontrol-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kigo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s7my7ndzl4cf3nkxhp23krf8cc0rxpb6-kigo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kigo-15.04.1.tar.xz"; + sha256 = "0a2a39x1249vjgwc7sxvf1kxmkjd6nq97rhh7cp7j3ssa2gggspn"; + name = "kigo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "jovie-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9dhsv2hxy8pwh8i6sp9dmirz3d7hlk77-jovie-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/jovie-15.04.1.tar.xz"; + sha256 = "051ycpgifz9si8301167rr7h50qcnkhffk0wyr59iqxyyf69aqbf"; + name = "jovie-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdf-15.04.1.tar.xz" ".tar"; + store = "/nix/store/m088jnlvz3b3fabza6hcy3dh57mbs3f5-kdf-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdf-15.04.1.tar.xz"; + sha256 = "0by7dn3r22cx9slibc2jplbi6k498xiizidymaxkf6wa9f6m76yn"; + name = "kdf-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapman-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4lnw56hhsqbrgp60fwwcf62wdxb3k2aq-kapman-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kapman-15.04.1.tar.xz"; + sha256 = "1pwbxc9pbhr2cbr4n48hsnja7fghr2af02aifvrsj6jgcxzryfgd"; + name = "kapman-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kanagram-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kgjhkp3h6gaz1pi62mmyg8z0xyb1h4lz-kanagram-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kanagram-15.04.1.tar.xz"; + sha256 = "1i9z5hyqj326iim43mlrvvpl47b4244s1spk3xf8a3a929bwlf9l"; + name = "kanagram-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-send-file-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5bs3g1zqj5b13h4flvy9v4m620lcw7lf-ktp-send-file-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-send-file-15.04.1.tar.xz"; + sha256 = "0dzyvsnnxi6n3hy3rwyng4pszx4ghcgry3cvw6d3jrzlg4y3afmz"; + name = "ktp-send-file-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmines-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rqnvyiybcn99da45q2bvl8dwpa4y764z-kmines-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmines-15.04.1.tar.xz"; + sha256 = "1g02fbyqz8nb0qlz49dqn5jay4kdafpdmjx127n0p8wmkw4lh261"; + name = "kmines-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bovo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yrgnwbhl85qivg7hglzgaqqv0hwm91rv-bovo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/bovo-15.04.1.tar.xz"; + sha256 = "10y1px3vk9iv19m6m4jlh6bxky10vhyd1r0q7s50rhr44i3ibwml"; + name = "bovo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kruler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vhls9fra4la0ymwa2s387mw5n119hf47-kruler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kruler-15.04.1.tar.xz"; + sha256 = "0vhwg4qqiv4gflvqspjibm7zh2zgaxql5xmaylpr90hyc1k3vykl"; + name = "kruler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.1.tar.xz" ".tar"; + store = "/nix/store/a7lgl9rd9bpmh8yqdibk0zym25mfc3gm-ktp-desktop-applets-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-desktop-applets-15.04.1.tar.xz"; + sha256 = "19rzq0k2dklzrlpn1qkad1x0v72dk6szya8fsfgxcv1047cczrma"; + name = "ktp-desktop-applets-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpat-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r4n7jrlw47j1mvipzyfw9mx6cksk3rpy-kpat-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kpat-15.04.1.tar.xz"; + sha256 = "1aa6m64slfg12zg02an8sbv51k5jnq9bs95y666bc1697yij8sag"; + name = "kpat-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vnpm0h4amj9pxqbrgn8m7xjl04x2ybb7-libkcompactdisc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkcompactdisc-15.04.1.tar.xz"; + sha256 = "0lis8llzl684z12yzvrc74zckxxbi06fn1krqkiawhpafl0kc8qs"; + name = "libkcompactdisc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgpg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6ampb59zxfj4qm8a7fxs0kqchwcxv5kl-kgpg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgpg-15.04.1.tar.xz"; + sha256 = "013z6ryq1khk1hwird678n4rfikgyl173j5chkqpgw7nrz93770c"; + name = "kgpg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7ajx21aws82z92wiqc041jmbysna95cn-kdenetwork-filesharing-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-filesharing-15.04.1.tar.xz"; + sha256 = "1f26z4zm0bzkbsanj9rw704s25iq0ahw3mi51sgj4ak8gb9r6ibb"; + name = "kdenetwork-filesharing-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kubrick-15.04.1.tar.xz" ".tar"; + store = "/nix/store/clxa7535xdqii03b5rp3p8vs2xpc6263-kubrick-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kubrick-15.04.1.tar.xz"; + sha256 = "0anysvrnyj5pafy7svgszqaj68ryvgbmc8s9xcaw7xpqxxjv2bvd"; + name = "kubrick-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfourinline-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xk72vmcz1gl5w05wsv0f5qw182hy72vf-kfourinline-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kfourinline-15.04.1.tar.xz"; + sha256 = "1qg8cg4w207f9ir9saraxyvrhz7y0hr8di9yjv3i32hhmi36v35a"; + name = "kfourinline-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.1.tar.xz" ".tar"; + store = "/nix/store/b0381wzz8yr0g7a5f89cxq0ay0vvskq7-libkeduvocdocument-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkeduvocdocument-15.04.1.tar.xz"; + sha256 = "0lky05kb4yqggfzwips4jagfsmi7lc5fwp1zv4mlgh0w68rbzq0f"; + name = "libkeduvocdocument-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7wjw21kqy746kxq8ciprhc2jn9sda1qw-mplayerthumbs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/mplayerthumbs-15.04.1.tar.xz"; + sha256 = "0a5w3cz6pdsj6vn1zzsjx61x52lqmfnblad0gjv29h7rzxx4p8vr"; + name = "mplayerthumbs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9i6281xfgc9xs8r16kvj96r3f5sq4sx2-kdegraphics-thumbnailers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-thumbnailers-15.04.1.tar.xz"; + sha256 = "1lpr7k7mhlrl4f8psixkp64j5igv0kbmfyml618pydbdbkyzy7wb"; + name = "kdegraphics-thumbnailers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gplbfp23pqx6kklb57j6p4pw2hnfy98h-kde-dev-scripts-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-dev-scripts-15.04.1.tar.xz"; + sha256 = "0yg2xw7ni25i1dvnfd18p0vdpli66xx9dn351av22k313wa7dyw2"; + name = "kde-dev-scripts-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblocks-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9rkp8602jhay2myxc1wm1s3511ivf1ix-kblocks-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kblocks-15.04.1.tar.xz"; + sha256 = "19dhccamka291p75brd03a3r5zll7yfzk9hd9dr52xr45lpbhqd9"; + name = "kblocks-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klines-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1hb2447kzfdymip921a3k08rdvls1b10-klines-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klines-15.04.1.tar.xz"; + sha256 = "1yb4qya06b3ld0xmnvqxzn6lgvxr8nyfwihgi4ldysxap6v629ra"; + name = "klines-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/z1pwkj78q3vrjh6yvs5p8wdikl67skgm-kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + sha256 = "03dc3h6r06dzl6z7nagmsahrzivylyiqlnwin9qjm1jw7wvcfdvk"; + name = "kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeartwork-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3aj5jpa1s6hzqiwlws6vg00qkn7m49jd-kdeartwork-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdeartwork-15.04.1.tar.xz"; + sha256 = "023d74d1k6lriy7hg1xigp2dv053dc6cnf74kxj4sgglg8qqnph3"; + name = "kdeartwork-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.1.tar.xz" ".tar"; + store = "/nix/store/83s2nk00gahqlc1akhv6gv72w165ab4j-ktp-common-internals-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-common-internals-15.04.1.tar.xz"; + sha256 = "1g7ms93b756iksjimf0vmrrv1cva0956yjyrxa6zx86z2gsqai0m"; + name = "ktp-common-internals-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "granatier-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vs49yw5vjlplwgsskrwv1i6dva0x12x6-granatier-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/granatier-15.04.1.tar.xz"; + sha256 = "09dazsxch26kh7pvakqzdcmb1vwx5dakq693v692payxgsrbd9zv"; + name = "granatier-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kspaceduel-15.04.1.tar.xz" ".tar"; + store = "/nix/store/flf9jk3v67l044291iscpc7yxqynr8s0-kspaceduel-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kspaceduel-15.04.1.tar.xz"; + sha256 = "1ypiyj7vz4g8dpzd2lygnlrv4gmzfjwbqflzkqq6gsx2a5v671v8"; + name = "kspaceduel-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lskat-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2rrzkyrqqmxphhcszdii2qrfag7y91bg-lskat-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/lskat-15.04.1.tar.xz"; + sha256 = "1nyjhispwf7brg4a1a50br3k583jh734vqj8v8gwjq68q7sig1an"; + name = "lskat-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcddb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s34in46wqxw0pyf0fgzmagbi9r18r1i5-libkcddb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkcddb-15.04.1.tar.xz"; + sha256 = "1fp8zq00nijwygap3571lpcyy3qn318djv0gj6vjyzfxlkijl745"; + name = "libkcddb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yrpx93448287fy645dnvwkc21c5fw41y-kdegraphics-mobipocket-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-mobipocket-15.04.1.tar.xz"; + sha256 = "1y4ci3l837l3pi308jzh1mvw9rxhyjdx8hgz29vca2gpwyp0v6zi"; + name = "kdegraphics-mobipocket-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkface-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7pmab8n861ng48b8483d2l71qy7prm75-libkface-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkface-15.04.1.tar.xz"; + sha256 = "1iannhmn3gh7j3q8x9dm4jvkilrnpkvzhqz4rs4cksr1q49hh8ah"; + name = "libkface-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbruch-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n7n2q3a4r9par2kc13nixqidwl5z1qwg-kbruch-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbruch-15.04.1.tar.xz"; + sha256 = "0d747mv9mwp0kk6q2bx0h3bn1km99wcxljhsz62kd9g3myzga6sj"; + name = "kbruch-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cantor-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5dbbmdm1w5r7hsy2z999aj8b7amy5mz8-cantor-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/cantor-15.04.1.tar.xz"; + sha256 = "0rlldfww4rzhxvsq3yl2a5ybcd4h4xihcy4924dbjzp15zgxjzyb"; + name = "cantor-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnapshot-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xya1fmdi09yiq9xvvpqp5bks628n6yqz-ksnapshot-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksnapshot-15.04.1.tar.xz"; + sha256 = "0bmq7qvi5522qcj1ksjy9m7pf3yr6n8hf809isvbamvqk285vln6"; + name = "ksnapshot-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kopete-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qq5dm0qrnb40nk2lhdyhhwxwnm2w73ry-kopete-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kopete-15.04.1.tar.xz"; + sha256 = "195vdbnk9azfhk7i3vq5zbw1c8f7wz3xdjm2n5g2sv3gnmgm598q"; + name = "kopete-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kteatime-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cgc2v9iffy7a48sn95rr9x05xwi6h1cy-kteatime-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kteatime-15.04.1.tar.xz"; + sha256 = "0sxdnk9v1p5mcwp8wka60saiqdm4r9bfpyh40qksd89jkjzw7aj9"; + name = "kteatime-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs-4.14.8.tar.xz" ".tar"; + store = "/nix/store/jwibw4jpjfxxhkv6kps17yqmaljsymi0-kdelibs-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdelibs-4.14.8.tar.xz"; + sha256 = "1fwvqgxxwy9ka6wq4ysn5x6blqw8wqrfnh6hk6m65jdknflshpvh"; + name = "kdelibs-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kajongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r34lymfzw7s9j1j30llnkj9b0nn0pxr3-kajongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kajongg-15.04.1.tar.xz"; + sha256 = "15yn5ixkwmwg1hvkdr6sl26zch5rdmjq0iqmc1kyrdipdhdp5mzm"; + name = "kajongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "print-manager-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7a9mkd04lsih0rq5dld1mnsx3cxrkr1z-print-manager-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/print-manager-15.04.1.tar.xz"; + sha256 = "05dpx0cwlpy17x2knq98kf6s1bh72lfn8i5l5xzf4bxil9s2fir9"; + name = "print-manager-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-baseapps-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lz0chc1pimbj5ddi5bkp2nlrlbvgi5l1-kde-baseapps-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-baseapps-15.04.1.tar.xz"; + sha256 = "0970mw5ywjimrmhcfskwiwc048w1rvjffs3d2a9v74yvv64irkgv"; + name = "kde-baseapps-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiten-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f02ixhrvj27hwwsswk7p8n9hdwfrlyms-kiten-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kiten-15.04.1.tar.xz"; + sha256 = "0l85ccy71ag6nn8fn7b3yr8pjikzivrq6dxka2342nfqidhfpzfh"; + name = "kiten-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krdc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kcp6bc4c7vwnrvpjgvlwx0q3ss74f3ay-krdc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/krdc-15.04.1.tar.xz"; + sha256 = "1d1cjy9b5sx533j1aayw503b65gg7pc5wk3n9hy3x9f1a2yywv1i"; + name = "krdc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "superkaramba-15.04.1.tar.xz" ".tar"; + store = "/nix/store/akzfq1iqi1p5zyy4ha003jxq93hx41bk-superkaramba-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/superkaramba-15.04.1.tar.xz"; + sha256 = "1ncvmmvsfs4jp67ij1vs87sjg59x960pqqxblq49m0l6vmp0l6j8"; + name = "superkaramba-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "katomic-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xqifvkcnpvncp34cz72axncvfm4ar17r-katomic-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/katomic-15.04.1.tar.xz"; + sha256 = "1lpsvi2hnf4f5ngdkcg56j73qwjzm8zahl2pm5l0r53i95kxlqyd"; + name = "katomic-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "killbots-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rzm4an2qh22q4d8gxn7hf2lc1h8apblj-killbots-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/killbots-15.04.1.tar.xz"; + sha256 = "1wrdwjcpr75lwbrb6ijbwi8ghkgdlp3sv5sbbmws9p77xa13scyk"; + name = "killbots-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkgeomap-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2sprrk9f1bp0i1pyprzkbfx93p44qr3h-libkgeomap-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkgeomap-15.04.1.tar.xz"; + sha256 = "1zj7wimigjlrg2sq3288wc1h5by155ngascwbbn1x9zy86akb5dj"; + name = "libkgeomap-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konsole-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6p788sim5alh13lbgfc4095nas0rav9m-konsole-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/konsole-15.04.1.tar.xz"; + sha256 = "0fddv6ag23m5ks1cj8rrfbd2xcifxwijkypx6dhxk4pbgkhy0m8m"; + name = "konsole-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kuser-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0z7jv74ig27pxaf6fw9sq33r4xvanm4k-kuser-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kuser-15.04.1.tar.xz"; + sha256 = "1gvpqazrij2ipdfhyfbsw1vgv4173j4r4qnbp2sd8kjibryqcm76"; + name = "kuser-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8krkra77y0vck4pki2r25zivig521cqk-ktp-kded-module-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-kded-module-15.04.1.tar.xz"; + sha256 = "0hyyz9f8qjzcqj6g92a4g4a3xp7fgyfgznir65mx2kka6fq7532s"; + name = "ktp-kded-module-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lbvr1zi1lipmmdx5pkga2k06isy0kk5y-ktp-accounts-kcm-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-accounts-kcm-15.04.1.tar.xz"; + sha256 = "0s2nny6l744fvf45yczzbcrx1win47b0xvxgf16s29q3y2l51y3s"; + name = "ktp-accounts-kcm-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klettres-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xdqivsid3wvc73mxnwzn7ayva3002l3a-klettres-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klettres-15.04.1.tar.xz"; + sha256 = "1shlhdmzmis0szafk6kvjy0w25xr7p261zj1fi4gz5hr7262lirz"; + name = "klettres-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ayi379ldyhmq5cn53nf89lmvwwfyp9gm-signon-kwallet-extension-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/signon-kwallet-extension-15.04.1.tar.xz"; + sha256 = "0nk1gjz2bw6kssv09kwksj8p5qpzz90plpnd4nd19qnhgz0a0v7r"; + name = "signon-kwallet-extension-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-runtime-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wg7pzsw9s8lm35cxihc08fs9jd21jm13-kde-runtime-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-runtime-15.04.1.tar.xz"; + sha256 = "178n0zfjzzfpr1shqxyixlb2swmkz2n17xhnmf04hql2l4yj3khp"; + name = "kde-runtime-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k0ph8jkjq43ym4851swr12csj53vdh6m-kaccounts-providers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccounts-providers-15.04.1.tar.xz"; + sha256 = "1bd9v89r6y90r8bkm9m46p8yzpbv1zyf4bg0c3scbaqkviqihi09"; + name = "kaccounts-providers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bomber-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sczdf7d6q8qr4kjlyk1q4s573mr7g0fd-bomber-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/bomber-15.04.1.tar.xz"; + sha256 = "0mzik0cfz6v0jd31z5q9hkfxsynrhiwm704ns4pgb8qsww41yzrf"; + name = "bomber-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkexiv2-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qc76hz1v7rawy1xb3d7dlf4yxw9d6clz-libkexiv2-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkexiv2-15.04.1.tar.xz"; + sha256 = "0f3ljs8n2gc9frn3j0cjy60hp8wq0f66ry2qpmdaypdswr7vx04n"; + name = "libkexiv2-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lmzsbajhy53ay7swff47gsq3il629wfj-ktp-auth-handler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-auth-handler-15.04.1.tar.xz"; + sha256 = "1ixxvf5lvy0isv0gqc6sw2pfjqz139kcd0pncq4i89kwqnca8jkp"; + name = "ktp-auth-handler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.8.tar.xz" ".tar"; + store = "/nix/store/xxnnkp49p5s0hc4sgsb0id14mnfsd6f5-kdepim-runtime-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepim-runtime-4.14.8.tar.xz"; + sha256 = "1c9lmacadkxdl8kaxn823a7r07w67hrzdypijvvz3ms7k5i84k0z"; + name = "kdepim-runtime-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klickety-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wffyflkf9im135fdalll1x68cm523rgm-klickety-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klickety-15.04.1.tar.xz"; + sha256 = "0igw7rm7ii30x3971gg5zjpzljlr1ajxbk5bjylizxbl960dx0kw"; + name = "klickety-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkomparediff2-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rmzhngxxfnvbr76mm85zgp4zlqbjid9z-libkomparediff2-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkomparediff2-15.04.1.tar.xz"; + sha256 = "16fkixmpvxn7459v41418rs49n6knnf1lpfz1mjidaz6q7ii5y8p"; + name = "libkomparediff2-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c6yg7sc1xnla574r1bc122gp63y8wvyp-ktp-contact-list-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-list-15.04.1.tar.xz"; + sha256 = "1vmcs0ww4hv7ckb9nddkpci57ha7j6wqrwiikq4rxcvq9a4z1g7x"; + name = "ktp-contact-list-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.1.tar.xz" ".tar"; + store = "/nix/store/v7wjiq2vwpv0r1c6rqfxhjsdcvcr9ffd-ktp-contact-runner-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-runner-15.04.1.tar.xz"; + sha256 = "19hin3qmcznxlp1lypka7h1nqj4n40hys6sxf6m74fx0myk6jia9"; + name = "ktp-contact-runner-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcolorchooser-15.04.1.tar.xz" ".tar"; + store = "/nix/store/al6rmbszcmx8m2fk4i2ihxxp4wk2n06p-kcolorchooser-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcolorchooser-15.04.1.tar.xz"; + sha256 = "1q1ipvvd02kgrvz322m7gn6rwxdnpkkj4575yrn6vpxx616q1pf7"; + name = "kcolorchooser-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfloppy-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4zgqikwm771c85nkd20xw9lplpyqhycf-kfloppy-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kfloppy-15.04.1.tar.xz"; + sha256 = "1rqccsiyfazsbfjs8mpjsqbbw9pd6fakdb076q0mj2syrlm7xr36"; + name = "kfloppy-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/277d4282d2h3cqrjrrlh6w6z0f9sp12l-kde-wallpapers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-wallpapers-15.04.1.tar.xz"; + sha256 = "0nbv456714vr5mp125bdza3czgxzhbv2wglsmxj0sqc1k6fiadfi"; + name = "kde-wallpapers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksirk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vzxblpcsa0jrzcwcp5a9pnax60dkjwav-ksirk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksirk-15.04.1.tar.xz"; + sha256 = "1v56n78cxd9201r5pz3vn4mkpry2rihy138ar7kpqvcp7radipr6"; + name = "ksirk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmag-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ir7qgza1smfbnwdxf1aj60p1xqmgb44p-kmag-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmag-15.04.1.tar.xz"; + sha256 = "0xh66mpddlriivcqg931nd5bbqvrylq1gpccqbajahhr0jbp6lzf"; + name = "kmag-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xli6mjyym1qql8id8fwjvx9yils6kihx-ktp-text-ui-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-text-ui-15.04.1.tar.xz"; + sha256 = "00nbzyh2m9gg401krcnm5p38xj6xyp8n6v4lh779hdx63d755myw"; + name = "ktp-text-ui-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okteta-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gxnx1dmd8964wj7cz37c50i382sg2gbp-okteta-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/okteta-15.04.1.tar.xz"; + sha256 = "17jvf6ca27xj1vv7yss2886imdaws2xpkibz13aicjvw23xhxhvj"; + name = "okteta-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmix-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0wvrlr0afl9j7mwn6qp59qb5662bnjv4-kmix-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmix-15.04.1.tar.xz"; + sha256 = "0gf1a63ycz8hmlzz7xm361hszzr4l7dibwam9pwg4wipankdipxh"; + name = "kmix-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kget-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0yx4x1f5rxhk7wg1fj9ck54z5b9wim8q-kget-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kget-15.04.1.tar.xz"; + sha256 = "0qckya9r4gic6axq4fi5r5qv4wj31jahbyv1jlyi468wv16cxmnq"; + name = "kget-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0ky72glm45d5p7knpg00xzjp08shjc1b-kate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kate-15.04.1.tar.xz"; + sha256 = "0ykppas7fnnslj71y77y2p2qv4jnnv8gdmmfaz5plxkcdjk63a87"; + name = "kate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kamera-15.04.1.tar.xz" ".tar"; + store = "/nix/store/331lhb9vdk6jr5bcd9z9kdg0nsy74sha-kamera-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kamera-15.04.1.tar.xz"; + sha256 = "1g1lq4g1gk9cw6l1pxaaxzqy4qrqr0f4idkg9bkqbhj20xrl51xd"; + name = "kamera-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kstars-15.04.1.tar.xz" ".tar"; + store = "/nix/store/29wwk2c90zcifni2hra686nwqlxjqh4m-kstars-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kstars-15.04.1.tar.xz"; + sha256 = "1r2sf1ifgkmg8f59jj1j41js538h2x9nr2j6bppd16bbp8gzs2na"; + name = "kstars-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmouth-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vwkzr7jkym3x2lhilv4vp92pzsc7zj69-kmouth-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmouth-15.04.1.tar.xz"; + sha256 = "0qq45lmgxy5wn24wwi8d5p1vc8h25a70xzaw2gdhj1m2vq37sn5p"; + name = "kmouth-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "poxml-15.04.1.tar.xz" ".tar"; + store = "/nix/store/nfm24h17jvwp3sbl9r4wyjqhm1ly853h-poxml-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/poxml-15.04.1.tar.xz"; + sha256 = "0by57c11p2g82cbl4pmv281dnkdky2943bzcy4yb0qnhihpl99nh"; + name = "poxml-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zcadi1mwn8qb0s4j9y33cm46z07wlnlv-kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + sha256 = "1xp7k0m2blm6nfzv6pf8vqc2wfdw1pp08dfgg9qvvl4ar80wi62v"; + name = "kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksudoku-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iz57bv4hld01cxkdm6dv2i0n72ckv8g9-ksudoku-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksudoku-15.04.1.tar.xz"; + sha256 = "1x81q0bya702dcksn86pi8qzw13zb8x558nw3wv8q3z4cp7bzwba"; + name = "ksudoku-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.1.tar.xz" ".tar"; + store = "/nix/store/33kal7ji8dw5a89n6m7wpfpf519kdwbp-kde-dev-utils-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-dev-utils-15.04.1.tar.xz"; + sha256 = "01ivnsjvpbl1i55zgrcz01hzcn02mrvr14a0nz8bi5s5l53r88sy"; + name = "kde-dev-utils-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kompare-15.04.1.tar.xz" ".tar"; + store = "/nix/store/if8mcxgb9bf6i7hmrvlgmwjvjq92p6k1-kompare-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kompare-15.04.1.tar.xz"; + sha256 = "1h9xvd48kixrffr89kj3lr6nwbj4jvrw5nqz05jl7q6a4rd11p47"; + name = "kompare-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kppp-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k2vyy51405ds24y3mm1dz8y8yifwk60x-kppp-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kppp-15.04.1.tar.xz"; + sha256 = "0d4mk303yw1f17sw517ni8g0lqr3wdl9r2whz2l3pznnd3hh447q"; + name = "kppp-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dragon-15.04.1.tar.xz" ".tar"; + store = "/nix/store/nk9ya7riashh1gaw9jnqwypdalr5sq2l-dragon-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/dragon-15.04.1.tar.xz"; + sha256 = "1kmp3klp86mmkgvdy973cpnqw9ghbvvs7iqbsqkg19gqg5p3qi6n"; + name = "dragon-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdegames-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kl3yj4xk86l67vl3lahdzq4x6gi8w8yv-libkdegames-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdegames-15.04.1.tar.xz"; + sha256 = "0jwvywzamfnjv9lfyxbvki9j1y8ksk6x54v4p16k7mkz7dx7qmd7"; + name = "libkdegames-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgoldrunner-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bfyd2yxzm5y2bc8mvchpa5scd297lx5h-kgoldrunner-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgoldrunner-15.04.1.tar.xz"; + sha256 = "19aiabdyyyfsc8vdgvh26sh9i2cg4lcvgfca296ch0wdlbs8xdd3"; + name = "kgoldrunner-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebdev-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l3hf3r3q9a0mas8i2br6ajlq1h1wnm9h-kdewebdev-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdewebdev-15.04.1.tar.xz"; + sha256 = "00av449nc04mascih5ii17hbjxxpanr8gbdimjjhdp2z9dvgnb0h"; + name = "kdewebdev-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knavalbattle-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vkm47y3nws18va3cz13isi02g1wrkf6p-knavalbattle-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/knavalbattle-15.04.1.tar.xz"; + sha256 = "0d94bmd2jvd6jzjxzdbc4rgq1k1a22md4azddqm6z1yc1n41qkyc"; + name = "knavalbattle-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmahjongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n5dxy147bwqxx9i49h2lia68846f1zwg-kmahjongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmahjongg-15.04.1.tar.xz"; + sha256 = "0zl0z3p07hxyiy5p894cf0rai0ad0i4sihxgj8n23cqs653wglb7"; + name = "kmahjongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ark-15.04.1.tar.xz" ".tar"; + store = "/nix/store/shl563g5w7cn13zynzpbm94ri1ccy6lm-ark-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ark-15.04.1.tar.xz"; + sha256 = "077xvn6symzzr9jb5cdfvzf1xbpliq2krnw1ab1c9a251x90zclw"; + name = "ark-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "gwenview-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ccy2m84g722ihs95n2kindl14n93ir6n-gwenview-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/gwenview-15.04.1.tar.xz"; + sha256 = "07vvcamksgvk8xgj872ql8a7ml7drw3pbv4z7zgrprzracniapwr"; + name = "gwenview-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksquares-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n63xlpj38d1ziy7fg5y5fa0smw12whpa-ksquares-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksquares-15.04.1.tar.xz"; + sha256 = "0i6rf5x6wsij05xgv9rzizax7j029am7xgwrzzjdk7anph1mx6i9"; + name = "ksquares-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "umbrello-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g91s71jw5mbiy8y2gdknkqnxyklm39wj-umbrello-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/umbrello-15.04.1.tar.xz"; + sha256 = "1sp8f2bjgp5gv9834csa42531psx0sq43ldjgsgygrnbggzmv8nw"; + name = "umbrello-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblackbox-15.04.1.tar.xz" ".tar"; + store = "/nix/store/w1s27mkqknc6q7ni39641vgviyqgnxk0-kblackbox-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kblackbox-15.04.1.tar.xz"; + sha256 = "02b9kfqm64qz0jnyviag02rd0h36ajmfbnswwgin3i7zbvd5xph0"; + name = "kblackbox-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolourpaint-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xsvwhyp6j478pjbjslilb62s89ljdfrd-kolourpaint-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kolourpaint-15.04.1.tar.xz"; + sha256 = "04vamlgbsmpkfw4g3hrm9mm6imnrk3gk994pqb35ajvz8089prwp"; + name = "kolourpaint-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "step-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gjcms2qdl726gv00644ljmsl6ddyywwl-step-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/step-15.04.1.tar.xz"; + sha256 = "1sy42yxpp1qkpcj151xpi2576j59s0cznig3bj65klm5iamiar48"; + name = "step-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcachegrind-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3x1mlqph515m8nf31pdk8wxhhrcbj444-kcachegrind-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcachegrind-15.04.1.tar.xz"; + sha256 = "16fvs27gbpsras3q2qva9x9sc4r056rk2q5b0jijqpncha51wnr2"; + name = "kcachegrind-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/x3hq5g8vcvm5a9npa7amn5w492rh9fhw-ffmpegthumbs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ffmpegthumbs-15.04.1.tar.xz"; + sha256 = "196hc96ifqq1m5jja8gkl83a23206l304kqh9rngqbqx2xqbis7g"; + name = "ffmpegthumbs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "parley-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qj4bmbkiah1jrf0arh2r1ygd6ki0vi6q-parley-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/parley-15.04.1.tar.xz"; + sha256 = "1mz2s4l3bzdpz3jd2rkamwvjiqx133sq7agmrg3ssmhl583bgyln"; + name = "parley-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmplot-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4s3kx66a51gj19imxp7y73q59dx3dsb1-kmplot-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmplot-15.04.1.tar.xz"; + sha256 = "1rz7l1lggpprmanyr6d1hpyjw6c3z1gdpcf475573y5gip1sylvj"; + name = "kmplot-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kturtle-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6irgf5syddcsvyn8jpfmzjmdccy9mp3j-kturtle-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kturtle-15.04.1.tar.xz"; + sha256 = "0qkaspwdb60cqizf3ph9w245nqg7rarb7riwzdpf007kcpx16905"; + name = "kturtle-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2xabxjp756c62b9l4iaqjb2hn6jm57bn-kaccounts-integration-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccounts-integration-15.04.1.tar.xz"; + sha256 = "0rm4i69b63vmcjcdvgc5bj3sygdjxkk5bx12vm70h2wx72zi7bmm"; + name = "kaccounts-integration-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktouch-15.04.1.tar.xz" ".tar"; + store = "/nix/store/889f6956q1d0k0m9n1j9bx36y446zaqd-ktouch-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktouch-15.04.1.tar.xz"; + sha256 = "040xb5bpc848g4m7lpgh2qp7zn3x88pi8lx49rvd7cwy9r0yypxg"; + name = "ktouch-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "analitza-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ci7yardryphabk0561gfqv9w3bg2dld9-analitza-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/analitza-15.04.1.tar.xz"; + sha256 = "0ndz76kdk0x63269324c516d7vyssni8q89im62hkcvsjv0y1wb5"; + name = "analitza-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cervisia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6v595hx7jz5v0k6pvmxixva0pz9a86c2-cervisia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/cervisia-15.04.1.tar.xz"; + sha256 = "01j8ai5s5gqh5wb6c74yrpr6x8652zdmh25dchpafih5sm5y1s8l"; + name = "cervisia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "filelight-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kxzx5vxg5cl6v99c2q0dx6svzq66lmq3-filelight-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/filelight-15.04.1.tar.xz"; + sha256 = "1pi3j10h23s7ianr5dhf17skdspnxgqfv9hxzfi0pyy3z9yfhs9r"; + name = "filelight-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktimer-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bfgk2rpkifs0kmmg8a9cw2sbcw9x4acj-ktimer-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktimer-15.04.1.tar.xz"; + sha256 = "0avscwyksa6rba9ppp6pcd332phd2zwsvpbprn0sbsias63mx7rb"; + name = "ktimer-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "picmi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/adzmd2pnn5lss9fm35x6hqvb6jfb3dc5-picmi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/picmi-15.04.1.tar.xz"; + sha256 = "06v2cxdlg8366r122gfs03y2zfhcml2bp0q79a357b4aj14xah76"; + name = "picmi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g7mzrah5zhp760dw67z836yjb9ycscqb-dolphin-plugins-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/dolphin-plugins-15.04.1.tar.xz"; + sha256 = "1zw626gzrc0sxbif1y2mnqm96s2yap3fnh3ij1cv81v43yy12jsk"; + name = "dolphin-plugins-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkmahjongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9awn6c5akngz6f7h9xbwvnxfjh7k4k6c-libkmahjongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkmahjongg-15.04.1.tar.xz"; + sha256 = "1lw9k7h2cli65738lp06wwn763aggqdaqm52gf4s25ia6sqa1vs2"; + name = "libkmahjongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wygvvlqqdcah3ilsr18n32jbidb3vjp2-kde-base-artwork-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-base-artwork-15.04.1.tar.xz"; + sha256 = "1jxmg1s11kj1qiwlh5jji2bhcgn2d0sx6lljh65snwxg26liwz6v"; + name = "kde-base-artwork-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscd-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k6bz5mzppxksahygjg51bfyr2lmb56vq-kscd-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kscd-15.04.1.tar.xz"; + sha256 = "17spvnflbq2wq80awk6y895ls214n8h0ssk87r7qmr03pvzhnyaa"; + name = "kscd-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sweeper-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s35plhhx4ic5ghzqa9v3ivsvr1rynang-sweeper-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/sweeper-15.04.1.tar.xz"; + sha256 = "0vzqpyhi5kn2p6waj2pn1myaz44v7dw2ll0hz8vp0rfh9qnwq70l"; + name = "sweeper-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-workspace-4.11.19.tar.xz" ".tar"; + store = "/nix/store/lxglid45py66valnl34y41z7ny1zyla3-kde-workspace-4.11.19.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-workspace-4.11.19.tar.xz"; + sha256 = "1hn5q86p1wpv6y4wia0sxfn83iya00d6y70gdq3svmhj1bdjj50w"; + name = "kde-workspace-4.11.19.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konquest-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wags5sgprgy7cngppjj2n9b29625yp1r-konquest-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/konquest-15.04.1.tar.xz"; + sha256 = "078503rf9r7rb161xi5j22d08imk2b1g4ma5xyaap8j7jr8qykak"; + name = "konquest-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kig-15.04.1.tar.xz" ".tar"; + store = "/nix/store/pii50yzi2wkj384pvswiqcqf3m6w2b22-kig-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kig-15.04.1.tar.xz"; + sha256 = "07dw82q68akjzc3v1igx1ah1j4b53ph4pgpkrxzh3468nrhkrxqc"; + name = "kig-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-approver-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0z3zii1zjnnjk34x0i94nc41i2cdi0gw-ktp-approver-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-approver-15.04.1.tar.xz"; + sha256 = "158c93kmwffnsx78qr84qqjb34p7czynrqbz3iyj29s79kkx4ix0"; + name = "ktp-approver-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalzium-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f4jk61d6sgcx57k7ppjql6qml9q2pazn-kalzium-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kalzium-15.04.1.tar.xz"; + sha256 = "1islh3c67hlar51hf2hx31c1pg8kkw6h7c6vl3mv442wl468ilvl"; + name = "kalzium-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcron-15.04.1.tar.xz" ".tar"; + store = "/nix/store/q6dydf2sgx486rf4rfm3sfbbbsrcns89-kcron-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcron-15.04.1.tar.xz"; + sha256 = "0ppdydcasrigqmpldjgvrxmjffizf9gnqbxrjypwirhsay2z5clv"; + name = "kcron-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktuberling-15.04.1.tar.xz" ".tar"; + store = "/nix/store/z7nqzkmyfc7fw4a2c4kwh8flvx9309pb-ktuberling-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktuberling-15.04.1.tar.xz"; + sha256 = "1nm0g089c22nc06xi7446drsgllsxrsfd68r7mm5p38fdh1rmxll"; + name = "ktuberling-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "juk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k9pq6074j197y1hz9hr3xdcla9pcqhic-juk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/juk-15.04.1.tar.xz"; + sha256 = "158mxy9c73g27i3plndik4zw8p527zgqq7rj1mrdlj2sic1jd6df"; + name = "juk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdiamond-15.04.1.tar.xz" ".tar"; + store = "/nix/store/266jwjlfnq0njn09f26xnif9bl3v12h8-kdiamond-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdiamond-15.04.1.tar.xz"; + sha256 = "0kkprlaghidb0skmra1ja9vwncg0zsvawvnjrzb0fgi065iz6bc2"; + name = "kdiamond-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cw3cr2nrhmid0miwp6nfh7c3kqwf072k-ktp-filetransfer-handler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-filetransfer-handler-15.04.1.tar.xz"; + sha256 = "1dzkbgpv9fbkwxlzdch0axc722m5kq6viy33isihv2j0hcxvjjzy"; + name = "ktp-filetransfer-handler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-4.14.8.tar.xz" ".tar"; + store = "/nix/store/2jiwn6rshw66kv3v058w34qv45qgkrna-kdepim-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepim-4.14.8.tar.xz"; + sha256 = "19z3pfmb8d6gsr9njyfyrjl4llzkk7q6fcl0ng0k0w1q4i4igd2j"; + name = "kdepim-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3hz1jgliry4xb27cbn4khkynvz42asfm-kdesdk-thumbnailers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-thumbnailers-15.04.1.tar.xz"; + sha256 = "104wyrapk77mi11a72p03liln0qh0mq84hbgklyf3rwxbdsmysz9"; + name = "kdesdk-thumbnailers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeedu-data-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c4kzdj7sq4557wcmhwf2cg566b04x617-kdeedu-data-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdeedu-data-15.04.1.tar.xz"; + sha256 = "1fvvam4wilijvmlfklqwgvl47ffy7w7lhp61hjgn6chjhrk3wxd1"; + name = "kdeedu-data-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksane-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l09dwrlxm13fl8qnk7cpgs66537287cb-libksane-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libksane-15.04.1.tar.xz"; + sha256 = "1wlp09c2djprwwsbip0i1jx3d9cj16axbvbyn1hhc1hzaim3wnsc"; + name = "libksane-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kshisen-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2mb9v1738cif1qwwkfqyqgbs3lysg0ij-kshisen-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kshisen-15.04.1.tar.xz"; + sha256 = "0vgh980plqrd0r8s4pp79xy39j7n6z2xjrj62z6bna65wywv8cim"; + name = "kshisen-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjumpingcube-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ap7dpxkmh50bay925x93hhchdvga0zc0-kjumpingcube-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kjumpingcube-15.04.1.tar.xz"; + sha256 = "0lsd14qpb1c6hs9ff9fwpmrbdn7khk6lwdar82l9dwvzd9zk9vpd"; + name = "kjumpingcube-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ncrdk952fj4sg748lqfdm9xf5wi5rm2d-zeroconf-ioslave-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/zeroconf-ioslave-15.04.1.tar.xz"; + sha256 = "181q88i8ygqp2g4c78qr2flwbrnwphix0ksm2qrinrchbc7v7mxm"; + name = "zeroconf-ioslave-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenlive-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qcwij9xp4fv8s5zgizij3rmb220r7193-kdenlive-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenlive-15.04.1.tar.xz"; + sha256 = "0v4qx1r5kkkiqvxzdvr2467dhx0ndylvwl1vd723lbdi9vk9gg4q"; + name = "kdenlive-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khangman-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g1f0f255pjr3wd2jh10q05xjkgm3340h-khangman-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/khangman-15.04.1.tar.xz"; + sha256 = "1jnc5cjij32sbxcq2bvmzkdsj2f7w194lwkj48gdkkwfplbn4kwc"; + name = "khangman-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lokalize-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1j2l2qhfkxrgqbwiglg8mn60480sanfy-lokalize-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/lokalize-15.04.1.tar.xz"; + sha256 = "0h46kf14i4gd17k2fad629b7yq66mcy2cp5w0ir0f071z2s9jvg3"; + name = "lokalize-15.04.1.tar.xz"; + }; + } { name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar"; store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz"; @@ -2413,6 +4447,15 @@ name = "kde-l10n-ar-15.04.0.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar"; + store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca_valencia-15.04.0.tar.xz"; + sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f"; + name = "kde-l10n-ca_valencia-15.04.0.tar.xz"; + }; + } { name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar"; store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz"; diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh index 3ef8c11c3a1..2aa3cee8c85 100755 --- a/pkgs/applications/kde-apps-15.04/manifest.sh +++ b/pkgs/applications/kde-apps-15.04/manifest.sh @@ -9,6 +9,7 @@ if [ $# -eq 0 ]; then # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../.. -A autonix.manifest) \ "${KDE_MIRROR}/stable/applications/15.04.0/" \ + "${KDE_MIRROR}/stable/applications/15.04.1/" \ $MANIFEST_EXTRA_ARGS -A '*.tar.xz' else diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0f9dbf8d422..0e821e92703 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qt53, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: stdenv.mkDerivation rec { - name = "calibre-2.27.0"; + name = "calibre-2.29.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "13id1r2q6alw4wzb4z0njkyr6lsmzs2fjp3cflqavx3qk25darv5"; + sha256 = "1n3cfnjnghhhsgzcbcvbr0gh191lhl6az09q1s68jhlcc2lski6l"; }; inherit python; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg - fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qt53 pil chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix index 1637586eb47..54aec8606cd 100644 --- a/pkgs/applications/misc/dmenu2/default.nix +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dmenu2"; + name = "dmenu2-0.3pre-2014-07-08"; src = fetchhg { url = "https://bitbucket.org/melek/dmenu2"; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index db613cd4922..4324a33d238 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { ln -s $out/eaglemode.sh $out/bin/eaglemode.sh ''; - meta = { + meta = with stdenv.lib; { homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; - license="GPLv3"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl3; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index e4b0675aa94..bdd1a9e8e28 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with lib; { diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 169331ceb73..440d2b790c2 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr # drivers (optional): , rtl-sdr -, pulseaudioSupport ? true, pulseaudio +, pulseaudioSupport ? true, libpulseaudio }: -assert pulseaudioSupport -> pulseaudio != null; +assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 gnuradio boost gnuradio-osmosdr rtl-sdr - ] ++ stdenv.lib.optionals pulseaudioSupport [ pulseaudio ]; + ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; configurePhase = ''qmake PREFIX="$out"''; diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix index 9875b3abf01..823b6cdf538 100644 --- a/pkgs/applications/misc/grass/default.nix +++ b/pkgs/applications/misc/grass/default.nix @@ -176,7 +176,7 @@ a.composableDerivation.composableDerivation {} (fix: { meta = { description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization"; homepage = http://grass.itc.it/index.php; - license = [ "GPL" ]; + license = "GPL"; broken = true; }; diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile new file mode 100644 index 00000000000..0788a359116 --- /dev/null +++ b/pkgs/applications/misc/jekyll/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem 'jekyll' +gem 'rdiscount' diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock new file mode 100644 index 00000000000..76bddef5869 --- /dev/null +++ b/pkgs/applications/misc/jekyll/Gemfile.lock @@ -0,0 +1,72 @@ +GEM + remote: https://rubygems.org/ + specs: + blankslate (2.1.2.4) + celluloid (0.16.0) + timers (~> 4.0.0) + classifier-reborn (2.0.3) + fast-stemmer (~> 1.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.9.1.1) + colorator (0.1) + execjs (2.5.2) + fast-stemmer (1.0.2) + ffi (1.9.8) + hitimes (1.2.2) + jekyll (2.5.3) + classifier-reborn (~> 2.0) + colorator (~> 0.1) + jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) + toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-gist (1.2.1) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-watch (1.2.1) + listen (~> 2.7) + kramdown (1.7.0) + liquid (2.6.2) + listen (2.10.0) + celluloid (~> 0.16.0) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + mercenary (0.3.5) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.11) + pygments.rb (0.6.3) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.2.0) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rdiscount (2.1.8) + redcarpet (3.2.3) + safe_yaml (1.0.4) + sass (3.4.13) + timers (4.0.1) + hitimes + toml (0.1.2) + parslet (~> 1.5.0) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll + rdiscount diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix new file mode 100644 index 00000000000..5e9505e9f32 --- /dev/null +++ b/pkgs/applications/misc/jekyll/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby_2_1, curl }: + +bundlerEnv { + name = "jekyll-2.5.3"; + + ruby = ruby_2_1; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Simple, blog aware, static site generator"; + homepage = http://jekyllrb.com/; + license = licenses.mit; + maintainers = with maintainers; [ pesterhazy ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix new file mode 100644 index 00000000000..0ceb095b4c8 --- /dev/null +++ b/pkgs/applications/misc/jekyll/gemset.nix @@ -0,0 +1,282 @@ +{ + "blankslate" = { + version = "2.1.2.4"; + source = { + type = "gem"; + sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; + }; + }; + "celluloid" = { + version = "0.16.0"; + source = { + type = "gem"; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + }; + dependencies = [ + "timers" + ]; + }; + "classifier-reborn" = { + version = "2.0.3"; + source = { + type = "gem"; + sha256 = "0vca8jl7nbgzyb7zlvnq9cqgabwjdl59jqlpfkwzv6znkri7cpby"; + }; + dependencies = [ + "fast-stemmer" + ]; + }; + "coffee-script" = { + version = "2.4.1"; + source = { + type = "gem"; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + }; + dependencies = [ + "coffee-script-source" + "execjs" + ]; + }; + "coffee-script-source" = { + version = "1.9.1.1"; + source = { + type = "gem"; + sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5"; + }; + }; + "colorator" = { + version = "0.1"; + source = { + type = "gem"; + sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs"; + }; + }; + "execjs" = { + version = "2.5.2"; + source = { + type = "gem"; + sha256 = "0y2193yhcyz9f97m7g3wanvwzdjb08sllrj1g84sgn848j12vyl0"; + }; + }; + "fast-stemmer" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh"; + }; + }; + "ffi" = { + version = "1.9.8"; + source = { + type = "gem"; + sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879"; + }; + }; + "hitimes" = { + version = "1.2.2"; + source = { + type = "gem"; + sha256 = "17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4"; + }; + }; + "jekyll" = { + version = "2.5.3"; + source = { + type = "gem"; + sha256 = "1ad3d62yd5rxkvn3xls3xmr2wnk8fiickjy27g098hs842wmw22n"; + }; + dependencies = [ + "classifier-reborn" + "colorator" + "jekyll-coffeescript" + "jekyll-gist" + "jekyll-paginate" + "jekyll-sass-converter" + "jekyll-watch" + "kramdown" + "liquid" + "mercenary" + "pygments.rb" + "redcarpet" + "safe_yaml" + "toml" + ]; + }; + "jekyll-coffeescript" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg"; + }; + dependencies = [ + "coffee-script" + ]; + }; + "jekyll-gist" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "10hywgdwqafa21nwa5br54wvp4wsr3wnx64v8d81glj5cs17f9bv"; + }; + }; + "jekyll-paginate" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; + }; + }; + "jekyll-sass-converter" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1"; + }; + dependencies = [ + "sass" + ]; + }; + "jekyll-watch" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0p9mc8m4bggsqlq567g1g67z5fvzlm7yyv4l8717l46nq0d52gja"; + }; + dependencies = [ + "listen" + ]; + }; + "kramdown" = { + version = "1.7.0"; + source = { + type = "gem"; + sha256 = "070r81kz88zw28c8bs5p0p92ymn1nldci2fm1arkas0bnqrd3rna"; + }; + }; + "liquid" = { + version = "2.6.2"; + source = { + type = "gem"; + sha256 = "1k7lx7szwnz7vv3hqpdb6bgw8p73sa1ss9m1m5h0jaqb9xkqnfzb"; + }; + }; + "listen" = { + version = "2.10.0"; + source = { + type = "gem"; + sha256 = "131pgi5bsqln2kfkp72wpi0dfz5i124758xcl1h3c5gz75j0vg2i"; + }; + dependencies = [ + "celluloid" + "rb-fsevent" + "rb-inotify" + ]; + }; + "mercenary" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb"; + }; + }; + "parslet" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; + }; + dependencies = [ + "blankslate" + ]; + }; + "posix-spawn" = { + version = "0.3.11"; + source = { + type = "gem"; + sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; + }; + }; + "pygments.rb" = { + version = "0.6.3"; + source = { + type = "gem"; + sha256 = "160i761q2z8kandcikf2r5318glgi3pf6b45wa407wacjvz2966i"; + }; + dependencies = [ + "posix-spawn" + "yajl-ruby" + ]; + }; + "rb-fsevent" = { + version = "0.9.4"; + source = { + type = "gem"; + sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7"; + }; + }; + "rb-inotify" = { + version = "0.9.5"; + source = { + type = "gem"; + sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; + }; + dependencies = [ + "ffi" + ]; + }; + "rdiscount" = { + version = "2.1.8"; + source = { + type = "gem"; + sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; + }; + }; + "redcarpet" = { + version = "3.2.3"; + source = { + type = "gem"; + sha256 = "0l6zr8wlqb648z202kzi7l9p89b6v4ivdhif5w803l1rrwyzvj0m"; + }; + }; + "safe_yaml" = { + version = "1.0.4"; + source = { + type = "gem"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + }; + }; + "sass" = { + version = "3.4.13"; + source = { + type = "gem"; + sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig"; + }; + }; + "timers" = { + version = "4.0.1"; + source = { + type = "gem"; + sha256 = "03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l"; + }; + dependencies = [ + "hitimes" + ]; + }; + "toml" = { + version = "0.1.2"; + source = { + type = "gem"; + sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + }; + dependencies = [ + "parslet" + ]; + }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index ac128b2460e..1055b4de72b 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.73"; + version = "0.7.74"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; - sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7"; + sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index ce2875656b6..6330d90c178 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.73"; + version = "0.7.74"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; - sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7"; + sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 4f2c2fba97c..eddf9b8ac71 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -3,7 +3,7 @@ , libctemplate, libglade , libiodbc , libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql -, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite +, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo }: stdenv.mkDerivation rec { @@ -29,6 +29,16 @@ stdenv.mkDerivation rec { ''; postInstall = '' + patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh + + for i in $out/lib/mysql-workbench/modules/wb_utils_grt.py \ + $out/lib/mysql-workbench/modules/wb_server_management.py \ + $out/lib/mysql-workbench/modules/wb_admin_grt.py; do + substituteInPlace $i \ + --replace "/bin/bash" ${stdenv.shell} \ + --replace "/usr/bin/sudo" ${sudo}/bin/sudo + done + wrapProgram "$out/bin/mysql-workbench" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 821b362b365..b76852b035a 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -41,7 +41,7 @@ pythonPackages.buildPythonPackage { ''; checkPhase = '' - patchShebangs ./run-test + patchShebangs . substituteInPlace ./run-test \ --replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES' PATH=".:$PATH" ./run-test diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix new file mode 100644 index 00000000000..e20c511be91 --- /dev/null +++ b/pkgs/applications/misc/rofi/pass.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, rofi, wmctrl, xprop, xdotool}: + +stdenv.mkDerivation rec { + name = "rofi-${version}"; + version = "2015-05-29"; + + src = fetchgit { + url = "https://github.com/carnager/rofi-pass"; + rev = "92c26557ec4b0508c563d596291571bbef402899"; + sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng"; + }; + + buildInputs = [ rofi wmctrl xprop xdotool ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a $src/rofi-pass $out/bin/rofi-pass + + mkdir -p $out/share/doc/rofi-pass/ + cp -a $src/config.example $out/share/doc/rofi-pass/config.example + ''; + + meta = { + description = "A script to make rofi work with password-store"; + homepage = https://github.com/carnager/rofi-pass; + maintainers = [stdenv.lib.maintainers._1126]; + }; +} diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index c0cc702c986..3c5caeda789 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index a636c3bcfe5..ba68a46cf0c 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/mina86/urxvt-tabbedex"; - rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42"; - sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e"; + rev = "b0a02018b1cbaaba2a0c8ea7af9368db0adf3363"; + sha256 = "f0025f2741d424736620147d9fc39faac68193cb9f74bde0fb6e02a6f1ae61c3"; }; installPhase = '' @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; homepage = "https://github.com/mina86/urxvt-tabbedex"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 12eeb62dc04..c1d74c247ce 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation (rec { ln -s $out/{lib/urxvt,lib/perl5/site_perl} ''; + postInstall = '' + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + meta = { description = "A clone of the well-known terminal emulator rxvt"; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index f655a0f8c26..a1d5ef153bb 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4, qscintilla }: +{ stdenv, fetchFromGitHub, cmake, qt4, qscintilla }: stdenv.mkDerivation rec { - name = "sqliteman"; - version = "1.2.0-c41b89e1"; + name = "sqliteman-${version}"; + version = "1.2.0"; - src = fetchurl { - url = https://github.com/pvanek/sqliteman/archive/1.2.0.tar.gz; - sha256 = "1x4ppwf01jdnz3a4ycia6vv5qf3w2smbqx690z1pnkwbvk337akm"; + src = fetchFromGitHub { + repo = "sqliteman"; + owner = "pvanek"; + rev = version; + sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; }; buildInputs = [ cmake qt4 qscintilla ]; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 7c1fe5fc5cb..ba3d3db3267 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "9"; + version = "10"; src = fetchgit { url = "https://github.com/thestinger/termite"; rev = "refs/tags/v${version}"; - sha256 = "0bnzfjk5yl5i96v5jnlvrz0d1jcp5lal6ppl7y8wx13166i6sdnh"; + sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2"; }; makeFlags = "VERSION=v${version}"; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 6ead69db220..c70436e68f9 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { buildInputs = [tcl tk x11 makeWrapper]; + patchPhase = '' + sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c + ''; + # Needs the path to `tclConfig.sh' and `tkConfig.sh'. configureFlags = "--with-tcl=" + tcl + "/lib " + "--with-tk=" + tk + "/lib"; diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix deleted file mode 100644 index 7584ebf72fb..00000000000 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This program used to come with xorg releases, but now I could only find it -# at http://www.x.org/releases/individual/. -# That is why this expression is not inside pkgs.xorg - -{stdenv, fetchurl, libX11, pkgconfig}: -stdenv.mkDerivation rec { - name = "xlsfonts-1.0.4"; - - src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; - sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8"; - }; - - buildInputs = [libX11 pkgconfig]; - - meta = { - homepage = http://www.x.org/; - description = "Lists the fonts available in the X server"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - }; -} diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 6612c22d4fe..a4427c11f6a 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xmove-2.0b2"; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz; + url = mirror://debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz; sha256 = "0q310k3bi39vdk0kqqvsahnb1k6lx9hlx80iyxnkq59l6jxnhyhf"; }; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 247a27ca37b..1f6c272aceb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -26,7 +26,7 @@ , gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true -, pulseSupport ? false, pulseaudio ? null +, pulseSupport ? false, libpulseaudio ? null , hiDPISupport ? false , source @@ -113,12 +113,12 @@ let glib gtk dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2 + pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport pulseaudio; + ++ optional pulseSupport libpulseaudio; # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to # be fixed, then try again to unbundle everything into separate diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index f6e3cd3cf8d..9715b46ed50 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { --add-flags "-app $out/libexec/conkeror/application.ini" ''; - meta = { + meta = with stdenv.lib; { description = "A keyboard-oriented, customizable, extensible web browser"; longDescription = '' Conkeror is a keyboard-oriented, highly-customizable, highly-extensible @@ -30,8 +30,8 @@ stdenv.mkDerivation { self-documenting, featuring a powerful interactive help system. ''; homepage = http://conkeror.org/; - license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl chaoflow ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ mpl11 gpl2 lgpl21 ]; + maintainers = with maintainers; [ astsmtl chaoflow ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index c6c86263888..6760e123ccb 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -6,12 +6,12 @@ , libXcursor, libXi, libXinerama }: stdenv.mkDerivation rec { - version = "3.0.4"; + version = "3.0.4.1"; name = "dillo-${version}"; src = fetchurl { url = "http://www.dillo.org/download/${name}.tar.bz2"; - sha256 = "0ffz481vgl7f12f575pmbagm8swgxgv9s9c0p8c7plhd04jsnazf"; + sha256 = "0iw617nnrz3541jkw5blfdlk4x8jxb382pshi8nfc7xd560c95zd"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 23726f5c3d1..4da970528d5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -30,8 +30,8 @@ , nspr , nss , pango -, heimdal -, pulseaudio +, libheimdal +, libpulseaudio , systemd }: @@ -102,8 +102,8 @@ stdenv.mkDerivation { nspr nss pango - heimdal - pulseaudio + libheimdal + libpulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 2e5545d6a95..c5d82573a32 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "38.0"; + version = "38.0.1"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "703e63e142bba42a1735acf9da88cd52e722ab02"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "93da442b9262e2191145cbf95813fae1358cd981"; } - { locale = "af"; arch = "linux-i686"; sha1 = "b489f1a3fbae4762e7dac947d26effa3ff0c3f60"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "fe6b38ceb279e042d238064154f6d4d8e2c6fb61"; } - { locale = "an"; arch = "linux-i686"; sha1 = "28bdaafca6b99f115dcdae34a0f6ce4eaeaf5507"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "726e734772bf68ff5e4b88ed789b10122fe302bc"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "ed0ab975dbf5a26c3704fdd24b47b7f358edeb3a"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "909af01cbe8eb2e2c3557a474bb0d77b03b40a6d"; } - { locale = "as"; arch = "linux-i686"; sha1 = "c869d42a757798d17d0b0398c6a75652e795ce4c"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "c4183741ea8383caa350c115288f32057306bc95"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "9f20f4dae0ede083f193c61935d2781c7cd29b76"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "0198b69cbf5864a1d4981e0a3e0373e7bad1b8a8"; } - { locale = "az"; arch = "linux-i686"; sha1 = "f2ab43ab4bd81c4dfc17657943e962a1b2ec01ab"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "f903da974577d99354ba7e2d753c8796af3cc037"; } - { locale = "be"; arch = "linux-i686"; sha1 = "ff88567de38d5a9195e3d31bdb3897c6db960315"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "7a4bc7296bad8fa1afad53ec9c56b933bf2f34d4"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "452515451a1a1e1640f46233d287d62213948dd1"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "715cffedcd576b8b124b67effaf72e9091bbd072"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "e8418ff4e04dd2058dd50fb2a926df4c975fd5a4"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e3e4037b8f19355b036af6c19ce9ba11a13411f1"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "edae503e6d7529ba3af7facda18cc25a9634c7d6"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b22a1784efb4ba741843360a8cb2da95e8eefa77"; } - { locale = "br"; arch = "linux-i686"; sha1 = "776b7edd9fdb3a02cbcd2c74f7fe237760483e37"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "19718f8e6e45ac480ea8ede27408063e3e966044"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "e74b5e40c76429cbfe84c282a8d7f3d7e39ed3b6"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "6cf56a28635a84e87a6d2735d812b5bd286f66b3"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "c062cbb2847c78990849ed34171b356ba2514a4a"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "443875f512bc1ff697d3a2848710afa0cf27149f"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "4c7ea9e5cf6c9cc790f8e738658155160062d82b"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "34ed2e0cdba5c9347c886d0f5f1dc595339001b3"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "161aa92acbd5175e0e05094a98ae4620f3e61e15"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "07fed553ab3d8942af865ef54ca45d3cb084671a"; } - { locale = "da"; arch = "linux-i686"; sha1 = "1d287b810ab6eb2c69861aa97279d95e5de9e00b"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "a11872f1243fb7f2afac871497f77e559c571198"; } - { locale = "de"; arch = "linux-i686"; sha1 = "d44d41473f9c89129316247e3b3782ac5e734a03"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "bf82fadea1008287e6b7b6c5cc3ce45297102493"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "f6f533c7c96e5b0551df12007511fb03b252d568"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "5d2c8f0729bf9dd7a33f3469e5eceb10d3b68e4c"; } - { locale = "el"; arch = "linux-i686"; sha1 = "f3bcdb0616e7dbb9d0c014819568c426643b01d6"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "65d0ecad9093142bc122479f71d4a8f865dab9ce"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "b8681a21ee8c59067abb8971d5dfc0c183ce9f3a"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "8b94b6866f865926142fadaa1c4a995d8a4939ab"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "a37a42035062385ed664521e6fcc64b6acc3e100"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f72bd458cf0f42894a1023b09e25ba491c666c8d"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "84eb150df148cc792398f020a06c368b0f3a5384"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "84bb82b946c227931383620f2bda7a4511c86772"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "878ac1426303882701ca99a0e54ce025d5275e84"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "a4187e25529dde37e4b6f5201035efef69810e7d"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "adb3ecd1082e944f6cfb6c224fb99868d6b204e7"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "1ebba7dde7424c0855f738fb37c71be6739ddd54"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "7247e16910263ab971fdf7957e6e075a41ce0072"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "40113a4ddf11d43ae9b382456810193c3e50204a"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "328ec405ff20ee4ac3dcdb242978f552fd471bb4"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "aeb6d54290b1c2e882e871520232f20e05c9ee49"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "b5b0d078d36ac681df735336406e3a5d5ef7347c"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cb02ced1e1e132247cba8505e1a3240bb71ac186"; } - { locale = "et"; arch = "linux-i686"; sha1 = "27eccc34804a058bd163f369715863486a9a578d"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "2429fbb2e011cee22024b4f2d34b6e28821ba874"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "3496749c75804f7d710edb8e3c67e7291608ca39"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "9401f038ff97bf8ed55e21e8871f33aa342268da"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "6068057c34ef0c53a70f01d29bdbccc708c57501"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "c18b0c916f7716012b7e7262351741c6c798c951"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "c32c8be17b6254bd48166062569e41bd8cf3a1ca"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "717da6c53be118f6373e8c68c2e82ef720503646"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "0e15abde00eb8e7807985deb74a2abb7c1f48ffa"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "b0f556019f0696a14b538925551b64e0d8e4f9cc"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "f07ed45bef78333cddbbe8490683867c81e4d497"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "e43a5d8034e641ffa8380cbbfec04e5e04ffe025"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7d1d7228eca1e24bbcd3f247f2cb0bcbeb7843"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "fceeca14bbad0baa0ab76c51f826701df4a35c54"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "2fdb907fc1a6d889a177eee661d246d485c0b2d7"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "11a516d9104ece3130f01c1d6a4a218409ac191b"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "290b25548e4a0f123598953e08b6ffc0ffa7f5a8"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "ea371c234e4eb6e3a4a1b92add169d7539df16a0"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "3fcaa32d2f4825b59ed7f08dee92c7ef9a5301e4"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "1118347a7bcb197bdfcdadfd96a33c315f716cd5"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "368318d6cc8393d0867fe9e0abc0109420a0ad7f"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "72c8eae63bb9298d3b54c9f93ff442a1ffa21b47"; } - { locale = "he"; arch = "linux-i686"; sha1 = "27255ec09da56566297af99f22d13de1f5807d0a"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "f557dc50e027f2f1b327977df9bf1b86640b035d"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "942f2c4eff380ea660deb2a3a26f0b0716d10e84"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "7e4085fc80eb4b10010f10ad7ea3b40278c60c26"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "870d720f3a56068f4c0ec3ed0393efeca5106c52"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fbafa4f4f18bf4fbfe42366a1bdcd06952d1886"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "010b18faf1f999f88a5a618ca03e05a2d1a55cee"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "0ff5b1500514c82a4199a3af511be1c66a6b17b7"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "ce4d095eda872b05045766e6cdd686a21501b78e"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "397c66d7d95eabf5ba8bf47b9700c5d52657f586"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "605cae22b8edb09bcee585c7a0ddf91bb7b8771c"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "f9bf891cfb82baaa27ecf4f6192f50d264a362ba"; } - { locale = "id"; arch = "linux-i686"; sha1 = "0901de7f7b50b652a640e069c811ebffb990af1a"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "7d054dfe69b4c6a2359f89ebd9936d887d432637"; } - { locale = "is"; arch = "linux-i686"; sha1 = "9e50b342cc1754f66f274002a04ca35e933bbe35"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "6396bfe04f896321e1bdb2a1b742ee2461e3840b"; } - { locale = "it"; arch = "linux-i686"; sha1 = "e0818ad23234a31355cd366fb5cecf7a157e437f"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "ca8dd6aa223dccfd65b0ef3f8d85775a38ae5f9f"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "b67d6167b13ba68731b32944a9ba4e2010e54c8c"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "c2421cd629de2cc317965e1d8e047a247dc3135d"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "8dac75acdfcd95bce9bbee2a90785aaf50d1e331"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "01318b4a164d73801d53a86b9147cc3c68090e44"; } - { locale = "km"; arch = "linux-i686"; sha1 = "702f772a54290f2cf73842caa1780cd054630113"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "7bf0508c975f5e14964b25d40570dd7488364169"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "d8241f3ed0d78643ae38986b2f0898f895a47ed9"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "2b499f42e831c8a949d1ac2955cb52bbe01fa516"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "b3a41ba02af12471183a07af0de203e8d1c8e679"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "d31af209483706603dfe2ac39490e8258fe1f376"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "7b97e5c6e5868e1400616bf59317e2aee54b4f9d"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "ff77fe8e75dc98d07f6fa943c2b87572e2fe821d"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "2a126616d400e1781b0d25da0b92f374f5c58764"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "f5a77f3da6dbce8f3069377c8107b6c21dc8ad33"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "213b239888c9bc9667db5b90d5327edb16533346"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "2ebe88b6e9457105abe21db5e501174c4ed6b9a3"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "dd64b8f13021007506cda02b620463a37a40cb44"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "765f498cd0a27a50148022cef1b0db0b7e272393"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "3be4f9cfab1885a891360e7e3d024c130d55b098"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "15c95ded6f5057cdaa8716c1f9a63867f7f698e9"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "2ccc54e8c8fe8fd130427d56b65f191224483d3d"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "90f8826a73042bb5019f4ef75be49beb40e47c1d"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "6d06a583ffd0520a4f8606e7dfed798363f96133"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "c91c4de37182f3c01738856e11f4ddfd867343b4"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "46c9b3f5c7c3b288e759894a4041b0854e35811b"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "0b11edafce5fca8af93f06e7d3461508456faa3c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "43c0a898e13b5cdec73c20a8e47d7ed73340a4be"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "1a1ee21a5f935ec38b540a573e3261eb72d18737"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "9f024aa7cd88b43f1d41ca35b9602c4ce3ce0d66"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "51fb9526bc2f6ffbcca33a9db565041ec7541c17"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "4620b4ee8ac0d9f20dae06ab5039559c947e189e"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bcb56f263c9f8cf87dbfb667bcd6261b6cab3da9"; } - { locale = "or"; arch = "linux-i686"; sha1 = "b9e499a16b8dea07e05ab68e92b07aac09611a0e"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "69d8afea4beeea7b6f8e85d2c57834e36ec0a5da"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "15c35746a9ca5f9bba4048764ef01f38eed1d7b3"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "d068f8fc28ae96dc62a0131a5ef42f35028d8dc9"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "4127ddf36a954066deb09e967224163f4dc9e632"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "8e2f853eece4d7793db9757f32466f85d1f98029"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "85f0440039b77cbf6547fe5b7be0acaba613aee4"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0d0d661c3b6197516d3e3f990a49e327170fb8b0"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3f42e38f0a9436c6eea9cd6b84688f1c5046d9c3"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "56a9c8600f17106ee360994f2816e814f6dde054"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "e8de5922f28f494c3a6a8b1e53c270dd4f34cada"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "1fe39b3dd62180cf6b2b7a6771ac0f61b1538619"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "57739540e02371abe21f6022b3b8fa6103543279"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "56c5815007727024c6e479d81122a59836f848d8"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "f5dcf9023ca5aeeb60d04158f7efc1b6ccbd5313"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "142d95e936063a90b28d2c33e79ac4cb8052ed8b"; } - { locale = "si"; arch = "linux-i686"; sha1 = "489ef1bb93ca27673067d370a62f20cb227d2f55"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "50d819cbde16c384c9adb1d4d176400cbf3544ea"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "0f1f4fee615ce2ee49f5458b9953af176e13280c"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "fddac5b20e6231c9626bb966475d8a16d03efde9"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "832d040787c6cb599f956cb4124ed11c4730be74"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "a73ebbfab7e630de54b13165d428e4b2843f68a2"; } - { locale = "son"; arch = "linux-i686"; sha1 = "49ff3285d4b4a9efae2f434709d80fe87aa94375"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "1f77f4d495c94b6c94ecbd4bb40c56e985cae5c6"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "5c9075d55d62177e24b7a91ff25ee0d8173ca1a8"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "eac042c5080f6bbc43770e7d2b0910537a44bc1e"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "c261b8d480c1c23aaea1754857ab7e069a5ef812"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "3d83d21430a7f90ccbbe8ab4a16d0faa44efc22b"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c6a5b825196404024f4a11ea3c4f1d74b0cbe80b"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "90ff4a639dcd65ce821b9dd6545875ed5230513a"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "99f4418e230a987c12671b9fc3242b3ccc97e5ab"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "bda55fcf5719f3d43f422dd4a1e7935db598d8a0"; } - { locale = "te"; arch = "linux-i686"; sha1 = "dd1d269619f0377993178e9f7083301c39339513"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "c73e447f83ecb44acdd5637702b977b3d37a0593"; } - { locale = "th"; arch = "linux-i686"; sha1 = "c63c3509af06f4c9a19f6ac04149d2eacb201459"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "dfad91490135d6536af450b70ef96afb04413d76"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "43f60e6dd8e412aebcfab2a2c6ca1813933152f8"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "2d121c22f3a9aefb611a8ba8dee568c2c8e6e66a"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "f5841ceb3482d91dd2d805258fd9e326cba2e131"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "d16acad424a61e098b37b68aea98a2ac69efdd21"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "4c94cdc7a19fbe9adfb0aa091299efc973b37d60"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "91b5af1bd30c3821924968b03961e5295f15b0e6"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "96561c7bbb7cfbc3af8f1bbb75b054cc95649357"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "d7ea3b927eff3b229d2013d064fef8661cb088e0"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "53edf9df438d7e6b344a8e321ebfe769cd456bb6"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "9c132b7b651e3dd9c2c78ad4beada01784b2ef41"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3cacf5dfaf58467e27e4804da74a9f6da6f12de4"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "f649c726757ed1bca13d2a05dd57b7d3f56b5dc6"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e77b856a434ad6dd12594cef9362313e910b14d"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "545d3bdd564232788850cb04b1314a3191b14175"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "912fff124863aba8189cdb2f22a2c1cf96c5057a"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "72d9bf343fac24312faf42272553b37e7cb5df5e"; } + { locale = "af"; arch = "linux-i686"; sha1 = "c266d1ce84018e55f239c0cf692feab0b3d2bb58"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "28df7ec17c9008e59af3ba50225e2e6b53f9722a"; } + { locale = "an"; arch = "linux-i686"; sha1 = "2d254b3818afcc0510efba99fe469754076b8841"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "6428c38cd5c00c2a9c02e26b71945831c3c102d2"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "5477725a61b9479a90e76727eb9f69d19e282f83"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "e663608972b44aca2b08abcc2d92a3f8e8c92ed9"; } + { locale = "as"; arch = "linux-i686"; sha1 = "101da7d20a72980cdc5db7c4b2755edc3e0a5d66"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "9e6b94146534ec11d00ecd4f1e06680f0fd918b8"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "b5e195606434b4dd90818877e5aea05fa995f136"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "851276e8a86b27ad7b92e075e6e20a527284dd4e"; } + { locale = "az"; arch = "linux-i686"; sha1 = "48ed44ab60ca16fc39abce13a630d997dd5099c1"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "fb6b4ca689670a3d994e3c524490e46636a8cd59"; } + { locale = "be"; arch = "linux-i686"; sha1 = "6c4d9cdb9fb8aa0fb3ed8042306268600e3c385a"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "0795a804507837821fed591849169c13bf193302"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "3423b59b472eff5bdd0d16994a777c06de734b2b"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "5571d632e5dc7efea9fccae5035ed070542adc52"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c9724715fa1036e872b09b4bc453c9ff9344831a"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f99413c5716c4d45eee22cf1f547138b1ba3d044"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "76d5752e8bc131ece1a43a3376b99280545861bc"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b9ea600f884e50afc31d096697b54366186b1331"; } + { locale = "br"; arch = "linux-i686"; sha1 = "e72e62a49ebda9cadf032e2e90c14adb5a7db1c4"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "7c64d69d3510d06ccdf98fbf85f41d3b7f4b532f"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "c69f54bd537c9d16ce4ccf5169646c6f7dde98a5"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "abe0137bb0cb8536b6bdaf03246bfc97e7cba4bc"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "3c914e3f26a61568a220b8eed2742c70ee879fd5"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "b3aa2e0caa2b145df9b3c099bb5158eb6c21402d"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "bfc8733ee396bfa0dedfdffb5aa11bb4c8816be0"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6de8e3bb0038676a906b75a9603b9f057251538a"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "125c53350f599e975b177db3e11ce367b2250fd8"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "4535f608f78f91014371b4b49ca5d73ba369e5be"; } + { locale = "da"; arch = "linux-i686"; sha1 = "860baa240c24453b55bb3c3273eee85821ab4a7f"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "2078e23dbeeeaad80ef55a07888a94958a8bce85"; } + { locale = "de"; arch = "linux-i686"; sha1 = "d3d6fbcfc622a303b932c6f9fed134d26fa3a32f"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "1e7e7608ad79337212d73fd72df189bcfbc08be5"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "aadd04915c3dd07b4fa257071382081531e910cb"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "ab57a27336d9b2b379dd9370781cbe38fb34f274"; } + { locale = "el"; arch = "linux-i686"; sha1 = "a96898e37be58096490ce26313760e9595eab0cb"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "fd83ef7ac7b6b44ca61737b85f4b2aa9e297566b"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "923e977c4a53e91ff0299271bfacf675d1c9f047"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6250c59ec325ce9f2a6520cc326a500fe8a61106"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "11647b846463af53eebc70e5000c1b2072bcb08e"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "c65084273a4684898d1bd265714bcd2a577939a0"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cbe33f717d3548913cc316adc4163824f63301dd"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "ddaa35f6f054184484856254927bb4b0c7009ec1"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "d8c0d5adbebac214be559354e6f83efc6c01c874"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "e2deaaea97169a50e50c7a3cd7963b7627fd0271"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "cee1c800c773dd784900e8e1d9efc7ae59764907"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "38efb3a002d3ffafd825b24d0aa5c55617f0a198"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "419ca07f1d5bb1d460ce22a7bf8488611b3efee3"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "4ccd1423a7840b9bc696dbe9f1edc1e1629e664e"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "9398c4714f01ce1a2420ad879fc710a84c19f666"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "79e8fff4b9390f3258a7ed78995759d0005e167e"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "c3b4d3496c08ec12f3dc96d2600b327f8d326377"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "d5ee06667437b1d2f56de89b5f5e5f2f007c4eb1"; } + { locale = "et"; arch = "linux-i686"; sha1 = "1c9a8326ca27152a4a8554c62d69784ad4f07ac6"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "f4002b8fa6734353d02e605bf870aa51d67940a8"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "39bf95af55156896df07a2a5f77909987095f567"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "99a70da03d31e8209e2818ef07d8d380c1521164"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "1346de9715783742fcafe60df6d1c37460c6db93"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "d2e0b04bbc4617e35a1d46f22801ecebdb6e873f"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "2ec4e8bd9cdaefe06c390a5e41b5a234a2b1d7e2"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "293dad19f7278909b216107c229e20a79bcfa1fd"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "15c2fe0d7c6a53ee5bc7d8284ff414dd6da6b883"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "09222ca13bc199c8c32fad00a638f335276ff44b"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "10a45fab960d898d65f0dc45a6d0e6368f6bde8e"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "e6ed3e2d6d8e272d6a82bd39a0986afe9f9d5b00"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0222d1158829d06f3fee3314296ebe9126e0d9ab"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "a0c5529c5439c4a4ac29578dd0df6801310b1279"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "95e9d1636243553b72c8d5a6a653f5cd12539ca0"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c525824667f8fe9225fafd1c1bbe6d84413d3e30"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "d29e93647a906856033607ef15e88307cf98fab7"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "5473877025c6a4e57c286a7dc8c7550b71d4e156"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "350847f8853219234edb68b9316cbcf486191f2a"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "7e4c444870d24d9b5ce283bbbf0e2ecdd5ed4d85"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6aa7416aeb84000778df3ff354f4efd2cd805d70"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "262b35a170b39750dc19579caa05df19c98cac94"; } + { locale = "he"; arch = "linux-i686"; sha1 = "e6a798072a9fb01e947e5d40e431d3e71256d3e3"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "6674ba9cad77bbc912f94084f8fd2403f0ce42fb"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d10a236c1e8bc425cd8077b87816fe0a28405274"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "d67449c5cfe939ab5531cf5a27e1da6e5b9335d7"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "f5e151299b3da7788e40dadf1c1d0fab6e409a00"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "6f6b79f283f11414ba2344e83cfb1f0197011c2e"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "a56600d80d772d4009c8feeca7dc6d63c344c199"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "40a7724e59e002446c0a9cfd35de948fc5311e54"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "d1e68650ec713a0d24e159fe967b73b26198d33c"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "abac7894c98a55bb3f7f2ca02a439575c241ea7c"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d45c305cb676c7456d8e8f4f803089d82077a8fa"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "473b7beca08bcbf8d443f6efbe3ac8752a6773c8"; } + { locale = "id"; arch = "linux-i686"; sha1 = "084dd83725e94a557e73d11f78633e1bf98e5d69"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "e173e4f47878070a98afde349d2fb93a6ae1c342"; } + { locale = "is"; arch = "linux-i686"; sha1 = "65b89daf623810a94bbaaaad301a2c3e9e6d4d5f"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "f108f862dafe32a047c08c6fe1135611728d3f4f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "ba049d6eb3b455674caf424745607f49675a8ed6"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "006f094f2966358ec685b00033e640a94d809d53"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "95f6d91f882d9d0ab8ff5d4b7654a102d973543f"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "e2a70547561a1fed87e3308ebf857df6cc3a315e"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "c0d239c2220979dc0daa15ab1e9af510d7c09706"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "d23bdcacb5714b10f773381fb9c8e3d628d2e278"; } + { locale = "km"; arch = "linux-i686"; sha1 = "d9119536b4295fea892afd8ee1b46fd5eb881314"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "1c7eb6d62b050769634fb487c0161c5748b8e4a2"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "491269cc3bbd577d24cfe898b862cad008d2da41"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "9043341ce5c84064aa80f95545404f5415bea782"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "13cad5dea192e57b03a26c09254e6fb7cc4022d3"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "8b2f6551415637ff8c9d2de1e1643aa5cd721d48"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "b57d7e89e0cf548ab016867d468d5fa2e3b429aa"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "3246755855f5d869ddf5724cbd2fb6c237d3ad35"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "804ee921241432208c83bdf70986628c5fc1ce1d"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "c2bd411ddf33382afd091cda7f2f6c4cf3dfb5d4"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "89dfa9f319c1d6681deea122a3f23e8ea4bf6248"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "8b209580ff83965ebc27aa3f97eac1180fb82ffd"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "ff727fe52dac2468d430c5d8d734dca133693e9c"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "21844cd80358d5ac24bd9d9ea2a6daadd296e760"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "cbc4cb34957fde341affa780ea743fb30aa13aad"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "4e395325fd1550710197822495c8873a89ff014c"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "19f538b937a9f4a3ef2ee498c64de69b214b87d4"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "ebc164cd9cf4c3993270949a13c9cb1123379093"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "a942c265bedf537e59fcde8bff39c3addb4a2963"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "8967615af2f2efe359f0babe614d282569e44691"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "89f8a2bd49ff4793b2d69efb48aaa93b031dfa69"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "d2be6c9f62cc0615f9041470bae3b139b69ef55c"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "99afd0b77d350df671acbe403b9b19d975bcb91a"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b14f1b45617773a0e010d81ce83b493dd93dc03a"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "9a043691524087b9968aaac1b5d19a212ddffebb"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "f22f09a85bdd943c874a0b321ae1ec017200d0b4"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1cdbd8319688ccd0af636e71568d7f2244ca0d1a"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bf660208d072b92f4d961d63f6bfadf5d2848e97"; } + { locale = "or"; arch = "linux-i686"; sha1 = "fe1edc33462f5b31d76b7b39ef7de459b2260658"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "679eb537bd4007ef14b09dd705a0eaf5de6c29ff"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "cfa52529dcb953c5448d589845bf22343fc6339f"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a603ec800745b17d7ef31ee4008b2ccfc6515a51"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "09e02683fa6fc34ff152533026824205f976b866"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "94ed7980eb737171e6d9a428a99cc1cbcfa98daa"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "2a73ca16724778da05aca6284b50f8ce6b2855c9"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0c0fc357264ed7ef806729cf5f3a636829740c47"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "02a6ce278285830a1d9a2f092321d73755fc6b71"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0bcf7133711b812d55e4c4f824f6cd53b83ce3ef"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "e314ce94c7f7f72882e4b2671f8a52488e293adc"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "878d2fa1fb737963bb93296d4e0f2e67cd58cb04"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "e4643626b93bacd2f2dae152228287aa0d84acf3"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "6e99ce189e18f7056720500cfa596c8caf8f5a17"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "cffab960763f296586e4bbbbc671409323844464"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "7455db46a81f99ba21d7a3ed0ae5a97246fae822"; } + { locale = "si"; arch = "linux-i686"; sha1 = "ba2a4ddaf8f8978d01f996b599f26801ce3c3a5b"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "8e5cf5885fe5e12e1cf28e7b77171ed23c4fd1c3"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "423e824526557309cb2ec007c41c57daf69e8b42"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "8205ce31e27a6595f2384a85f35f48610cd8b187"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "8766cf70ffd089e79d1eac1211bcc3255c86146d"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "f49ae94b77df1f038bae64f47f3ded0e4f10f349"; } + { locale = "son"; arch = "linux-i686"; sha1 = "dd07bb545505ce0251760d7960ddcfb235856b79"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "aa660969f12a316dd85f7e69678f583430e084aa"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "ea498b08ae2dceb0a103a7980ca086bc5ce94cb2"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "4e2d7c6098c3cc48cc7a3e5b1557b75e1a9c1958"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "e03a369d834c2a2a0a5bc9e539f2a007fa78641f"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8cc41734b718deb50654ccc24c20e5be0b767fd"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "358efd06a28a9ad43703335d190f4bea9b5ef95a"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e63d4ad88ad45e1e4ed43906c4525a24c1b1cd1b"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "ce0fb4901e621dea2330cf80df632d9424ea46b6"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "5910ddf0f1bee1ae3e2ce5c2882ce93732edf586"; } + { locale = "te"; arch = "linux-i686"; sha1 = "367816038ddfbd11b7ad6cc2bae41fe4d82b132b"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "6e6c46db9e45bbe20861fc8d6f971daaaa63d181"; } + { locale = "th"; arch = "linux-i686"; sha1 = "0d4859a54ae11c114cb449b150373465d92b795b"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "16d95125a4c51df9ebd587df16cb428f560cb8e9"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "6bab2ad51c7cf6e761c147d0a0f748573b1683a2"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "ba660dbe60c4e95ac82f536313989933e1edddb6"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "1e1e5dd54da8e3b94da831909149721dd2766267"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "1f32f890d4a1ba2a672d25a005ef5daa76040e33"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "49b36171729e3e0924d8398b62c22d5a02b36b8c"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "2336db0769fa921f2a50774791174565e6828978"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "2b40d9003eca218d235574d1ee7d6da73244d614"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "517d6269f4c2a98f4817be8a926b82c261a8d1f5"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "9d24460c7bcd1e8b36d900a130bb88ecda967678"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "e70d742aa94bb4678446a4b94edd915033a640fb"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3eb4e076fc42e9cbd97dd82af8eb77d3ea6bb068"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "bdbf6abd8e86f6811d032b302818f15f343e8883"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "b7e4cf9bf9db13f3e2d92bdb91ede3f243232a0a"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "411cfc0033ac8edeb30d9d371738864e9401200c"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index bd8fb4d2cd7..0fa1d2068f1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "37.0.2"; in +let version = "38.0.1"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "6e306d56e4e00ffdc2ddbdfbbabe4cb9fc527071"; + sha1 = "20f52c37e099cb2b21f3a76c6e39fe698e1e79e8"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5ebd2607841..409f7d29ba2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = browserName; + inherit icon; comment = ""; desktopName = desktopName; genericName = "Web Browser"; @@ -43,7 +43,7 @@ stdenv.mkDerivation { --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ - --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}*")" + --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" ${ lib.optionalString libtrick '' @@ -58,8 +58,14 @@ stdenv.mkDerivation { '' } - mkdir -p $out/share/icons - ln -s $out/lib/${browserName}${nameSuffix}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png + if [ -e "${browser}/share/icons" ]; then + mkdir -p "$out/share" + ln -s "${browser}/share/icons" "$out/share/icons" + else + mkdir -p "$out/share/icons/hicolor/128x128/apps" + ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \ + "$out/share/icons/hicolor/128x128/apps/${browserName}.png" + fi mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index c44db8db759..1969a1f502f 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper }: +{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper +, gsettings_desktop_schemas }: stdenv.mkDerivation rec { name = "jumanji-${version}"; @@ -10,13 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1xq06iabr4y76faf4w1cx6fhwdksfsxggz1ndny7icniwjzk98h9"; }; - buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper ]; + buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup='' wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 3b473019600..b8aa17803e9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { passthru.mozillaPlugin = "/lib/mozilla/plugins"; - meta = { + meta = with stdenv.lib; { description = "A browser plugin to manage Swedish BankID:s"; longDescription = '' FriBID is an open source software for the Swedish e-id system @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { support. ''; homepage = http://fribid.se; - license = [ "GPLv2" "MPLv1" ]; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ gpl2 mpl10 ]; + maintainers = [ maintainers.edwtjo ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index bdccb932e1c..6fd953636a8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo , libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, pulseaudio, udev, pango +, dbus_glib, alsaLib, libpulseaudio, udev, pango }: with stdenv.lib; @@ -34,7 +34,7 @@ let xorg.libXrandr stdenv.cc.cc alsaLib - pulseaudio + libpulseaudio dbus_glib udev curl diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 105e5904715..07e152e91db 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { mozillaPlugin = "/lib/mozilla/plugins"; }; - meta = { + meta = with stdenv.lib; { description = "A browser plugin that uses mplayer to play digital media from websites"; homepage = http://mplayerplug-in.sourceforge.net/; - license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; + license = with licenses; [ gpl2Plus lgpl2Plus "MPLv1+" ]; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/netsurf.nix b/pkgs/applications/networking/browsers/netsurf/netsurf.nix index 2d2253f43ef..f7e90b61a94 100644 --- a/pkgs/applications/networking/browsers/netsurf/netsurf.nix +++ b/pkgs/applications/networking/browsers/netsurf/netsurf.nix @@ -23,12 +23,15 @@ stdenv.mkDerivation { buildPhase = "make PREFIX=$out"; installPhase = "make PREFIX=$out install"; - meta = { + meta = with args.lib; { description = "free, open source web browser"; homepage = http://www.netsurf-browser.org; - license = ["GPLv2" /* visual worrk : */ "MIT" ]; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + license = with licenses; [ + gpl2 + mit /* visual work */ + ]; + maintainers = with maintainers; [ marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index ced16da5f7e..b29f2d1974c 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -6,7 +6,7 @@ , kdeSupport ? false, qt4, kdelibs }: -assert stdenv.isLinux && stdenv.cc.cc.isGNU or false && stdenv.cc.libc != null; +assert stdenv.isLinux && stdenv.cc.isGNU && stdenv.cc.libc != null; let mirror = http://get.geo.opera.com/pub/opera; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index b30b2e260e3..24a43d95ca9 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking -, gsettings_desktop_schemas, makeWrapper +, gsettings_desktop_schemas, makeWrapper, cacert }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/config.def.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, src/config.def.h ''; buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 8e1e00795d2..7ab5c397abe 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl, - pkgconfig, webkit, gsettings_desktop_schemas }: + pkgconfig, webkit, gsettings_desktop_schemas, cacert }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, config.h ''; buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/browsers/w3m/cygwin.patch b/pkgs/applications/networking/browsers/w3m/cygwin.patch new file mode 100644 index 00000000000..767cc289b5f --- /dev/null +++ b/pkgs/applications/networking/browsers/w3m/cygwin.patch @@ -0,0 +1,1710 @@ +diff -ur w3m-0.5.3/config.guess new/w3m-0.5.3/config.guess +--- w3m-0.5.3/config.guess 2004-08-04 13:32:27.000000000 -0400 ++++ w3m-0.5.3/config.guess 2013-04-28 18:43:59.480227700 -0400 +@@ -1,13 +1,14 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012, 2013 Free Software Foundation, Inc. + +-timestamp='2004-03-12' ++timestamp='2012-12-29' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -16,24 +17,22 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). ++# ++# Originally written by Per Bothner. + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -53,8 +52,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, ++2012, 2013 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -66,11 +66,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -104,7 +104,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -123,7 +123,7 @@ + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ;' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 1994-08-24) +@@ -141,7 +141,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -158,6 +158,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -166,7 +167,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -176,7 +177,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -196,71 +197,34 @@ + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; +- amd64:OpenBSD:*:*) +- echo x86_64-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- cats:OpenBSD:*:*) +- echo arm-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pegasos:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; + macppc:MirBSD:*:*) +- echo powerppc-unknown-mirbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -306,40 +270,46 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha*:OpenVMS:*:*) +- echo alpha-hp-vms +- exit 0 ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 +- exit 0 ;; ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm*:riscos:*:*|arm*:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -347,32 +317,51 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 +- exit 0 ;; +- DRS?6000:UNIX_SV:4.2*:7*) ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -381,10 +370,10 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +@@ -396,10 +385,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -409,41 +398,41 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -467,35 +456,36 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -508,29 +498,29 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -538,7 +528,7 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build +@@ -553,15 +543,19 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -574,28 +568,28 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in +@@ -604,52 +598,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -657,9 +651,19 @@ + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then +- # avoid double evaluation of $set_cc_for_build +- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -667,11 +671,11 @@ + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -699,224 +703,269 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using +- # FreeBSD's kernel, but not the complete OS. +- case ${LIBC} in gnu) kernel_only='k' ;; esac +- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +- exit 0 ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) ++ exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:[34]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit 0 ;; ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +- exit 0 ;; ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix +- exit 0 ;; ++ exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin +- exit 0 ;; ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu +- exit 0 ;; ++ exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu +- exit 0 ;; +- ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- m68*:Linux:*:*) ++ exit ;; ++ hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips +- #undef mipsel +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips +- #else +- CPU= +- #endif ++ #ifdef __dietlibc__ ++ LIBC=dietlibc + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 +- ;; +- mips64:Linux:*:*) ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips64 +- #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit 0 ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit 0 ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ or32:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -924,115 +973,71 @@ + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu +- exit 0 ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #ifdef __INTEL_COMPILER +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; ++ exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; +- i*86:syllable:*:*) ++ exit ;; ++ i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; ++ exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -1040,15 +1045,16 @@ + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; ++ exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv +- exit 0 ;; ++ exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -1140,68 +1159,97 @@ + else + echo ns32k-sni-sysv + fi +- exit 0 ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Darwin:*:*) +- case `uname -p` in +- *86) UNAME_PROCESSOR=i686 ;; +- powerpc) UNAME_PROCESSOR=powerpc ;; ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then +@@ -1209,22 +1257,28 @@ + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; ++ exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 +@@ -1235,36 +1289,55 @@ + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); ++ printf ("arm-acorn-riscix\n"); exit (0); + #endif + + #if defined (hp300) && !defined (hpux) +@@ -1380,11 +1453,12 @@ + } + EOF + +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -1393,22 +1467,22 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +@@ -1419,7 +1493,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- ftp://ftp.gnu.org/pub/gnu/config/ ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++and ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -ur w3m-0.5.3/main.c new/w3m-0.5.3/main.c +--- w3m-0.5.3/main.c 2011-01-04 04:42:19.000000000 -0500 ++++ w3m-0.5.3/main.c 2013-04-28 18:42:08.408034100 -0400 +@@ -789,7 +789,8 @@ + } + + #ifdef USE_BINMODE_STREAM +- setmode(fileno(stdout), O_BINARY); ++ /* Seems to only be needed for old versions of Cygwin */ ++ /***setmode(fileno(stdout), O_BINARY);***/ + #endif + if (!w3m_dump && !w3m_backend) { + fmInit(); diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index bf14e7e5341..5d9705cfe1b 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { patches = [ ./glibc214.patch ] # Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that # alpha. At the time of writing this, boehm-gc-7.1 is the last stable. - ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ]; + ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ] + ++ stdenv.lib.optional stdenv.isCygwin ./cygwin.patch; buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 3eebc6de3cf..4311b352ab9 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, jdk, mesos, fetchurl }: stdenv.mkDerivation rec { - name = "marathon-v${version}"; + name = "marathon-${version}"; version = "0.8.1"; src = fetchurl { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \ --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \ - --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" + --prefix "MESOS_NATIVE_JAVA_LIBRARY" : "$MESOS_NATIVE_JAVA_LIBRARY" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 9458ffc3925..c330b8acfbf 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion , leveldb, glog, perf, utillinux, libnl, iproute }: @@ -9,18 +9,18 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.22.0"; + version = "0.22.1"; name = "mesos-${version}"; dontDisableStatic = true; src = fetchurl { url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; - sha256 = "0z8c1vr7b06l3nqgbxq8ydcz79ayw75y2szipfqkw17c7gv6d7v8"; + sha256 = "0ry0ppzgpab68fz5bzd7ry5rjbg8xjz73x1x4c5id42cpsqnn7x5"; }; buildInputs = [ - makeWrapper autoconf automake libtool curl sasl jdk maven + makeWrapper autoconf automake114x libtool curl sasl jdk maven python wrapPython boto distutils-cfg setuptools leveldb subversion apr glog ] ++ lib.optionals stdenv.isLinux [ @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { homepage = "http://mesos.apache.org"; license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; - maintainers = with maintainers; [ cstrahan offline ]; + maintainers = with maintainers; [ cstrahan offline rushmorem ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 6cbec878a48..8bb19cb3eb8 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -62,8 +62,7 @@ stdenv.mkDerivation rec { --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ --prefix "HOME" : "$out/share/panamax-api" \ --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \ - --prefix "SSL_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \ + --prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \ --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" ''; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 97573fb1e7b..14360f9ff0b 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -18,19 +18,25 @@ # them with our own. let - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else throw "Dropbox client for: ${stdenv.system} not supported!"; + # NOTE: When updating, please also update in current stable, as older versions stop working + version = "3.4.6"; + sha256 = + { + "x86_64-linux" = "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky"; + "i686-linux" = "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" - else if stdenv.system == "i686-linux" then "ld-linux.so.2" - else throw "Dropbox client for: ${stdenv.system} not supported!"; + arch = + { + "x86_64-linux" = "x86_64"; + "i686-linux" = "x86"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.4.4"; - sha256 = if stdenv.system == "x86_64-linux" then "05ncbxwkimq7cl3bad759qvda7zjdh07f5wh6aw12g472l4yqq98" - else if stdenv.system == "i686-linux" then "18089bh6i64yw75pswgn2vkcl1kf7ipxxncmssw3qhb6791qfhbk" - else throw "Dropbox client for: ${stdenv.system} not supported!"; + interpreter = + { + "x86_64-linux" = "ld-linux-x86-64.so.2"; + "i686-linux" = "ld-linux.so.2"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; @@ -109,6 +115,9 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "${ldpath}" + + mkdir -p "$out/share/icons" + ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" ''; meta = { diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index df5f7954182..ee9d1dbbf8d 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { detects a new entry it'll emit only that new entry. ''; homepage = http://www.vanheusden.com/rsstail/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 287a4239c2c..c4a82966238 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,16 +1,16 @@ {stdenv, fetchurl, flex, bison, libpcap}: stdenv.mkDerivation rec { - name = "daq-2.0.4"; - + name = "daq-2.0.5"; + src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "0g15kny0s6mpqfc723jxv7mgjfh45izhwcidhjzh52fd04ysm552"; + url = "mirror://sourceforge/snort/${name}.tar.gz"; + sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p"; }; - + buildInputs = [ flex bison libpcap ]; - + meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; homepage = http://www.snort.org; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 257b676686b..ea7e0962699 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; + url = "mirror://sourceforge/snort/${name}.tar.gz"; sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index db24670d969..ec269def5b4 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 805a47fc058..43d11f0a8ff 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.2.2"; + name = "bitlbee-3.4"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "13jmcxxgli82wb2n4hs091159xk8rgh7nb02f478lgpjh6996f5s"; + sha256 = "0plx4dryf8i6hz7vghg84z5f6w6rkw1l8ckl4c4wh5zxpd3ddfnf"; }; buildInputs = [ gnutls glib pkgconfig libotr ] diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index cae9fe294f3..7ce47d53d14 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool perl perlXMLParser evolution_data_server gnome_doc_utils avahi libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite - gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme gnome3.gnome_icon_theme boost + gnome3.libsoup glib gnome3.defaultIconTheme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index bc9246d8845..77fe37481d8 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let curl_custom = stdenv.lib.overrideDerivation curl (args: { - configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ca-bundle.crt"] ; + configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/ca-bundle.crt"] ; } ); in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index b9f9667ad3b..f82ffa5ecd3 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -5,7 +5,7 @@ let - version = "2.2.1287"; + version = "2.2.1373"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc @@ -47,12 +47,12 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; - sha256 = "170izy3v18rgriz84h4gyf9354jvjrsbkgg53czq9l0scyz8x55b"; + sha256 = "0mxjzigncp8sh5w2rpr7kvkiahagm3adss1zv6rqk8hc1awrnd8n"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "150q7pxg5vs14is5qf36yfsf7r70g49q9xr1d1rknmc5m4qa5rc5"; + sha256 = "1f4cjbazgifxpyr6589frs417h4wpxbykf46w5qiw0m2wiqpqff5"; } else throw "HipChat is not supported on ${stdenv.system}"; @@ -92,10 +92,11 @@ stdenv.mkDerivation { mv opt/HipChat/bin/linuxbrowserlaunch $out/libexec/hipchat/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "Desktop client for HipChat services"; homepage = http://www.hipchat.com; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 14d01de3245..2ab0930842b 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig - , pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto + , libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto , ...}: builderDefsPackage (a : diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index c290975152c..7b80ec85661 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libotr pidgin intltool ]; meta = with stdenv.lib; { - homepage = http://www.cypherpunks.ca/otr; + homepage = https://otr.cypherpunks.ca/; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 586ce26e8c9..4a5522039c8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 9771f29c770..874f68f0ec2 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv , libsodium, libXScrnSaver }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ - libtoxcore openalSoft opencv libsodium filteraudio + libtoxcore openal opencv libsodium filteraudio qt5.base qt5.tools libXScrnSaver ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index fb14782ef9f..8b259c90fe5 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate +{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, libpulseaudio, libsamplerate , commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus , autoconf, automake, libtool, gettext, perl , cmake, qt4 @@ -43,7 +43,7 @@ rec { configureFlags = "--with-expat --with-expat-inc=${expat}/include " + "--with-expat-lib=-lexpat --with-opus "; - buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate + buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus autoconf automake libtool gettext perl ]; }; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 218e7303807..1e84e015bc1 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig -, pulseaudio, lib, ... }: +, libpulseaudio, lib, ... }: assert stdenv.system == "i686-linux"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libXi libXrender libXrandr - pulseaudio + libpulseaudio freetype fontconfig zlib diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index df4f7054ad3..51707d2dca6 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg -, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null +, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null , libredirect, quazip, less, which }: @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base pulseaudio + xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio ]; in diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index e8e76c10ea5..b7cebd47cd7 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon -, sqlite, libsoup, libnice, gnutls }: +, sqlite, libsoup, libnice, gnutls, cacert }: stdenv.mkDerivation rec { name = "telepathy-gabble-0.18.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] ++ stdenv.lib.optional doCheck dbus_daemon; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index b1341af7a9d..5e4ad860687 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup -, libuuid, gnutls, sqlite, pkgconfigUpstream }: +, libuuid, openssl, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { pname = "telepathy-salut"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; - buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls + buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl sqlite ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 2b3703bc279..d0cc333c71b 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -43,7 +43,7 @@ in mkTkabber (main // { postPatch = '' substituteInPlace login.tcl --replace \ "custom::defvar loginconf(sslcacertstore) \"\"" \ - "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)" + "custom::defvar loginconf(sslcacertstore) \$env(SSL_CERT_FILE)" '' + optionalString (theme != null) '' themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb" sed -i '/^if.*load_default_xrdb/,/^}$/ { diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 521f568ff5b..4ebfddf82e1 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5, gstreamer, zlib, sqlite, libxslt }: +{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }: assert stdenv.system == "x86_64-linux"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { unpackPhase = "true"; libPath = stdenv.lib.makeLibraryPath [ - qt5 + qt5Full xlibs.libX11 gstreamer zlib diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b8940bcd96e..8c26bf8d10e 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { name = "irssi-0.8.17"; - + src = fetchurl { - url = "http://irssi.org/files/${name}.tar.bz2"; + urls = [ "https://distfiles.macports.org/irssi/${name}.tar.bz2" + "http://irssi.org/files/${name}.tar.bz2" + ]; sha256 = "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw"; }; - + buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; - + NIX_LDFLAGS = ncurses.ldflags; - + configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes"; meta = { diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index d5cc3fb7718..bbad1587982 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cacert cmake ] ++ extraBuildInputs; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ca-bundle.crt"; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/ca-bundle.crt"; postInstall = '' NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index de5dc849148..2b4c5f564be 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - buildInputs = [ qt5.base pkgconfig boost ]; + buildInputs = [ qt5 pkgconfig boost ]; postPatch = '' sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index 19715d7b255..f7aff8a4d0c 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -12,7 +12,7 @@ bundlerEnv { meta = with lib; { description = "A curses threads-with-tags style email client"; homepage = http://supmua.org; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ cstrahan lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 991f8cbd53b..8dce20f60da 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,117 +4,117 @@ # ruby generate_source.rb > source.nix { - version = "31.6.0"; + version = "31.7.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha1 = "4c0c50d5c315f438d09b8bf2ba821c7148552076"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "d0361df60873c787ebcb487acb65e9e4e7bf6c97"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "84e0ab9f62afbf1c673383a6c6c0d07ce369b360"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "b590ca477b00dd2080a887ee4451d06d59da5e6c"; } - { locale = "be"; arch = "linux-i686"; sha1 = "06812c96cbd62c07180062fca293171cf4177d77"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "1cf6501aa77adfa41ad48316f471201f2c2e1976"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "322654ebdf12a9d60738e0a5f30dfde77e095951"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "00fa9855d81a59f7340d69ef25389503b3374c5b"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "efd6f1afc8787295071f1577e043fe8ed4824604"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0163078b1edc17b3df86d9d80d2dcf1b14e289c5"; } - { locale = "br"; arch = "linux-i686"; sha1 = "1051e4faa171ea762dd0d4c79d1f7b6d59fa1343"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "cad5ff8a920a90e79c1e343022aba0d95347a9a6"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "1801969f47164e9e40fe611b2b11c664541ea619"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "8427fdbf5149c7e0a96e6037f3b7690cc43684f1"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "8ae6c4b5e97b1a129c178c17ddb787b8a499bbbf"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "422d73aa8d853afd219c4be983e9d0b0c165d3a7"; } - { locale = "da"; arch = "linux-i686"; sha1 = "ee6239de012bb2d581c42e4271736b3565932d2d"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "3e24c6d239e5d55ffefdecab5c280668d36f3c14"; } - { locale = "de"; arch = "linux-i686"; sha1 = "474f1b4ce9b6cf635c60ab32dc99268f30bd906b"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "7327c84c0b447cbeb00a57790334dbd4df02441a"; } - { locale = "el"; arch = "linux-i686"; sha1 = "a1cced1eb8d290f8f7668839af68a42b47172fda"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "c7a41b26bee1bcf1a1012ab122036983c42223ed"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "73309ee5d0304762b24b040fea3be934b0193b76"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "79466a14532bac1c5db7de4f1aacd97538b12ccd"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "1886939dd4fa0bd720f209a9280bdd48f2805144"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "18090d7adbb45350d47d796ee0d4a52da68629b4"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "6d5b993c8c5f9a311e128520a2eb1115a1004d72"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "04afb8826d04dc6511a77377d78f9dcdd67bb73f"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "c49c2175842d40698128da293305317c5d986561"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "65e6d24657a47d69cec4820fc699b948ef7235df"; } - { locale = "et"; arch = "linux-i686"; sha1 = "4a066d35ab922587ed1000b770becbaeafb91d39"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "fad64bc6cdf1bbc03ef0e6fd4fac96e0ddd26578"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "ac90f02584bedfe3b958020c37d3677b2312b203"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "7152187af874799ca22dffca1d85afc0346a5f7c"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "797c494042986578e79290a827056ee56ad32526"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "5fec8fc94b8296c5189be29fdc0f43f074c88722"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "2f90216459e8bd24fe775bc84f3d3371c64c705e"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "07176c2825be793521e11dde8a73ead970c58385"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7f95afef9fc01667b0e2ee33e2620069662b4b"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ff9a84cb2ca4e222a6d75b5591e5337b3b5e3b3b"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "a392c2287a3907b5b79c443c67dfb4d8e6624ebf"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "766035560552bb26b1d9a6c98357acab515153e3"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "5f9dcab41f522ca84833cf5dc566ee9679efcc01"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "46ced4f5c67f560b15341db70dc04d1a19e176cc"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "66f1b772f981ce5bbd3c7c2a73d260d2243887a9"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "2c087b2ba065f06aa4e4e491d92864ef679f14c2"; } - { locale = "he"; arch = "linux-i686"; sha1 = "b157e04413ee246304f30b0dc68eeed3e00d5cf3"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "72e77175705052c6102405897edc1c5887f94c58"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "f515c41dda71a69974b67d70ca1980987ab895ba"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "9b560bc16985e8610d11c1aa1df6a8b29a650528"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "24b0e2555617b1b0e7dcb601b3f7a8c54bf64524"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "a1cf5c244fd98a024b2987b72b95671a90c7e0f9"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "20a07254d51cc94be8153426e472d8c7b077a014"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "3e5c41c5239da37ee52070c043b5de2f16859055"; } - { locale = "id"; arch = "linux-i686"; sha1 = "bbbc669ead8c716725ad162247dbb35f6b6d3376"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "30c73fff969d9d94e6a24b27fa5b03285104ed38"; } - { locale = "is"; arch = "linux-i686"; sha1 = "d8ede481d0f04237b1a36356880d76a5439e6796"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "d5c70452102f0c1f513a45b3b05339b171e7e149"; } - { locale = "it"; arch = "linux-i686"; sha1 = "00bad56fb3a4bcc4032b204471a66dc64a9976e9"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "cd15137766f9bdb693743401d14e69c4c990aeab"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "eb51ca9c4d5d22ff178c45c99ba35270d9f006d1"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "ec7bdce8ecba50aa4c6f0495ec4737b032e85688"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "ce2a6f518fe69b6cf87ba6a2d5ff7e32f676e516"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "614808276829835d81f6a330154c3dbf617109e2"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "95da07c69121bf0e22b480f3e4df9db3e7676a8b"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "02dee38474393cf86c78aacfb2c546bfd2130e0a"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "cd8b7dc6eda97de0ec1c8a5dde36f4afd60b720a"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "748030706822a80156e5ffcfbaed413b3905280a"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "eafd2b7fa376f58fd5320a8e67bd76c9eb17819e"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "f04672081b0281dec909fd110f1c1dc8f340cc40"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "c51c6a23f5e99181cd2aa6e324165a523c7e7c41"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "29adc20bbdb3b1de7b0c1a325ded1159f7627478"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "b94fc235c3644455ca19238aed9e2e4cff4ce7d2"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "78bd45bf21196cc4bb400d10d19151931e390681"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "0b921d11a43968bc12a31be48baa962fb084be3d"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "b975d958fdb152c942cf68ed6dbde8df6b6cfe09"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "5384bc8f899d1ba75c96b11276dd98cb5049896a"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "dbd5db203127f01b1ec46259f9b668aa2dec8d63"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "eb6590aecd509ee02b02fd6d39aec32a77616b59"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "750f9d25164f2aae4d5bb3147738cb604c131b94"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "5dc246fc1c661d5a965da6eed7d0b57dacbcc643"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "ca3d7a76564552cab92cf1c3f2098bbb740e6315"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "ceb0264ab40dc437c2a44fa03c2f9a3ff18b667c"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "d2200d241c26059136169850a5ad4f702c273301"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "678bae69497e2ab6c4d895192b5093a0d120ddc1"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "9ca3af62babeeda8a46609ffd265ff0cc059349a"; } - { locale = "si"; arch = "linux-i686"; sha1 = "46376507d77af110a63de24a7a136c43b2d6cb1b"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "d43e51c5e504bfa1a0f7370e1cea3bda247b81e0"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "e97bc9017953f91f4fc9a158dca36ae1217a8a97"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "f80a0473ff265295f3eaa8ed8b8fe99a0a71b049"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "449cf3770e4eaa4289bac9abbf7f655bbdcdf8ca"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "ef1092cdef4dd2d4ebf62b29654da4ad08c7a6e0"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "0d856fdb66ca1208a08eef5073744f66de7c94f5"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "346888cbc1428897df1b50651a263ae5cc449475"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "3252ea6a0706813d4c536cab9251ec707a46fe47"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "ea55159965bc8b5fb5c692efc1a30ac3ddd74a48"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "5191f311d6324e1fbc98763e80316bb7584999ba"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "4c8387f5db87776ae6ba322fa81983f7bab14690"; } - { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e1fa5437760c8964aa312ed296454c0736009479"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "1e277512366a60745cfdc409530943e42bb62b11"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "8907cb5f77b0dafd6c2c69d63b6f9b72ab58d7d1"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "b101b37f7fe86686db1813786cbf2ee994bf33c3"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "ab0e84cd69808d12efa28f5062372ba8983b8c42"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "bce4718c183c9fc62f38025f7f9329999ba1f8a4"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "7a05e5dd98215dab96746166fe46c96592e8768a"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "c2c54c1831199ac8b5ba0bbebb564e9dc2ff2563"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3c2a7f6096eb16a00451d1ec71f6ff382910bf43"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "e3d43d6aa007419d057da99d06fdd200faf8d9c5"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "97bc53d2216eb24ad6c0496fed4698da4e481c38"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "3e5fcc5058646ee326f4b6b1ef885999222ab0b8"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "8d5dd6af05d9a285097db7f96372464e2c48a7fe"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "07866e3716bc3bd370e4aa4711ee2882be8380b9"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "f9c353e03792ade2c3df9842bad6707c50b59395"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "ecbfaa883c2dda597213ca739e92c30ec9c2eac1"; } + { locale = "be"; arch = "linux-i686"; sha1 = "ac1abca375cfbc2e45b7eb0f66b9cef73924ae4e"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "5f296643c42890a200416678a6ed8240ee219d9f"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "4b59b171b67641097da95fd76113efe1019fd2aa"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "13d5124fd8925de174f83a8075fb711aa14438b7"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "833c826ee2be3c8664060d4ad24c508b5c122a5e"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b29fb50d9eb83e98802655236a6c1ccb56bf6be3"; } + { locale = "br"; arch = "linux-i686"; sha1 = "5985c09eab409db0c62e525e9cd3d7469b82f0e1"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "2e4e3efe1d89b8cf329a64894807b69555e505e2"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "1a81aabe1ded11bde92349e8b9f5ae499aaebdfa"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "406212f107939a627f2166d8fc6a72a0dcff56a4"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "6cc272e25d45e54c6008da968884de039eba9db9"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6f7e54ff4fe7d8bfa477475aaad371fc8b2f85d4"; } + { locale = "da"; arch = "linux-i686"; sha1 = "8f944829ef98bfdb46eadfd10fafe75a353c1a4a"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "f22e4293a3462effa0a928be3ae1ddbd8273450f"; } + { locale = "de"; arch = "linux-i686"; sha1 = "c115ea9356b457b25526c8469ebcf7a8e1c6241a"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "04ac40b3e10f96e17db70c9541040970cbe2e480"; } + { locale = "el"; arch = "linux-i686"; sha1 = "b0ccb81db2b8cb505ade10a0fc1eaf4322f7de0d"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "410da87c432e3d4e4ddfbe4912bc00c8fcfb8dfd"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "b91bea9a1813f1772a85873fb712c9857234864f"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f6a08558fb3b6ebd79fdf9b359286b7ba58f2a9c"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "b433601ffdf83cc2a90224f683f627f562d8e3e3"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "68624fead16c459f87cbdeefd75326bcabccd805"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "14c4a6abb6269dea926efccfdae41d2eeab9031a"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "ffd800950b8a768d4e7ec4c8666fc2e7a390a080"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "61889cee58be7c5da0f3424faae5192f07d31651"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "360335d5c3a1eccaba29095f88d9b50dc04fbc6d"; } + { locale = "et"; arch = "linux-i686"; sha1 = "ba1e1dbcb1c0c87ba1c916b1053cf876e42d76bf"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "c40a2e0c70d3c3af5e0c34045864a7279f95b2fa"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "45c6270bb1350799df089620cdae4919833d5a54"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "ee8cacf035658fda1605f3a2968c56fa03cd73d4"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "45329cd3222d74cefaa0e96e18b71b6ddc844e77"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "47c1ec1e67829a86111a76f6ea6cb40c9f178066"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "1f2e1edbb49f141c1ac63f20e47bc4bcbe0361f4"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "cf70711b4fb6130b31d3286ad1b2a102d5cb8fc5"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "938ee57e657b3b2f0a228bc1dc7a9bc2eebee1cc"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "5c807541fa4e232b6b5119cbc482a79dd9e4f54e"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6f2ef03c505f4936f6263b643bbfd6e0befd54f4"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "7246ed88b0c3f504ca0043f3f20c5cc86eea8ac6"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "130f7ae3c0127d00e24946e9ec2558161fd3fcf1"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "aed0e1e7e699c6df4538663dc6a0556a106cb35f"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "69fca12c63c023f689463de709db731073a3c812"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "45ab4866e3f6989e4a08920564292622abea7f97"; } + { locale = "he"; arch = "linux-i686"; sha1 = "2898eed89af21c6a4122937bf596b97828cb9271"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "a3fb3b8564fcbe8cad29d430665d3f369d765369"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "143d8dcbccd3ad219330d7389e93597cb98d20f8"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fdc0095646678c2885e374e277ab50c4a4ffe53"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "4c135cfaa8644fab4558d53eb7f5f0ae53ed3704"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "a4faeb5aa6dc7f6a16d436a56ef9f954c80271fd"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "f3e60e515fa20c4092ecf4df64970bc750c849e5"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2d6ea4a41a33db4e2aeb67d7bcd38f32f427f757"; } + { locale = "id"; arch = "linux-i686"; sha1 = "cd97780c5f70dca5e9c2a61e9af11f38f79b014b"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "da2ae751b6b0dd2caf5c54fcd30560a57c6746cb"; } + { locale = "is"; arch = "linux-i686"; sha1 = "f6f3b56e8b134e93e30ecfcf706e9ddbb9b181cc"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "a922a569b293005e5efc797bf51e0c33e87cea7f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "2643526d774e44fc41b0b7b6872ba683b01a9c77"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "e91689f635060087f8c8c9806ac1607a59e26776"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "dafca3f2c34ae417b5bd3065026af4a075c9bee7"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "6a1d03062d599ea35af8479dea3e6cfc45840ba1"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "9b92baecd3906b35499513723685cd791e1aab9e"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "116c8b02f8be6c739595cc88888a19e225ed865d"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "85f44f77cc27deb9cf95487a9a3673918f102bd9"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "0bd82afbe4c27318ce8882eff62e53fda13d3590"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "07cd4e46a5811096759c565bb533adf1ee9cb0d9"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "ece8a8b69aef74f9c22db1660a14ae5205aa7ff7"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "1f1e30f5aef29bf96d0e2b8609acb03d1b6ec0aa"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "5a0ffeb38b183b835966568c1b3fc719c0908fea"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9bbb5e61eecf09d059cfb17bd75fd0e64c455d78"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "e1115c4451ede51833387ef8c592ce7342d508d3"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "65dcef7d9bfcdbd35a09ff6a9e436261b79e4d90"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "cd64fb45459e699e0c8c2269a52bb0512e592db0"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "ea2650cb700a42dc96fb56ad1860061e87626bc9"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "976a52d128e8d912363fadb7e14adec0a7c9d973"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "323b876b6c11c4881c280cdb64d2867076970abf"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "952d5b82b0d3d47d5494f2d9667fc2a5b88408df"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5ce1feb2446c6dba96c3b3a0e9afd6a00655b738"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "83115d2fdc8494451b79cc67d581c77b64c27af4"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "a26678482d8c425f3291116e99e0196952d0cb09"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "327391e44d43d58b4d3fee97904a336f5c52648e"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "8b67f03c053f89af7d50331eec056402cfbd5bf4"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "15ec5c6fa7e6aa843910bc6c6479bf308393b52f"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "09127b5202cf63c7b9715813061ca79bc27c2f37"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "8b409350741edcd33b3eeaf7928a133eb1c2a399"; } + { locale = "si"; arch = "linux-i686"; sha1 = "733d049ffd66d5007ef68c761f2d84ab579bd400"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "dc5460e82bdf613e9d778687d11533dc97b77ffb"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "b4b9b10b53c48adf224507faf77a04c19c750d58"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "81aeb1d95fd2b220c17f388ba882127fc6d290de"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "a621f04b7e5accf05f946ce775391667579679e6"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "f9086f1ce56d84e3b732f22d086fcce43d2373a7"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "1b2b11fd04b7d1979f88268db37510ef231c158b"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "f06ad4d533c7144695fbe2eb3ba700bb1d5151b7"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "92d4cd9bbc5f24045295bda6c75420708d593aac"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "53e661b5c485fae7c27770d2a2701d6d21e481c9"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "e4614597ef42eaa6ede065b4c3b9f11de491dd5b"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e3c8af45ab65e7977a350ae617cd55afa685e8d0"; } + { locale = "ta-LK"; arch = "linux-i686"; sha1 = "17b3d419fe769a02a360b96042c78c497063b9e8"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "cbc34ab650bfc95926b98e63c474f1997a1256fa"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "ba63efda6864a6984d492cda30d4fca6157e26a8"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "9b8cb45aab578b3dbfeace90f44dad26eda6e798"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "36a9867155fa0e6924ed62d7dbc350a2425178e1"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "abbc155c34c5d404b3143ccc63a1bb5c99c3d395"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "850ac8190adef8d227166b9b4478ea8c88c90287"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "afba1f0043ba96a89bc8ab23fe6b6e19af4f826b"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "acda86b5c48b751eb06719754921e7604a1c222e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a88745a4a8f85d5d2861e40ba8d72b0af73bb055"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c03e6e4fae7fec1ae0b30e5cb600a4cf28151cc7"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c5788c6672b230681cfb3ee2fe97763ef81d34b1"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6d5dd577bf2..f2a088164d2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "31.6.0"; in +let version = "31.7.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha1 = "147ba0f3c7da29a7814ee9ce4265fb107744559e"; + sha1 = "90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede"; }; buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx @@ -84,6 +84,8 @@ stdenv.mkDerivation rec { ../mozilla/mach configure ''; + enableParallelBuilding = true; + buildPhase = "../mozilla/mach build"; installPhase = diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 904f6904979..26078c8e583 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas gnome3.libpeas gnome3.dconf gst-plugins-base gst-plugins-good gst-plugins-bad - gnome3.libgnome_keyring + gnome3.libgnome_keyring gnome3.defaultIconTheme libnotify makeWrapper ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix index 65ec54cf0f7..e7be81def61 100644 --- a/pkgs/applications/networking/p2p/firestr/default.nix +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation { name = "firestr-0.8"; - buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base libXScrnSaver openssl ]; - src = fetchFromGitHub { owner = "mempko"; repo = "firestr"; @@ -13,23 +11,25 @@ stdenv.mkDerivation { sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb"; }; + buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base qt5.multimedia + libXScrnSaver openssl ]; + patches = ./return.patch; - postPatch = - '' + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "set(Boost_USE_STATIC_LIBS on)" "" \ --replace "/usr/include/botan" "${botan}/include/botan" \ --replace "libopus.a" "libopus.so" \ --replace "libsnappy.a" "libsnappy.so" \ --replace "libbotan-1.10.a" "libbotan-1.10.so.0" - ''; + ''; - meta = with stdenv.lib; - { description = "Grass computing platform"; - homepage = http://firestr.com/; - license = licenses.gpl3; - maintainers = [ maintainers.emery ]; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Grass computing platform"; + homepage = http://firestr.com/; + license = licenses.gpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix index 4ac3a0448de..21d99013a1a 100644 --- a/pkgs/applications/networking/pond/default.nix +++ b/pkgs/applications/networking/pond/default.nix @@ -14,11 +14,6 @@ buildGoPackage rec { subPackages = [ "client" ]; - renameImports = [ - "code.google.com/p/go.crypto golang.org/x/crypto" - "code.google.com/p/goprotobuf github.com/golang/protobuf" - ]; - buildInputs = [ trousers net crypto protobuf ed25519 govers ]; buildFlags = "--tags nogui"; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 092e6f53e49..f773cf6755e 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -15,7 +15,7 @@ #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt , libXinerama , libXv -, pulseaudioSupport ? true, pulseaudio +, pulseaudioSupport ? true, libpulseaudio }: assert printerSupport -> cups != null; diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index e66f78f2602..cc6ec9bd231 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , substituteAll -, pulseaudio ? null, cups ? null, pcsclite ? null +, libpulseaudio ? null, cups ? null, pcsclite ? null , buildServer ? true, optimize ? true }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib - alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite + alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite ]; doCheck = false; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DWITH_CUNIT=OFF" - ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON" + ] ++ stdenv.lib.optional (libpulseaudio != null) "-DWITH_PULSE=ON" ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON" ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON" ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON" diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 8544ccc0f79..328a156260b 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: -let version = "4.0.3.2"; in +let version = "4.0.4.0"; in stdenv.mkDerivation rec { name = "x2goclient-${version}"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "0vqcz9kmnbvlj8kns68zl60019fdz97rydz4wsgnsgdf7r370npn"; + sha256 = "0mqn4nvq2w7qja5i4vx9fg2spwzl01p0hmfwbjb0mzir03hmrl46"; }; meta = with stdenv.lib; { description = "Graphical NoMachine NX3 remote desktop client"; homepage = http://x2go.org/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f3215e7befd..ac2d11a33f1 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "1.12.4"; + version = "1.12.5"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2"; - sha256 = "04n3xfakg6368ba49vj6n3csqnkzipac4sldsaavgr2jwac4x06y"; + sha256 = "10mxgj916bwv92pfhk4kldcaanr9vndjklzp9ypdxr29xyr7gwfh"; }; buildInputs = [ diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 84d0d4ba239..1e26e61161c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.1"; + version = "0.11.7"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "518add39e2239fc8575cdf5cafc3562f006df7201fbd272077ed3bbbbfd816d4"; + sha256 = "7d928a255c61c7b89d460cc70c79bd8e85bef3e919c157f59d5709fef4153c8d"; }; subPackages = [ "cmd/syncthing" ]; @@ -25,7 +25,7 @@ buildGoPackage rec { meta = { homepage = http://syncthing.net/; description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; - license = with lib.licenses; mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matejc ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index a8ae393598d..194b22f0fd7 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook openssl protobufc libconfig ]; - configureFlags = "--with-ssl=openssl"; + configureFlags = [ + "--with-ssl=openssl" + "--enable-shmapi" + ]; meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e82ce2d7b9e..02a78a2b2d1 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,32 +1,31 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser -, goffice, makeWrapper, gtk3, gnome_icon_theme, gnome3 +, gnome3, makeWrapper, gtk3 }: stdenv.mkDerivation rec { - name = "gnumeric-1.12.18"; + name = "gnumeric-1.12.20"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9"; + sha256 = "1k915ks55a32fpqrr0rx6j8ml9bw0a07f11350qc1bvkx53i2jad"; }; - preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs - configureFlags = "--disable-component"; # ToDo: optional libgda, python, introspection? buildInputs = [ pkgconfig intltool perl perlXMLParser - goffice gtk3 makeWrapper + gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme ]; + enableParallelBuilding = true; + preFixup = '' for f in "$out"/bin/gnumeric-*; do wrapProgram $f \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d0d6fd136ef..720a07afcfa 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -3,11 +3,11 @@ , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: stdenv.mkDerivation rec { - name = "scribus-1.4.4"; + name = "scribus-1.4.5"; src = fetchurl { - url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "1bhp09x8rgdhyq8b516226nn0p7pxd2arkfkf2vvvklca5arsfx4"; + url = "mirror://sourceforge/scribus/scribus/${name}.tar.bz2"; + sha256 = "1644ym79q7a1m5xf3xl1wf4kdk870np911jmpqdv2syjc42nyw4z"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix index 0018f00a366..edf56c3eb4d 100644 --- a/pkgs/applications/office/zotero/firefox-bin/default.nix +++ b/pkgs/applications/office/zotero/firefox-bin/default.nix @@ -30,8 +30,8 @@ , nspr , nss , pango -, heimdal -, pulseaudio +, libheimdal +, libpulseaudio , systemd }: @@ -102,8 +102,8 @@ stdenv.mkDerivation { nspr nss pango - heimdal - pulseaudio + libheimdal + libpulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix deleted file mode 100644 index 2f622e94057..00000000000 --- a/pkgs/applications/science/biology/arb/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, glew, mesa, libpng, lesstif, lynx, freeglut -, libtiff, rxp, sablotron, perl, jdk, transfig, gv, gnuplot, xorg }: - -# NOTE: This package does not build on 64-bit systems. Because of some faulty -# int->pointer arithmatic. The build scripts are abnormal - but it appears to -# work. - -stdenv.mkDerivation { - name = "arb-2007-Dec-07"; - - src = fetchurl { - url = http://download.arb-home.de/release/2007_12_07/arbsrc.tgz; - sha256 = "04l7qj0wigg1h56a9d70hxhdr343v3dg5dhqrc7fahc1v4h8f1rd"; - }; - - patches = [ ./makefile.patch ]; - - buildInputs = - [ glew mesa libpng xorg.libXpm lesstif lynx freeglut libtiff rxp - sablotron xorg.libXaw perl jdk transfig xorg.libX11 xorg.libXext - xorg.libXt gv gnuplot - ]; - - unpackPhase = '' - tar xzf $src - ''; - - buildPhase = '' - echo `make` # avoids error signal - export ARBHOME=`pwd` - export PATH=$ARBHOME/bin:$PATH - make all - ''; - - installPhase = '' - mkdir -p $out/lib - shareddir=/nix/var/lib/arb - # link out writable shared location lib/pts - mkdir -p $shareddir/lib/pts - cp -vau lib/pts $shareddir/lib - rm -vrf lib/pts - ln -vs $shareddir/lib/pts $out/lib/pts - chmod a+rwx $shareddir/lib/pts - # link out writable shared location lib/nas/ - mkdir -p $shareddir/lib/nas - cp -vau lib/nas $shareddir/lib - rm -vrf lib/nas - ln -vs $shareddir/lib/nas $out/lib/nas - chmod a+rwx $shareddir/lib/nas - # link out shared lib/pixmaps (not sure about this, yet): - mkdir -p $shareddir/lib/pixmaps - cp -vau lib/pixmaps $shareddir/lib - rm -vrf lib/pixmaps - ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps - chmod a+rwx $shareddir/lib/pixmaps - # bulk copy - cp -vau * $out - - # replace arb script - mv $out/bin/arb $out/bin/arb.orig - cat > $out/bin/arb << ARB - #!/bin/sh - - echo Starting Nix compiled arb from $out - echo Shared databases are located in $shareddir - # sometimes local profiles override these: - export ARBHOME=$out - export LD_LIBRARY=$ARBHOME/lib - - $out/bin/arb_ntree $* - - ARB - - chmod +x $out/bin/arb - ''; - - meta = { - description = "Software for sequence database handling and analysis"; - longDescription = ''The ARB software is a graphically oriented package comprising various tools for sequence database handling and data analysis. A central database of processed (aligned) sequences and any type of additional data linked to the respective sequence entries is structured according to phylogeny or other user defined criteria. Note that this package includes its own older versions of clustal etc.''; - license = "non-free"; - pkgMaintainer = "http://BioLib.open-bio.org/"; - homepage = http://www.arb-home.de/; - priority = "10"; # because it includes binaries of clustal etc. - broken = true; - }; -} diff --git a/pkgs/applications/science/biology/arb/makefile.patch b/pkgs/applications/science/biology/arb/makefile.patch deleted file mode 100644 index 8e7962511af..00000000000 --- a/pkgs/applications/science/biology/arb/makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r a1e04cdafd13 Makefile ---- a/Makefile Thu Sep 25 11:59:19 2008 +0200 -+++ b/Makefile Thu Sep 25 11:59:27 2008 +0200 -@@ -109,7 +109,7 @@ endif - - ALLOWED_GCC_295_VERSIONS=2.95.3 - ALLOWED_GCC_3xx_VERSIONS=3.2 3.3.1 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0 3.4.2 3.4.3 --ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3 -+ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3 4.2.4 - ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_295_VERSIONS) $(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS) - - GCC_VERSION_FOUND=$(shell $(GCC) -dumpversion) diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index f5a835423bd..1fa0a0d97b5 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.0b"; - name = "fritzing"; + name = "fritzing-${version}"; src = fetchurl { url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2"; diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 493af97d156..e64ea909cbb 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation { configureFlags = [ "--enable-x" "--with-x" "--with-readline" ]; - meta = { + meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = "http://ngspice.sourceforge.net"; - license = ["BSD" "GPLv2"]; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ "BSD" gpl2 ]; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 160c530e722..8b09b7dd37d 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, cmake, graphviz, pkgconfig }: stdenv.mkDerivation rec { - name = "qfsm-0.53.0"; + name = "qfsm-0.54.0"; src = fetchurl { url = "mirror://sourceforge/qfsm/${name}-Source.tar.bz2"; - sha256 = "1fx99dyai8zhs8s6mbr1i1467mnv1pf0ymh6mr0jm68mzj2jyzx4"; + sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; buildInputs = [ qt4 cmake graphviz pkgconfig ]; @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; - broken = true; }; } diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix new file mode 100644 index 00000000000..635e89dadc8 --- /dev/null +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, perl, flex, bison }: + +stdenv.mkDerivation rec { + name = "verilator-${version}"; + version = "3.872"; + + src = fetchurl { + url = "http://www.veripool.org/ftp/${name}.tgz"; + sha256 = "113ha7vy6lsi9zygiy3rnsd3dhi5y8lkfsfrh0nwzady7147l2yh"; + }; + + enableParallelBuilding = true; + buildInputs = [ perl flex bison ]; + + meta = { + description = "Fast and robust (System)Verilog simulator/compiler"; + homepage = "http://www.veripool.org/wiki/verilator"; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix new file mode 100644 index 00000000000..d542bf87c79 --- /dev/null +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "tetgen-1.4.3"; + + src = fetchurl { + url = "${meta.homepage}/files/tetgen1.4.3.tar.gz"; + sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm"; + }; + + installPhase = '' + mkdir -p $out/bin + cp tetgen $out/bin + ''; + + meta = { + description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; + homepage = "http://tetgen.org/"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index ddfb92def95..8a0565fce10 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { - name = "tetgen-1.4.3"; +let version = "1.5.0"; in +stdenv.mkDerivation { + name = "tetgen-${version}"; src = fetchurl { - url = "${meta.homepage}/files/tetgen1.4.3.tar.gz"; - sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm"; + url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; + sha256 = "1www3x2r6r7pck43ismlwy82x0j6xj2qiwvfs2pn687gsmhlh4ad"; }; installPhase = '' @@ -14,8 +15,9 @@ stdenv.mkDerivation rec { ''; meta = { + inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix new file mode 100644 index 00000000000..71114d2f9e1 --- /dev/null +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gmp, mpfr, boost }: + +stdenv.mkDerivation { + name = "gappa-1.2"; + + src = fetchurl { + url = https://gforge.inria.fr/frs/download.php/file/34787/gappa-1.2.0.tar.gz; + sha256 = "03hfzmaf5jm54sjpbks20q7qixpmagrfbnyyc276vgmiyslk4dkh"; + }; + + buildInputs = [ gmp mpfr boost.dev ]; + + buildPhase = "./remake"; + installPhase = "./remake install"; + + meta = { + homepage = http://gappa.gforge.inria.fr/; + description = "Verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point arithmetic"; + license = with stdenv.lib.licenses; [ cecill20 gpl2 ]; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix index e2aff9313e9..d7f047b84e0 100644 --- a/pkgs/applications/science/logic/lci/default.nix +++ b/pkgs/applications/science/logic/lci/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { description = ''Lambda calculus interpreter''; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = with stdenv.lib.platforms; linux; - license = with stdenv.lib.licenses; gpl3; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 4d391379e81..2d93fdd6196 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; enableParallelBuilding = true; - preConfigure = "cd src"; + preConfigure = '' + patchShebangs bin/leantags + cd src + ''; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index cfe96bc6983..444bb06c4a0 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = ''Simple Theorem Prover''; maintainers = with stdenv.lib.maintainers; [mornfall]; platforms = with stdenv.lib.platforms; linux; - license = with stdenv.lib.licenses; mit; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 0dbab841a81..9a3ab13c33e 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { "--with-gmp=${gmp} " + "--with-readline=${readline}"; - meta = { + meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; homepage = "http://pari.math.u-bordeaux.fr/"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ertes raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ertes raskin ]; + platforms = platforms.linux; inherit version; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index dee33a04be2..66292499f2b 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { buildFlags = "VERBOSE=1"; - meta = { + meta = with stdenv.lib; { homepage = "http://speedcrunch.digitalfanatics.org"; - license = "GPLv2+"; + license = licenses.gpl2Plus; description = "A fast power user calculator"; longDescription = '' SpeedCrunch is a fast, high precision and powerful desktop calculator. diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 879690bc91e..43ef4337d57 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation { ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} ''; - meta = { + meta = with stdenv.lib; { homepage = "http://www.gromacs.org"; - license = "GPLv2"; + license = licenses.gpl2; description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 648d59ac01c..ad6f0c50a37 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython cacert ]; + buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; # Readline support is needed by bzrtools. pythonPath = [ pythonPackages.readline ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./add_certificates.patch ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by "certPath" "${cacert}/etc/ca-bundle.crt" + --subst-var-by "certPath" "${cacert}/ca-bundle.crt" ''; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 56a6618e531..a73d1637417 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -46,7 +46,8 @@ rec { sendEmailSupport = !stdenv.isDarwin; }; - gitAnnex = pkgs.haskell-ng.packages.ghc784.git-annex; + inherit (pkgs.haskellPackages) git-annex; + gitAnnex = git-annex; qgit = import ./qgit { inherit fetchurl stdenv; diff --git a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch index 846752f5bfe..7d5dca9abfe 100644 --- a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch +++ b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch @@ -5,7 +5,7 @@ diff -ru -x '*~' git-1.9.2-orig/git-send-email.perl git-1.9.2/git-send-email.per return; } -+ $smtp_ssl_cert_path //= $ENV{'OPENSSL_X509_CERT_FILE'}; ++ $smtp_ssl_cert_path //= $ENV{'SSL_CERT_FILE'}; + if (!defined $smtp_ssl_cert_path) { # use the OpenSSL defaults 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 620d3264be8..60bfaa86199 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.4.0"; + version = "2.4.1"; 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 = "095v8n0b0c314sfg5mrnxjx2d9mklbjcmajh92kmi6b5jkfkhd5k"; + sha256 = "195d61f98jj53jq0w3kfphpyk51h7fylpahc558id79ccc4ii1bj"; }; patches = [ diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 72640662ead..60e0a794705 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, perl, git }: +{ stdenv, fetchurl, git, nettools, perl }: stdenv.mkDerivation rec { name = "gitolite-${version}"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz"; - sha256 = "1gsgzi9ayb4rablki3mqr11b0h8db4xg43df660marfpacmkfb01"; + sha256 = "16cxifjxnri719qb6zzwkdf61x5y957acbdhcgqcan23x1mfn84v"; }; - buildInputs = [ perl git ]; + buildInputs = [ git nettools perl ]; buildPhase = "true"; patchPhase = '' @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { --replace /usr/bin/perl "${perl}/bin/perl" substituteInPlace src/lib/Gitolite/Hooks/Update.pm \ --replace /usr/bin/perl "${perl}/bin/perl" + substituteInPlace src/lib/Gitolite/Setup.pm \ + --replace hostname "${nettools}/bin/hostname" ''; installPhase = '' @@ -30,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://gitolite.com/gitolite/index.html; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = [ maintainers.thoughtpolice maintainers.lassulus ]; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index a9fbd89f3fa..dee2abd2b1f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip -, guiSupport ? false, tk ? null, curses }: +, guiSupport ? false, tk ? null, curses, cacert }: let version = "3.3.3"; @@ -44,7 +44,7 @@ stdenv.mkDerivation { mkdir -p $out/etc/mercurial cat >> $out/etc/mercurial/hgrc << EOF [web] - cacerts = /etc/ssl/certs/ca-bundle.crt + cacerts = ${cacert}/ca-bundle.crt EOF # copy hgweb.cgi to allow use in apache diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index ced82dd45c0..eede33c2145 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://www.catb.org/~esr/src/; - license = [ stdenv.lib.licenses.bsd3 ]; + license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 476abd4e19b..4afb1b20e32 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchhg, autoconf, sqlite }: -stdenv.mkDerivation { - name = "vcprompt"; +stdenv.mkDerivation rec { + name = "vcprompt-${version}"; + version = "1.2.1"; src = fetchhg { url = "http://hg.gerg.ca/vcprompt/"; - rev = "1.2.1"; + rev = version; sha256 = "03xqvp6bfl98bpacrw4n82qv9cw6a4fxci802s3vrygas989v1kj"; }; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index e7cc9b78195..a5c14d0888f 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -9,14 +9,14 @@ , automationSupport ? true, lua ? null , openalSupport ? false, openal ? null , alsaSupport ? true, alsaLib ? null -, pulseaudioSupport ? true, pulseaudio ? null +, pulseaudioSupport ? true, libpulseaudio ? null , portaudioSupport ? false, portaudio ? null }: assert spellcheckSupport -> (hunspell != null); assert automationSupport -> (lua != null); assert openalSupport -> (openal != null); assert alsaSupport -> (alsaLib != null); -assert pulseaudioSupport -> (pulseaudio != null); +assert pulseaudioSupport -> (libpulseaudio != null); assert portaudioSupport -> (portaudio != null); with stdenv.lib; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ++ optional automationSupport lua ++ optional openalSupport openal ++ optional alsaSupport alsaLib - ++ optional pulseaudioSupport pulseaudio + ++ optional pulseaudioSupport libpulseaudio ++ optional portaudioSupport portaudio ; diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 83fb7546a3b..2f0c3070921 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper , libX11, libxcb, qt5, mesa , ffmpeg , libchardet @@ -13,14 +13,18 @@ , libbluray , jackSupport ? false, jack ? null , portaudioSupport ? false, portaudio ? null -, pulseSupport ? true, pulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null , cddaSupport ? false, libcdda ? null +, youtubeSupport ? true, youtube-dl ? null }: +with stdenv.lib; + assert jackSupport -> jack != null; assert portaudioSupport -> portaudio != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert cddaSupport -> libcdda != null; +assert youtubeSupport -> youtube-dl != null; let waf = fetchurl { @@ -32,18 +36,18 @@ in stdenv.mkDerivation rec { name = "bomi-${version}"; - version = "0.9.5"; + version = "0.9.10"; src = fetchFromGitHub { owner = "xylosper"; repo = "bomi"; rev = "v${version}"; - sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll"; + sha256 = "1c7497gks7yxzfy6jx77vn9zs2pdq7y6l9w61miwnkdm91093n17"; }; buildInputs = with stdenv.lib; [ libX11 libxcb mesa - qt5.base qt5.quick1 qt5.x11extras + qt5.base qt5.x11extras qt5.declarative qt5.quickcontrols ffmpeg libchardet mpg123 @@ -59,19 +63,23 @@ stdenv.mkDerivation rec { ] ++ optional jackSupport jack ++ optional portaudioSupport portaudio - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional cddaSupport libcdda ; preConfigure = '' patchShebangs configure - # src/mpv/waf build-mpv; do ''; preBuild = '' - patchShebangs build-mpv install -m755 ${waf} src/mpv/waf - sed -i '1 s,.*,#!${python3.interpreter},' src/mpv/waf + patchShebangs src/mpv/waf + patchShebangs build-mpv + ''; + + postInstall = '' + wrapProgram $out/bin/bomi \ + ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; configureFlags = with stdenv.lib; @@ -82,7 +90,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl which ]; + nativeBuildInputs = [ pkgconfig perl python which qt5.tools makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 69b0ffbe131..79b9ab92ad9 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: +{ stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: stdenv.mkDerivation rec { version = "0.2.3.alpha"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix=$out ''; - buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; meta = with stdenv.lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 1256572de7c..fd336dafb23 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { videos to MPEG4, MP3 or other formats in just one easy step. ''; homepage = http://clipgrab.org/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index cab7b4112d0..1711503314e 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec{ ./dvdauthor-imagemagick-0.7.0.patch ]; - meta = { + meta = with stdenv.lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; - license = ["GPLv2"]; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 0b18705e6fb..dafa381d9ec 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -23,7 +23,7 @@ # TODO: would be nice to have nfsSupport (needs libnfs library) # TODO: librtmp , libvdpau ? null, vdpauSupport ? true -, pulseaudio ? null, pulseSupport ? true +, libpulseaudio ? null, pulseSupport ? true , libcec ? null, cecSupport ? true }: @@ -32,7 +32,7 @@ assert udevSupport -> udev != null; assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable assert sambaSupport -> samba != null; assert vdpauSupport -> libvdpau != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert cecSupport -> libcec != null; let @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { ++ lib.optional usbSupport libusb ++ lib.optional sambaSupport samba ++ lib.optional vdpauSupport libvdpau - ++ lib.optional pulseSupport pulseaudio + ++ lib.optional pulseSupport libpulseaudio ++ lib.optional cecSupport libcec; dontUseCmakeConfigure = true; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix new file mode 100644 index 00000000000..be4363c8314 --- /dev/null +++ b/pkgs/applications/video/mediathekview/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, jre, unzip }: + +stdenv.mkDerivation { + name = "mediathekview-9"; + src = fetchurl { + url = "mirror://sourceforge/zdfmediathk/MediathekView_9.zip"; + sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4"; + }; + unpackPhase = "true"; + + buildInputs = [ unzip ]; + + # Could use some more love + # Maybe we can also preconfigure locations for vlc and the others. + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/opt/mediathekview + cd $out/opt/mediathekview + unzip $src + find . -iname '*.exe' -delete + sed -i -e 's, java, ${jre}/bin/java,' MediathekView__Linux.sh + ln -s $out/opt/mediathekview/MediathekView__Linux.sh $out/bin/mediathekview + ''; + + meta = with stdenv.lib; { + homepage = http://zdfmediathk.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ maintainers.chaoflow ]; + platforms = platforms.linux; # also OS X and cygwin, but not investigated, yet + }; +} diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index ac106431240..57f8289a1f9 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -18,7 +18,7 @@ , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null , jackaudioSupport ? false, jack2 ? null -, pulseSupport ? false, pulseaudio ? null +, pulseSupport ? false, libpulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null @@ -45,7 +45,7 @@ assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; assert jackaudioSupport -> jack2 != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; assert libjpegSupport -> libjpeg != null; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { ++ optional jackaudioSupport jack2 ++ optionals amrSupport [ amrnb amrwb ] ++ optional x264Support x264 - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional lameSupport lame ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8e516fd91e3..03cb5154f85 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,5 @@ -{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass -, lua, perl, libpthreadstubs -, lua5_sockets -, python3, docutils, which, lib +{ stdenv, fetchurl, docutils, makeWrapper, perl, pkgconfig, python, which +, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, lua, lua5_sockets , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -15,16 +13,20 @@ , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null , jackaudioSupport ? true, jack2 ? null -, pulseSupport ? true, pulseaudio ? null -, bs2bSupport ? false, libbs2b ? null +, pulseSupport ? true, libpulseaudio ? null +, bs2bSupport ? true, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null # for Youtube support -, youtubeSupport ? false, youtubeDL ? null -, cacaSupport ? false, libcaca ? null +, youtubeSupport ? true, youtube-dl ? null +, cacaSupport ? true, libcaca ? null , vaapiSupport ? false, libva ? null }: +# TODO: Wayland support +# TODO: investigate caca support +# TODO: investigate lua5_sockets bug + assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); @@ -38,37 +40,56 @@ assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert jackaudioSupport -> jack2 != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; -assert youtubeSupport -> youtubeDL != null; +assert youtubeSupport -> youtube-dl != null; assert cacaSupport -> libcaca != null; -# Purity problem: Waf needed to be is downloaded by bootstrap.py -# but by purity reasons it should be avoided; thanks the-kenny to point it out! -# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour - let + inherit (stdenv.lib) optional optionals optionalString; + + # Purity: Waf is normally downloaded by bootstrap.py, but + # for purity reasons this behavior should be avoided. waf = fetchurl { url = http://ftp.waf.io/pub/release/waf-1.8.5; sha256 = "0gh266076pd9fzwkycskyd3kkv2kds9613blpxmn9w4glkiwmmh5"; }; - in -with stdenv.lib; stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "17hpx8wb4b6hjhc208jn71p02s0gd6665vzyyy249k6jfn2nh8sx"; + sha256 = "0la7pmy75mq92kcrawdiw5idw6a46z7d15mlkgs0axyivdaqy560"; }; - buildInputs = - [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ] - ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] + patchPhase = '' + patchShebangs ./TOOLS/ + ''; + + NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext"; + + configureFlags = [ + "--enable-libmpv-shared" + "--disable-libmpv-static" + "--disable-static-build" + "--enable-manpage-build" + "--disable-build-date" # Purity + "--enable-zsh-comp" + ] ++ optional vaapiSupport "--enable-vaapi"; + + configurePhase = '' + python ${waf} configure --prefix=$out $configureFlags + ''; + + nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python which ]; + + buildInputs = [ + ffmpeg freetype libass libpthreadstubs lua lua5_sockets + ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora @@ -77,55 +98,45 @@ stdenv.mkDerivation rec { ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray ++ optional jackaudioSupport jack2 - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau ++ optional speexSupport speex ++ optional bs2bSupport libbs2b ++ optional libpngSupport libpng - ++ optional youtubeSupport youtubeDL + ++ optional youtubeSupport youtube-dl ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca - ++ optional vaapiSupport libva - ; - -# There are almost no need of "configure flags", but some libraries -# weren't detected; see the TODO comments below - - NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + ++ optional vaapiSupport libva; enableParallelBuilding = true; - configurePhase = '' - python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"} - patchShebangs TOOLS - ''; - buildPhase = '' - python3 ${waf} build + python ${waf} build ''; installPhase = '' - python3 ${waf} install - # Maybe not needed, but it doesn't hurt anyway: a standard font + python ${waf} install + + # Use a standard font mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - ''; + '' + optionalString youtubeSupport '' + # Ensure youtube-dl is available in $PATH for MPV + wrapProgram $out/bin/mpv --prefix PATH : "${youtube-dl}/bin" + ''; + + meta = with stdenv.lib; { + description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; + homepage = http://mpv.io; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres fuuzetsu ]; + platforms = platforms.linux; - meta = with stdenv.lib;{ - description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)"; longDescription = '' mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; - homepage = http://mpv.io; - license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ AndersonTorres fuuzetsu ]; - platforms = platforms.linux; }; } - -# TODO: Wayland support -# TODO: investigate caca support -# TODO: investigate lua5_sockets bug diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 2bc635d510e..cd157a473e6 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec +{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/mythtv"; buildInputs = [ - freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec + freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index e414a6e723a..67f5e11de68 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz"; - sha256 = "198ymfdrg58i3by58fs68df835rkpnpagnvyzlilmn9ypvpa8h81"; + sha256 = "1xms48gl20pr9g8bv8ygykh6m99c3wjphsavr4hb1d5263r9f4in"; }; buildInputs = [ cmake diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 5b77ec916b0..743df2647f1 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ gstreamer gst-python gst-editing-services diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index a7e8cd8c1b9..c8056512c79 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: stdenv.mkDerivation { - name = "qarte-2.2.0"; + name = "qarte-2.2.0-147"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; - rev = "146"; - sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9"; + rev = "147"; + sha256 = "0cl3k3vr3kmp5dls0lbv5pka4zrlyh5816pwl5rkgqmycl11pk51"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 7320a7f6d74..453829bc580 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext -, libXfixes, mesa, pkgconfig, pulseaudio, qt4 +, libXfixes, mesa, pkgconfig, libpulseaudio, qt4 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig - pulseaudio qt4 + libpulseaudio qt4 ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 37cae1cd0ed..3180a9e632a 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smtube-15.5.10"; + versionMajor = "15.5"; + versionMinor = "17"; + version = "${versionMajor}.${versionMinor}"; + name = "smtube-${version}"; src = fetchurl { - url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1if2b0h6snfmj5hnx4cs55zjbdvwagx95jv62f2jgh3m5gis0cbz"; + url = "mirror://sourceforge/smtube/SMTube/${versionMajor}/${name}.tar.bz2"; + sha256 = "0jbik41nb1b7381ybzblmmsl8b7ljl6a2zpn1dcg0cccjw5mnbyg"; }; makeFlags = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 6a1e9552d3c..85fc6f6b6ba 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -2,7 +2,7 @@ , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp -, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg +, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt - libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec + libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-dc1394" "--enable-ncurses" "--enable-vdpau" + "--enable-dvdnav" ] ++ optional onlyLibVLC "--disable-vlc"; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix new file mode 100644 index 00000000000..4f32ec55a0e --- /dev/null +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake, + libmspack, openssl, pam, xercesc, icu, libdnet, procps, + x11, libXinerama, libXi, libXrender, libXrandr, libXtst, + pkgconfig, glib, gtk, gtkmm }: + +let + majorVersion = "9.10"; + minorVersion = "0"; + patchSet = "2476743"; + version = "${majorVersion}.${minorVersion}-${patchSet}"; + +in stdenv.mkDerivation { + name = "open-vm-tools-${version}"; + src = fetchurl { + url = "mirror://sourceforge/project/open-vm-tools/open-vm-tools/stable-${majorVersion}.x/open-vm-tools-${version}.tar.gz"; + sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1"; + }; + + buildInputs = + [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps + pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ]; + + patchPhase = '' + sed -i s,-Werror,,g configure.ac + sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am + sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am + ''; + + preConfigure = "autoreconf"; + configureFlags = "--without-kernel-modules --without-xmlsecurity"; + + meta = with stdenv.lib; { + homepage = "https://github.com/vmware/open-vm-tools"; + description = "Set of tools for VMWare guests to improve host-guest interaction"; + longDescription = '' + A set of services and modules that enable several features in VMware products for + better management of, and seamless user interactions with, guests. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ joamaki ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 69888e22a01..f04ff311930 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,70 +1,229 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman -, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libseccomp, libaio, libcap_ng, gnutls -, makeWrapper -, pulseSupport ? true, pulseaudio -, sdlSupport ? true, SDL -, vncSupport ? true, libjpeg, libpng -, spiceSupport ? true, spice, spice_protocol, usbredir -, x86Only ? false +{ stdenv, fetchurl, pkgconfig, libtool, python, perl, texinfo, flex, bison +, gettext, makeWrapper, glib, zlib, pixman + +# Optional Arguments +, SDL2 ? null, gtk ? null, gnutls ? null, cyrus_sasl ? null, libjpeg ? null +, libpng ? null, ncurses ? null, curl ? null, libcap ? null, attr ? null +, bluez ? null, libibverbs ? null, librdmacm ? null, libuuid ? null, vde2 ? null +, libaio ? null, libcap_ng ? null, spice ? null, spice_protocol ? null +, libceph ? null, libxfs ? null, nss ? null, nspr ? null, libusb ? null +, usbredir ? null, mesa ? null, lzo ? null, snappy ? null, bzip2 ? null +, libseccomp ? null, glusterfs ? null, libssh2 ? null, numactl ? null + +# Audio libraries +, libpulseaudio ? null, alsaLib ? null + +# Extra options +, type ? "" }: +with stdenv; with stdenv.lib; let - n = "qemu-2.2.1"; - audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," - + optionalString pulseSupport "pa," - + optionalString sdlSupport "sdl,"; + n = "qemu-2.3.0"; + + isKvmOnly = type == "kvm-only"; + isNix = type == "nix"; + + optSDL2 = if isNix then null else shouldUsePkg SDL2; + optGtk = if isNix then null else shouldUsePkg gtk; + optLibcap = if isNix then null else shouldUsePkg libcap; + optAttr = if isNix then null else shouldUsePkg attr; + optGnutls = if isNix then null else shouldUsePkg gnutls; + optCyrus_sasl = if isNix then null else shouldUsePkg cyrus_sasl; + optLibjpeg = if isNix then null else shouldUsePkg libjpeg; + optLibpng = if isNix then null else shouldUsePkg libpng; + optNcurses = if isNix then null else shouldUsePkg ncurses; + optCurl = if isNix then null else shouldUsePkg curl; + optBluez = if isNix then null else shouldUsePkg bluez; + optLibibverbs = if isNix then null else shouldUsePkg libibverbs; + optLibrdmacm = if isNix then null else shouldUsePkg librdmacm; + optLibuuid = if isNix then null else shouldUsePkg libuuid; + optVde2 = if isNix then null else shouldUsePkg vde2; + optLibaio = shouldUsePkg libaio; + optLibcap_ng = if isNix then null else shouldUsePkg libcap_ng; + optSpice = if isNix then null else shouldUsePkg spice; + optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol; + optLibceph = if isNix then null else shouldUsePkg libceph; + optLibxfs = if isNix then null else shouldUsePkg libxfs; + optNss = if isNix then null else shouldUsePkg nss; + optNspr = if isNix then null else shouldUsePkg nspr; + optLibusb = if isNix then null else shouldUsePkg libusb; + optUsbredir = if isNix then null else shouldUsePkg usbredir; + optMesa = if isNix then null else shouldUsePkg mesa; + optLzo = if isNix then null else shouldUsePkg lzo; + optSnappy = if isNix then null else shouldUsePkg snappy; + optBzip2 = if isNix then null else shouldUsePkg bzip2; + optLibseccomp = if isNix then null else shouldUsePkg libseccomp; + optGlusterfs = if isNix then null else shouldUsePkg glusterfs; + optLibssh2 = if isNix then null else shouldUsePkg libssh2; + optNumactl = if isNix then null else shouldUsePkg numactl; + + hasSDLAbi = if optSDL2 != null then true else null; + + hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null; + + hasVnc = !isNix; + hasVncTls = hasVnc && optGnutls != null; + hasVncSasl = hasVnc && optCyrus_sasl != null; + hasVncJpeg = hasVnc && optLibjpeg != null; + hasVncPng = hasVnc && optLibpng != null; + hasVncWs = hasVnc && optGnutls != null; + + hasFdt = !isNix; + + hasRdma = optLibibverbs != null && optLibrdmacm != null; + + hasLinuxAio = stdenv.isLinux && optLibaio != null; + + hasSpice = optSpice != null && optSpice_protocol != null; + + hasNss = optNss != null && optNspr != null; + + optLibpulseaudio = if isNix then null else shouldUsePkg libpulseaudio; + optAlsaLib = if isNix then null else shouldUsePkg alsaLib; + audio = concatStringsSep "," ( + optional (optSDL2 != null) "sdl" + ++ optional (optLibpulseaudio != null) "pa" + ++ optional (optAlsaLib != null) "alsa" + ); + + systemBinary = if stdenv.system == "x86_64-linux" then "x86_64" + else if stdenv.system == "i686-linux" then "i386" + else null; + + targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu" + else if stdenv.system == "i686-linux" then "i386-softmmu" + else null; + + hasModules = if isNix then null else true; in stdenv.mkDerivation rec { - name = n + (if x86Only then "-x86-only" else ""); + name = "${n}${optionalString (type != null && type != "") "-${type}"}"; src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; + sha256 = "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn"; }; - buildInputs = - [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls - ] - ++ optionals pulseSupport [ pulseaudio ] - ++ optionals sdlSupport [ SDL ] - ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice usbredir ] - ++ optionals (hasSuffix "linux" stdenv.system) [ alsaLib libaio ]; + nativeBuildInputs = [ pkgconfig libtool perl texinfo flex bison gettext makeWrapper ]; + + buildInputs = [ + python glib zlib pixman optSDL2 optGtk optNcurses optCurl optBluez optVde2 + optLibcap_ng optAttr optLibuuid optLibceph optLibxfs optLibusb optUsbredir + optMesa optLzo optSnappy optBzip2 optLibseccomp optGlusterfs optLibssh2 + optNumactl optLibpulseaudio optAlsaLib + ] ++ optionals (hasVncTls || hasVncWs) [ + optGnutls + ] ++ optionals hasVncSasl [ + optCyrus_sasl + ] ++ optionals hasVncJpeg [ + optLibjpeg + ] ++ optionals hasVncPng [ + optLibpng + ] ++ optionals hasVirtfs [ + optLibcap + ] ++ optionals hasRdma [ + optLibibverbs optLibrdmacm + ] ++ optionals hasLinuxAio [ + optLibaio + ] ++ optionals hasSpice [ + optSpice optSpice_protocol + ] ++ optionals hasNss [ + optNss optNspr + ]; enableParallelBuilding = true; - patches = [ ./no-etc-install.patch ]; + configureFlags = [ + (mkOther "smbd" "smbd") + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable hasModules "modules" null) + (mkEnable false "debug-tcg" null) + (mkEnable false "debug-info" null) + (mkEnable false "sparse" null) + (mkEnable false "werror" null) + (mkEnable (optSDL2 != null) "sdl" null) + (mkWith hasSDLAbi "sdlabi" "2.0") + (mkEnable (optGtk != null) "gtk" null) + (mkEnable hasVirtfs "virtfs" null) + (mkEnable hasVnc "vnc" null) + (mkEnable stdenv.isDarwin "cocoa" null) + (mkOther "audio-drv-list" audio) + (mkEnable false "xen" null) + (mkEnable false "xen-pci-passthrough" null) + (mkEnable false "brlapi" null) + (mkEnable hasVncTls "vnc-tls" null) + (mkEnable hasVncSasl "vnc-sasl" null) + (mkEnable hasVncJpeg "vnc-jpeg" null) + (mkEnable hasVncPng "vnc-png" null) + (mkEnable hasVncWs "vnc-ws" null) + (mkEnable (optNcurses != null) "curses" null) + (mkEnable (optCurl != null) "curl" null) + (mkEnable hasFdt "fdt" null) + (mkEnable (optBluez != null) "bluez" null) + (mkEnable stdenv.isLinux "kvm" null) + (mkEnable hasRdma "rdma" null) + (mkEnable (!isNix) "system" null) + (mkEnable (!isKvmOnly) "user" null) + (mkEnable (!isKvmOnly) "guest-base" null) + (mkEnable (!isNix) "pie" null) + (mkEnable (optLibuuid != null) "uuid" null) + (mkEnable (optVde2 != null) "vde" null) + (mkEnable false "netmap" null) # TODO(wkennington): Add Support + (mkEnable hasLinuxAio "linux-aio" null) + (mkEnable (optLibcap_ng != null) "cap-ng" null) + (mkEnable (optAttr != null) "attr" null) + (mkEnable (!isNix) "docs" null) + (mkEnable stdenv.isLinux "vhost-net" null) + (mkEnable hasSpice "spice" null) + (mkEnable (optLibceph != null) "rbd" null) + (mkEnable false "libiscsi" null) # TODO(wkennington): Add support + (mkEnable false "libnfs" null) # TODO(wkennington): Add support + (mkEnable (optLibxfs != null) "xfsctl" null) + (mkEnable hasNss "smartcard-nss" null) + (mkEnable (optLibusb != null) "libusb" null) + (mkEnable (optUsbredir != null) "usb-redir" null) + (mkEnable (optMesa != null) "opengl" null) + (mkEnable (optLzo != null) "lzo" null) + (mkEnable (optSnappy != null) "snappy" null) + (mkEnable (optBzip2 != null) "bzip2" null) + (mkEnable true "guest-agent" null) + (mkEnable (optLibseccomp != null) "seccomp" null) + (mkEnable (optGlusterfs != null) "glusterfs" null) + (mkEnable false "archipelago" null) + (mkEnable true "tpm" null) + (mkEnable (optLibssh2 != null) "libssh2" null) + (mkEnable (optLibuuid != null) "vhdx" null) + (mkEnable (optGnutls != null) "quorum" null) + (mkEnable (optNumactl != null) "numa" null) + ] ++ optionals isKvmOnly [ + (mkOther "target-list" targetList) + ] ++ optionals isNix [ + "--static" + ]; - configureFlags = - [ "--enable-seccomp" - "--smbd=smbd" # use `smbd' from $PATH - "--audio-drv-list=${audio}" - "--sysconfdir=/etc" - "--localstatedir=/var" - ] - ++ optional spiceSupport "--enable-spice" - ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" - ++ optional (hasSuffix "linux" stdenv.system) "--enable-linux-aio"; + installFlags = [ + "sysconfdir=\${out}/etc" + "qemu_confdir=\${out}/etc/qemu" + "qemu_localstatedir=\${TMPDIR}" + ]; - postInstall = - '' - # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. - p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" - if [ -e "$p" ]; then - makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" - fi - ''; + postInstall = optionalString (systemBinary != null) '' + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. + p="$out/bin/qemu-system-${systemBinary}" + if [ -e "$p" ]; then + makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" + fi + ''; meta = with stdenv.lib; { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric shlevy eelco ]; - platforms = platforms.linux; + maintainers = with maintainers; [ viric shlevy eelco wkennington ]; + platforms = if isKvmOnly then platforms.linux else platforms.all; }; } diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index a257ef27e9f..14adddf8d1b 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VirtualBox client with remote management"; homepage = http://remotebox.knobgoblin.org.uk/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; longDescription = '' VirtualBox is traditionally considered to be a virtualization solution aimed at the desktop. While it is certainly possible to install diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 842985dce5b..31a14830034 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -5,7 +5,7 @@ , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null -, pulseSupport ? false, pulseaudio ? null +, pulseSupport ? false, libpulseaudio ? null , enableHardening ? false }: @@ -14,7 +14,7 @@ with stdenv.lib; let buildType = "release"; - version = "4.3.26"; # changes ./guest-additions as well + version = "4.3.28"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -35,13 +35,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "98988"; + extpackRevision = "100309"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS - sha256 = "4e39a6d0da23799a31c3f6a4022b144ef3ddfe30c523e51b21bf7d9ebade62ce"; + sha256 = "72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -60,7 +60,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961"; + sha256 = "e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31"; }; buildInputs = @@ -69,7 +69,7 @@ in stdenv.mkDerivation { pkgconfig which libXmu nukeReferences ] ++ optional javaBindings jdk ++ optional pythonBindings python - ++ optional pulseSupport pulseaudio; + ++ optional pulseSupport libpulseaudio; prePatch = '' set -x diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index e63f69ca230..0d856063522 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670"; + sha256 = "9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index 3df41228ae5..37d2ad3a515 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -100,19 +100,6 @@ index 95dc9a7..39170bc 100644 size_t cchBufLeft = strlen(szPath); szPath[cchBufLeft++] = RTPATH_DELIMITER; szPath[cchBufLeft] = 0; -diff --git a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -index 090018e..7dcfc7a 100644 ---- a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -+++ b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -@@ -75,7 +75,7 @@ int NATNetworkServiceRunner::start() - - /* get the path to the executable */ - char exePathBuf[RTPATH_MAX]; -- const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX); -+ const char *exePath = RTProcGetSuidPath(exePathBuf, RTPATH_MAX); - char *substrSl = strrchr(exePathBuf, '/'); - char *substrBs = strrchr(exePathBuf, '\\'); - char *suffix = substrSl ? substrSl : substrBs; diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp index e9e1ba62..4d1c1e1 100644 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 3541743057c..c57a89193b5 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; homepage = http://awesome.naquadah.org/; - license = "GPLv2+"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 2dec3b2241f..4e6c9c9a83e 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { export makeFlags="PREFIX=$out" ''; - meta = { + meta = with stdenv.lib; { homepage = http://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; - license="MIT"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.mit; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 3613bb21ff6..1e6b53446aa 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ]; - meta = { + meta = with stdenv.lib; { homepage = http://vwm.sourceforge.net/; description = "Dynamic window manager for the console"; - license="GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index a44c54f7b57..e8ecc72a6d3 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -30,6 +30,6 @@ args: with args; stdenv.mkDerivation { "; meta = { homepage = "www.suckless.org"; description = "a really cool window manager which can by driven by keyboard only"; - license="MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix index dd49cf5ec43..568be30f1c5 100644 --- a/pkgs/applications/window-managers/wmii31/default.nix +++ b/pkgs/applications/window-managers/wmii31/default.nix @@ -30,6 +30,6 @@ args: with args; stdenv.mkDerivation { "; meta = { homepage = "www.suckless.org"; description = "One small tool of the wmii window manger to let the user select an item from a list by filtering"; - license="MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/window-managers/xcompmgr/default.nix b/pkgs/applications/window-managers/xcompmgr/default.nix deleted file mode 100644 index 930b612f691..00000000000 --- a/pkgs/applications/window-managers/xcompmgr/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libXcomposite, libXfixes, libXdamage -, libXrender, libXext }: -stdenv.mkDerivation rec { - name = "xcompmgr-1.1.6"; - src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; - sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02"; - }; - buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ]; - meta = { - homepage = http://www.x.org/; - description = "A sample compositing manager for X servers"; - longDescription = '' - A sample compositing manager for X servers supporting the XFIXES, - DAMAGE, RENDER, and COMPOSITE extensions. It enables basic eye-candy - effects. - ''; - license = "bsd"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index cb6059e00cd..69c4897d1a4 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -21,24 +21,34 @@ in sourceDirectories = filter (y: !(y == null)) x.sourceDirectories; propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; - extraBuildFlags = filter (y : ! (y == null)) x.extraBuildFlags; everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; + + passthru = { inherit (x) extras; }; + extras = null; }; defaults = self : { # There is no Hackage for Agda so we require src. inherit (self) src name; + isAgdaPackage = true; + buildInputs = [ Agda ] ++ self.buildDepends; buildDepends = []; + + buildDependsAgda = filter + (dep: dep ? isAgdaPackage && dep.isAgdaPackage) + self.buildDepends; + buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; + # Not much choice here ;) LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; everythingFile = "Everything.agda"; - propagatedBuildInputs = self.buildDepends ++ self.buildTools; - propagatedUserEnvPkgs = self.buildDepends; + propagatedBuildInputs = self.buildDependsAgda; + propagatedUserEnvPkgs = self.buildDependsAgda; # Immediate source directories under which modules can be found. sourceDirectories = [ ]; @@ -50,43 +60,44 @@ in # would make a direct copy of the whole thing. topSourceDirectories = [ "src" ]; - buildTools = []; + # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" + includeDirs = self.buildDependsAgdaShareAgda + ++ self.sourceDirectories ++ self.topSourceDirectories + ++ [ "." ]; + buildFlags = unwords (map (x: "-i " + x) self.includeDirs); - # Extra stuff to pass to the Agda binary. - extraBuildFlags = [ "-i ." ]; - buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends; - d = map (x : "-i " + x) (self.sourceDirectories ++ self.topSourceDirectories); - in unwords (r ++ d ++ self.extraBuildFlags); - - # We expose this as a mere convenience for any tools. - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends; - - # Makes a wrapper available to the user. Very useful in - # nix-shell where all dependencies are -i'd. - agdaWrapper = writeScriptBin "agda" '' - ${Agda}/bin/agda ${self.buildFlags} "$@" - ''; - - # configurePhase is idempotent - configurePhase = '' - eval "$preConfigure" - export AGDA_PACKAGE_PATH=${self.AGDA_PACKAGE_PATH}; - export PATH="${self.agdaWrapper}/bin:$PATH" - eval "$postConfigure" - ''; + agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}"; buildPhase = '' - eval "$preBuild" - ${Agda}/bin/agda ${self.buildFlags} ${self.everythingFile} - eval "$postBuild" + runHook preBuild + ${self.agdaWithArgs} ${self.everythingFile} + runHook postBuild ''; installPhase = '' - eval "$preInstall" + runHook preInstall mkdir -p $out/share/agda cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda - eval "$postInstall" + runHook postInstall ''; + + # Optionally-built conveniences + extras = { + # Makes a wrapper available to the user. Very useful in + # nix-shell where all dependencies are -i'd. + agdaWrapper = writeScriptBin "agda" '' + ${self.agdaWithArgs} "$@" + ''; + + # Use this to stick `agdaWrapper` at the front of the PATH: + # + # agda.mkDerivation (self: { PATH = self.extras.agdaWrapperPATH; }) + # + # Not sure this is the best way to handle conflicts.... + agdaWrapperPATH = "${self.extras.agdaWrapper}/bin:$PATH"; + + AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; + }; }; in stdenv.mkDerivation (postprocess (let super = defaults self // args self; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8f930eb4dc4..ec024c72481 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -9,6 +9,7 @@ , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [] , dyld ? null # TODO: should this be a setup-hook on dyld? +, isGNU ? false, isClang ? false }: with stdenv.lib; @@ -40,7 +41,7 @@ stdenv.mkDerivation { # The wrapper scripts use 'cat', so we may need coreutils. coreutils = if nativeTools then null else coreutils; - passthru = { inherit nativeTools nativeLibc nativePrefix; }; + passthru = { inherit nativeTools nativeLibc nativePrefix isGNU isClang; }; buildCommand = '' diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 678ba450211..4020a1aca33 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -66,6 +66,12 @@ stdenv.mkDerivation { makeWrapper "$prog" $out/bin/$(basename "$prog") \ --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:" done + + mkdir -p $out/share + # Link icons and desktop files into place + for dir in applications icons info man; do + ln -s $emacs/share/$dir $out/share/$dir + done ''; inherit (emacs) meta; } diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index e5ad7200cec..7259fa8ff4c 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { inherit url rev leaveDotGit fetchSubmodules deepClone branchName; - GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; + GIT_SSL_CAINFO = "${cacert}/ca-bundle.crt"; impureEnvVars = [ # We borrow these environment variables from the caller to allow diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 0d7534e6758..b1dc6e7be31 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -76,6 +76,9 @@ in , # If set, don't download the file, but write a list of all possible # URLs (resulting from resolving mirror:// URLs) to $out. showURLs ? false + +, # Meta information, if any. + meta ? {} }: assert builtins.isList urls; @@ -120,4 +123,6 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s # Doing the download on a remote machine just duplicates network # traffic, so don't do that. preferLocalBuild = true; + + inherit meta; } diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix new file mode 100644 index 00000000000..87bfa6cea12 --- /dev/null +++ b/pkgs/build-support/ocaml/default.nix @@ -0,0 +1,36 @@ +{ stdenv, writeText, ocaml, findlib, camlp4 }: + +{ name, version, buildInputs ? [], + createFindlibDestdir ? true, + dontStrip ? true, + minimumSupportedOcamlVersion ? null, + hasSharedObjects ? false, + setupHook ? null, + meta ? {}, ... +}@args: +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + defaultMeta = { + platforms = ocaml.meta.platforms; + }; +in + assert minimumSupportedOcamlVersion != null -> + stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml_version; + +stdenv.mkDerivation (args // { + name = "ocaml-${name}-${version}"; + + buildInputs = [ ocaml findlib camlp4 ] ++ buildInputs; + + setupHook = if setupHook == null && hasSharedObjects + then writeText "setupHook.sh" '' + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/${name}/" + '' + else setupHook; + + inherit ocaml_version; + inherit createFindlibDestdir; + inherit dontStrip; + + meta = defaultMeta // meta; +}) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ddf2fce3cae..cd19782e611 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,5 +1,11 @@ { stdenv, cacert, git, rustc, cargo, rustRegistry }: -{ name, src, depsSha256, buildInputs ? [], cargoUpdateHook ? "", ... } @ args: +{ name, depsSha256 +, src ? null +, srcs ? null +, sourceRoot ? null +, buildInputs ? [] +, cargoUpdateHook ? "" +, ... } @ args: let fetchDeps = import ./fetchcargo.nix { @@ -7,18 +13,10 @@ let }; cargoDeps = fetchDeps { - inherit name src cargoUpdateHook; + inherit name src srcs sourceRoot cargoUpdateHook; sha256 = depsSha256; }; - # The following is the directory name cargo creates when the registry index - # URL is file:///dev/null - # - # It's OK to use /dev/null as the URL because by the time we do this, cargo - # won't attempt to update the registry anymore, so the URL is more or less - # irrelevant - registryIndexDirName = "-ba82b75dd6681d6f"; - in stdenv.mkDerivation (args // { inherit cargoDeps rustRegistry; @@ -34,18 +32,34 @@ in stdenv.mkDerivation (args // { cp -r "$cargoDeps" deps chmod +w deps -R + # It's OK to use /dev/null as the URL because by the time we do this, cargo + # won't attempt to update the registry anymore, so the URL is more or less + # irrelevant + cat < deps/config [registry] index = "file:///dev/null" EOF - echo "Using rust registry from $rustRegistry" - - ln -s "$rustRegistry" "deps/registry/index/${registryIndexDirName}" - export CARGO_HOME="$(realpath deps)" + # Let's find out which $indexHash cargo uses for file:///dev/null + (cd $sourceRoot && cargo fetch &>/dev/null) + cd deps + indexHash="$(basename $(echo registry/index/*))" + + echo "Using indexHash '$indexHash'" + + rm -rf -- "registry/cache/$indexHash" \ + "registry/index/$indexHash" + + mv registry/cache/HASH "registry/cache/$indexHash" + + echo "Using rust registry from $rustRegistry" + ln -s "$rustRegistry" "registry/index/$indexHash" + # Retrieved the Cargo.lock file which we saved during the fetch + cd .. mv deps/Cargo.lock $sourceRoot/ ( diff --git a/pkgs/build-support/rust/fetch-builder.sh b/pkgs/build-support/rust/fetch-builder.sh deleted file mode 100644 index faa17e65328..00000000000 --- a/pkgs/build-support/rust/fetch-builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -# cargo-fetch needs to write to Cargo.lock, even to do nothing. We -# create a fake checkout with symlinks and and editable Cargo.lock. -mkdir copy -cd copy -for f in $(ls $src); do - ln -s $src/"$f" . -done -rm Cargo.lock -cp $src/Cargo.lock . -chmod +w Cargo.lock - -$fetcher . $out - -cd .. -rm -rf copy diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index c7799fb1b1f..69eb404e644 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -104,12 +104,9 @@ substituteInPlace Cargo.lock \ set -u mv Cargo.lock $out/ -# The following is the $indexHash cargo uses for the registry index when -# its URL is file:///dev/null, which is the registry index URL we use to make -# sure our output is deterministic. -registryIndexDirName="-ba82b75dd6681d6f" -mv $out/registry/cache/* $out/registry/cache/$registryIndexDirName +# Let's replace $indexHash with something more deterministic +mv $out/registry/cache/* $out/registry/cache/HASH # The registry index changes all the time, so it's not deterministic # We'll symlink it before running 'cargo build' diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 7ebd02a485d..1f5166d5c43 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,18 +1,22 @@ { stdenv, cacert, git, rustc, cargo, rustRegistry }: -{ name ? "cargo-deps", src, sha256, cargoUpdateHook ? "" }: +{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-fetch"; buildInputs = [ rustc cargo git ]; - builder = ./fetch-builder.sh; - fetcher = ./fetch-cargo-deps; - inherit src rustRegistry cargoUpdateHook; + inherit src srcs sourceRoot rustRegistry cargoUpdateHook; + + phases = "unpackPhase installPhase"; + + installPhase = '' + ${./fetch-cargo-deps} . "$out" + ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - SSL_CERT_FILE = "${cacert}/etc/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/ca-bundle.crt"; impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; preferLocalBuild = true; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 78e671e8d22..7e73f98db78 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -20,13 +20,18 @@ rec { }: runCommand name { inherit text executable; + passAsFile = [ "text" ]; # Pointless to do this on a remote machine. preferLocalBuild = true; } '' n=$out${destination} mkdir -p "$(dirname "$n")" - echo -n "$text" > "$n" + if [ -e "$textPath" ]; then + mv "$textPath" "$n" + else + echo -n "$text" > "$n" + fi (test -n "$executable" && chmod +x "$n") || true ''; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5aa1a9c092d..a9f9f0d184c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -694,7 +694,17 @@ rec { runCommand "${name}.nix" { buildInputs = [ perl dpkg ]; } '' for i in ${toString packagesLists}; do echo "adding $i..." - bunzip2 < $i >> ./Packages + case $i in + *.xz | *.lzma) + xz -d < $i >> ./Packages + ;; + *.bz2) + bunzip2 < $i >> ./Packages + ;; + *.gz) + gzip -dc < $i >> ./Packages + ;; + esac done # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279 @@ -1572,6 +1582,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; + ubuntu1504i386 = { + name = "ubuntu-15.04-vivid-i386"; + fullName = "Ubuntu 15.04 Vivid (i386)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/vivid/main/binary-i386/Packages.bz2; + sha256 = "0bf587152fa3fc3524bf3a3caaf46ea43cc640a27b2b448577232f014a3ec1e4"; + }) + (fetchurl { + url = mirror://ubuntu/dists/vivid/universe/binary-i386/Packages.bz2; + sha256 = "3452cff96eb715ca36b73d4d0cdffbf06064cbc30b1097e334a2e493b94c7fac"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu1504x86_64 = { + name = "ubuntu-15.04-vivid-amd64"; + fullName = "Ubuntu 15.04 Vivid (amd64)"; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/vivid/main/binary-amd64/Packages.bz2; + sha256 = "8f22c9bd389822702e65713e816250aa0d5829d6b3d75fd34f068de5f93de1d9"; + }) + (fetchurl { + url = mirror://ubuntu/dists/vivid/universe/binary-amd64/Packages.bz2; + sha256 = "feb88768e245a63ee04b0f3bcfc8899a1f03b2f831646dc2a59e4e58884b5cb9"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian40i386 = { name = "debian-4.0r9-etch-i386"; fullName = "Debian 4.0r9 Etch (i386)"; @@ -1664,6 +1708,27 @@ rec { packages = commonDebianPackages; }; + debian8i386 = { + name = "debian-8.0-jessie-i386"; + fullName = "Debian 8.0 Jessie (i386)"; + packagesList = fetchurl { + url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; + sha256 = "0lrv1lnd595c346ci7z8ja2b0rm2gx5r4hwp0wbp9lzxi8k5nk1d"; + }; + urlPrefix = mirror://debian; + packages = commonDebianPackages; + }; + + debian8x86_64 = { + name = "debian-8.0-jessie-amd64"; + fullName = "Debian 8.0 Jessie (amd64)"; + packagesList = fetchurl { + url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; + sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4"; + }; + urlPrefix = mirror://debian; + packages = commonDebianPackages; + }; }; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 6b8399a8b3f..515f172b748 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,38 +1,26 @@ { stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive }: stdenv.mkDerivation rec { - version = "20141123"; + version = "0.1.1"; name = "zeal-${version}"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "76405f8387d6a82697faab9630c78f31417d8450"; - sha256 = "1057py3j2flzxyiks031s0mwm9h82v033iqn5cq8sycmrb3ihj2s"; + rev = "v${version}"; + sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii"; }; - buildInputs = [ pkgconfig qt5.base qt5.webkit libarchive ]; + buildInputs = [ pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ]; - patchPhase = '' - substituteInPlace src/main.cpp \ - --replace /usr/share/pixmaps/zeal $out/share/pixmaps/zeal - ''; - - buildPhase = '' - qmake PREFIX=$out - make + configurePhase = '' + qmake PREFIX=/ ''; installPhase = '' make INSTALL_ROOT=$out install ''; - preFixup = '' - mv $out/usr/bin $out/bin - mv $out/usr/share $out/share - rmdir $out/usr - ''; - enableParallelBuilding = true; meta = { @@ -42,7 +30,7 @@ stdenv.mkDerivation rec { app), available for Linux and Windows. ''; homepage = "http://zealdocs.org/"; - license = with stdenv.lib.licenses; [ gpl3 ]; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 2f528a619e7..3ae436179ba 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { longDescription = '' Pre-patched and adjusted fonts for usage with the Powerline plugin. ''; - license = "asl20 free ofl"; + license = with licenses; [ asl20 free ofl ]; platforms = platforms.all; maintainer = with maintainers; [ malyn ]; }; diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index d70fe3ca3f8..390bf9f523a 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; - # In lieu of a licence: + # In lieu of a license: # Fonts in this site are offered free for any use; # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. license = stdenv.lib.licenses.free; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index fa9eb0ac42d..ad5fd1999ed 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { make install fontdir ''; - meta = { + meta = with stdenv.lib; { description = "A clean fixed width font"; longDescription = '' Terminus Font is designed for long (8 and more hours per day) work @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { EGA/VGA-bold for 8x14 and 8x16. ''; homepage = http://www.is-vn.bg/hamster/; - license = [ "GPLv2+" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix new file mode 100644 index 00000000000..63f74bb41b4 --- /dev/null +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, mkfontdir, mkfontscale }: + +stdenv.mkDerivation { + name = "uni-vga"; + + src = fetchurl { + url = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz; + sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6"; + }; + + buildInputs = [ mkfontdir mkfontscale ]; + + installPhase = '' + mkdir -p $out/share/fonts + cp *.bdf $out/share/fonts + cd $out/share/fonts + mkfontdir + mkfontscale + ''; + + meta = { + description = "Unicode VGA font"; + maintainers = [stdenv.lib.maintainers.ftrvxmtrx]; + homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 0a2c43fc581..205d051ddb2 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl }: +{ stdenv, nss, curl-full, perl, perlPackages }: stdenv.mkDerivation rec { - name = "cacert-20140715"; + name = "nss-cacert-${nss.version}"; - src = fetchurl { - url = "http://tarballs.nixos.org/${name}.pem.bz2"; - sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl"; - }; + src = nss.src; - unpackPhase = "true"; + postPatch = '' + unpackFile ${curl-full.src}; + ''; - installPhase = - '' - mkdir -p $out/etc - bunzip2 < $src > $out/etc/ca-bundle.crt - ''; + nativeBuildInputs = [ perl ] ++ (with perlPackages; [ LWP ]); - meta = { + buildPhase = '' + perl curl-*/lib/mk-ca-bundle.pl -d "file://$(pwd)/nss/lib/ckfw/builtins/certdata.txt" ca-bundle.crt + ''; + + installPhase = '' + mkdir -pv $out + cp -v ca-bundle.crt $out + ''; + + meta = with stdenv.lib; { homepage = http://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 7715a0db236..69baf7bda45 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-05-07"; + version = "2015-05-20"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -22,15 +22,15 @@ stdenv.mkDerivation { srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" - "1y5b68s1giw01vw98c99qdhjiaxx6l4hrc2mx4rdaja46zic4maz"; + "09vv3jg6gnz2k30pkwgcakvfvklfrkwsj0xq5q2awcw6ik0vkfcm"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" - "0crl31yc11w4jzgvbr9pgqd7x6ivpsgsip19s1g5xl71qbpmmjxm"; + "1qdprh1idxa1l4s23lcjg33hi4i8qzlk4fjril2zcd3prff1xkz2"; meta = with stdenv.lib; { inherit version; description = "GeoLite Legacy IP geolocation databases"; homepage = https://geolite.maxmind.com/download/geoip; - license = with licenses; cc-by-sa-30; + license = licenses.cc-by-sa-30; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index b2bfb7bd13d..9abe5d6ea8e 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -26,7 +26,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainer = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center.nix b/pkgs/desktops/cinnamon/cinnamon-control-center.nix index bb53ecfd901..97489a7ec08 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify, -gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, pulseaudio, isocodes, kerberos, +gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, libpulseaudio, isocodes, kerberos, libxkbfile}: let @@ -24,7 +24,7 @@ stdenv.mkDerivation { intltool libxslt gtk3 cinnamon-desktop libnotify gnome-menus libxml2 systemd upower cinnamon-settings-daemon colord - polkit ibus libcanberra_gtk3 pulseaudio + polkit ibus libcanberra_gtk3 libpulseaudio isocodes kerberos libxkbfile ]; preBuild = "patchShebangs ./scripts"; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix index ca220fd9d85..550a7acaf62 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3, -libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, pulseaudio, upower, libcanberra_gtk3, colord, +libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, libpulseaudio, upower, libcanberra_gtk3, colord, systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}: let @@ -25,7 +25,7 @@ stdenv.mkDerivation { glib gettext gnome_common intltool gtk3 libnotify lcms2 libgnomekbd libxklavier colord - libcanberra pulseaudio upower + libcanberra libpulseaudio upower libcanberra_gtk3 cinnamon-desktop systemd libxslt docbook_xsl makeWrapper gsettings_desktop_schemas diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 08d7a8c3e73..4d80b633bd3 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_13 python27Packages.dbus e19.elementary ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_14 python27Packages.dbus e19.elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_13}/lib/python2.7/site-packages + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages ''; meta = { description = "A user interface for the connman network connection manager"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/desktops/e19/efl-elua.patch b/pkgs/desktops/e19/efl-elua.patch new file mode 100644 index 00000000000..96c42b3ff3c --- /dev/null +++ b/pkgs/desktops/e19/efl-elua.patch @@ -0,0 +1,14 @@ +--- ./src/scripts/elua/core/util.lua.old 2015-05-17 11:59:57.307743243 +0200 ++++ ./src/scripts/elua/core/util.lua 2015-05-17 12:39:11.906797377 +0200 +@@ -159,7 +159,10 @@ + local ev = os.getenv("ELUA_" .. libname:upper() .. "_LIBRARY_PATH") + local succ, v = load_lib(libname, ev) + if not succ then +- error(v, 2) ++ succ, v = load_lib(libname, "$out/lib") ++ if not succ then ++ error(v, 2) ++ end + end + lib = v + loaded_libs[libname] = lib diff --git a/pkgs/desktops/e19/efl-setup-hook.sh b/pkgs/desktops/e19/efl-setup-hook.sh deleted file mode 100755 index d98f24b4c04..00000000000 --- a/pkgs/desktops/e19/efl-setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addDbusIncludePath () { - if test -d "$1/include/dbus-1.0" - then - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include" - fi -} - -envHooks=(${envHooks[@]} addDbusIncludePath) diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index c8860a5f7da..6fb262ac50a 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.13.2"; + version = "1.14.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "196293zf4pbyd5acs4nzb818yql9r67709ccfj7k3siyws6lsh4q"; + sha256 = "0sb2104b2rayr2ag0n3g8zqds9nxd53mlyvq7650c3cy8hws5a1h"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto - xlibs.libX11 udev utillinuxCurses luajit ]; + gst_all_1.gst-libav libpulseaudio libsndfile xlibs.libXcursor xlibs.printproto + xlibs.libX11 udev utillinuxCurses ]; propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr - xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 + xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm libinput ]; @@ -25,23 +25,31 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" - "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" + "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "ac_ct_CXX=foo" ]; NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; + patches = [ ./efl-elua.patch ]; + preConfigure = '' export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" + export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" + ''; + + postInstall = '' + substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out" + modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done) + substituteInPlace "$out/lib/pkgconfig/efl.pc" --replace 'Cflags: -I''${includedir}/efl-1' \ + 'Cflags: -I''${includedir}/eina-1/eina'"$modules" ''; enableParallelBuilding = true; - setupHook = ./efl-setup-hook.sh; - meta = { description = "Enlightenment Core libraries"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 28ce894bfc7..30d0761c99e 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: +{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.13.2"; + version = "1.14.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0f8hz60aj4ar8lqnc63nlxkpf3b51scjalgy1iphgjc27hzxcb9i"; + sha256 = "03h9sv5c3473wxf7hcimdf80d2phxl81yv0kzngx4g1b6cdwl1ma"; }; - buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 -I${e19.efl}/include/efl-1 $NIX_CFLAGS_COMPILE" - ''; + buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; + patches = [ ./elementary.patch ]; enableParallelBuilding = true; meta = { description = "Widget set/toolkit"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl2; }; diff --git a/pkgs/desktops/e19/elementary.patch b/pkgs/desktops/e19/elementary.patch new file mode 100644 index 00000000000..32080c81cb3 --- /dev/null +++ b/pkgs/desktops/e19/elementary.patch @@ -0,0 +1,18 @@ +--- a/elementary.pc.in 2015-05-16 21:08:14.321148417 +0200 ++++ b/elementary.pc.in 2015-05-16 21:08:30.643412725 +0200 +@@ -14,4 +14,4 @@ + Requires.private: @requirement_elm_pc@ + Version: @VERSION@ + Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@ +-Cflags: -I${includedir}/elementary-@VMAJ@ ++Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@ +--- a/Makefile.am 2015-05-16 21:08:14.322148433 +0200 ++++ b/Makefile.am 2015-05-16 21:08:30.643412725 +0200 +@@ -84,6 +84,7 @@ + -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \ + -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \ + -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \ ++-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \ + < $< > $@ || rm $@ + + pc_verbose = $(pc_verbose_@AM_V@) diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index bffc2e70f59..6aa4089f52f 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl, pkgconfig, e19, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3"; + sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3"; }; buildInputs = [ pkgconfig e19.efl vlc ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - ''; + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ]; meta = { description = "Extra video decoders"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 2cccf3a0dfd..7e770ffe00b 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.4"; + version = "0.19.5"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0r3bad700cfx5sq8y61dbz3hxdx9n3nf5hzx40ryqld75yxzwxz7"; + sha256 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc"; }; buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/elocation-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export USER_SESSION_DIR=$prefix/lib/systemd/user substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "The Compositing Window Manager and Desktop Shell"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index 3ec3d53c69a..a35b4c58321 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.13.2"; + version = "1.14.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "06m8p8k8dpyvzdm690zhdzcr7n0ld12bcgjdssjfl66lil5z2mc4"; + sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { description = "Extra image decoders"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix index 0ccdb3bf3e3..19c99ac17eb 100644 --- a/pkgs/desktops/e19/rage.nix +++ b/pkgs/desktops/e19/rage.nix @@ -2,28 +2,13 @@ , makeWrapper, lib }: stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.1.1"; + version = "0.1.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "0jdhbzmnvl0i2zzmjs1wgvxmnv0lm76k7h5llbb8ai34xh4yp3fi"; + sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"; }; buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig makeWrapper ]; - NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/evas-1" - "-I${e19.efl}/include/ecore-1" - "-I${e19.efl}/include/eina-1" - "-I${e19.efl}/include/eina-1/eina" - "-I${e19.efl}/include/eet-1" - "-I${e19.efl}/include/eo-1" - "-I${e19.efl}/include/ecore-evas-1" - "-I${e19.efl}/include/ecore-imf-1" - "-I${e19.efl}/include/ecore-con-1" - "-I${e19.efl}/include/ecore-file-1" - "-I${e19.efl}/include/ecore-input-1" - "-I${e19.efl}/include/eldbus-1" - "-I${e19.efl}/include/efreet-1" - "-I${e19.efl}/include/ethumb-client-1" - "-I${e19.efl}/include/ethumb-1" ]; GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -39,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Video + Audio player along the lines of mplayer"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix index 96028311f1e..32135bbe2e2 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/e19/terminology.nix @@ -7,17 +7,10 @@ stdenv.mkDerivation rec { sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628"; }; buildInputs = [ pkgconfig e19.efl e19.elementary ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/elocation-1 $NIX_CFLAGS_COMPILE" - ''; meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index dca3b3a16a2..93dfa544ea9 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, pulseaudio }: +, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio }: stdenv.mkDerivation { name = "gnome-settings-daemon-2.32.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit - pulseaudio + libpulseaudio ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix deleted file mode 100644 index c4f6741c070..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist -, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "bijiben-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/bijiben/3.12/${name}.tar.xz"; - sha256 = "f319ef2a5b69ff9368e7488a28453da0f10eaa39a0f8e5d74623d0c07c824708"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig glib intltool itstool libxml2 - clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/bijiben" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Bijiben; - description = "Note editor designed to remain simple to use"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix deleted file mode 100644 index f0356352098..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight, sqlite -, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3 -, makeWrapper, itstool, shared_mime_info, libical, db, gcr -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: - -stdenv.mkDerivation rec { - name = "evolution-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz"; - sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas makeWrapper sqlite ]; - - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ]; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; - description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix deleted file mode 100644 index deff8494866..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "file-roller-${version}"; - - majVersion = "3.12"; - version = "${majVersion}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz"; - sha256 = "0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf"; - }; - - # TODO: support nautilus - # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so - - buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - attr bzip2 acl gdk_pixbuf librsvg makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/file-roller" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/FileRoller; - description = "Archive manager for the GNOME desktop environment"; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix deleted file mode 100644 index c65a28c3446..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gedit-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz"; - sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gedit" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; - description = "Official text editor of the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix deleted file mode 100644 index 4783804f200..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libxml2, docbook_xsl -, gnome3, librsvg, gdk_pixbuf, libxslt }: - -stdenv.mkDerivation rec { - name = "glade-3.16.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz"; - sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python - gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/glade" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Glade; - description = "User interface designer for GTK+ applications"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix deleted file mode 100644 index 7d33933656a..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala -, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio -}: - -# TODO: ovirt (optional) - -stdenv.mkDerivation rec { - name = "gnome-boxes-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/3.12/${name}.tar.xz"; - sha256 = "0kzdh8kk9isaskbfyj7r7nybgdyhj7i4idkgahdsl9xs9sj2pmc8"; - }; - - enableParallelBuilding = true; - - doCheck = true; - - buildInputs = [ - makeWrapper pkgconfig intltool itstool libvirt-glib glib - gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol - libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - librsvg hicolor_icon_theme desktop_file_utils - ]; - - preFixup = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" - done - ''; - - meta = with stdenv.lib; { - description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = https://wiki.gnome.org/action/show/Apps/Boxes; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix deleted file mode 100644 index 47bcbf692ad..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2 }: - -stdenv.mkDerivation rec { - name = "gnome-clocks-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/3.12/${name}.tar.xz"; - sha256 = "3fc0ce2b7b2540d6c2d791ff63ab1670f189a339c804fcf24c9010a478314604"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gnome-clocks" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; - description = "Clock application designed for GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix deleted file mode 100644 index 642e0044a75..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libxslt, webkitgtk -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib -, gmp, desktop_file_utils }: - -stdenv.mkDerivation rec { - name = "gnome-documents-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/3.12/${name}.tar.xz"; - sha256 = "6d0df1d90781d56992ed5d5c2591833e89e3aa756ccab63f82dd935185ce5a53"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.gnome_icon_theme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ]; - in - '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" - - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${libPath}" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Documents; - description = "Document manager application designed to work with GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix deleted file mode 100644 index ebcd4c0d01e..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, python3, libxml2, python3Packages, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: - -stdenv.mkDerivation rec { - name = "gnome-music-3.12.2.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz"; - sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 cairo - gnome3.grilo libxml2 python3Packages.pygobject3 libnotify - python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gnome-music" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Music; - description = "Music player and management application for the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix deleted file mode 100644 index 4d080039a88..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp -, gnome3, librsvg, gdk_pixbuf, libexif }: - -stdenv.mkDerivation rec { - name = "gnome-photos-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-photos/3.12/${name}.tar.xz"; - sha256 = "077cc6c2ae28680457fba435a22184e25f3a60a6fbe1901a75e42f6f6136538f"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication" - - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Photos; - description = "Photos is an application to access, organize and share your photos with GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix deleted file mode 100644 index 5a85e00e4e4..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool -, gobjectIntrospection, makeWrapper }: - -stdenv.mkDerivation rec { - name = "nautilus-sendto-${version}"; - - version = "3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; - sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; - }; - - buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; - - meta = with stdenv.lib; { - description = "Integrates Evolution and Pidgin into the Nautilus file manager"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix deleted file mode 100644 index 6289fd4a6db..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib -, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup -, gdk_pixbuf, librsvg }: - -stdenv.mkDerivation rec { - name = "polari-3.12.2"; - - src = fetchurl { - url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz"; - sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995"; - }; - - buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 - telepathy_glib gnome3.gjs telepathy_logger libsoup - gdk_pixbuf librsvg - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - propagatedUserEnvPkgs = [ telepathy_idle ]; - - preFixup = '' - wrapProgram "$out/bin/polari" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Internet Relay Chat (IRC) client designed for GNOME 3"; - homepage = https://wiki.gnome.org/Apps/Polari; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix deleted file mode 100644 index 152acb26b1b..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base, - glib, gobjectIntrospection, hicolor_icon_theme -}: - -stdenv.mkDerivation rec { - rev = "0.10.3"; - name = "gnome-shell-pomodoro-${rev}-61df3fa"; - - src = fetchFromGitHub { - owner = "codito"; - repo = "gnome-shell-pomodoro"; - rev = "${rev}"; - sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship"; - }; - - configureScript = ''./autogen.sh''; - - buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3_12.gsettings_desktop_schemas gnome3_12.gnome_desktop - gnome3_12.gnome_common gnome3_12.gnome_shell hicolor_icon_theme gtk3 - ]; - - preBuild = '' - sed -i \ - -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \ - -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3_12.gnome_desktop}\1|' \ - vapi/Makefile - ''; - - preFixup = '' - wrapProgram $out/bin/gnome-pomodoro \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS" - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/codito/gnome-shell-pomodoro; - description = - "Personal information management application that provides integrated " + - "mail, calendaring and address book functionality"; - maintainers = with maintainers; [ DamienCassou ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix deleted file mode 100644 index 02365d6b3d5..00000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, vala -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit }: - -stdenv.mkDerivation rec { - name = "seahorse-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/seahorse/3.12/${name}.tar.xz"; - sha256 = "5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg - gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme - libsecret avahi libsoup p11_kit vala gnome3.gcr - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - wrapProgram "$out/bin/seahorse" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Seahorse; - description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix deleted file mode 100644 index 4d6c91787a3..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "baobab-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/baobab/3.12/${name}.tar.xz"; - sha256 = "494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Baobab; - description = "Graphical application to analyse disk usage in any Gnome environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix deleted file mode 100644 index 3a6c3f0dd35..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }: - - -stdenv.mkDerivation rec { - name = "caribou-0.4.13"; - - src = fetchurl { - url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz"; - sha256 = "953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782"; - }; - - buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3 - libxml2 libXtst gtk2 intltool libxslt ]; - - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - - preBuild = '' - patchShebangs . - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix deleted file mode 100644 index a1d98449bee..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "0.20.0"; - - src = fetchurl { - url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz"; - sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9"; - }; - - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - rm $out/lib/gio/modules/giomodule.cache - rm $out/share/icons/hicolor/icon-theme.cache - rm $out/share/icons/HighContrast/icon-theme.cache - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix deleted file mode 100644 index a10450d9332..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, pulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info -, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: - -# TODO: enable more features - -stdenv.mkDerivation rec { - name = "empathy-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz"; - sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome_online_accounts shared_mime_info ]; - propagatedBuildInputs = [ folks telepathy_logger evolution_data_server - telepathy_mission_control ]; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper - telepathy_glib clutter_gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas file libtool librsvg ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" - "-I${dbus_libs}/include/dbus-1.0" - "-I${dbus_libs}/lib/dbus-1.0/include" ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Empathy; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = with maintainers; [ lethalman ]; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix deleted file mode 100644 index de30f0dbbe1..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, makeWrapper, librsvg, libexif }: - - -stdenv.mkDerivation rec { - name = "eog-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/eog/3.12/${name}.tar.xz"; - sha256 = "0ca8be7f20c98e9b104b2c1fa53df293e5403e6d517de845ae0f3b72777453fd"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg - gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ]; - - preFixup = '' - wrapProgram "$out/bin/eog" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; - platforms = platforms.linux; - description = "GNOME image viewer"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix deleted file mode 100644 index d159965c544..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }: - -stdenv.mkDerivation rec { - name = "epiphany-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz"; - sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93"; - }; - - # Tests need an X display - configureFlags = [ "--disable-static --disable-tests" ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig file ]; - - configureScript = "./autogen.sh"; - - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file - webkitgtk libsoup libsecret gnome_desktop libnotify libtool - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - patches = [ ./libxml_missing_dep.patch ]; - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Epiphany; - description = "WebKit based web browser for GNOME"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch deleted file mode 100644 index c4dc85cd97e..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2014-05-19 13:28:28.493988695 +0200 -+++ configure.ac 2014-05-19 13:28:54.837159748 +0200 -@@ -115,6 +115,7 @@ - - PKG_CHECK_MODULES(WEB_EXTENSION, [ - $WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED -+ libxml-2.0 >= $LIBXML_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - ]) - AC_SUBST(WEB_EXTENSION_CFLAGS) diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix deleted file mode 100644 index d1ad071d426..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper -, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number -, gobjectIntrospection -}: - -stdenv.mkDerivation rec { - name = "evince-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz"; - sha256 = "30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d"; - }; - - buildInputs = [ - pkgconfig intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - makeWrapper libsecret librsvg - ]; - - configureFlags = [ - "--disable-nautilus" # Do not use nautilus - "--enable-introspection" - ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - - preFixup = '' - # Tell Glib/GIO about the MIME info directory, which is used - # by `g_file_info_get_content_type ()'. - wrapProgram "$out/bin/evince" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - doCheck = false; # would need pythonPackages.dogTail, which is missing - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/projects/evince/; - description = "GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix deleted file mode 100644 index a92cf684a76..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python, sqlite -, intltool, libsoup, libxml2, libsecret, icu -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: - - -stdenv.mkDerivation rec { - name = "evolution-data-server-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz"; - sha256 = "d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811"; - }; - - buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret - gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper icu sqlite ] - ++ stdenv.lib.optional valaSupport vala; - - # uoa irrelevant for now - configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"] - ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; - - preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix deleted file mode 100644 index 7e3af8405a4..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: - -# TODO: enable more folks backends - -stdenv.mkDerivation rec { - name = "folks-0.9.8"; - - src = fetchurl { - url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz"; - sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj"; - }; - - propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; - # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala libsecret libxml2 libsoup nspr nss intltool db ]; - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = "--disable-fatal-warnings"; - - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" - "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; - - enableParallelBuilding = true; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Folks"; - - homepage = https://wiki.gnome.org/Projects/Folks; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix deleted file mode 100644 index a4cb3e8c146..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, withGtk ? false }: - -assert withGtk -> (gnome3 != null); - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "6"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; - }; - - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix deleted file mode 100644 index 6dd69a64fd7..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper, libxslt, vala }: - -stdenv.mkDerivation rec { - name = "gcr-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gcr/3.12/${name}.tar.xz"; - sha256 = "456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c"; - }; - - buildInputs = [ - pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala - ]; - - #doCheck = true; - - preFixup = '' - wrapProgram "$out/bin/gcr-viewer" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix deleted file mode 100644 index a939a8d4fd9..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus -, intltool, accountsservice, libX11, gnome3, systemd, gnome_session -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gdm-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/3.12/${name}.tar.xz"; - sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4"; - }; - - # Only needed to make it build - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" - ''; - - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool - accountsservice gnome3.dconf systemd - gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool ]; - - #enableParallelBuilding = true; # problems compiling - - preBuild = '' - substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' - substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch' - ''; - - patches = [ ./xserver_path.patch ./sessions_dir.patch ./propagate_env.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GDM; - description = "A program that manages graphical display servers and handles graphical user logins"; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch deleted file mode 100644 index b3e356a65c3..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/daemon/gdm-launch-environment.c 2014-11-24 15:43:55.532879804 +0100 -+++ a/daemon/gdm-launch-environment.c 2014-11-28 18:22:42.636313967 +0100 -@@ -220,8 +220,8 @@ - "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME", - "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", - "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", -- "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", -- NULL -+ "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH", -+ "XDG_CONFIG_DIRS", NULL - }; - char *system_data_dirs; - int i; diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch deleted file mode 100644 index b8fbad4d731..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index f759d2d..d154716 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -373,9 +373,12 @@ get_system_session_dirs (void) - #ifdef ENABLE_WAYLAND_SUPPORT - DATADIR "/wayland-sessions/", - #endif -+ NULL, - NULL - }; - -+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; -+ - return search_dirs; - } - diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch deleted file mode 100644 index 412daee9f27..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 -+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 -@@ -322,7 +322,11 @@ - fallback: - #endif - -- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); -+ } else { -+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ } - } - - static gboolean diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix deleted file mode 100644 index 6a461e3bde6..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: - - -stdenv.mkDerivation rec { - name = "geocode-glib-3.12.2"; - - - src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/3.12/${name}.tar.xz"; - sha256 = "5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix deleted file mode 100644 index c1e5486d3a7..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }: - - -stdenv.mkDerivation rec { - name = "gjs-1.40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gjs/1.40/${name}.tar.xz"; - sha256 = "2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793"; - }; - - buildInputs = with gnome3; - [ gobjectIntrospection pkgconfig glib pango ]; - - propagatedBuildInputs = [ spidermonkey_24 ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix deleted file mode 100644 index 46db008787f..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-backgrounds-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz"; - sha256 = "ac4d3e0fffc5991865ca748e728a1ab87f167400105250ce2195b03502427180"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix deleted file mode 100644 index fae47476898..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib -, udev, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-bluetooth-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz"; - sha256 = "0rsw27yj6887axk7s2vwpsr0pmic0wdskl7sx8rk4kns7b0ifs88"; - }; - - buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 - gsettings_desktop_schemas itstool ]; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix deleted file mode 100644 index 19d0c9c10e8..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-calculator-3.12.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz"; - sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxml2 gnome3.gtksourceview - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-calculator" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Calculator; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix deleted file mode 100644 index b534d6922b7..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, which, autoconf, automake }: - -stdenv.mkDerivation rec { - name = "gnome-common-3.12.0"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gnome-common/3.12/${name}.tar.xz"; - sha256 = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8"; - }; - - patches = [(fetchurl { - url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; - sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; - })]; - - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch deleted file mode 100644 index 926762defbd..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2014-04-08 10:25:49.497620879 +0200 -+++ configure.ac 2014-04-08 10:26:36.639440950 +0200 -@@ -43,6 +43,7 @@ - folks-telepathy - folks-eds - libnotify -+ dbus-glib-1 - telepathy-glib >= 0.17.5 - libebook-1.2 >= 3.5.3 - libedataserver-1.2 >= 3.5.3 diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix deleted file mode 100644 index 5b4ca5c3418..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret -, bash, makeWrapper, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake114x, autoconf }: - -stdenv.mkDerivation rec { - name = "gnome-contacts-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/3.12/${name}.tar.xz"; - sha256 = "fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; - - # force build from vala - preBuild = '' - touch src/*.vala - ''; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - vala automake114x autoconf db ]; - - preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - patches = [ ./configure_dbus_glib.patch ]; - - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix deleted file mode 100644 index 4a394b3b897..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig -, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, krb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }: - -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, smbclient, printers - -stdenv.mkDerivation rec { - name = "gnome-control-center-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/3.12/${name}.tar.xz"; - sha256 = "5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - - enableParallelBuilding = true; - - buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino - networkmanager modemmanager makeWrapper ]; - - preBuild = '' - substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - - # hack to make test-endianess happy - mkdir -p $out/share/locale - substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" - ''; - - preFixup = with gnome3; '' - wrapProgram $out/bin/gnome-control-center \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - for i in $out/share/applications/*; do - substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" - done - ''; - - patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ]; - - meta = with stdenv.lib; { - description = "Single sign-on framework for GNOME"; - maintainers = with maintainers; [ lethalman ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch deleted file mode 100644 index 7f5ad970f34..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c -index d08e230..3bff4ad 100644 ---- a/panels/search/cc-search-panel.c -+++ b/panels/search/cc-search-panel.c -@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self) - { - GFile *providers_location; - -- providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers"); -+ const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR"); -+ if (search_providers_dir == NULL) { -+ search_providers_dir = DATADIR "/gnome-shell/search-providers"; -+ } -+ providers_location = g_file_new_for_path (search_providers_dir); - g_file_enumerate_children_async (providers_location, - "standard::type,standard::name,standard::content-type", - G_FILE_QUERY_INFO_NONE, diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch deleted file mode 100644 index e25105a303f..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c -index 7dc23c2..fcb1384 100644 ---- a/panels/network/connection-editor/vpn-helpers.c -+++ b/panels/network/connection-editor/vpn-helpers.c -@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) - if (!so_path) - goto next; - -- /* Remove any path and extension components, then reconstruct path -- * to the SO in LIBDIR -- */ -- so_name = g_path_get_basename (so_path); -- g_free (so_path); -- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); -- g_free (so_name); -- - module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if (!module) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix deleted file mode 100644 index e8d4efc1c80..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, gobjectIntrospection }: - -stdenv.mkDerivation rec { - - majorVersion = "3.12"; - minorVersion = "2"; - name = "gnome-desktop-${majorVersion}.${minorVersion}"; - - # this should probably be setuphook for glib - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; - sha256 = "b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d"; - }; - - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix deleted file mode 100644 index 6f68916b781..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gnome-dictionary-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz"; - sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-dictionary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Dictionary; - description = "Dictionary is the GNOME application to look up definitions"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix deleted file mode 100644 index a68624ba0e1..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: - -stdenv.mkDerivation rec { - name = "gnome-disk-utility-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz"; - sha256 = "5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxslt libtool libsecret libpwquality cracklib - libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.gnome_icon_theme - librsvg udisks2 gnome3.gnome_settings_daemon - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-disks" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Disks; - description = "A udisks graphical front-end"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix deleted file mode 100644 index a74c5722ba2..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-font-viewer-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/3.12/${name}.tar.xz"; - sha256 = "fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix deleted file mode 100644 index 066951c63a6..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-symbolic-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/${name}.tar.xz"; - sha256 = "851a4c9d8e8cb0000c9e5e78259ab8b8e67c5334e4250ebcc8dfdaa33520068b"; - }; - - configureFlags = "--enable-icon-mapping"; - - # Avoid postinstall make hooks - installPhase = '' - make install-exec-am install-data-local install-pkgconfigDATA - make -C src install - ''; - - buildInputs = [ pkgconfig iconnamingutils gtk ]; - - propagatedBuildInputs = [ gnome3.gnome_icon_theme ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_icon_theme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix deleted file mode 100644 index 34a3b67af7e..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz"; - sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a"; - }; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; - - propagatedBuildInputs = [ hicolor_icon_theme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix deleted file mode 100644 index 59667fe3323..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper -, docbook_xsl_ns, docbook_xsl, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-keyring-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/3.12/${name}.tar.xz"; - sha256 = "3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c"; - }; - - buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit makeWrapper - ]; - - propagatedBuildInputs = [ glib libtasn1 libxslt ]; - - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; - - configureFlags = [ - "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" - ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix deleted file mode 100644 index 37d2ea1c086..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gnome-menus-${version}"; - version = "3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; - sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - preBuild = "patchShebangs ./scripts"; - - buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; - - meta = { - homepage = "http://www.gnome.org"; - description = "Gnome menu specification"; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix deleted file mode 100644 index e113a854a8b..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib -, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl -}: - -stdenv.mkDerivation rec { - name = "gnome-online-accounts-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/3.12/${name}.tar.xz"; - sha256 = "cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec"; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix deleted file mode 100644 index 394a3ee447c..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "gnome-online-miners-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/3.12/${name}.tar.xz"; - sha256 = "734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/libexec/*; do - wrapProgram "$f" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; - description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix deleted file mode 100644 index 349df0b103c..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-screenshot-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz"; - sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; - description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix deleted file mode 100644 index bebd0b4b77c..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg }: - - -stdenv.mkDerivation rec { - name = "gnome-session-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-session/3.12/${name}.tar.xz"; - sha256 = "fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3"; - }; - - configureFlags = "--enable-systemd"; - - buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-session" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix deleted file mode 100644 index 81b49e6bc64..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit -, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: - -stdenv.mkDerivation rec { - name = "gnome-settings-daemon-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/3.12/${name}.tar.xz"; - sha256 = "e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f"; - }; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas - libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; - - preFixup = '' - wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PATH : "${glib}/bin" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix deleted file mode 100644 index 8503af44613..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, file }: - -stdenv.mkDerivation rec { - name = "gnome-shell-extensions-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/3.12/${name}.tar.xz"; - sha256 = "30ba6e4792062e5a5cdd18e4a12230e68bfed1ded7de433ad241dd75e7ae2fc6"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool - makeWrapper file ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; - description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix deleted file mode 100644 index 578081ccf89..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, hicolor_icon_theme, sqlite -, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: - -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup - -stdenv.mkDerivation rec { - name = "gnome-shell-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/3.12/${name}.tar.xz"; - sha256 = "3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71"; - }; - - buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server - libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center - hicolor_icon_theme gnome_icon_theme gnome_icon_theme_symbolic sqlite - at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; - - installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; - - preBuild = '' - patchShebangs src/data-to-c.pl - substituteInPlace data/Makefile --replace " install-keysDATA" "" - ''; - - preFixup = with gnome3; '' - wrapProgram "$out/bin/gnome-shell" \ - --prefix PATH : "${unzip}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix deleted file mode 100644 index 9abeda53744..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; - sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-log" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; - description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix deleted file mode 100644 index 622df1c5db2..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: - -stdenv.mkDerivation rec { - name = "gnome-system-monitor-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz"; - sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; - description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix deleted file mode 100644 index 057ef191a6f..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, libuuid -, desktop_file_utils, itstool, makeWrapper, appdata-tools }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "2"; - - name = "gnome-terminal-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; - sha256 = "ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd"; - }; - - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool makeWrapper gnome3.nautilus ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; - - # FIXME: enable for gnome3 - configureFlags = [ "--disable-search-provider" "--disable-migration" ]; - - preFixup = '' - for f in "$out/libexec/gnome-terminal-server"; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix deleted file mode 100644 index 5128a195141..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-themes-standard-3.12.0"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-themes-standard/3.12/${name}.tar.xz"; - sha256 = "a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217"; - }; - - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix deleted file mode 100644 index 2a237b15c21..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-user-docs-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz"; - sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd"; - }; - - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-help/3.12; - description = "User and system administration help for the Gnome desktop"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.cc-by-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix deleted file mode 100644 index fde47a66340..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - name = "gnome-user-share-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz"; - sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf - ''; - - configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2}/modules" - "--disable-bluetooth" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - nautilus libnotify libcanberra_gtk3 ]; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas - ''; - - preFixup = '' - wrapProgram "$out/libexec/gnome-user-share" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-user-share/3.8; - description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix deleted file mode 100644 index 9076d5c5839..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, itstool }: - -stdenv.mkDerivation rec { - name = "grilo-plugins-0.2.13"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; - sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55"; - }; - - installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; - - buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker intltool itstool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "A collection of plugins for the Grilo framework"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix deleted file mode 100644 index 9c0e3f9a0bc..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib -, libxml2, gnome3, gobjectIntrospection, libsoup }: - -stdenv.mkDerivation rec { - name = "grilo-0.2.11"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; - sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6"; - }; - - configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; - - preConfigure = '' - for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do - substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" - substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" - done - ''; - - buildInputs = [ pkgconfig file intltool glib libxml2 libsoup - gnome3.totem-pl-parser gobjectIntrospection ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index 917bcd99c95..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection - # just for passthru -, gtk3, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "2"; - moduleName = "gsettings-desktop-schemas"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1"; - }; - - buildInputs = [ glib gobjectIntrospection ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix deleted file mode 100644 index 5779b6d0480..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext }: - -stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; - version = "3.12.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz"; - sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk"; - }; - - propagatedBuildInputs = [ gtk3 ]; - - buildInputs = [ pkgconfig atk cairo glib pango - libxml2Python perl intltool gettext ]; - - preBuild = '' - substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" - ''; - - patches = [ ./nix_share_path.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch deleted file mode 100644 index c87350167c2..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200 -+++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200 -@@ -68,6 +68,8 @@ - basename, - NULL)); - -+ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL)); -+ - g_ptr_array_add (dirs, NULL); - - return (gchar**) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix deleted file mode 100644 index 590f8706fff..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash -, makeWrapper, gnome3, file, itstool, libxml2 }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic - -stdenv.mkDerivation rec { - name = "gucharmap-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gucharmap/3.12/${name}.tar.xz"; - sha256 = "5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 intltool itstool glib - gnome3.yelp_tools libxml2 file desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gucharmap; - description = "GNOME Character Map, based on the Unicode Character Database"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix deleted file mode 100644 index 1875c1491f9..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.8"; - - src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; - }; - - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - buildInputs = [ pkgconfig libxml2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix deleted file mode 100644 index 9a1a45e0d1a..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: - -stdenv.mkDerivation rec { - name = "libgdata-0.14.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz"; - sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; - - buildInputs = with gnome3; - [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl ]; - - meta = with stdenv.lib; { - description = "GData API library"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix deleted file mode 100644 index b21c274ce51..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: -let - ver_maj = "0.14"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd"; - }; - - doCheck = true; - - patches = [ ./fix_introspection_paths.patch ]; - - buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f45164..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 -+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 -@@ -12085,8 +12085,8 @@ - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" -+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix deleted file mode 100644 index c6c9323c010..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "libgnome-keyring-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; - sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; - }; - - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - description = "Framework for managing passwords and other secrets"; - homepage = http://live.gnome.org/GnomeKeyring; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - inherit (glib.meta) platforms maintainers; - - longDescription = '' - gnome-keyring is a program that keeps password and other secrets for - users. The library libgnome-keyring is used by applications to integrate - with the gnome-keyring system. - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix deleted file mode 100644 index 1156474e5a7..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }: - -stdenv.mkDerivation rec { - name = "libgnomekbd-3.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz"; - sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09"; - }; - - buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/gkbd-keyboard-display \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Keyboard management library"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix deleted file mode 100644 index 8246a2183b7..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata }: - -stdenv.mkDerivation rec { - name = "libgweather-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/libgweather/3.12/${name}.tar.xz"; - sha256 = "54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix deleted file mode 100644 index 72d307f4f1a..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr -}: - -stdenv.mkDerivation rec { - name = "libgxps-0.2.2"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; - }; - - buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; - - configureFlags = "--without-liblcms2"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix deleted file mode 100644 index 547a52ccf9a..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, glib, gtk3, gobjectIntrospection, python, pygobject3 -}: - -stdenv.mkDerivation rec { - name = "libpeas-${version}"; - version = "1.10.0"; - - buildInputs = [ - intltool pkgconfig - glib gtk3 gobjectIntrospection python pygobject3 - ]; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/1.10/${name}.tar.xz"; - sha256 = "4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47"; - }; - - preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = { - description = "A GObject-based plugins engine"; - homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix deleted file mode 100644 index 5a8117528b6..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: - -stdenv.mkDerivation rec { - name = "libzapojit-0.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix deleted file mode 100644 index aa1af1ebd55..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 -, libtool, makeWrapper }: - - -stdenv.mkDerivation rec { - name = "mutter-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/3.12/${name}.tar.xz"; - sha256 = "e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173"; - }; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; - - buildInputs = with gnome3; - [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra - libcanberra_gtk3 zenity libtool makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix deleted file mode 100644 index dceb7c817bd..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif -, gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, makeWrapper, exempi, librsvg, tracker }: - -stdenv.mkDerivation rec { - name = "nautilus-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus/3.12/${name}.tar.xz"; - sha256 = "969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1"; - }; - - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ]; - - preFixup = '' - wrapProgram "$out/bin/nautilus" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - patches = [ ./extension_dir.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch deleted file mode 100644 index 317b8257992..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c -index 6273a76..4adcc8a 100644 ---- a/libnautilus-private/nautilus-module.c -+++ b/libnautilus-private/nautilus-module.c -@@ -242,11 +242,17 @@ void - nautilus_module_setup (void) - { - static gboolean initialized = FALSE; -+ const gchar* extensiondir = NULL; - - if (!initialized) { - initialized = TRUE; -- -- load_module_dir (NAUTILUS_EXTENSIONDIR); -+ -+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); -+ if (extensiondir == NULL) { -+ extensiondir = NAUTILUS_EXTENSIONDIR; -+ } -+ -+ load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); - } diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix deleted file mode 100644 index 9e19d4f9005..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "rest-0.7.91"; - - src = fetchurl { - url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; - sha256 = "838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a"; - }; - - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix deleted file mode 100644 index 2830d5bac27..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz -, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 -, gdk_pixbuf, librsvg, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "sushi-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz"; - sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff"; - }; - - propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - buildInputs = [ pkgconfig file intltool gobjectIntrospection glib - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg - gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram $out/libexec/sushi-start \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; - description = "A quick previewer for Nautilus"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix deleted file mode 100644 index f1b3bfe53c1..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }: - -stdenv.mkDerivation rec { - name = "totem-pl-parser-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; - - buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix deleted file mode 100644 index 9c2db40f89d..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, pygobject3, shared_mime_info -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "totem-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz"; - sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn"; - }; - - doCheck = true; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.libpeas pygobject3 shared_mime_info dbus_glib - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - preFixup = '' - wrapProgram "$out/bin/totem" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix deleted file mode 100644 index d14b088f530..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection -, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler, libtool -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 }: - -stdenv.mkDerivation rec { - name = "tracker-1.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz"; - sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preConfigure = '' - substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/" - sed -i -e 's,glib/poppler.h,poppler.h,' src/tracker-extract/tracker-extract-pdf.c - ''; - - buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser gobjectIntrospection - automake114x autoconf libtool - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite - upower libnotify evolution_data_server gnome3.libgee - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac - poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix deleted file mode 100644 index 1692b2c9c96..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, hicolor_icon_theme, gnome3 -, libnotify, file, telepathy_glib, dbus_glib }: - -stdenv.mkDerivation rec { - name = "vino-${versionMajor}.${versionMinor}"; - versionMajor = "3.12"; - versionMinor = "0"; - - src = fetchurl { - url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz"; - sha256 = "86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b"; - }; - - doCheck = true; - - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - dbus_glib telepathy_glib file makeWrapper ]; - - preFixup = '' - wrapProgram "$out/libexec/vino-server" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; - description = "GNOME desktop sharing server"; - maintainers = with maintainers; [ lethalman iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix deleted file mode 100644 index d3245e232ed..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection -, selectTextPatch ? false }: - -stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; - }; - - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" - ''; - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix deleted file mode 100644 index ba83380f86d..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: - -stdenv.mkDerivation rec { - name = "yelp-tools-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/3.12/${name}.tar.xz"; - sha256 = "7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172"; - }; - - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; - description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix deleted file mode 100644 index e9911823073..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash -, itstool, libxml2, libxslt }: - -stdenv.mkDerivation rec { - name = "yelp-xsl-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/3.12/${name}.tar.xz"; - sha256 = "dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = with maintainers; [ lethalman ]; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix deleted file mode 100644 index 2e7715d1efc..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite -, bash, makeWrapper, itstool, libxml2, libxslt, icu }: - -stdenv.mkDerivation rec { - name = "yelp-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp/3.12/${name}.tar.xz"; - sha256 = "0k2a1fggidmh98x2fv8zki2lbx7wx7p4b25iq11p6q8j9fwr2ff8"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.gnome_icon_theme - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas sqlite ]; - - preFixup = '' - wrapProgram "$out/bin/yelp" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "The help viewer in Gnome"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix deleted file mode 100644 index ca20bbc785d..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "1"; - - name = "zenity-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz"; - sha256 = "a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11"; - }; - - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix deleted file mode 100644 index 670ceb105af..00000000000 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ /dev/null @@ -1,299 +0,0 @@ -{ callPackage, pkgs }: - -rec { - corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database - gtk3 # for gtk-update-icon-cache - glib_networking gvfs dconf gnome-backgrounds gnome_control_center - gnome-menus gnome_settings_daemon gnome_shell - gnome_themes_standard defaultIconTheme - ]; - - optionalPackages = with gnome3; [ baobab empathy eog epiphany evince - gucharmap nautilus totem vino yelp gnome-bluetooth - gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-shell-extensions gnome-system-log gnome-system-monitor - gnome_terminal gnome-user-docs bijiben evolution file-roller gedit - gnome-clocks gnome-music gnome-tweak-tool gnome-photos - nautilus-sendto - ]; - - inherit (pkgs) glib gtk2 gtk3 gnome2; - gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; - - # DO NOT UPGRADE CLUTTER, IT BREAKS GNOME 3.12 - clutter = pkgs.clutter_1_18; - clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; - clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; - cogl = pkgs.cogl_1_18; - - gtk = gtk3; # just to be sure - libcanberra = pkgs.libcanberra_gtk3; # just to be sure - inherit (pkgs.gnome2) ORBit2; - orbit = ORBit2; - inherit (pkgs) libsoup; - - version = "3.12"; - -# Simplify the nixos module and gnome packages - defaultIconTheme = gnome_icon_theme_symbolic; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - baobab = callPackage ./core/baobab { }; - - caribou = callPackage ./core/caribou { }; - - dconf = callPackage ./core/dconf { }; - - empathy = callPackage ./core/empathy { - webkitgtk = pkgs.webkitgtk24x; - }; - - epiphany = callPackage ./core/epiphany { - webkitgtk = pkgs.webkitgtk24x; - }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution_data_server = callPackage ./core/evolution-data-server { }; - - gconf = callPackage ./core/gconf { }; - - geocode_glib = callPackage ./core/geocode-glib { }; - - gcr = callPackage ./core/gcr { }; # ToDo: tests fail - - gdm = callPackage ./core/gdm { }; - - gjs = callPackage ./core/gjs { }; - - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; - }; - - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; - - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; - - gnome-contacts = callPackage ./core/gnome-contacts { }; - - gnome_control_center = callPackage ./core/gnome-control-center { }; - - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome_common = callPackage ./core/gnome-common { }; - - gnome_desktop = callPackage ./core/gnome-desktop { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; - - gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { }; - - gnome-menus = callPackage ./core/gnome-menus { }; - - gnome_keyring = callPackage ./core/gnome-keyring { }; - - libgnome_keyring = callPackage ./core/libgnome-keyring { }; - - libgnomekbd = callPackage ./core/libgnomekbd { }; - - folks = callPackage ./core/folks { }; - - gnome_online_accounts = callPackage ./core/gnome-online-accounts { - webkitgtk = pkgs.webkitgtk24x; - }; - - gnome-online-miners = callPackage ./core/gnome-online-miners { }; - - gnome_session = callPackage ./core/gnome-session { }; - - gnome_shell = callPackage ./core/gnome-shell { }; - - gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; - - gnome-system-log = callPackage ./core/gnome-system-log { }; - - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome_terminal = callPackage ./core/gnome-terminal { }; - - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; - - gnome-user-docs = callPackage ./core/gnome-user-docs { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - grilo = callPackage ./core/grilo { }; - - grilo-plugins = callPackage ./core/grilo-plugins { }; - - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; - - gtksourceview = callPackage ./core/gtksourceview { }; - - gucharmap = callPackage ./core/gucharmap { }; - - gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; - - eog = callPackage ./core/eog { }; - - libcroco = callPackage ./core/libcroco {}; - - libgee = callPackage ./core/libgee { }; - - libgdata = callPackage ./core/libgdata { }; - - libgxps = callPackage ./core/libgxps { }; - - libpeas = callPackage ./core/libpeas {}; - - libgweather = callPackage ./core/libgweather { }; - - libzapojit = callPackage ./core/libzapojit { }; - - mutter = callPackage ./core/mutter { }; - - nautilus = callPackage ./core/nautilus { }; - - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { - inherit gnome3; - }; - - networkmanager_pptp = pkgs.networkmanager_pptp.override { - inherit gnome3; - }; - - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { - inherit gnome3; - }; - - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { - inherit gnome3; - }; - - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { - inherit gnome3; - }; - - networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; - }; - - rest = callPackage ./core/rest { }; - - sushi = callPackage ./core/sushi { - webkitgtk = pkgs.webkitgtk24x; - }; - - totem = callPackage ./core/totem { }; - - totem-pl-parser = callPackage ./core/totem-pl-parser { }; - - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; - - vte = callPackage ./core/vte { }; - - vino = callPackage ./core/vino { }; - - yelp = callPackage ./core/yelp { - webkitgtk = pkgs.webkitgtk24x; - }; - - yelp_xsl = callPackage ./core/yelp-xsl { }; - - yelp_tools = callPackage ./core/yelp-tools { }; - - zenity = callPackage ./core/zenity { }; - - -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - bijiben = callPackage ./apps/bijiben { - webkitgtk = pkgs.webkitgtk24x; - }; - - evolution = callPackage ./apps/evolution { - webkitgtk = pkgs.webkitgtk24x; - }; - - file-roller = callPackage ./apps/file-roller { }; - - gedit = callPackage ./apps/gedit { }; - - glade = callPackage ./apps/glade { }; - - gnome-boxes = callPackage ./apps/gnome-boxes { - gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; - spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; - }; - - gnome-clocks = callPackage ./apps/gnome-clocks { }; - - gnome-documents = callPackage ./apps/gnome-documents { - webkitgtk = pkgs.webkitgtk24x; - }; - - gnome-music = callPackage ./apps/gnome-music { }; - - gnome-photos = callPackage ./apps/gnome-photos { }; - - nautilus-sendto = callPackage ./apps/nautilus-sendto { }; - - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - - seahorse = callPackage ./apps/seahorse { }; - - polari = callPackage ./apps/polari { }; - - pomodoro = callPackage ./apps/pomodoro { }; - -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - anjuta = callPackage ./devtools/anjuta { }; - - gdl = callPackage ./devtools/gdl { }; - -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - geary = callPackage ./misc/geary { - webkitgtk = pkgs.webkitgtk24x; - }; - - gfbgraph = callPackage ./misc/gfbgraph { }; - - goffice = callPackage ./misc/goffice { }; - - gitg = callPackage ./misc/gitg { - webkitgtk = pkgs.webkitgtk24x; - }; - - libgda = callPackage ./misc/libgda { }; - - libgit2-glib = callPackage ./misc/libgit2-glib { - libgit2 = pkgs.libgit2.override { libssh2 = null; }; - }; - - libmediaart = callPackage ./misc/libmediaart { }; - - gexiv2 = callPackage ./misc/gexiv2 { }; - - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; - - gpaste = callPackage ./misc/gpaste { }; - - gtkhtml = callPackage ./misc/gtkhtml { }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix deleted file mode 100644 index a1b38b21869..00000000000 --- a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix deleted file mode 100644 index 79bfd895257..00000000000 --- a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python }: - -let - major = "3.13"; - minor = "1"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "anjuta-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; - sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b"; - }; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python ]; - - meta = with stdenv.lib; { - description = "Software development studio"; - homepage = http://anjuta.org/; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix deleted file mode 100644 index 1dae33cd4e9..00000000000 --- a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }: - -let - major = "3.12"; - minor = "0"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "gdl-${version}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz"; - sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d"; - }; - - buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; - - meta = with stdenv.lib; { - description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix deleted file mode 100644 index 4df287c7b8b..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala -, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra, libsecret, gmime -, libpthreadstubs, hicolor_icon_theme, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: - -stdenv.mkDerivation rec { - name = "geary-0.6.2"; - - src = fetchurl { - url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz"; - sha256 = "0ap40mpj89sx82kcxlhl9gipq34ks2b70yhiv9s8zc5wg0nm7rpg"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme - gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; - - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/ - mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} - ''; - - preFixup = '' - wrapProgram "$out/bin/geary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - patches = [ ./disable_valadoc.patch ]; - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Geary; - description = "Mail client for GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch deleted file mode 100644 index e65c0dea747..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 -+++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 -@@ -696,21 +696,6 @@ - ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ - ) - --# Valadoc --################################################# --foreach(pkg ${ENGINE_PACKAGES}) -- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") --endforeach(pkg ${ENGINE_PACKAGES}) -- --include(FindValadoc) --add_custom_target( -- valadoc -- WORKING_DIRECTORY -- ${CMAKE_SOURCE_DIR}/src -- COMMAND -- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --) -- - ## Make clean: remove copied files - ################################################## - set_property( diff --git a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix deleted file mode 100644 index 86942c13f34..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }: - - -stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "0.7.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz"; - sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn"; - }; - - preConfigure = '' - patchShebangs . - ''; - - buildInputs = [ pkgconfig glib libtool m4 ]; - propagatedBuildInputs = [ exiv2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gexiv2; - description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix deleted file mode 100644 index d36534f0d32..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: - -stdenv.mkDerivation rec { - name = "gfbgraph-0.2.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; - sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4"; - }; - - buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix deleted file mode 100644 index 37e1975fd57..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic - -stdenv.mkDerivation rec { - name = "gitg-3.13.91"; - - src = fetchurl { - url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz"; - sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37"; - }; - - preCheck = '' - substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" - ''; - doCheck = true; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; - - buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg - gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; - - preFixup = '' - wrapProgram "$out/bin/gitg" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/gitg/icons/hicolor/icon-theme.cache - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; - description = "GNOME GUI client to view git repositories"; - maintainers = with maintainers; [ iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index 26e9144349f..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, intltool, fetchurl, python, pygobject3, atk -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup -, bash, makeWrapper, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify }: - -stdenv.mkDerivation rec { - name = "gnome-tweak-tool-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz"; - sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - makeFlags = [ "DESTDIR=/" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - python pygobject3 libnotify gnome3.gnome_shell - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-tweak-tool" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" - ''; - - patches = [ ./find_gsettings.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3a..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py -index a00fe19..dce74b2 100644 ---- a/gtweak/gsettings.py -+++ b/gtweak/gsettings.py -@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): - - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): -- if not schema_dir: -- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" -+ if not schema_dir: -+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR -+ for xdg_dir in GLib.get_system_data_dirs(): -+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") -+ if os.path.exists(os.path.join(dir, schema_filename)): -+ schema_dir = dir -+ break - - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix deleted file mode 100644 index 02520a9f121..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 -, pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: - -stdenv.mkDerivation rec { - name = "goffice-0.8.17"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz"; - sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; - }; - - # fix linking error: undefined reference to pcre_info - patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 - - buildInputs = [ - pkgconfig libglade bzip2 libart intltool gettext - gconf libgnomeui pcre - ]; - - propagatedBuildInputs = [ - # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk libglade libart cairo pango - ]; - - postInstall = - '' - # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig. - substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires - ''; - - doCheck = true; - - meta = gnome3.goffice.meta // { - maintainers = [ ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix deleted file mode 100644 index f116f5b53cd..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: - -stdenv.mkDerivation rec { - name = "goffice-0.10.18"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "4743a148d4452743f3484ed28285a6889adb4af2a61b72448e0ddfe7d5142c64"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? - glib gtk3 libxml2 cairo pango libgsf - ]; - - buildInputs = [ libxslt librsvg ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = { - description = "A Glib/GTK+ set of document centric objects and utilities"; - - longDescription = '' - There are common operations for document centric applications that are - conceptually simple, but complex to implement fully: plugins, load/save - documents, undo/redo. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.gnu; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch deleted file mode 100644 index cd4ef3c9fed..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c -index bc4aae4..3adb696 100644 ---- a/goffice/utils/regutf8.c -+++ b/goffice/utils/regutf8.c -@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) - default: return GO_REG_BADPAT; - } - } else { -- gor->re_nsub = pcre_info (r, NULL, NULL); -+ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL); - gor->nosub = (cflags & GO_REG_NOSUB) != 0; - return 0; - } diff --git a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix deleted file mode 100644 index f87431653c9..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib -, pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }: - -stdenv.mkDerivation rec { - version = "3.12.3.1"; - name = "gpaste-${version}"; - - src = fetchurl { - url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "05afbhn3gw015cf2z3045lvlnj4cz06p6libkglb2wqsfb7azbl0"; - }; - - buildInputs = [ intltool autoreconfHook pkgconfig vala glib - gtk3 gnome3.gnome_control_center dbus.libs - clutter pango appdata-tools makeWrapper ]; - - preConfigure = "intltoolize -f"; - - configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" - "--with-dbusservicesdir=$(out)/share/dbus-1/services" ]; - - enableParallelBuilding = true; - - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ glib gtk3 clutter pango ]; - in - '' - for i in $out/libexec/gpaste/*; do - wrapProgram $i \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/Keruspe/GPaste; - description = "Clipboard management system with GNOME3 integration"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix deleted file mode 100644 index 5e27b474cbd..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: - -stdenv.mkDerivation rec { - name = "gtkhtml-4.6.6"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz"; - sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd"; - }; - - buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme - gnome3.gsettings_desktop_schemas ]; - - propagatedBuildInputs = [ enchant isocodes ]; - -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix deleted file mode 100644 index 3944644a453..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }: - -let - major = "5.2"; - minor = "2"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "libgda-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz"; - sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4"; - }; - - configureFlags = [ - "--enable-gi-system-install=no" - ]; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ]; - - meta = with stdenv.lib; { - description = "Database access library"; - homepage = http://www.gnome-db.org/; - license = [ licenses.lgpl2 licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix deleted file mode 100644 index 94776c90cf9..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala -, gtk_doc, gobjectIntrospection, libgit2, glib }: - -stdenv.mkDerivation rec { - name = "libgit2-glib-${version}"; - version = "0.0.20"; - - src = fetchurl { - url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz"; - sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x"; - }; - - configureScript = "sh ./autogen.sh"; - - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala - gtk_doc gobjectIntrospection libgit2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix deleted file mode 100644 index 4985bfa902c..00000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "libmediaart-0.4.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz"; - sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c"; - }; - - buildInputs = [ pkgconfig glib gdk_pixbuf ]; - - meta = with stdenv.lib; { - description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix index cebbce78177..7d610c79b49 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix @@ -2,16 +2,16 @@ , pkgconfig, gtk3, glib, hicolor_icon_theme , makeWrapper, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit }: +, libsecret, avahi, p11_kit, openssh }: let - majVer = "3.14"; + majVer = gnome3.version; in stdenv.mkDerivation rec { - name = "seahorse-${majVer}.1"; + name = "seahorse-${majVer}.0"; src = fetchurl { url = "mirror://gnome/sources/seahorse/${majVer}/${name}.tar.xz"; - sha256 = "14syy2qxxrim220aj64mbp76jbrrc6wmdwc4lfl4sngsh84qjah9"; + sha256 = "0cg1grgpwbfkiny5148n17rzpc8kswyr5yff0kpm8l3lp01my2kp"; }; doCheck = true; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { gnome3.gsettings_desktop_schemas makeWrapper gnupg gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme libsecret avahi libsoup p11_kit vala gnome3.gcr - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + hicolor_icon_theme gnome3.adwaita-icon-theme openssh ]; preFixup = '' wrapProgram "$out/bin/seahorse" \ diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix index ab5ea0cbcca..ef344c5bf55 100644 --- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix @@ -2,7 +2,7 @@ , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf , dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, pulseaudio, telepathy_mission_control +, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control , telepathy_logger, libnotify, clutter, libsoup, gnutls , evolution_data_server , libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libxml2 libxslt icu file makeWrapper telepathy_glib clutter_gtk clutter-gst cogl gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf + gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf libnotify clutter libsoup gnutls libgee p11_kit libcanberra_gtk3 telepathy_farstream farstream gnome3.adwaita-icon-theme hicolor_icon_theme diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index f442bd88973..0c676c38efa 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig +, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, krb5, networkmanagerapplet, networkmanager +, cracklib, python, libkrb5, networkmanagerapplet, networkmanager , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }: @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile + gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality + accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.adwaita-icon-theme librsvg clutter clutter_gtk - hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.vino udev + gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk + gnome3.vino udev libcanberra_gtk3 networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ]; preBuild = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix index aacc62a30a9..7afa2800105 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper -, docbook_xsl_ns, docbook_xsl, gnome3 }: +, docbook_xsl_ns, docbook_xsl, gnome3, cacert }: let majVer = gnome3.version; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; configureFlags = [ - "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path + "--with-ca-certificates=${cacert}/ca-bundle.crt" # NixOS hardcoded path "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix index e4d2d80e9f4..76c770e51d6 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager , docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager - libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio + libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio libcanberra_gtk3 upower colord libgweather xkeyboard_config polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix index f7e3efd1dd9..c49a4503d63 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, hicolor_icon_theme, sqlite, libgweather -, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper +, sqlite, libgweather, libcanberra_gtk3 +, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server - libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center - hicolor_icon_theme adwaita-icon-theme sqlite gnome3.gnome-bluetooth + libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server + libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm + libcanberra_gtk3 gnome_control_center + defaultIconTheme sqlite gnome3.gnome-bluetooth libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix index 3df5d9f55d9..9b91cd98777 100644 --- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { - name = "mutter-${gnome3.version}.1.1"; + name = "mutter-${gnome3.version}.2"; src = fetchurl { url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz"; - sha256 = "07059jmwhc7zf2gww2xw94hhy4csjj2v30ivyzllbas2nvv88l3r"; + sha256 = "0qq7gpkljn1z45sg2sxvmia52krj4ck2541iar89z99s1cppaasa"; }; # fatal error: gio/gunixfdlist.h: No such file or directory @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + patches = [ ./x86.patch ]; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch new file mode 100644 index 00000000000..bc8829de42f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch @@ -0,0 +1,20 @@ +--- mutter-3.16.2/src/core/window.c.orig 2015-05-26 10:52:41.382834963 +0200 ++++ mutter-3.16.2/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 +@@ -3499,7 +3499,7 @@ + + static MetaMonitorInfo * + find_monitor_by_winsys_id (MetaWindow *window, +- guint winsys_id) ++ gint winsys_id) + { + int i; + +@@ -3618,7 +3618,7 @@ + */ + + gboolean did_placement; +- guint old_output_winsys_id; ++ gint old_output_winsys_id; + MetaRectangle unconstrained_rect; + MetaRectangle constrained_rect; + MetaMoveResizeResultFlags result = 0; diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix index d1bfee5c14a..9dbd46946c0 100644 --- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacert }: stdenv.mkDerivation rec { name = "rest-0.7.92"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix index 82252224906..89a1405f62b 100644 --- a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal"; }; - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.38.0.patch; + patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch; buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch deleted file mode 100644 index 0a9b82a8598..00000000000 --- a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch +++ /dev/null @@ -1,227 +0,0 @@ -Only in vte-0.38.0.new: expose_select_text.patch -diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c ---- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400 -+++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400 -@@ -1427,7 +1427,7 @@ - *start_offset = offset_from_xy (priv, start_x, start_y); - _vte_terminal_get_end_selection (terminal, &end_x, &end_y); - *end_offset = offset_from_xy (priv, end_x, end_y); -- return _vte_terminal_get_selection (terminal); -+ return vte_terminal_get_selection (terminal); - } - - static gboolean -diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c ---- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400 -@@ -122,7 +122,6 @@ - gpointer data, - GArray *attributes, - gboolean include_trailing_spaces); --static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal); - static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); - static void vte_terminal_stop_processing (VteTerminal *terminal); - -@@ -3267,9 +3266,10 @@ - _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); - terminal->pvt->pty_input_source = 0; - } --static void --_vte_terminal_connect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_connect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_channel == NULL) { - return; - } -@@ -3321,9 +3321,10 @@ - } - } - --static void --_vte_terminal_disconnect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_disconnect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_input_source != 0) { - _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); - g_source_remove(terminal->pvt->pty_input_source); -@@ -6154,6 +6155,28 @@ - } - } - -+/** -+ * vte_terminal_set_cursor_position: -+ * @terminal: a #VteTerminal -+ * @column: the new cursor column -+ * @row: the new cursor row -+ * -+ * Set the location of the cursor. -+ */ -+void -+vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) -+{ -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ terminal->pvt->screen->cursor_current.col = column; -+ terminal->pvt->screen->cursor_current.row = row; -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ _vte_check_cursor_blink(terminal); -+ vte_terminal_queue_cursor_moved(terminal); -+} -+ - static GtkClipboard * - vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) - { -@@ -6319,7 +6342,7 @@ - vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); - - /* Temporarily stop caring about input from the child. */ -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - } - - static gboolean -@@ -6336,7 +6359,7 @@ - terminal->pvt->selecting = FALSE; - - /* Reconnect to input from the child if we paused it. */ -- _vte_terminal_connect_pty_read(terminal); -+ vte_terminal_connect_pty_read(terminal); - - return TRUE; - } -@@ -6834,6 +6857,50 @@ - vte_terminal_deselect_all (terminal); - } - -+/** -+ * vte_terminal_get_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * -+ * Checks whether or not block selection is enabled. -+ * -+ * Returns: %TRUE if block selection is enabled, %FALSE if not -+ */ -+gboolean -+vte_terminal_get_selection_block_mode(VteTerminal *terminal) { -+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE); -+ return terminal->pvt->selection_block_mode; -+} -+ -+/** -+ * vte_terminal_set_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * @block_mode: whether block selection is enabled -+ * -+ * Sets whether or not block selection is enabled. -+ */ -+void -+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ terminal->pvt->selection_block_mode = block_mode; -+} -+ -+/** -+ * vte_terminal_select_text: -+ * @terminal: a #VteTerminal -+ * @start_col: the starting column for the selection -+ * @start_row: the starting row for the selection -+ * @end_col: the end column for the selection -+ * @end_row: the end row for the selection -+ * -+ * Sets the current selection region. -+ */ -+void -+vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) { -+ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); -+} -+ - /* Autoscroll a bit. */ - static gboolean - vte_terminal_autoscroll(VteTerminal *terminal) -@@ -8476,7 +8543,7 @@ - #endif - kill(terminal->pvt->pty_pid, SIGHUP); - } -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - if (terminal->pvt->pty_channel != NULL) { - g_io_channel_unref (terminal->pvt->pty_channel); -@@ -12533,7 +12600,7 @@ - g_object_freeze_notify(object); - - if (pvt->pty != NULL) { -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - - if (terminal->pvt->pty_channel != NULL) { -@@ -12588,7 +12655,7 @@ - _vte_terminal_setup_utf8 (terminal); - - /* Open channels to listen for input on. */ -- _vte_terminal_connect_pty_read (terminal); -+ vte_terminal_connect_pty_read (terminal); - - g_object_notify(object, "pty"); - -@@ -12623,7 +12690,7 @@ - } - - char * --_vte_terminal_get_selection(VteTerminal *terminal) -+vte_terminal_get_selection(VteTerminal *terminal) - { - g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); - -Only in vte-0.38.0.new/src: .vte.c.swp -diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h ---- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400 -+++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400 -@@ -25,7 +25,6 @@ - G_BEGIN_DECLS - - void _vte_terminal_accessible_ref(VteTerminal *terminal); --char* _vte_terminal_get_selection(VteTerminal *terminal); - void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); -diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h ---- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400 -@@ -170,6 +170,18 @@ - - void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); - void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_selection_block_mode(VteTerminal *terminal, -+ gboolean block_mode) _VTE_GNUC_NONNULL(1); -+void vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) _VTE_GNUC_NONNULL(1); -+char * -+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+ -+/* pause and unpause output */ -+void vte_terminal_disconnect_pty_read(VteTerminal *vte); -+void vte_terminal_connect_pty_read(VteTerminal *vte); - - /* Set the terminal's size. */ - void vte_terminal_set_size(VteTerminal *terminal, -@@ -276,6 +288,8 @@ - void vte_terminal_get_cursor_position(VteTerminal *terminal, - glong *column, - glong *row) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) _VTE_GNUC_NONNULL(1); - - /* Add a matching expression, returning the tag the widget assigns to that - * expression. */ diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch similarity index 82% rename from pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch rename to pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch index 0a9b82a8598..c18f1b76b41 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch +++ b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch @@ -1,8 +1,8 @@ -Only in vte-0.38.0.new: expose_select_text.patch -diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c ---- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400 -+++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400 -@@ -1427,7 +1427,7 @@ +Only in vte-0.40.0.new: .git +diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c +--- vte-0.40.0/src/vteaccess.c 2015-03-16 06:34:37.000000000 -0400 ++++ vte-0.40.0.new/src/vteaccess.c 2015-04-10 00:08:53.146853382 -0400 +@@ -1444,7 +1444,7 @@ *start_offset = offset_from_xy (priv, start_x, start_y); _vte_terminal_get_end_selection (terminal, &end_x, &end_y); *end_offset = offset_from_xy (priv, end_x, end_y); @@ -11,10 +11,10 @@ diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c } static gboolean -diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c ---- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400 -@@ -122,7 +122,6 @@ +diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c +--- vte-0.40.0/src/vte.c 2015-03-18 12:38:09.000000000 -0400 ++++ vte-0.40.0.new/src/vte.c 2015-04-10 00:08:53.150186722 -0400 +@@ -123,7 +123,6 @@ gpointer data, GArray *attributes, gboolean include_trailing_spaces); @@ -22,7 +22,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); static void vte_terminal_stop_processing (VteTerminal *terminal); -@@ -3267,9 +3266,10 @@ +@@ -3344,9 +3343,10 @@ _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); terminal->pvt->pty_input_source = 0; } @@ -35,7 +35,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c if (terminal->pvt->pty_channel == NULL) { return; } -@@ -3321,9 +3321,10 @@ +@@ -3398,9 +3398,10 @@ } } @@ -48,7 +48,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c if (terminal->pvt->pty_input_source != 0) { _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); g_source_remove(terminal->pvt->pty_input_source); -@@ -6154,6 +6155,28 @@ +@@ -6302,6 +6303,28 @@ } } @@ -67,8 +67,8 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c + g_return_if_fail(VTE_IS_TERMINAL(terminal)); + + _vte_invalidate_cursor_once(terminal, FALSE); -+ terminal->pvt->screen->cursor_current.col = column; -+ terminal->pvt->screen->cursor_current.row = row; ++ terminal->pvt->cursor.col = column; ++ terminal->pvt->cursor.row = row; + _vte_invalidate_cursor_once(terminal, FALSE); + _vte_check_cursor_blink(terminal); + vte_terminal_queue_cursor_moved(terminal); @@ -77,7 +77,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c static GtkClipboard * vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) { -@@ -6319,7 +6342,7 @@ +@@ -6465,7 +6488,7 @@ vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); /* Temporarily stop caring about input from the child. */ @@ -86,7 +86,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c } static gboolean -@@ -6336,7 +6359,7 @@ +@@ -6482,7 +6505,7 @@ terminal->pvt->selecting = FALSE; /* Reconnect to input from the child if we paused it. */ @@ -95,7 +95,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c return TRUE; } -@@ -6834,6 +6857,50 @@ +@@ -6982,6 +7005,50 @@ vte_terminal_deselect_all (terminal); } @@ -146,7 +146,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c /* Autoscroll a bit. */ static gboolean vte_terminal_autoscroll(VteTerminal *terminal) -@@ -8476,7 +8543,7 @@ +@@ -8631,7 +8698,7 @@ #endif kill(terminal->pvt->pty_pid, SIGHUP); } @@ -155,7 +155,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c _vte_terminal_disconnect_pty_write(terminal); if (terminal->pvt->pty_channel != NULL) { g_io_channel_unref (terminal->pvt->pty_channel); -@@ -12533,7 +12600,7 @@ +@@ -12188,7 +12255,7 @@ g_object_freeze_notify(object); if (pvt->pty != NULL) { @@ -164,7 +164,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c _vte_terminal_disconnect_pty_write(terminal); if (terminal->pvt->pty_channel != NULL) { -@@ -12588,7 +12655,7 @@ +@@ -12243,7 +12310,7 @@ _vte_terminal_setup_utf8 (terminal); /* Open channels to listen for input on. */ @@ -173,7 +173,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c g_object_notify(object, "pty"); -@@ -12623,7 +12690,7 @@ +@@ -12276,7 +12343,7 @@ } char * @@ -182,10 +182,9 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c { g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); -Only in vte-0.38.0.new/src: .vte.c.swp -diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h ---- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400 -+++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400 +diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h +--- vte-0.40.0/src/vteint.h 2014-05-28 08:22:48.000000000 -0400 ++++ vte-0.40.0.new/src/vteint.h 2015-04-10 00:08:53.153520062 -0400 @@ -25,7 +25,6 @@ G_BEGIN_DECLS @@ -194,10 +193,10 @@ diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); -diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h ---- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400 -@@ -170,6 +170,18 @@ +diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h +--- vte-0.40.0/src/vteterminal.h 2015-03-18 12:38:09.000000000 -0400 ++++ vte-0.40.0.new/src/vteterminal.h 2015-04-10 00:08:53.150186722 -0400 +@@ -169,6 +169,18 @@ void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); @@ -214,9 +213,9 @@ diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h +void vte_terminal_disconnect_pty_read(VteTerminal *vte); +void vte_terminal_connect_pty_read(VteTerminal *vte); - /* Set the terminal's size. */ - void vte_terminal_set_size(VteTerminal *terminal, -@@ -276,6 +288,8 @@ + /* By-word selection */ + void vte_terminal_set_word_char_exceptions(VteTerminal *terminal, +@@ -280,6 +292,8 @@ void vte_terminal_get_cursor_position(VteTerminal *terminal, glong *column, glong *row) _VTE_GNUC_NONNULL(1); diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 933e89dcd64..15f4a210e04 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -19,10 +19,8 @@ rec { nautilus-sendto dconf-editor ]; - inherit (pkgs) libsoup glib gtk2; + inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra; inherit (pkgs.gnome2) ORBit2; - gtk3 = pkgs.gtk3_16; - gtkmm3 = pkgs.gtkmm3_16; orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; clutter = pkgs.clutter_1_22; @@ -34,29 +32,11 @@ rec { vala = pkgs.vala_0_26; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - # Due to gtk 3.12 -> 3.16 transition - libcanberra_gtk3 = pkgs.libcanberra_gtk3.override { inherit gtk; }; - libcanberra = libcanberra_gtk3; - ibus = pkgs.ibus.override { inherit gnome3; }; - colord-gtk = pkgs.colord-gtk.override { inherit gtk3; }; - webkitgtk24x = pkgs.webkitgtk24x.override { inherit gtk3; }; - webkitgtk = pkgs.webkitgtk.override { inherit gtk3; }; - libwnck3 = pkgs.libwnck3.override { inherit gtk3; }; - gtkspell3 = pkgs.gtkspell3.override { inherit gtk3; }; - librsvg = pkgs.librsvg.override { inherit gtk3; }; - iconnamingutils = pkgs.iconnamingutils.override { inherit librsvg; }; - libchamplain = pkgs.libchamplain.override { inherit gtk3 clutter_gtk; }; - djvulibre = pkgs.djvulibre.override { inherit librsvg; }; - version = "3.16"; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; -# Backward compatibility, must be removed in favor of defaultIconTheme - gnome_icon_theme = adwaita-icon-theme; - gnome_icon_theme_symbolic = adwaita-icon-theme; - #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; @@ -295,6 +275,12 @@ rec { goffice = callPackage ./misc/goffice { }; + goffice_0_8 = callPackage ./misc/goffice/0.8.nix { + inherit (pkgs.gnome2) libglade libgnomeui; + gconf = pkgs.gnome2.GConf; + libart = pkgs.gnome2.libart_lgpl; + }; + gitg = callPackage ./misc/gitg { webkitgtk = webkitgtk24x; }; diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix index a55adf6d975..e488ab64047 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python }: + itstool, python, makeWrapper }: let major = gnome3.version; @@ -11,13 +11,19 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; - sha256 = "b1aac2d4c35891b23c9bc3f168bf2845e02d0a438742478c98e450950d82b5e5"; + sha256 = "0g4lv6rzkwfz2wp4fg97qlbvyfh2k9gl7k7lidazaikvnc0jlhvp"; }; enableParallelBuilding = true; buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python ]; + gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/anjuta \ + --prefix XDG_DATA_DIRS : \ + "$GSETTINGS_SCHEMAS_PATH" + ''; meta = with stdenv.lib; { description = "Software development studio"; diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix index 9cad72de8f9..e12f41c9b7f 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz"; - sha256 = "4b903c28a8894a82b997a1732a443c8b1d6a510304b3c3b511023339ff5d01db"; + sha256 = "107zwvs913jr5hb59a4a8hsk19yinsicr2ma4vm216nzyl2f3jrl"; }; buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; @@ -18,7 +18,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome docking library"; homepage = https://developer.gnome.org/gdl/; - license = [ licenses.gpl2 ]; + maintainers = [ maintainers.lethalman ]; + license = licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix index 7d2c8cf0eb3..1508338f6ca 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix @@ -5,24 +5,24 @@ let in stdenv.mkDerivation rec { name = "gexiv2-${version}"; - version = "${majorVersion}.0"; + version = "${majorVersion}.3"; src = fetchurl { url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "2fd21f0ed5125e51d02226e7f41be751cfa8ae411a8ed1a651e16b06d79047b2"; + sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988"; }; - + preConfigure = '' patchShebangs . ''; - + buildInputs = [ pkgconfig glib libtool m4 ]; propagatedBuildInputs = [ exiv2 ]; - + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/gexiv2; description = "GObject wrapper around the Exiv2 photo metadata library"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; }; -} \ No newline at end of file +} diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix index fd16d2d4985..517836f4d63 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.12"; + name = "goffice-0.10.22"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff"; + sha256 = "0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix index 0bcf85e1d42..dbdd2cc7fd1 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8"; }; - configureScript = "sh ./autogen.sh"; - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection libgit2 glib ]; diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index 2b8df4757de..ddda04fd370 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -1,5 +1,5 @@ { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2 -, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio +, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme }: @@ -8,7 +8,7 @@ kde { buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack - qca2 samba libcanberra pulseaudio gpgme + qca2 samba libcanberra libpulseaudio gpgme networkmanager kactivities kdepimlibs openexr #todo: add openslp #todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix index 1dd8108166f..8d8bc84e16e 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix @@ -1,6 +1,6 @@ -{ kde, kdelibs, libcanberra, pulseaudio }: +{ kde, kdelibs, libcanberra, libpulseaudio }: kde { - buildInputs = [ kdelibs libcanberra pulseaudio ]; + buildInputs = [ kdelibs libcanberra libpulseaudio ]; meta = { description = "sound mixer, an application to allow you to change the volume of your sound card"; }; diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 7506ece43dc..b0958d232fc 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -16,11 +16,14 @@ stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share" done ''; - buildInputs = [perl cmake vala pkgconfig glib gtk3 granite gnome3.vte gnome3.libgee libnotify gettext makeWrapper]; + buildInputs = with gnome3; [ + perl cmake vala pkgconfig glib gtk3 granite libnotify gettext makeWrapper + vte_290 libgee gsettings_desktop_schemas defaultIconTheme + ]; meta = { description = "elementary OS's terminal"; longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index 7ff2d5fe815..c4fb624a377 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -53,7 +53,7 @@ let GTK3 = gtk3; Libinput = libinput; LibSSH = libssh; - PulseAudio = pulseaudio; + PulseAudio = libpulseaudio; Taglib = taglib; USB = libusb; Wayland = wayland; diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix index 087ba0f2c81..8cbb4cca93c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pulseaudio +{ stdenv, fetchurl, pkgconfig, libpulseaudio , gtk2, libnotify , keybinder, xfconf }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pulseaudio gtk2 + [ libpulseaudio gtk2 keybinder xfconf libnotify ]; diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index e4c7c318352..f48a3e3808b 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "exo"; ver_maj = "0.10"; - ver_min = "4"; + ver_min = "6"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "cced5fdbc0b61a5d976210ff71ecdd81b89fcd15e5860a44f50da7b83fb2deaa"; + sha256 = "1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index abcfd656c50..6e479454459 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { p_name = "thunar"; ver_maj = "1.6"; - ver_min = "6"; + ver_min = "10"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2"; - sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr"; + sha256 = "7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index c75eb787757..9a3116463c6 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; ver_maj = "1.4"; - ver_min = "3"; + ver_min = "4"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1"; + sha256 = "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 45a89b93748..4402e61a2fb 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; ver_maj = "4.12"; - ver_min = "0"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf"; + sha256 = "c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index cedf36d43ae..dd18b1355f7 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfwm4"; ver_maj = "4.12"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "5bb5f72b41060d10bd3823f8b69abcd462bbd8853fdf9c82041450ae68e7d75a"; + sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index a751076537a..7a960dc931b 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -7,7 +7,7 @@ assert withGui -> gtk2 != null; stdenv.mkDerivation rec { version = "1.0.6"; - name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}"; + name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; src = fetchFromGitHub { owner = "arduino"; diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 5059cdf2158..6fbc1a350f5 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,12 +1,12 @@ {stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { - name = "aliceml-1.4-493cd356"; + name = "aliceml-1.4-7d44dc8e"; src = fetchgit { url = "https://github.com/aliceml/aliceml"; - rev = "493cd3565f0bc3b35790185ec358fb91b7b43037"; - sha256 = "12fbaf0a474e53f40a71f16bf61c52b7ffe044f4d0993e208e69552df3054d45"; + rev = "7d44dc8e4097c6f85888bbf4ff86d51fe05b0a08"; + sha256 = "ab2d5bf05c40905b02cb1ec975d4980ae4437757856eeb1f587ede2c45a1917f"; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 8345a353f3f..08cae4d3e42 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.11"; + version = "0.1.12"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1dy2f7lxfwcmrk753midr75cy8xs6pqnmqmj9xj0ch479q4pkpsv"; + sha256 = "1jiki88mzhki74xh5ffw3pali5zs74pa0nylcb8n4ypfvdpqvlhb"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix new file mode 100644 index 00000000000..ebfee6c4188 --- /dev/null +++ b/pkgs/development/compilers/colm/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, makeWrapper, gcc }: + +stdenv.mkDerivation rec { + name = "colm-${version}"; + version = "0.12.0"; + + src = fetchurl { + url = "http://www.colm.net/files/colm/${name}.tar.gz"; + sha256 = "0kbfipxv3nvggd1a2nahk3jg22iifp2l7lkm55i5r7qkpms5sm3v"; + }; + + buildInputs = [ makeWrapper ]; + + doCheck = true; + checkPhase = ''sh ./test/runtests.sh''; + + postInstall = '' + wrapProgram $out/bin/colm \ + --prefix PATH ":" ${gcc}/bin + ''; + + meta = with stdenv.lib; { + description = "A programming language for the analysis and transformation of computer languages"; + homepage = http://www.colm.net/open-source/colm; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index efe8be2051f..b49884fad1c 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/kripken/emscripten; description = "An LLVM-to-JavaScript Compiler"; maintainers = with maintainers; [ bosu ]; - license = with licenses; ncsa; + license = licenses.ncsa; }; } diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index f1161dd4dd1..82742cf9af6 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "3.1.1.31"; + version = "3.1.1.32"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "1c38jpisnh8slqaaw1bsccxgllpc6yivrpb86raw4xalcbsc6fcv"; + sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd"; }; buildInputs = [ mono pkgconfig autoconf automake which ]; diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix new file mode 100644 index 00000000000..bd11b1ebc8e --- /dev/null +++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix @@ -0,0 +1,27 @@ +# This is a derivation specific to OS X (Darwin). It may work on other +# systems as well but has not been tested. +{gmp, mpfr, libmpc, fetchurl, stdenv}: + +stdenv.mkDerivation rec { + name = "gfortran-${version}"; + version = "5.1.0"; + buildInputs = [gmp mpfr libmpc]; + src = fetchurl { + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp"; + }; + configureFlags = '' + --enable-languages=fortran --enable-checking=release --disable-bootstrap + --with-gmp=${gmp} + --with-mpfr=${mpfr} + --with-mpc=${libmpc} + ''; + makeFlags = ["CC=clang"]; + passthru.cc = stdenv.cc.cc; + meta = with stdenv.lib; { + description = "GNU Fortran compiler, part of the GNU Compiler Collection."; + homepage = "https://gcc.gnu.org/fortran/"; + license = licenses.gpl3Plus; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index a31517afbeb..f1844a1a632 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -10,7 +10,7 @@ in ( assert a.stdenv ? cc ; -assert a.stdenv.cc.cc.isGNU or false ; +assert a.stdenv.cc.isGNU ; assert a.stdenv.cc ? libc ; assert a.stdenv.cc.libc != null ; diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 1e755ab6c0c..4e660853f20 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -97,6 +97,11 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux"]; + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + license = stdenv.lib.licenses.bsd3; + platforms = ["x86_64-linux" "i686-linux"]; + }; + } diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 4eb4a501e4e..34c2e3b36b0 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -42,6 +42,9 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984"; sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w"; }) + # Fix TH + indirect symbol resolution on OSX (or any system using gold linker) + # https://phabricator.haskell.org/D852 + ./osx-dylib-resolver.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 5497b35ec1d..4323341dc4a 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "7.8.4"; name = "ghc-${version}"; @@ -45,4 +45,7 @@ stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs stdenv.isDarwin { + # https://ghc.haskell.org/trac/ghc/ticket/9762 + patches = [ ./hpc-7.8.4.patch ]; +}) diff --git a/pkgs/development/compilers/ghc/hpc-7.8.4.patch b/pkgs/development/compilers/ghc/hpc-7.8.4.patch new file mode 100644 index 00000000000..212989200bc --- /dev/null +++ b/pkgs/development/compilers/ghc/hpc-7.8.4.patch @@ -0,0 +1,13 @@ +diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs +index 991fc57..0aad221 100644 +--- a/compiler/cmm/CLabel.hs ++++ b/compiler/cmm/CLabel.hs +@@ -877,7 +877,7 @@ labelDynamic dflags this_pkg this_mod lbl = + + PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m) + +- HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m) ++ HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_mod /= m + + -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves. + _ -> False diff --git a/pkgs/development/compilers/ghc/osx-dylib-resolver.patch b/pkgs/development/compilers/ghc/osx-dylib-resolver.patch new file mode 100644 index 00000000000..50236026031 --- /dev/null +++ b/pkgs/development/compilers/ghc/osx-dylib-resolver.patch @@ -0,0 +1,60 @@ +diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs +--- a/compiler/ghci/Linker.hs ++++ b/compiler/ghci/Linker.hs +@@ -119,9 +119,9 @@ + -- that is really important + pkgs_loaded :: ![PackageKey], + +- -- we need to remember the name of the last temporary DLL/.so +- -- so we can link it +- last_temp_so :: !(Maybe (FilePath, String)) } ++ -- we need to remember the name of previous temporary DLL/.so ++ -- libraries so we can link them (see #10322) ++ temp_sos :: ![(FilePath, String)] } + + + emptyPLS :: DynFlags -> PersistentLinkerState +@@ -131,7 +131,7 @@ + pkgs_loaded = init_pkgs, + bcos_loaded = [], + objs_loaded = [], +- last_temp_so = Nothing } ++ temp_sos = [] } + + -- Packages that don't need loading, because the compiler + -- shares them with the interpreted program. +@@ -841,19 +841,19 @@ + dflags2 = dflags1 { + -- We don't want the original ldInputs in + -- (they're already linked in), but we do want +- -- to link against the previous dynLoadObjs +- -- library if there was one, so that the linker ++ -- to link against previous dynLoadObjs ++ -- libraries if there were any, so that the linker + -- can resolve dependencies when it loads this + -- library. + ldInputs = +- case last_temp_so pls of +- Nothing -> [] +- Just (lp, l) -> ++ concatMap ++ (\(lp, l) -> + [ Option ("-L" ++ lp) + , Option ("-Wl,-rpath") + , Option ("-Wl," ++ lp) + , Option ("-l" ++ l) +- ], ++ ]) ++ (temp_sos pls), + -- Even if we're e.g. profiling, we still want + -- the vanilla dynamic libraries, so we set the + -- ways / build tag to be just WayDyn. +@@ -868,7 +868,7 @@ + consIORef (filesToNotIntermediateClean dflags) soFile + m <- loadDLL soFile + case m of +- Nothing -> return pls { last_temp_so = Just (libPath, libName) } ++ Nothing -> return pls { temp_sos = (libPath, libName) : temp_sos pls } + Just err -> panic ("Loading temp shared object failed: " ++ err) + + rmDupLinkables :: [Linkable] -- Already loaded diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 0547f80106b..696415f4562 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -41,8 +41,8 @@ let version = "0.1.0"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "19620b69257115a69306eec505a97ac843055e92"; # 7.10 branch - sha256 = "027md1glfakniccqq0z1pyrz5w4fy0myxmbl0h789rbcxz9ybv6n"; + rev = "5c3ca2db12bd3e92d3eeaead8bcb6b347174a30f"; # 7.10 branch + sha256 = "0rpfb73bd0maccg3bjf51l23byy0h2i47wph99wblmkdp8ywxkpf"; fetchSubmodules = true; }; shims = fetchgit { @@ -55,8 +55,8 @@ in mkDerivation (rec { inherit version; src = fetchgit { url = git://github.com/ghcjs/ghcjs.git; - rev = "d4322c2ae4467420b28eca99f0c0abd00caf5d4a"; # master branch - sha256 = "12mvl4l1i993j86n9wkwcs567jm13javghbxapjjsc7493xpmya5"; + rev = "15b7a34ddc11075a335e097f6109ad57ca03edab"; # master branch + sha256 = "0h6jdwd7lh3rkfsqpq3s6iavqkz1a88grzcxrcqj4rjilzdw288q"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index a00fe734670..113e2118efb 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc +, libgpgerror }: let loader386 = "${glibc}/lib/ld-linux.so.2"; @@ -14,7 +15,7 @@ stdenv.mkDerivation { sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167"; }; - buildInputs = [ bison glibc bash makeWrapper ]; + buildInputs = [ bison glibc bash makeWrapper libgpgerror ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 37149625005..1feaf68930a 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,26 +1,19 @@ -{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }: +{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security, goPackages }: let loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; loaderArm = "${glibc}/lib/ld-linux.so.3"; - srcs = { - golang = fetchurl { - url = https://github.com/golang/go/archive/go1.4.2.tar.gz; - sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac"; - }; - tools = fetchgit { - url = https://github.com/golang/tools.git; - rev = "c836fe615a448dbf9ff5448c1aa657479a0d0aeb"; - sha256 = "0q9jnhmgmm3xzjss7ndsi6nyykmmb1y984n98118c2sipi183xp5"; - }; - }; in -stdenv.mkDerivation { - name = "go-1.4.2"; +stdenv.mkDerivation rec { + name = "go-${version}"; + version = "1.4.2"; - src = srcs.golang; + src = fetchurl { + url = "https://github.com/golang/go/archive/go${version}.tar.gz"; + sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac"; + }; # perl is used for testing go vet buildInputs = [ bison bash makeWrapper perl ] @@ -41,9 +34,6 @@ stdenv.mkDerivation { mv * go fi - mkdir -p $out/share/go/src/golang.org/x - cp -r --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/golang.org/x/tools - cd go patchShebangs ./ # replace /bin/bash @@ -68,13 +58,16 @@ stdenv.mkDerivation { sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c ''; - patches = [ ./cacert-1.4.patch ]; + patches = [ + ./cacert-1.4.patch + ./remove-tools.patch + ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "armv5tel-linux" then "arm" + else if stdenv.isArm then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 @@ -91,13 +84,6 @@ stdenv.mkDerivation { export PATH="$GOBIN:$PATH" cd ./src ./all.bash - cd - - - # Build extra tooling - # TODO: Fix godoc tests - TOOL_ROOT=golang.org/x/tools/cmd - go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc - go test -v $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc ''; setupHook = ./setup-hook.sh; @@ -107,7 +93,7 @@ stdenv.mkDerivation { homepage = http://golang.org/; description = "The Go Programming language"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + maintainers = with stdenv.lib.maintainers; [ cstrahan wkennington ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/remove-tools.patch b/pkgs/development/compilers/go/remove-tools.patch new file mode 100644 index 00000000000..807ab8e089c --- /dev/null +++ b/pkgs/development/compilers/go/remove-tools.patch @@ -0,0 +1,81 @@ +diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go +index 3b511b1..a46ebd8 100644 +--- a/misc/makerelease/makerelease.go ++++ b/misc/makerelease/makerelease.go +@@ -65,9 +65,6 @@ const ( + // These must be the command that cmd/go knows to install to $GOROOT/bin + // or $GOROOT/pkg/tool. + var toolPaths = []string{ +- "golang.org/x/tools/cmd/cover", +- "golang.org/x/tools/cmd/godoc", +- "golang.org/x/tools/cmd/vet", + } + + var preBuildCleanFiles = []string{ +diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c +index b6c61b4..2006bc2 100644 +--- a/src/cmd/dist/build.c ++++ b/src/cmd/dist/build.c +@@ -210,7 +210,9 @@ init(void) + workdir = xworkdir(); + xatexit(rmworkdir); + +- bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); ++ xgetenv(&b, "GOTOOLDIR"); ++ if (b.len == 0) ++ bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); + tooldir = btake(&b); + + bfree(&b); +diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go +index b71feb7..8468ea8 100644 +--- a/src/cmd/go/pkg.go ++++ b/src/cmd/go/pkg.go +@@ -401,9 +401,9 @@ var goTools = map[string]targetDir{ + "cmd/pack": toTool, + "cmd/pprof": toTool, + "cmd/yacc": toTool, +- "golang.org/x/tools/cmd/cover": toTool, +- "golang.org/x/tools/cmd/godoc": toBin, +- "golang.org/x/tools/cmd/vet": toTool, ++ "nixos.org/x/tools/cmd/cover": toTool, ++ "nixos.org/x/tools/cmd/godoc": toBin, ++ "nixos.org/x/tools/cmd/vet": toTool, + "code.google.com/p/go.tools/cmd/cover": stalePath, + "code.google.com/p/go.tools/cmd/godoc": stalePath, + "code.google.com/p/go.tools/cmd/vet": stalePath, +diff --git a/src/go/build/build.go b/src/go/build/build.go +index 311ecb0..f151d8f 100644 +--- a/src/go/build/build.go ++++ b/src/go/build/build.go +@@ -1367,7 +1367,7 @@ func init() { + } + + // ToolDir is the directory containing build tools. +-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) ++var ToolDir = runtime.GOTOOLDIR() + + // IsLocalImport reports whether the import path is + // a local import path, like ".", "..", "./foo", or "../foo". +diff --git a/src/runtime/extern.go b/src/runtime/extern.go +index 6cc5df8..9a9a964 100644 +--- a/src/runtime/extern.go ++++ b/src/runtime/extern.go +@@ -152,6 +152,17 @@ func GOROOT() string { + return defaultGoroot + } + ++// GOTOOLDIR returns the root of the Go tree. ++// It uses the GOTOOLDIR environment variable, if set, ++// or else the root used during the Go build. ++func GOTOOLDIR() string { ++ s := gogetenv("GOTOOLDIR") ++ if s != "" { ++ return s ++ } ++ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH ++} ++ + // Version returns the Go tree's version string. + // It is either the commit hash and date at the time of the build or, + // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 8e6828bce46..d9c9f91df6a 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation { dontStrip = true; - meta = { + meta = with stdenv.lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = http://haxe.org; - license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 72bdabb4349..a5586117588 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c -, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5 +, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit , libvpx, imagemagick, fribidi @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5 + libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5 gmp libyaml libedit libvpx imagemagick fribidi ]; diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix deleted file mode 100644 index 14751799795..00000000000 --- a/pkgs/development/compilers/hugs/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ composableDerivation, fetchurl }: - -let edf = composableDerivation.edf; - wwf = composableDerivation.wwf; in - -composableDerivation.composableDerivation {} { - name = "hugs98-200609"; - - src = fetchurl { - url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; - sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6"; - }; - - #encode all character I/O using the byte encoding - #determined by the locale in effect at that time. To - #require that the UTF-8 encoding is always used, give - #the --enable-char-encoding=utf8 option. - #[default=autodetect] - postUnpack = '' - find -type f | xargs sed -i 's@/bin/cp@cp@'; - ''; - - configurePhase = "./configure --prefix=\$out --enable-char-encoding=utf8 $configureFlags"; - - flags = - edf { name = "pathCanonicalization"; feat="path-canonicalization"; } - // edf { name="timer"; } # enable evaluation timing (for benchmarking Hugs) - // edf { name="profiling"; }# enable heap profiler - // edf { name="stackDumps"; feat="stack-dummps"; } # enable stack dump on stack overflow - // edf { name="largeBanner"; feat="large-banner"; } # disable multiline startup banner - // edf { name="internal-prims"; } # experimental primitives to access Hugs's innards - // edf { name="debug"; } # include C debugging information (for debugging Hugs) - // edf { name="tag"; } # runtime tag checking (for debugging Hugs) - // edf { name="lint"; } # enable "lint" flags (for debugging Hugs) - // edf { name="only98"; } # build Hugs to understand Haskell 98 only - // edf { name="ffi"; } - #--with-nmake produce a Makefile compatible with nmake - #--with-gui build Hugs for Windows GUI (Borland C++ only) - // wwf { name="pthreads"; } # build Hugs using POSIX threads C library - ; - - cfg = { - largeBannerSupport = true; # seems to be default - char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; }; - utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; }; - }; - - meta = { - license = "as-is"; # gentoo is calling it this way.. - description = "Haskell interpreter"; - homepage = http://www.haskell.org/hugs; - }; -} diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix index 5e008821d95..fe7ec585155 100644 --- a/pkgs/development/compilers/icedtea/default.nix +++ b/pkgs/development/compilers/icedtea/default.nix @@ -135,7 +135,7 @@ let # Generate certificates. pushd $jre/lib/icedtea/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/ca-bundle.crt popd ln -s $out/lib/icedtea/bin $out/bin diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index cd060e3a65d..51e871f2ca4 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }: stdenv.mkDerivation { name = "clang-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; - buildInputs = [ cmake libedit libxml2 ]; + buildInputs = [ cmake libedit libxml2 zlib ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 2398b0c59ac..05ac4be01e5 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -1,6 +1,6 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: let - gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { name = "clang-${version}"; diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index 7be535ada1e..ecca67398ec 100644 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -1,12 +1,12 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: let - gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0b8825mvdhfk5r9gwcwp1j2dl9kw5glgyk7pybq2dzhrh4vnj3my"} + unpackFile ${fetch "cfe" "1myssbxlyln0nggfz04nfrbzdckljksmaxp82nq7hrmqjc62vybl"} mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix index 624fc68c21a..3321e38949f 100644 --- a/pkgs/development/compilers/llvm/3.6/default.nix +++ b/pkgs/development/compilers/llvm/3.6/default.nix @@ -2,7 +2,7 @@ let callPackage = newScope (self // { inherit isl version fetch; }); - version = "3.6.0"; + version = "3.6.1"; fetch = fetch_v version; fetch_v = ver: name: sha256: fetchurl { @@ -10,8 +10,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "04bbn946jninynkrjyp337xqs8ihn4fkz5xgvmywxkddwmwznjbz"; - clang-tools-extra_src = fetch "clang-tools-extra" "04n83gsmy2ghvn7vp9hamsgn332rx2g7sa4paskr0d4ihax4ka9s"; + compiler-rt_src = fetch "compiler-rt" "17v4gf4y5krgkrd12r95hfxbw5q4c4jlf3513kqlfq5yfw663gzw"; + clang-tools-extra_src = fetch "clang-tools-extra" "1dljzdk2jmrwyh8z92rljxl9wzdggp74i9f6g8aajl6mf3c71vpl"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix index a01d15e186b..5bc122fa5ce 100644 --- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1dzvhyrzj54v823biadag5lwxfz37gm8a65aq72pjsh8n211x719"; + src = fetch "libcxx" "1yf0ns4cvvirp1ml5a8h29lysnw5c23715b09x68v5zkxhxnap2s"; # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib, # force it to link with our copy diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix index ddc9c267edd..6cd08e46e63 100644 --- a/pkgs/development/compilers/llvm/3.6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.6/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "1xclv63l7cmrxkl129w6j9fsxgdm8jjlcm8gswl2y9qmh3dwz2zp"; + src = fetch "libcxxabi" "0pgimy1b5vj4favzdz2830n917fyz65hm3khdgkbgnfs43s8g0xw"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind; diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix index d4f496a1749..4740c97cb9b 100644 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "1cphxbc8c0yqs2rxn94vcn8his465m97rnynklpzm8sf5kad26ib"; + src = fetch "lldb" "1fmaz7zcc1f54ns4x8rx9nvhh4pyrhbz103bl02sv1cfwxj5ryyf"; patchPhase = '' sed -i 's|/usr/bin/env||' \ diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix index 05772ebb318..0cf5ef215a2 100644 --- a/pkgs/development/compilers/llvm/3.6/llvm.nix +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -15,7 +15,7 @@ }: let - src = fetch "llvm" "1kmr5vlnz1419nnvyc7lsrcfx09n65ravjbmzxrqz7ml07jnk6mk"; + src = fetch "llvm" "0ypwcqrld91jn0zz4mkdksl2mbb0ds9lh5gf0xkbb81sj4awc01g"; in stdenv.mkDerivation rec { name = "llvm-${version}"; diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 195e83e7313..ce61e562139 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -41,9 +41,12 @@ stdenv.mkDerivation rec { ln -sv $out/lib/ocaml/caml $out/include/caml ''; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -65,7 +68,7 @@ stdenv.mkDerivation rec { documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 6488d94cc08..e6ed6f4b73e 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -34,10 +34,13 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; branch = "3.12"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -59,7 +62,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 4e888e14322..f8a7ed920a5 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -33,10 +33,13 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; branch = "4.00"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -58,7 +61,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index d178285834f..1d323ec0cba 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -48,10 +48,13 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; branch = "4.01"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -73,7 +76,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/4.02.1.nix b/pkgs/development/compilers/ocaml/4.02.1.nix index 18f9d373650..6f4cce522e4 100644 --- a/pkgs/development/compilers/ocaml/4.02.1.nix +++ b/pkgs/development/compilers/ocaml/4.02.1.nix @@ -44,10 +44,13 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; branch = "4.02"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -69,7 +72,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 8b86c805c61..882af287c04 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -55,9 +55,16 @@ stdenv.mkDerivation rec { cd .. ''; - meta = { + meta = with stdenv.lib; { homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; + description = "Conservative extension of OCaml"; + longDescription = '' + A conservative extension of OCaml with the primitive type of code values, + and three basic multi-stage expression forms: Brackets, Escape, and Run + ''; }; } diff --git a/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch new file mode 100644 index 00000000000..85722a1d365 --- /dev/null +++ b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch @@ -0,0 +1,11 @@ +diff -r 61edd5c7412e make/linux/Makefile +--- a/hotspot/make/linux/Makefile Mon Mar 02 18:12:06 2015 +0000 ++++ b/hotspot/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100 +@@ -233,7 +233,7 @@ + # Solaris 2.5.1, 2.6). + # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. + +-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% ++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% + OS_VERSION := $(shell uname -r) + EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index ec095bb4efa..d0ca85af0e0 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch new file mode 100644 index 00000000000..6189412c999 --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch @@ -0,0 +1,15 @@ +--- a/hotspot/src/os/linux/vm/os_linux.cpp 2015-02-04 21:14:39.000000000 +0100 ++++ b/hotspot/src/os/linux/vm/os_linux.cpp 2015-05-19 16:17:29.960107613 +0200 +@@ -2304,10 +2304,8 @@ + assert(ret, "cannot locate libjvm"); + char *rp = NULL; + if (ret && dli_fname[0] != '\0') { +- rp = realpath(dli_fname, buf); ++ snprintf(buf, buflen, "%s", dli_fname); + } +- if (rp == NULL) +- return; + + if (Arguments::created_by_gamma_launcher()) { + // Support for the gamma launcher. Typical value for buf is + diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 44e93474163..c2780866161 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -1,41 +1,41 @@ { stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl, liberation_ttf, fontconfig } : let update = "40"; - build = "25"; + build = "27"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u40"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "05s5j0rq45n8piymv9c1n0hxr4bk3j8lz6fw2wbp0m8kam6zzpza"; + sha256 = "0ra05jngvvy2g1da5b9anrp86m812g2wlkxpijc82kxv6c3h6g28"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0p1z38szm63cf5f83697awbqwpf7b8q1ymrqc0v6r9hb5yf0p22r"; + sha256 = "0r9zdq13kgqqm8rgr36qf03h23psxcwzvdqffsncd4jvbfap3n5f"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0sl0ima3zlbd1ai7qrg4msy5ibg64qpwdrv7z4l8cpalwby26y6p"; + sha256 = "07v3z38v5fdsx3g28c4pkdq76cdmnc4qflf1wb3lz46lhy230hkd"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1ahvhap8av519813yf20v3hbvg82j9bq3gnqlayng1qggfivsb5s"; + sha256 = "0y20468f2yi14lijbd732f2mlgrn718pyfji3279l2rm4ad7r7pl"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0n86fcy1z4z22jcgfnn9agzfi949709hn2x6s8wyhwwa055rjd1a"; + sha256 = "1sgfxmkq6z3vj9yq9kszr42b1ijvsknlss353jpcmyr1lljhyvfg"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0hp19hq0dw3j8zz4mxd6bjk9zqlyr56fhwzgjwmm56b6pwkcmsn7"; + sha256 = "08p3657d0871pz0g5fg157az9q38r5h2zs49dm7512sc9qrn5c06"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "037za0hjiwvzvbzsckfxnrrbak1vbd52pmrnd855vxkik08jxp8c"; + sha256 = "1f1vlrvlvnjbyh8d168smizvmkcm076zc496sxk6njqamby16ip2"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2"; + sha256 = "1llf3l4483kd8m1a77n7y9fgvm6fa63nim3qhp5z4gnw68ldbhra"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; @@ -50,13 +50,23 @@ let ''; prePatch = '' # despite --with-override-jdk the build still searchs here - ln -s "../jdk-${repover}" "jdk"; - ln -s "../hotspot-${repover}" "hotspot"; + # GNU Patch bug, --follow-symlinks only follow the last dir part symlink + mv "../jdk-${repover}" "jdk"; + mv "../hotspot-${repover}" "hotspot"; + ''; + postPatch = '' + mv jdk "../jdk-${repover}"; + mv hotspot "../hotspot-${repover}"; + # Patching is over, lets re-add the links + ln -s "../jdk-${repover}" "jdk" + ln -s "../hotspot-${repover}" "hotspot" ''; patches = [ - ./fix-java-home.patch + ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch + ./JDK-8074312-hotspot.patch + ]; preConfigure = '' chmod +x configure @@ -78,7 +88,7 @@ let "--with-milestone=fcs" ]; NIX_LDFLAGS= "-lfontconfig"; - buildFlags = "DEBUG_BINARIES=true all"; + buildFlags = "all"; installPhase = '' mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk @@ -126,7 +136,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/compilers/rustc/1.0.0-beta.nix b/pkgs/development/compilers/rustc/1.0.0.nix similarity index 78% rename from pkgs/development/compilers/rustc/1.0.0-beta.nix rename to pkgs/development/compilers/rustc/1.0.0.nix index 93359fba9f7..a85ed9290fe 100644 --- a/pkgs/development/compilers/rustc/1.0.0-beta.nix +++ b/pkgs/development/compilers/rustc/1.0.0.nix @@ -1,8 +1,8 @@ { stdenv, callPackage }: callPackage ./makeRustcDerivation.nix { - shortVersion = "1.0.0-beta.2"; + shortVersion = "1.0.0"; isRelease = true; - srcSha = "0wcpp6fg7cc75bj5b6dcz5dhgps6xw09n75qiapmd12qxjzj17wn"; + srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak"; snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; @@ -12,5 +12,5 @@ callPackage ./makeRustcDerivation.nix { patches = [ ./patches/beta.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - configureFlags = [ "--release-channel=beta" ]; + configureFlags = [ "--release-channel=stable" ]; } diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix index ae3981f1add..6208190f8df 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper -, tzdata, git, valgrind, procps, coreutils +{ stdenv, fetchurl, fetchgit, fetchzip, which, file, perl, curl, python27 +, makeWrapper, tzdata, git, valgrind, procps, coreutils , shortVersion, isRelease , srcSha, srcRev ? "" @@ -85,7 +85,7 @@ stdenv.mkDerivation { inherit meta; src = if isRelease then - fetchurl { + fetchzip { url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; sha256 = srcSha; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index b9e3011194d..80f7ea8cc3c 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0w1ymazyck5a8bjmsbnq1hps1n4824h3ajh849f1y09dwzd09al8"; + sha256 = "1bf98wi3gz8n09prwmxa38b2mhq69rqq11s9h9swi3avy5wchnxn"; }; buildInputs = [ which ] diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index aa8ea9012c1..a2b8d4f63b9 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "Standard ML of New Jersey, a compiler"; homepage = http://smlnj.org; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; platforms = [ "i686-linux" ]; - maintainers = stdenv.lib.maintainers.thoughtpolice; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 4a6408d66d1..816803d4bd9 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused -, libpthreadstubs, pango, pkgconfig, pulseaudio, which }: +, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: let version = "4.10.2.2614"; in stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs - pango pkgconfig pulseaudio which ]; + pango pkgconfig libpulseaudio which ]; postPatch = '' for i in squeak.in squeak.sh.in; do diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix index 92a3d16963b..fc3c16d0049 100644 --- a/pkgs/development/coq-modules/bedrock/default.nix +++ b/pkgs/development/coq-modules/bedrock/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { buildPhase = '' make -j$NIX_BUILD_CORES -C src/reification make -j$NIX_BUILD_CORES -C src + make -j$NIX_BUILD_CORES -C src native + # make -j$NIX_BUILD_CORES -C platform + # make -j$NIX_BUILD_CORES -C platform -f Makefile.cito ''; installPhase = '' diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index bfe83a74aae..a9e69184c4e 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, coq, ssreflect, mathcomp}: +{ stdenv, fetchgit, coq, mathcomp }: stdenv.mkDerivation rec { @@ -11,10 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1cvjz0yyqihdx1hp1h9x5x14kv9qf3rjhgqq4f7rv8bxcv9p1gv3"; }; - buildInputs = [ coq.ocaml coq.camlp5 ssreflect mathcomp ]; - propagatedBuildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; - preConfigure = "cd theory"; + preConfigure = '' + cd theory + patch ./Make < -R . CoqEAL + EOF + ''; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 76828784a9d..1d259da1415 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,32 +1,64 @@ { go, govers, lib }: -{ name, buildInputs ? [] +{ name, buildInputs ? [], passthru ? {} + +# Disabled flag +, disabled ? false # Go import path of the package , goPackagePath -, meta ? {}, ... } @ args: +# Go package aliases +, goPackageAliases ? [ ] + +# Extra sources to include in the gopath +, extraSrcs ? [ ] + +, dontRenameImports ? false + +, meta ? {}, ... } @ args': + +if disabled then throw "${name} not supported for go ${go.meta.branch}" else + +let + args = lib.filterAttrs (name: _: name != "extraSrcs") args'; +in + +go.stdenv.mkDerivation ( + (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { -go.stdenv.mkDerivation ( args // { name = "go${go.meta.branch}-${name}"; - buildInputs = [ go ] ++ buildInputs ++ (lib.optional (args ? renameImports) govers) ; + buildInputs = [ go ] ++ buildInputs ++ (lib.optional (!dontRenameImports) govers) ; configurePhase = args.configurePhase or '' runHook preConfigure + # Extract the source cd "$NIX_BUILD_TOP" mkdir -p "go/src/$(dirname "$goPackagePath")" mv "$sourceRoot" "go/src/$goPackagePath" + '' + lib.flip lib.concatMapStrings extraSrcs ({ src, goPackagePath }: '' + mkdir extraSrc + (cd extraSrc; unpackFile "${src}") + mkdir -p "go/src/$(dirname "${goPackagePath}")" + chmod -R u+w extraSrc/* + mv extraSrc/* "go/src/${goPackagePath}" + rmdir extraSrc + + '') + '' GOPATH=$NIX_BUILD_TOP/go:$GOPATH runHook postConfigure ''; - renameImports = lib.optionalString (args ? renameImports) - (lib.concatMapStringsSep "\n" - (cmdargs: "govers -m ${cmdargs}") - args.renameImports); + renameImports = args.renameImports or ( + let + inputsWithAliases = lib.filter (x: x ? goPackageAliases) + (buildInputs ++ (args.propagatedBuildInputs or [ ])); + rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}"; + renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; + in lib.concatMapStringsSep "\n" renames inputsWithAliases); buildPhase = args.buildPhase or '' runHook preBuild @@ -34,16 +66,25 @@ go.stdenv.mkDerivation ( args // { runHook renameImports if [ -n "$subPackages" ] ; then - for p in $subPackages ; do + for p in $subPackages ; do go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p - done + done else - find . -type d | while read d; do - for i in $d/*.go; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d - break - done - done + (cd go/src + find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do + echo "$d" | grep -q "/_" && continue + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue + local OUT + if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then + if ! echo "$OUT" | grep -q 'no buildable Go source files'; then + echo "$OUT" >&2 + exit 1 + fi + fi + if [ -n "$OUT" ]; then + echo "$OUT" >&2 + fi + done) fi runHook postBuild @@ -53,16 +94,14 @@ go.stdenv.mkDerivation ( args // { runHook preCheck if [ -n "$subPackages" ] ; then - for p in $subPackages ; do + for p in $subPackages ; do go test -p $NIX_BUILD_CORES -v $goPackagePath/$p - done + done else - find . -type d | while read d; do - for i in $d/*_test.go; do - go test -p $NIX_BUILD_CORES -v $d - break - done - done + (cd go/src + find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq | while read d; do + go test -p $NIX_BUILD_CORES -v $d + done) fi runHook postCheck @@ -71,15 +110,15 @@ go.stdenv.mkDerivation ( args // { installPhase = args.installPhase or '' runHook preInstall - mkdir $out + mkdir -p $out if [ -z "$dontInstallSrc" ]; then - local dir - for d in pkg src; do - mkdir -p $out/share/go - dir="$NIX_BUILD_TOP/go/$d" - [ -e "$dir" ] && cp -r $dir $out/share/go - done + (cd "$NIX_BUILD_TOP/go" + find . -type f | while read f; do + echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue + mkdir -p "$(dirname "$out/share/go/$f")" + cp $NIX_BUILD_TOP/go/$f $out/share/go/$f + done) fi dir="$NIX_BUILD_TOP/go/bin" @@ -88,7 +127,12 @@ go.stdenv.mkDerivation ( args // { runHook postInstall ''; - meta = meta // { + passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; + + meta = { + # Add default meta information + platforms = lib.platforms.all; + } // meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ [ lib.maintainers.emery lib.maintainers.lethalman ]; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 10d98dbf7c3..7cce27c387e 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, guile, texinfo}: -assert stdenv ? cc && stdenv.cc.cc.isGNU or false; +assert stdenv ? cc && stdenv.cc.isGNU; stdenv.mkDerivation rec { name = "guile-lib-0.2.2"; diff --git a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch b/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch deleted file mode 100644 index ae3397fa573..00000000000 --- a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru3 brainfuck-0.1-old/Language/Brainfuck.hs brainfuck-0.1/Language/Brainfuck.hs ---- brainfuck-0.1-old/Language/Brainfuck.hs 2015-04-17 21:17:34.568721144 +0300 -+++ brainfuck-0.1/Language/Brainfuck.hs 2015-04-17 21:19:17.065872395 +0300 -@@ -19,6 +19,8 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -} - -+{-# LANGUAGE FlexibleContexts #-} -+ - module Language.Brainfuck where - - import Data.Array.IO -@@ -287,4 +289,4 @@ - - halt = if debug - then putStrLn "Machine Halted.\n" -- else putStrLn "\n" -\ No newline at end of file -+ else putStrLn "\n" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c444b38d7a4..eb2c1e7c9c0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -8,10 +8,10 @@ self: super: { Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; }); + cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; }); + cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; }); # Break infinite recursions. - digest = super.digest.override { inherit (pkgs) zlib; }; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; hspec-expectations = dontCheck super.hspec-expectations; @@ -27,6 +27,7 @@ self: super: { # Doesn't compile with lua 5.2. hslua = super.hslua.override { lua = pkgs.lua5_1; }; + hslua_0_4_0 = super.hslua_0_4_0.override { lua = pkgs.lua5_1; }; # Use the default version of mysql to build this package (which is actually mariadb). mysql = super.mysql.override { mysql = pkgs.mysql.lib; }; @@ -115,9 +116,6 @@ self: super: { # Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10. network-uri = dontCheck super.network-uri; - # Agda-2.4.2.2 needs these overrides to compile. - Agda = super.Agda.override { equivalence = self.equivalence_0_2_5; cpphs = self.cpphs_1_18_9; }; - # Help libconfig find it's C language counterpart. libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; }; @@ -152,14 +150,11 @@ self: super: { wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; - # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. - darcs = overrideCabal super.darcs (drv: { + # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. + darcs = (overrideCabal super.darcs (drv: { doCheck = false; # The test suite won't even start. - patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal"; - }); - - # Needs the latest version of QuickCheck to compile. - cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; }; + patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' darcs.cabal"; + })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; }); # https://github.com/massysett/rainbox/issues/1 rainbox = dontCheck super.rainbox; @@ -171,7 +166,6 @@ self: super: { ASN1 = dontDistribute super.ASN1; # NewBinary frame-markdown = dontDistribute super.frame-markdown; # frame hails-bin = dontDistribute super.hails-bin; # Hails - hbro-contrib = dontDistribute super.hbro-contrib; # hbro lss = markBrokenVersion "0.1.0.0" super.lss; # https://github.com/dbp/lss/issues/2 snaplet-lss = markBrokenVersion "0.1.0.0" super.snaplet-lss; # https://github.com/dbp/lss/issues/2 @@ -296,6 +290,8 @@ self: super: { # These packages try to access the network. amqp = dontCheck super.amqp; amqp-conduit = dontCheck super.amqp-conduit; + bitcoin-api = dontCheck super.bitcoin-api; + bitcoin-api-extra = dontCheck super.bitcoin-api-extra; concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw @@ -313,9 +309,11 @@ self: super: { scotty-binding-play = dontCheck super.scotty-binding-play; slack-api = dontCheck super.slack-api; # https://github.com/mpickering/slack-api/issues/5 stackage = dontCheck super.stackage; # http://hydra.cryp.to/build/501867/nixlog/1/raw + textocat-api = dontCheck super.textocat-api; # http://hydra.cryp.to/build/887011/log/raw warp = dontCheck super.warp; # http://hydra.cryp.to/build/501073/nixlog/5/raw wreq = dontCheck super.wreq; # http://hydra.cryp.to/build/501895/nixlog/1/raw wreq-sb = dontCheck super.wreq-sb; # http://hydra.cryp.to/build/783948/log/raw + wuss = dontCheck super.wuss; # http://hydra.cryp.to/build/875964/nixlog/2/raw # https://github.com/NICTA/digit/issues/3 digit = dontCheck super.digit; @@ -403,7 +401,7 @@ self: super: { http-client-openssl = dontCheck super.http-client-openssl; http-client-tls = dontCheck super.http-client-tls; ihaskell = dontCheck super.ihaskell; - influxdb = dontCheck super.influxdb; + influxdb = dontCheck (dontJailbreak super.influxdb); itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; @@ -460,9 +458,6 @@ self: super: { # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test hspec-webdriver = markBroken super.hspec-webdriver; - # The build fails with the most recent version of c2hs. - ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; }; - # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; @@ -681,8 +676,14 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # https://github.com/jgm/pandoc/issues/2045 - pandoc = dontCheck super.pandoc; + # https://github.com/jgm/pandoc/issues/2190 + pandoc = overrideCabal super.pandoc (drv: { + enableSharedExecutables = false; + postInstall = '' # install man pages + mv man $out/ + find $out/man -type f ! -name "*.[0-9]" -exec rm {} + + ''; + }); # Broken by GLUT update. Monadius = markBroken super.Monadius; @@ -745,7 +746,9 @@ self: super: { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-general = super.llvm-general.override { llvm-config = pkgs.llvmPackages_34.llvm; }; + # Needs help finding LLVM. + llvm-general = super.llvm-general.override { llvm-config = self.llvmPackages.llvm; }; + spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; # Tries to run GUI in tests leksah = dontCheck super.leksah; @@ -753,19 +756,11 @@ self: super: { # Patch to consider NIX_GHC just like xmonad does dyre = appendPatch super.dyre ./dyre-nix.patch; - # Fix problems with GHC >=7.8 (in compatible way) - mueval = let pkg = appendPatch super.mueval (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/4.patch"; - sha256 = "1l0jn2lbzbhx9ifbpb5g617qa0fc8fwa6kyr87pjqfxpqminsgp5"; - }); - # Nix-specific workaround - in appendPatch pkg ./mueval-nix.patch; + # https://github.com/gwern/mueval/issues/9 + mueval = markBrokenVersion "0.9.1.1" super.mueval; # Test suite won't compile against tasty-hunit 0.9.x. - zlib_0_6_1_0 = dontCheck super.zlib_0_6_1_0; - - # Jailbreaking breaks the build. - QuickCheck_2_8_1 = dontJailbreak super.QuickCheck_2_8_1; + zlib = dontCheck super.zlib; # Override the obsolete version from Hackage with our more up-to-date copy. cabal2nix = pkgs.cabal2nix; @@ -801,4 +796,40 @@ self: super: { # https://github.com/bos/aeson/issues/253 aeson = dontCheck super.aeson; + # GNUTLS 3.4 causes linker errors: http://hydra.cryp.to/build/839563/nixlog/2/raw + gnutls = super.gnutls.override { gnutls = pkgs.gnutls33; }; + + # Won't compile with recent versions of QuickCheck. + testpack = markBroken super.testpack; + MissingH = dontCheck super.MissingH; + + # Obsolete for GHC versions after GHC 6.10.x. + utf8-prelude = markBroken super.utf8-prelude; + + # https://github.com/yaccz/saturnin/issues/3 + Saturnin = dontCheck super.Saturnin; + + # https://github.com/kolmodin/binary/issues/74 + binary_0_7_4_0 = dontCheck super.binary_0_7_4_0; + + # https://github.com/kkardzis/curlhs/issues/6 + curlhs = dontCheck super.curlhs; + + # This needs the latest version of errors to compile. + pipes-errors = super.pipes-errors.override { errors = self.errors_2_0_0; }; + + # https://github.com/hvr/token-bucket/issues/3 + token-bucket = dontCheck super.token-bucket; + + # https://github.com/alphaHeavy/lzma-enumerator/issues/3 + lzma-enumerator = dontCheck super.lzma-enumerator; + + # https://github.com/BNFC/bnfc/issues/140 + BNFC = dontCheck super.BNFC; + + # FPCO's fork of Cabal won't succeed its test suite. + Cabal-ide-backend = dontCheck super.Cabal-ide-backend; + + # https://github.com/vincenthz/hs-cipher-aes/issues/35 + cipher-aes = dontCheck super.cipher-aes; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 4686c813b3c..f6b2b2304b9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -48,11 +48,12 @@ self: super: { # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; - cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; }; cabal-install = self.cabal-install_1_18_1_0; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { + Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; }); + }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 b5c0f42fc78..2262819a779 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -41,25 +41,31 @@ self: super: { # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); - HStringTemplate = self.HStringTemplate_0_8_3; - - # We have Cabal 1.22.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9. + jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal; # GHC 7.10.x's Haddock binary cannot generate hoogle files. # https://ghc.haskell.org/trac/ghc/ticket/9921 mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; }); + idris = + let idris' = overrideCabal super.idris (drv: { + # "idris" binary cannot find Idris library otherwise while building. + # After installing it's completely fine though. + # Seems like Nix-specific issue so not reported. + preBuild = '' + export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH + ''; + }); + in idris'.overrideScope (self: super: { + zlib = self.zlib_0_5_4_2; + }); + Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; 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; @@ -105,27 +111,18 @@ self: super: { # Test suite fails in "/tokens_bytestring_unicode.g.bin". alex = dontCheck super.alex; - # https://github.com/haskell/haddock/issues/378 - haddock-library_1_2_0 = dontCheck super.haddock-library_1_2_0; - haddock-library = self.haddock-library_1_2_0; - # Upstream was notified about the over-specified constraint on 'base' # but refused to do anything about it because he "doesn't want to # support a moving target". Go figure. barecheck = doJailbreak super.barecheck; - syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { - url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; - sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br"; - }); - # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; # Until the changes have been pushed to Hackage mueval = appendPatch super.mueval (pkgs.fetchpatch { url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch"; - sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74"; + sha256 = "0h1lx4z15imq009k0qmwkn5l3hmigw463ahvwffdnszi2n618kpg"; }); present = appendPatch super.present (pkgs.fetchpatch { url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch"; @@ -164,7 +161,7 @@ self: super: { misfortune = appendPatch super.misfortune (pkgs.fetchpatch { url = "https://github.com/mokus0/misfortune/commit/9e0a38cf8d59a0de9ae1156034653f32099610e4.patch"; - sha256 = "15frwdallm3i6k7mil26bbjd4wl6k9h20ixf3cmyris3q3jhlcfh"; + sha256 = "01m1l199ihq85j9pyc3n0wqv1z4my453hhhcvg3yz3gpz3lf224r"; }); timezone-series = doJailbreak super.timezone-series; @@ -181,44 +178,8 @@ self: super: { in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 self.webkitgtk3-javascriptcore ]; - # FIXME: remove with the next Hackage update - brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch; - unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch; - - # https://github.com/BNFC/bnfc/issues/137 - BNFC = markBrokenVersion "2.7.1" super.BNFC; - cubical = dontDistribute super.cubical; - # contacted maintainer by e-mail - HList = markBrokenVersion "0.3.4.1" super.HList; - AspectAG = dontDistribute super.AspectAG; - Rlang-QQ = dontDistribute super.Rlang-QQ; - SyntaxMacros = dontDistribute super.SyntaxMacros; - expand = dontDistribute super.expand; - functional-arrow = dontDistribute super.functional-arrow; - guess-combinator = dontDistribute super.guess-combinator; - ihaskell-rlangqq = dontDistribute super.ihaskell-rlangqq; - ipopt-hs = dontDistribute super.ipopt-hs; - murder = dontDistribute super.murder; - netcore = dontDistribute super.netcore; - nettle-frp = dontDistribute super.nettle-frp; - nettle-netkit = dontDistribute super.nettle-netkit; - nettle-openflow = dontDistribute super.nettle-openflow; - oberon0 = dontDistribute super.oberon0; - poly-arity = dontDistribute super.poly-arity; - respond = dontDistribute super.respond; - semi-iso = dontDistribute super.semi-iso; - syntax = dontDistribute super.syntax; - syntax-attoparsec = dontDistribute super.syntax-attoparsec; - syntax-example = dontDistribute super.syntax-example; - syntax-example-json = dontDistribute super.syntax-example-json; - syntax-pretty = dontDistribute super.syntax-pretty; - syntax-printer = dontDistribute super.syntax-printer; - tuple-hlist = dontDistribute super.tuple-hlist; - tuple-morph = dontDistribute super.tuple-morph; - - # contacted maintainer by e-mail - cmdlib = markBroken super.cmdlib; + cmdlib = markBrokenVersion "0.3.5" super.cmdlib; darcs-fastconvert = dontDistribute super.darcs-fastconvert; ivory-backend-c = dontDistribute super.ivory-backend-c; ivory-bitdata = dontDistribute super.ivory-bitdata; @@ -242,7 +203,7 @@ self: super: { pell = dontDistribute super.pell; quadratic-irrational = dontDistribute super.quadratic-irrational; - # https://github.com/kazu-yamamoto/ghc-mod/issues/467 + # https://github.com/kazu-yamamoto/ghc-mod/issues/437 ghc-mod = markBroken super.ghc-mod; HaRe = dontDistribute super.HaRe; ghc-imported-from = dontDistribute super.ghc-imported-from; @@ -251,41 +212,6 @@ self: super: { hbb = dontDistribute super.hbb; hsdev = dontDistribute super.hsdev; - # http://hub.darcs.net/ivanm/graphviz/issue/5 - graphviz = markBroken super.graphviz; - Graphalyze = dontDistribute super.Graphalyze; - HLearn-approximation = dontDistribute super.HLearn-approximation; - HLearn-classification = dontDistribute super.HLearn-classification; - HLearn-distributions = dontDistribute super.HLearn-distributions; - SourceGraph = dontDistribute super.SourceGraph; - Zora = dontDistribute super.Zora; - ampersand = dontDistribute super.ampersand; - caffegraph = dontDistribute super.caffegraph; - dot2graphml = dontDistribute super.dot2graphml; - dvda = dontDistribute super.dvda; - erd = dontDistribute super.erd; - filediff = dontDistribute super.filediff; - fsmActions = dontDistribute super.fsmActions; - gbu = dontDistribute super.gbu; - geni-gui = dontDistribute super.geni-gui; - ghc-vis = dontDistribute super.ghc-vis; - grammar-combinators = dontDistribute super.grammar-combinators; - llvm-analysis = dontDistribute super.llvm-analysis; - llvm-base-types = dontDistribute super.llvm-base-types; - llvm-data-interop = dontDistribute super.llvm-data-interop; - llvm-tools = dontDistribute super.llvm-tools; - marxup = dontDistribute super.marxup; - mathgenealogy = dontDistribute super.mathgenealogy; - optimusprime = dontDistribute super.optimusprime; - phybin = dontDistribute super.phybin; - prolog-graph = dontDistribute super.prolog-graph; - prolog-graph-lib = dontDistribute super.prolog-graph-lib; - teams = dontDistribute super.teams; - vacuum-graphviz = dontDistribute super.vacuum-graphviz; - vampire = dontDistribute super.vampire; - visual-graphrewrite = dontDistribute super.visual-graphrewrite; - xdot = dontDistribute super.xdot; - # https://github.com/lymar/hastache/issues/47 hastache = dontCheck super.hastache; @@ -298,17 +224,17 @@ self: super: { # https://github.com/ocharles/tasty-rerun/issues/5 tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts"); + # http://hub.darcs.net/ivanm/graphviz/issue/5 + graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./graphviz-fix-ghc710.patch)); + # Broken with GHC 7.10.x. aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6; - annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3; - c2hs_0_20_1 = markBroken super.c2hs_0_20_1; Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3; cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0; containers_0_4_2_1 = markBroken super.containers_0_4_2_1; control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3; equivalence_0_2_5 = markBroken super.equivalence_0_2_5; haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2; - lens_4_7_0_1 = markBroken super.lens_4_7_0_1; optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0; QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1; seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0; @@ -320,8 +246,45 @@ self: super: { # https://github.com/HugoDaniel/RFC3339/issues/14 timerep = dontCheck super.timerep; - # Ugly hack that triggers a rebuild to fix the broken package on Hydra. - cabal-lenses = appendConfigureFlag super.cabal-lenses "-fignore-me-1"; - text = appendConfigureFlag super.text "-fignore-me-1"; + # Upstream has no issue tracker. + harp = markBrokenVersion "0.4" super.harp; + happstack-authenticate = dontDistribute super.happstack-authenticate; + + # Upstream has no issue tracker. + llvm-base-types = markBroken super.llvm-base-types; + llvm-analysis = dontDistribute super.llvm-analysis; + llvm-data-interop = dontDistribute super.llvm-data-interop; + llvm-tools = dontDistribute super.llvm-tools; + + # Upstream has no issue tracker. + MaybeT = markBroken super.MaybeT; + grammar-combinators = dontDistribute super.grammar-combinators; + + # Required to fix version 0.91.0.0. + wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts"); + + # Upstream has no issue tracker. + Graphalyze = markBroken super.Graphalyze; + gbu = dontDistribute super.gbu; + SourceGraph = dontDistribute super.SourceGraph; + + # Upstream has no issue tracker. + markBroken = super.protocol-buffers; + caffegraph = dontDistribute super.caffegraph; + + # Deprecated: https://github.com/mikeizbicki/ConstraintKinds/issues/8 + ConstraintKinds = markBroken super.ConstraintKinds; + HLearn-approximation = dontDistribute super.HLearn-approximation; + HLearn-distributions = dontDistribute super.HLearn-distributions; + HLearn-classification = dontDistribute super.HLearn-classification; + + # Won't work with LLVM 3.5. + llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + + # Ugly hack to trigger a rebuild to fix the broken package on Hydra. + crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1"; + + # Fix compilation under GHC 7.10, patch has been sent upstream. + iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 46a4b0d02e6..98bad4fa1be 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -45,14 +45,15 @@ self: super: { # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; - cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; }; cabal-install = self.cabal-install_1_18_1_0; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { + Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; }); + }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 56f1edb6620..2bad8d8b97d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -40,11 +40,14 @@ self: super: { # https://github.com/haskell/cabal/issues/2322 Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; + # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 8be816b0c9b..a90c5f99173 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -42,11 +42,14 @@ self: super: { # https://github.com/haskell/cabal/issues/2322 Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; + # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; @@ -85,4 +88,7 @@ self: super: { patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; } ); + # blaze-builder requires an additional build input on older compilers. + blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder; + } 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 361d404412e..84994bc683f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -37,6 +37,9 @@ self: super: { unix = null; xhtml = null; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; + # mtl 2.2.x needs the latest transformers. mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; }; @@ -48,19 +51,6 @@ self: super: { # haddock-api 2.16 requires ghc>=7.10 haddock-api = super.haddock-api_2_15_0_2; - # Idris needs special version of some libraries - idris = let super1 = super; in overrideCabal (super.idris.overrideScope (self: super: { - annotated-wl-pprint = self.annotated-wl-pprint_0_5_3; - blaze-html = self.blaze-html_0_7_0_3; - blaze-markup = self.blaze-markup_0_6_2_0; - lens = self.lens_4_7_0_1; - })) (drv: { - patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; - }); # warning: "Module ‘Control.Monad.Error’ is deprecated" - - # Depends on time == 0.1.5, which we don't have. - HStringTemplate_0_8_3 = dontDistribute super.HStringTemplate_0_8_3; - # This is part of bytestring in our compiler. bytestring-builder = dontHaddock super.bytestring-builder; @@ -88,6 +78,9 @@ self: super: { ghc-exactprint = dontDistribute super.ghc-exactprint; ghc-typelits-natnormalise = dontDistribute super.ghc-typelits-natnormalise; + # Needs directory >= 1.2.2.0. + idris = markBroken super.idris; + # Newer versions require transformers 0.4.x. seqid = super.seqid_0_1_0; seqid-streams = super.seqid-streams_0_1_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index cef72a2b188..73da57d7350 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -33,8 +33,8 @@ self: super: { unix = null; xhtml = null; - # We have Cabal 1.22.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9. + jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal; # GHC 7.10.x's Haddock binary cannot generate hoogle files. # https://ghc.haskell.org/trac/ghc/ticket/9921 @@ -81,4 +81,7 @@ self: super: { # The compat library is empty in the presence of mtl 2.2.x. mtl-compat = dontHaddock super.mtl-compat; + # Won't work with LLVM 3.5. + llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index e4e077def96..62d74b0ac7d 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -42,10 +42,11 @@ let }); callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // { - overrideScope = f: callPackageWithScope (fix (extend scope.__unfix__ f)) drv args; + overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args; }; - defaultScope = pkgs // pkgs.xlibs // pkgs.gnome // self; + mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; + defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; in diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d441b824842..edff84a0403 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation ({ mv $packageConfFile $packageConfDir/$pkgId.conf ''} - ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' + ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' for exe in "$out/bin/"* ; do install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" done diff --git a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch new file mode 100644 index 00000000000..e72bb793da7 --- /dev/null +++ b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch @@ -0,0 +1,11 @@ +diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs +--- graphviz.old/Data/GraphViz/Algorithms.hs 2015-05-18 15:21:38.379771357 +0300 ++++ graphviz/Data/GraphViz/Algorithms.hs 2015-05-18 15:01:01.940122684 +0300 +@@ -38,6 +38,7 @@ + import Data.GraphViz.Types.Canonical + import Data.GraphViz.Types.Internal.Common + ++import Prelude hiding (traverse) + import Control.Arrow (first, second, (***)) + import Control.Monad (unless) + import Control.Monad.Trans.State diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2361129113d..1eb15af14ee 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -256,7 +256,6 @@ self: { homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AERN-Basics" = callPackage @@ -655,26 +654,25 @@ self: { "Agda" = callPackage ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, emacs - , equivalence, filepath, geniplate, happy, hashable, hashtables - , haskeline, haskell-src-exts, mtl, parallel, pretty, process - , QuickCheck, STMonadTrans, strict, template-haskell, text, time - , transformers, unordered-containers, xhtml, zlib + , containers, cpphs, data-hash, deepseq, directory, edit-distance + , emacs, equivalence, filepath, geniplate-mirror, happy, hashable + , hashtables, haskeline, haskell-src-exts, mtl, parallel, pretty + , process, QuickCheck, strict, template-haskell, text, time + , transformers, transformers-compat, unordered-containers, xhtml + , zlib }: mkDerivation { pname = "Agda"; - version = "2.4.2.2"; - revision = "1"; - sha256 = "1hxvapnvlkx6imifswc70ng869zll0zfsygivhc2mjyhaiv10i13"; - editedCabalFile = "b604adb3c6609d27384834ce1d9483841245ac3d59e07571bc1ec114a080dcf3"; + version = "2.4.2.3"; + sha256 = "09vvipvab6bys8g7cdka1iirs0wc0jzcyynncccgb614wd2yyvdw"; isLibrary = true; isExecutable = true; buildDepends = [ array base binary boxes bytestring containers data-hash deepseq - directory equivalence filepath geniplate hashable hashtables - haskeline haskell-src-exts mtl parallel pretty process QuickCheck - STMonadTrans strict template-haskell text time transformers - unordered-containers xhtml zlib + directory edit-distance equivalence filepath geniplate-mirror + hashable hashtables haskeline haskell-src-exts mtl parallel pretty + process QuickCheck strict template-haskell text time transformers + transformers-compat unordered-containers xhtml zlib ]; buildTools = [ alex cpphs emacs happy ]; jailbreak = true; @@ -722,13 +720,12 @@ self: { ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { pname = "AlgorithmW"; - version = "0.1.0.1"; - sha256 = "0qqdd8220h6h1j7i121h84wysjrmv633md3c7sk01i1p774d67k4"; + version = "0.1.1.0"; + sha256 = "0avkxhw5hp00znhmqw3kqxx165ba5y5kgq8b9ahp679p0qf84a3c"; isLibrary = false; isExecutable = true; buildDepends = [ base containers mtl pretty ]; - jailbreak = true; - homepage = "http://hackage.haskell.org/package/AlgorithmW"; + homepage = "https://github.com/mgrabmueller/AlgorithmW"; description = "Example implementation of Algorithm W for Hindley-Milner type inference"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -771,7 +768,6 @@ self: { homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -919,6 +915,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG"; description = "Attribute Grammars in the form of an EDSL"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AttoBencode" = callPackage @@ -941,7 +938,6 @@ self: { homepage = "http://bitbucket.org/FlorianHartwig/attobencode"; description = "Fast Bencode encoding and parsing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AttoJson" = callPackage @@ -1050,7 +1046,6 @@ self: { ]; description = "Big Contact Map Tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC" = callPackage @@ -1060,8 +1055,8 @@ self: { }: mkDerivation { pname = "BNFC"; - version = "2.7.1"; - sha256 = "1n9l64wzga3i7ifh2k5rwhxp60gb0av5fszygw5mvr31r64cf4fp"; + version = "2.8"; + sha256 = "0d3zcxspxcpnifv3kqg8d6gp01wxybakcbw7jh69gqg8rzfmzgi1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -1444,6 +1439,7 @@ self: { PrimitiveArray split text tuple vector vector-binary-instances vector-th-unbox ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; @@ -1541,8 +1537,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.7.1.9"; - sha256 = "1llfbfwxnyvc4k9zlf1fdkb9dr4abmv0x6zc0048h4vx7db50f8h"; + version = "0.8"; + sha256 = "0sii2m3ha5z5di1flswd6c0xih652y73xdrzi3m662vhm9q94slv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -1551,11 +1547,9 @@ 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"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams" = callPackage @@ -1622,7 +1616,6 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html"; description = "A simple document organizer with some wiki functionality"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Boolean" = callPackage @@ -1670,13 +1663,10 @@ self: { ({ mkDerivation, base, bytestring, network, text }: mkDerivation { pname = "BufferedSocket"; - version = "0.1.1.0"; - revision = "2"; - sha256 = "1j0v2g7p8fmjgcdd10wfinakiviv9r1bh3mw897gsk1h5ycbxfjg"; - editedCabalFile = "646c24722f7f909e6430c9c55a225936c6c12db7d3d57ea0789d03cc800cbc59"; + version = "0.2.0.0"; + sha256 = "0sgwglnzsqwz1k11jbzp7lpb29h9ap2mny2lv9m9nrlr0ydhcdqf"; buildDepends = [ base bytestring network text ]; jailbreak = true; - homepage = "https://github.com/black0range/BufferedSocket"; description = "A socker wrapper that makes the IO of sockets much cleaner"; license = stdenv.lib.licenses.mit; }) {}; @@ -1825,7 +1815,6 @@ self: { homepage = "not available"; description = "preprocessor and library for Causal Commutative Arrows (CCA)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CHXHtml" = callPackage @@ -2174,6 +2163,7 @@ self: { HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; + jailbreak = true; preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP"; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; @@ -2200,10 +2190,10 @@ self: { filepath HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; + jailbreak = true; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CabalSearch" = callPackage @@ -2223,7 +2213,6 @@ self: { homepage = "http://github.com/brinchj/cabalsearch"; description = "Search cabal packages by name"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Capabilities" = callPackage @@ -2316,6 +2305,7 @@ self: { array base colour data-default-class lens mtl old-locale operational time vector ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; @@ -2333,6 +2323,7 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -2689,8 +2680,8 @@ self: { ({ mkDerivation, async, base }: mkDerivation { pname = "Concurrential"; - version = "0.4.0.0"; - sha256 = "0wgiwpkv65czcc5fllzicgswq6rf0jl646w2n937yhvbdmxfcq6i"; + version = "0.5.0.0"; + sha256 = "1fcl1ckinzv9c0iyfvhh3sm649jn7q8yv2r9vz99l139dw25l5vb"; buildDepends = [ async base ]; jailbreak = true; homepage = "http://github.com/avieth/Concurrential"; @@ -2808,7 +2799,6 @@ self: { jailbreak = true; description = "Repackages standard type classes with the ConstraintKinds extension"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Consumer" = callPackage @@ -3065,10 +3055,10 @@ self: { network network-uri optparse-applicative transformers transformers-base utf8-string xml-conduit xml-hamlet ]; + jailbreak = true; homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DBlimited" = callPackage @@ -3201,26 +3191,24 @@ self: { }) {}; "DSH" = callPackage - ({ mkDerivation, aeson, algebra-dag, algebra-sql, ansi-wl-pprint - , base, bytestring, containers, dlist, either, HDBC - , HDBC-postgresql, HUnit, kure, mtl, pretty, QuickCheck, semigroups - , set-monad, template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text + ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base + , bytestring, containers, Decimal, dlist, either, hashable, HUnit + , kure, mtl, process, QuickCheck, random, semigroups + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, unordered-containers + , vector }: mkDerivation { pname = "DSH"; - version = "0.10.0.2"; - sha256 = "02a8gfn5ji2n606ak1gs4syk0c97zvyi4146w5zy6gn21g4d3fa7"; + version = "0.12.0.0"; + sha256 = "0rv7jn6h5w2naz7h4psz258684rc2p2wyaqp1f6kqvk294mlmvrv"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson algebra-dag algebra-sql ansi-wl-pprint base bytestring - containers dlist either HDBC HDBC-postgresql kure mtl pretty - semigroups set-monad template-haskell text - ]; - testDepends = [ - base containers HDBC HDBC-postgresql HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text + aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal + dlist either hashable HUnit kure mtl process QuickCheck random + semigroups template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text time unordered-containers vector ]; description = "Database Supported Haskell"; license = stdenv.lib.licenses.bsd3; @@ -3432,19 +3420,18 @@ self: { }) {}; "DefendTheKing" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, GLUT - , haskell98, HTTP, MaybeT, mtl, network, peakachu, random, time - , utility-ht, zlib + ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP + , MaybeT, mtl, network, peakachu, random, time, utility-ht, zlib }: mkDerivation { pname = "DefendTheKing"; - version = "0.3"; - sha256 = "1qnf62c91q94galndi0f7pfyzvk0qwi3gzhwcazkwinildjy8zw6"; + version = "0.3.1"; + sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw"; isLibrary = false; isExecutable = true; buildDepends = [ - base binary bytestring containers GLUT haskell98 HTTP MaybeT mtl - network peakachu random time utility-ht zlib + base binary bytestring containers GLUT HTTP MaybeT mtl network + peakachu random time utility-ht zlib ]; homepage = "http://github.com/yairchu/defend/tree"; description = "A simple RTS game"; @@ -3558,7 +3545,6 @@ self: { jailbreak = true; description = "A client library for the DigitalOcean API"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DimensionalHash" = callPackage @@ -4387,7 +4373,6 @@ self: { homepage = "https://github.com/ddssff/haskell-extra"; description = "A grab bag of modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FComp" = callPackage @@ -4736,7 +4721,7 @@ self: { sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky"; buildDepends = [ base haskell98 ]; description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562"; - license = "BSD4"; + license = stdenv.lib.licenses.bsdOriginal; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -4879,7 +4864,6 @@ self: { homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Foster" = callPackage @@ -5332,7 +5316,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -5584,7 +5567,6 @@ self: { buildDepends = [ base dataenc download-curl utf8-string xml ]; description = "Interface to Google Suggest API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleTranslate" = callPackage @@ -5631,7 +5613,6 @@ self: { homepage = "http://www.bioinf.uni-leipzig.de/gADP/"; description = "Grammar products and higher-dimensional grammars"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Graph500" = callPackage @@ -6056,8 +6037,8 @@ self: { }: mkDerivation { pname = "HDBC-odbc"; - version = "2.4.0.0"; - sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz"; + version = "2.4.0.1"; + sha256 = "1sdf5llz40q9cg0gi0rglnz6agamb7z4n5c6dhwwly902b6fxinv"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring HDBC mtl time utf8-string ]; @@ -6126,7 +6107,6 @@ self: { homepage = "https://github.com/hdbc/hdbc-sqlite3"; description = "Sqlite v3 driver for HDBC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) sqlite;}; "HDRUtils" = callPackage @@ -7146,27 +7126,6 @@ self: { }) {}; "HStringTemplate" = callPackage - ({ mkDerivation, array, base, blaze-builder, bytestring, containers - , deepseq, directory, filepath, mtl, old-locale, old-time, parsec - , pretty, syb, template-haskell, text, time, utf8-string, void - }: - mkDerivation { - pname = "HStringTemplate"; - version = "0.7.3"; - revision = "2"; - sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8"; - editedCabalFile = "f3b42ea4e5c29507d6d186ccd34c83425d2e16a55ca3af95fd8bb1a71e3f54cb"; - buildDepends = [ - array base blaze-builder bytestring containers deepseq directory - filepath mtl old-locale old-time parsec pretty syb template-haskell - text time utf8-string void - ]; - jailbreak = true; - description = "StringTemplate implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HStringTemplate_0_8_3" = callPackage ({ mkDerivation, array, base, blaze-builder, bytestring, containers , deepseq, directory, filepath, mtl, old-locale, parsec, pretty , syb, template-haskell, text, time, void @@ -7217,26 +7176,27 @@ self: { "HTF" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, bytestring, containers, cpphs, Diff, directory - , filepath, haskell-lexer, haskell-src, HUnit, lifted-base - , monad-control, mtl, old-time, pretty, process, QuickCheck, random - , regex-compat, temporary, text, time, unix, unordered-containers - , vector, xmlgen + , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl + , old-time, pretty, process, QuickCheck, random, regex-compat + , template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen }: mkDerivation { pname = "HTF"; - version = "0.12.2.4"; - sha256 = "0f538wqihj8i1ys3aciz7n1asxvg73bm9zg0p8qazzx9ghpcgy6m"; + version = "0.13.0.0"; + sha256 = "0lrc60ydqsizz3rdyijqywncr1bcj3b95mgn99bz5q4yb3l6dc54"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array base base64-bytestring bytestring containers cpphs Diff - directory haskell-lexer haskell-src HUnit lifted-base monad-control - mtl old-time pretty process QuickCheck random regex-compat text - time unix vector xmlgen + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen ]; testDepends = [ aeson aeson-pretty base bytestring directory filepath HUnit mtl - process random regex-compat temporary text unordered-containers + process random regex-compat template-haskell temporary text + unordered-containers ]; homepage = "https://github.com/skogsbaer/HTF/"; description = "The Haskell Test Framework"; @@ -7450,10 +7410,9 @@ self: { ({ mkDerivation, base, template-haskell, th-lift }: mkDerivation { pname = "HaPy"; - version = "0.1.1.0"; - sha256 = "1gxxhyidcn3lcvmbjby364cypk6xmmsv5qdd0m16d06688cl9mq7"; + version = "0.1.1.1"; + sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz"; buildDepends = [ base template-haskell th-lift ]; - jailbreak = true; homepage = "https://github.com/sakana/HaPy"; description = "Haskell bindings for Python"; license = stdenv.lib.licenses.mit; @@ -7674,7 +7633,6 @@ self: { homepage = "https://github.com/egonSchiele/HandsomeSoup"; description = "Work with HTML more easily in HXT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HarmTrace" = callPackage @@ -8268,7 +8226,9 @@ self: { mkDerivation { pname = "HostAndPort"; version = "0.1.0"; + revision = "1"; sha256 = "0rykpzp3vvc81ra917vicwsh8x1mr1ykw9a597ks959nmjy06mz8"; + editedCabalFile = "5ad1783e80502877a1de17cb92308dd9e0cc003a1302c5d4c09103b1c98bd627"; buildDepends = [ base parsec ]; testDepends = [ base doctest hspec ]; homepage = "https://github.com/bacher09/hostandport"; @@ -8519,10 +8479,10 @@ self: { buildDepends = [ aeson base containers lens lens-aeson mtl time transformers wreq ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/HueAPI"; description = "API for controlling Philips Hue lights"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Hungarian-Munkres" = callPackage @@ -8969,6 +8929,7 @@ self: { aeson base HUnit language-typescript stack-prism test-framework test-framework-hunit text ]; + jailbreak = true; homepage = "https://github.com/MedeaMelana/JsonGrammar2"; description = "Combinators for bidirectional JSON parsing"; license = stdenv.lib.licenses.bsd3; @@ -8981,8 +8942,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.4"; - sha256 = "113w66rd6h04x0zbkqh34x33pf15hmrn3l9yy8kirs55kbg266w0"; + version = "3.2.5.1"; + sha256 = "11wpk4lr7h7s7mhl48i27dq1wwvzjviv2fnq3yl8dnikcl00k6dq"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -9353,7 +9314,6 @@ self: { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A game engine library for roguelike dungeon crawlers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LambdaINet" = callPackage @@ -9926,7 +9886,6 @@ self: { jailbreak = true; description = "MaybeT monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MaybeT-monads-tf" = callPackage @@ -10300,8 +10259,8 @@ self: { }: mkDerivation { pname = "MonadRandom"; - version = "0.3.0.2"; - sha256 = "18gajibgypy8hl0slh3lyjjwqqkayxrk7vwwk26nfdkq9yixxbvi"; + version = "0.4"; + sha256 = "14vgp2sml9jsras9l0488gy2siamcqf78y3vlr1my4lhhdx3ybyk"; buildDepends = [ base mtl random transformers transformers-compat ]; @@ -10521,7 +10480,6 @@ self: { homepage = "http://floss.scru.org/hMusicBrainz"; description = "interface to MusicBrainz XML2 web service"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MusicBrainz-libdiscid" = callPackage @@ -10661,6 +10619,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Neks" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, directory + , hashable, messagepack, network, stm, vector + }: + mkDerivation { + pname = "Neks"; + version = "0.3.0.0"; + sha256 = "1nqww81d9hdm4d2kgv5k4vhp3wavlpa39vym4x7bddcxg1g5drmv"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring cereal containers directory hashable messagepack + network stm vector + ]; + jailbreak = true; + description = "Simple networked key/value store"; + license = stdenv.lib.licenses.mit; + }) {}; + "NestedFunctor" = callPackage ({ mkDerivation, base, comonad, distributive }: mkDerivation { @@ -11983,6 +11960,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -12251,23 +12229,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, random, template-haskell, test-framework - , tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.7.6"; - sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40"; - buildDepends = [ - base random template-haskell tf-random transformers - ]; - testDepends = [ base template-haskell test-framework ]; - homepage = "https://github.com/nick8325/quickcheck"; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_8_1" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: @@ -12279,7 +12240,6 @@ self: { base containers random template-haskell tf-random transformers ]; testDepends = [ base containers template-haskell test-framework ]; - jailbreak = true; homepage = "https://github.com/nick8325/quickcheck"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; @@ -12677,20 +12637,19 @@ self: { homepage = "http://hub.darcs.net/martingw/Rasenschach"; description = "Soccer simulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, dlist, FontyFruity, free, JuicyPixels, mtl - , primitive, vector, vector-algorithms + ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity + , free, JuicyPixels, mtl, primitive, vector, vector-algorithms }: mkDerivation { pname = "Rasterific"; - version = "0.5.2.1"; - sha256 = "1wd12l4vpav3jsjf2mib5yrblys5aifwq6xniqm4l92qs5vjh4a2"; + version = "0.6.1"; + sha256 = "1y9jciiaam0dn2falhxc0nb97vy35dfvv71xzc1bhiw4gn66n4rm"; buildDepends = [ - base dlist FontyFruity free JuicyPixels mtl primitive vector - vector-algorithms + base bytestring containers dlist FontyFruity free JuicyPixels mtl + primitive vector vector-algorithms ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; @@ -13177,17 +13136,15 @@ self: { ]; description = "Calculate db-data dependencies of functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STL" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, text }: mkDerivation { pname = "STL"; - version = "0.3.0.1"; - sha256 = "0w14kra36ksa8jn72rr9b01f36gff33fi6ffrcws640v4pwisrg5"; + version = "0.3.0.2"; + sha256 = "0papwfxp4y8rn1rqm0sw22lbfw6iaziziprh04z85isrwkfh8v43"; buildDepends = [ attoparsec base bytestring cereal text ]; - jailbreak = true; homepage = "http://github.com/bergey/STL"; description = "STL 3D geometry format parsing and pretty-printing"; license = stdenv.lib.licenses.bsd3; @@ -13240,7 +13197,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -13331,6 +13287,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) glib; inherit (pkgs) mono;}; + "Saturnin" = callPackage + ({ mkDerivation, base, bytestring, data-default, directory, either + , exceptions, filepath, formatting, hlint, hspec, ini, mtl, network + , old-locale, process, spawn, stm, temporary, text, time + , unordered-containers, yaml + }: + mkDerivation { + pname = "Saturnin"; + version = "0.1.0.2"; + sha256 = "0f6z17ry2n0qkgajiwip09r7dbcn72dkz7gh4igwk3n0igxlpqsr"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring data-default directory either exceptions filepath + formatting ini mtl network old-locale process spawn stm temporary + text time unordered-containers yaml + ]; + testDepends = [ base data-default either hlint hspec mtl ]; + description = "Saturnin CI / Job System"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "SciFlow" = callPackage ({ mkDerivation, base, bytestring, data-default-class, mtl, shelly , template-haskell, text, unordered-containers, yaml @@ -13930,7 +13908,6 @@ self: { homepage = "https://github.com/agrafix/Spock-digestive"; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-worker" = callPackage @@ -14193,6 +14170,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/Center/SyntaxMacrosForFree"; description = "Syntax Macros in the form of an EDSL"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Sysmon" = callPackage @@ -14244,6 +14222,7 @@ self: { base containers deepseq fgl free hmatrix integration list-extras mtl numeric-tools parallel ]; + jailbreak = true; description = "Utilities for condensed matter physics tight binding calculations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -14348,6 +14327,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Tainted" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "Tainted"; + version = "0.1.0.2"; + sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb"; + buildDepends = [ base mtl ]; + homepage = "https://github.com/RossMeikleham/Tainted"; + description = "Tainted type, and associated operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Takusen" = callPackage ({ mkDerivation, base, mtl, old-time, time }: mkDerivation { @@ -14606,14 +14597,13 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "TransformersStepByStep"; - version = "0.1.0.1"; - sha256 = "0dxxgwcn4in3rpfn77c4g8h6l7326m8ikcsrl7pm6gifw667qpmv"; + version = "0.1.1.0"; + sha256 = "1cd8sh6gi9zmvd70kzw1x9ycanfsyphjdy3r65xrph54ilwy511p"; isLibrary = false; isExecutable = true; buildDepends = [ base containers mtl ]; - jailbreak = true; - homepage = "http://hackage.haskell.org/package/TransformersStepByStep"; - description = "Tutorial to monad transformers"; + homepage = "https://github.com/mgrabmueller/TransformersStepByStep"; + description = "Tutorial on monad transformers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -15448,12 +15438,12 @@ self: { }) {}; "Win32-services" = callPackage - ({ mkDerivation, Advapi32, base, Win32 }: + ({ mkDerivation, Advapi32, base, Win32, Win32-errors }: mkDerivation { pname = "Win32-services"; - version = "0.2.5.1"; - sha256 = "1biirmn4fmw9zdhvbwzj5lrw2ac5wn6zz2zvzqi4b0gz8hlywzr7"; - buildDepends = [ base Win32 ]; + version = "0.3"; + sha256 = "07vby574s528g259zq8jby1327b6jqn4zlzs406ml99w1p02d9js"; + buildDepends = [ base Win32 Win32-errors ]; extraLibraries = [ Advapi32 ]; homepage = "http://github.com/mikesteele81/win32-services"; description = "Windows service applications"; @@ -15462,14 +15452,16 @@ self: { }) { Advapi32 = null;}; "Win32-services-wrapper" = callPackage - ({ mkDerivation, base, directory, filepath, Win32, Win32-services + ({ mkDerivation, base, directory, filepath, Win32, Win32-errors + , Win32-services }: mkDerivation { pname = "Win32-services-wrapper"; - version = "0.1.2.0"; - sha256 = "01fvb9sraqw1ar5pvs8s23y8syix50wh6yifsm65fs4vy1nk3xfb"; - buildDepends = [ base directory filepath Win32 Win32-services ]; - jailbreak = true; + version = "0.1.3.0"; + sha256 = "1nihf12bcgahs5220pdny1kf54973qxh7llhzv5d9s9lxias2jyd"; + buildDepends = [ + base directory filepath Win32 Win32-errors Win32-services + ]; description = "Wrapper code for making a Win32 service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -15548,7 +15540,6 @@ self: { ]; description = "Workflow patterns over a monad for thread state logging & recovery"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WxGeneric" = callPackage @@ -15563,7 +15554,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/WxGeneric"; description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "X11" = callPackage @@ -16027,17 +16017,17 @@ self: { "Zora" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fgl - , graphviz, random, shelly, text + , graphviz, random, shelly, tasty, tasty-hunit, text }: mkDerivation { pname = "Zora"; - version = "1.1.23"; - sha256 = "0nfvqhrlz8wgvfiqnlfzgsbsk4q3yg7a7s4pyh4v4xw0xnj68vgl"; + version = "1.2.0"; + sha256 = "1yni2yq8ynq9jhnzabyx0ahmvmvcyblc0swxy0n7qdzlz5rxzm3i"; buildDepends = [ base bytestring containers directory fgl graphviz random shelly text ]; - testDepends = [ base ]; + testDepends = [ base containers random tasty tasty-hunit ]; homepage = "http://github.com/bgwines/zora"; description = "Graphing library wrapper + assorted useful functions"; license = stdenv.lib.licenses.bsd3; @@ -16152,6 +16142,7 @@ self: { aeson base base64-bytestring bson bytestring data-default-class scientific text time unordered-containers uuid vector ]; + jailbreak = true; homepage = "https://github.com/philopon/abeson"; description = "interconversion between aeson and bson"; license = stdenv.lib.licenses.mit; @@ -16272,7 +16263,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate/"; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-arithmetic" = callPackage @@ -16733,6 +16723,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "acme-memorandom" = callPackage + ({ mkDerivation, base, MemoTrie, random }: + mkDerivation { + pname = "acme-memorandom"; + version = "0.0.3"; + sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi"; + buildDepends = [ base MemoTrie random ]; + homepage = "https://github.com/ion1/acme-memorandom"; + description = "Memoized random number generation"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-microwave" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -16908,8 +16910,8 @@ self: { ({ mkDerivation, base, ghc-prim, mtl, transformers }: mkDerivation { pname = "acme-timemachine"; - version = "0.0.0.0"; - sha256 = "0sn20lz4bdrn7jz2ik4dr05h59qdjavnsp1z8656nbymndgi54iz"; + version = "0.0.0.1"; + sha256 = "06zhslaa7kp75gvnvh2ln15bqbdqgbgya6i4r2jkqxycnk8sczzl"; buildDepends = [ base ghc-prim mtl transformers ]; description = "An easy way to perform and unperform IO actions"; license = stdenv.lib.licenses.bsd3; @@ -16945,8 +16947,8 @@ self: { }: mkDerivation { pname = "active"; - version = "0.2.0.2"; - sha256 = "1xmm0xa4npdsbib5vmgzzqyq8b1abqx2j142zfal3b3nprfjpngk"; + version = "0.2.0.3"; + sha256 = "18z6gki5bjr4847r90aw89j8gkfs0w9dv1w2na4msd36i3jym3sc"; buildDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -16991,6 +16993,7 @@ self: { version = "0.3.0.3"; sha256 = "1q433by9ygs7rrjj8z76hg94zyh2cp4qiwsv7q1mywr5scfccn32"; buildDepends = [ base QuickCheck ]; + jailbreak = true; description = "Basic definitions for activehs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17160,8 +17163,8 @@ self: { }: mkDerivation { pname = "adjunctions"; - version = "4.2"; - sha256 = "07r56r6kyd6wlcxxnsnnyv59pyc8s1gsy54kzwmk9yknks5rij9i"; + version = "4.2.1"; + sha256 = "0vzlz2q6863ywnhvax3m5xq99x6bz1h47z7z8hmnqdfg5pa4r9k5"; buildDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers void @@ -17268,22 +17271,22 @@ self: { "aeson" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl - , old-locale, QuickCheck, scientific, syb, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, unordered-containers, vector + , QuickCheck, scientific, syb, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "aeson"; - version = "0.8.1.0"; - sha256 = "0dr0pnql4hlb6fxg9wvzg8a7ssjnzc89gpv0rxlkpaqrbb2hk32m"; + version = "0.9.0.1"; + sha256 = "1g7qdq7zpyvqwmh4sfhizqpb51cg24lrcj9vq5msz8k896y7vfcj"; buildDepends = [ attoparsec base blaze-builder bytestring containers deepseq dlist ghc-prim hashable mtl scientific syb template-haskell text time transformers unordered-containers vector ]; testDepends = [ - attoparsec base bytestring containers ghc-prim HUnit old-locale - QuickCheck template-haskell test-framework test-framework-hunit + attoparsec base bytestring containers ghc-prim HUnit QuickCheck + template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text time unordered-containers vector ]; homepage = "https://github.com/bos/aeson"; @@ -17392,7 +17395,9 @@ self: { mkDerivation { pname = "aeson-native"; version = "0.3.3.2"; + revision = "1"; sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh"; + editedCabalFile = "c9519a30bce75564cfbe84aade5ffb99fad12ecea1c7d2c362cca2234b8ae497"; buildDepends = [ attoparsec base blaze-builder blaze-textual-native bytestring containers deepseq hashable mtl old-locale syb text time @@ -17425,19 +17430,21 @@ self: { }) {}; "aeson-qq" = callPackage - ({ mkDerivation, aeson, base, ghc-prim, haskell-src-meta, hspec - , parsec, template-haskell, text, vector + ({ mkDerivation, aeson, attoparsec, base, ghc-prim + , haskell-src-meta, hspec, parsec, scientific, template-haskell + , text, vector }: mkDerivation { pname = "aeson-qq"; - version = "0.7.4"; - sha256 = "0wnc9pdjvd15gfkdxzf084393vwmxv2xaxdchzgal1qhwa1mak4v"; + version = "0.8.0"; + sha256 = "12vs3mh1a6j2r74xr11bpzb69i0k25dxplhvw15ph72kmhfbri7f"; buildDepends = [ - aeson base haskell-src-meta parsec template-haskell text vector + aeson attoparsec base haskell-src-meta parsec scientific + template-haskell text vector ]; testDepends = [ - aeson base ghc-prim haskell-src-meta hspec parsec template-haskell - text vector + aeson attoparsec base ghc-prim haskell-src-meta hspec parsec + scientific template-haskell text vector ]; homepage = "http://github.com/zalora/aeson-qq"; description = "JSON quasiquoter for Haskell"; @@ -17467,6 +17474,7 @@ self: { template-haskell temporary test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/timjb/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; @@ -17518,7 +17526,6 @@ self: { homepage = "https://github.com/noteed/aeson-streams"; description = "An HTTP client library for JSON-based APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-t" = callPackage @@ -17536,6 +17543,7 @@ self: { aeson aeson-qq base bytestring hspec text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/begriffs/aeson-t"; description = "Transform JSON"; license = stdenv.lib.licenses.mit; @@ -17559,8 +17567,8 @@ self: { }: mkDerivation { pname = "aeson-utils"; - version = "0.3.0.1"; - sha256 = "1y6nm841y3bvd7kixhwqk7h0pf7ipvfwj2hdq15ij08nlr48dzyl"; + version = "0.3.0.2"; + sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi"; buildDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -17679,7 +17687,6 @@ self: { buildDepends = [ base containers ]; description = "Unification and Matching in an Abelian Group"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aig" = callPackage @@ -17707,7 +17714,6 @@ self: { homepage = "https://github.com/nfjinjing/air"; description = "air"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "air-extra" = callPackage @@ -17725,7 +17731,6 @@ self: { homepage = "https://github.com/nfjinjing/air-extra"; description = "air-extra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "air-spec" = callPackage @@ -17750,7 +17755,6 @@ self: { homepage = "https://github.com/nfjinjing/air-th"; description = "air"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "airbrake" = callPackage @@ -17775,23 +17779,26 @@ self: { }) {}; "airship" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , case-insensitive, either, http-date, http-media, http-types - , lifted-base, monad-control, mtl, network, old-locale, random - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unordered-containers, wai, warp + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, bytestring-trie, case-insensitive, cryptohash + , directory, either, filepath, http-date, http-media, http-types + , lifted-base, mime-types, monad-control, mtl, network, old-locale + , random, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, transformers-base, unix, unordered-containers, wai + , warp }: mkDerivation { pname = "airship"; - version = "0.1.0.0"; - sha256 = "0x99mwyhnhs89hcwi23pjcd6qwihr4ldli68f701ilqp7cxxyk16"; + version = "0.3.0.0"; + sha256 = "118valfn96mwdl8pfrvpqgp1rg9armcwlw2r4lvvzb6ci0nyp9n8"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec base blaze-builder bytestring case-insensitive either - http-date http-media http-types lifted-base monad-control mtl - network old-locale random text time transformers transformers-base - unordered-containers wai warp + attoparsec base base64-bytestring blaze-builder bytestring + bytestring-trie case-insensitive cryptohash directory either + filepath http-date http-media http-types lifted-base mime-types + monad-control mtl network old-locale random text time transformers + transformers-base unix unordered-containers wai warp ]; testDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck text @@ -17806,8 +17813,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "4.0.1"; - sha256 = "0vhpv55wcljywh8rvv829c69wam0w505p6gf8bs5680spwc4z4y0"; + version = "4.0.3"; + sha256 = "1z5szc15qg7hqgz67b6m9is2dwkfcz50rw393nkpq7q2w6sjlf5m"; buildDepends = [ array base containers mtl random vector ]; homepage = "http://github.com/dsorokin/aivika"; description = "A multi-paradigm simulation library"; @@ -18000,15 +18007,18 @@ self: { }) {}; "alfred" = callPackage - ({ mkDerivation, aeson, base, bytestring, hexpat, HTTP, network-uri - , text, xmlgen + ({ mkDerivation, aeson, base, bytestring, hexpat, http-conduit + , http-types, network-uri, text, xmlgen }: mkDerivation { pname = "alfred"; - version = "0.4"; - sha256 = "1zmjllvcpj42cp01n1p2f2kzzx2ik4fql2vwbzlkaay9v9pskjk0"; + version = "0.5"; + revision = "1"; + sha256 = "1c6ak56g29wkas66x7yhg1zk039mp2mvlp7njixchhh2c4kx9fvn"; + editedCabalFile = "06e4b9ba672fc3d29452df70d2e9f9018ada5e8b62aa5890b9a70d9d937d6581"; buildDepends = [ - aeson base bytestring hexpat HTTP network-uri text xmlgen + aeson base bytestring hexpat http-conduit http-types network-uri + text xmlgen ]; description = "utility library for Alfred version 2"; license = stdenv.lib.licenses.bsd3; @@ -18028,6 +18038,7 @@ self: { adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void ]; + jailbreak = true; homepage = "http://github.com/ekmett/algebra/"; description = "Constructive abstract algebra"; license = stdenv.lib.licenses.bsd3; @@ -18039,8 +18050,8 @@ self: { }: mkDerivation { pname = "algebra-dag"; - version = "0.1.0.0"; - sha256 = "0sl3lsbjhnmnq49zf1irnijp7wfxixsv21vfknshi5hkl9757i89"; + version = "0.1.1.1"; + sha256 = "1pr6bbj67n13bw120l82zn5bj7bj0x00b754w852pbpij03fjay9"; buildDepends = [ aeson base containers fgl mtl parsec template-haskell transformers ]; @@ -18051,20 +18062,20 @@ self: { "algebra-sql" = callPackage ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base - , bytestring, containers, dlist, errors, fgl, filepath, ghc-prim - , mtl, multiset, parsec, pretty, process, template-haskell - , transformers + , bytestring, containers, Decimal, dlist, errors, fgl, filepath + , ghc-prim, mtl, multiset, parsec, pretty, process + , template-haskell, text, time, transformers }: mkDerivation { pname = "algebra-sql"; - version = "0.1.0.1"; - sha256 = "0das62ykwgyvj8qhk44i93b0w66wshdrdaylhvks03232pgpf8yp"; + version = "0.3.0.0"; + sha256 = "1wvm9qkixmyawwjd6ypshsmby7y7229zwidj3qhzkbmyi7p5sgzj"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson algebra-dag ansi-wl-pprint base bytestring containers dlist - errors fgl filepath ghc-prim mtl multiset parsec pretty process - template-haskell transformers + aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal + dlist errors fgl filepath ghc-prim mtl multiset parsec pretty + process template-haskell text time transformers ]; description = "Relational Algebra and SQL Code Generation"; license = stdenv.lib.licenses.bsd3; @@ -18283,7 +18294,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alsa-midi" = callPackage @@ -19131,6 +19141,7 @@ self: { homepage = "ampersand.sourceforge.net"; description = "Toolsuite for automated design of business processes"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp" = callPackage @@ -19166,8 +19177,8 @@ self: { }: mkDerivation { pname = "amqp-conduit"; - version = "0.1.0.1"; - sha256 = "167dkak5hg4q5b7i58mw6bl0mh38nyqbzyrhplmil9nins7cvqmv"; + version = "0.2.0.0"; + sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb"; buildDepends = [ amqp base conduit exceptions lifted-base monad-control mtl resourcet text transformers transformers-base @@ -19200,13 +19211,12 @@ self: { }: mkDerivation { pname = "analyze-client"; - version = "0.1.0.1"; - sha256 = "1k2x6srrf2cwiihhi2aacjy3bxyz59nczr49rnsxa0kk7gnkjngm"; + version = "0.1.0.2"; + sha256 = "12csrds628c3ff9giyc6q74jn1s2fbkdyagzbqcvnh3brnzsjvss"; buildDepends = [ base bytestring http-conduit MonadCatchIO-transformers mtl snap snap-core time ]; - jailbreak = true; homepage = "https://github.com/dbp/analyze-client"; description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; @@ -19326,18 +19336,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "annotated-wl-pprint_0_5_3" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "annotated-wl-pprint"; - version = "0.5.3"; - sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis"; - buildDepends = [ base ]; - homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; - description = "The Wadler/Leijen Pretty Printer, with annotation support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "annotated-wl-pprint" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -19422,7 +19420,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "A web interface to Antisplice dungeons"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antfarm" = callPackage @@ -19528,7 +19525,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "An engine for text-based dungeons"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antlrc" = callPackage @@ -19615,6 +19611,7 @@ self: { test-framework-hunit transformers ]; extraLibraries = [ openssl ]; + jailbreak = true; homepage = "https://github.com/trskop/apache-md5"; description = "Apache specific MD5 digest algorighm"; license = stdenv.lib.licenses.bsd3; @@ -19665,6 +19662,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "api-opentheory-unicode" = callPackage + ({ mkDerivation, base, bytestring, directory, opentheory-unicode }: + mkDerivation { + pname = "api-opentheory-unicode"; + version = "1.2"; + sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88"; + buildDepends = [ base bytestring opentheory-unicode ]; + testDepends = [ base bytestring directory opentheory-unicode ]; + description = "OpenTheory unicode character API"; + license = stdenv.lib.licenses.mit; + }) {}; + "api-tools" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base , base64-bytestring, bytestring, Cabal, case-insensitive @@ -19787,6 +19796,7 @@ self: { apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -20117,6 +20127,7 @@ self: { testDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://www.github.com/ktvoelker/AParsec"; description = "An applicative parser combinator library"; license = stdenv.lib.licenses.gpl3; @@ -20165,24 +20176,22 @@ self: { "approximate" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq - , directory, distributive, doctest, filepath, generic-deriving - , ghc-prim, hashable, hashable-extras, lens, log-domain, pointed - , safecopy, semigroupoids, semigroups, simple-reflect, vector + , directory, doctest, filepath, ghc-prim, hashable, hashable-extras + , lens, log-domain, pointed, safecopy, semigroupoids, semigroups + , simple-reflect, vector }: mkDerivation { pname = "approximate"; - version = "0.2.1.1"; - sha256 = "18ac2z1yqqksqmq9ch36ja3qjn9v6cgyzxs64lnnp98mgcwsmhwr"; + version = "0.2.2"; + sha256 = "1ym9f9vr83ks9lrdl54jaxw3ds2n943m6kqafwnzyypigcj3psxq"; buildDepends = [ - base binary bytes cereal comonad deepseq distributive - generic-deriving ghc-prim hashable hashable-extras lens log-domain - pointed safecopy semigroupoids semigroups vector + base binary bytes cereal comonad deepseq ghc-prim hashable + hashable-extras lens log-domain pointed safecopy semigroupoids + semigroups vector ]; testDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect + base directory doctest filepath semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/approximate/"; description = "Approximate discrete values and numbers"; license = stdenv.lib.licenses.bsd3; @@ -20260,25 +20269,25 @@ self: { "arbtt" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath - , HUnit, libXScrnSaver, old-locale, parsec, pcre-light - , process-extras, strict, tasty, tasty-golden, tasty-hunit - , terminal-progress-bar, time, transformers, unix, utf8-string, X11 + , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty + , tasty-golden, tasty-hunit, terminal-progress-bar, time + , transformers, unix, utf8-string, X11 }: mkDerivation { pname = "arbtt"; - version = "0.9.0.2"; - sha256 = "0ab5qrsrp6fcc2p1a4idbqazs7yrh957bfagdmw6b7rrydpig1lc"; + version = "0.9.0.4"; + sha256 = "02qz7qsk1kjavsdl8mq56blxzzjnnjlnyjvjnyfamq7j0rqzdq5v"; isLibrary = false; isExecutable = true; buildDepends = [ aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath old-locale parsec pcre-light strict + deepseq directory filepath parsec pcre-light strict terminal-progress-bar time transformers unix utf8-string X11 ]; testDepends = [ - base binary bytestring containers deepseq directory HUnit - old-locale parsec pcre-light process-extras tasty tasty-golden - tasty-hunit time transformers unix utf8-string + base binary bytestring containers deepseq directory parsec + pcre-light process-extras tasty tasty-golden tasty-hunit time + transformers unix utf8-string ]; extraLibraries = [ libXScrnSaver ]; homepage = "http://arbtt.nomeata.de/"; @@ -20376,7 +20385,6 @@ self: { homepage = "http://archhaskell.wordpress.com/"; description = "Convert Arch Linux package updates in RSS to pretty markdown"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arff" = callPackage @@ -20705,6 +20713,7 @@ self: { version = "0.1.1"; sha256 = "1fs8jap2ndcj21qgpkzy9nbnabvp4ac0xm0vdwkjjdf7i4j5kaqr"; buildDepends = [ base containers profunctors transformers ]; + jailbreak = true; homepage = "https://github.com/fumieval/artery"; description = "A simple, arrow-based reactive programming"; license = stdenv.lib.licenses.bsd3; @@ -20830,21 +20839,21 @@ self: { }) {}; "asciidiagram" = callPackage - ({ mkDerivation, base, containers, filepath, FontyFruity - , JuicyPixels, lens, linear, mtl, optparse-applicative + ({ mkDerivation, base, bytestring, containers, directory, filepath + , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative , rasterific-svg, svg-tree, text, vector }: mkDerivation { pname = "asciidiagram"; - version = "1.1"; - sha256 = "0vd4m3i4997vdd5wzy3jbidaz4rcsncqjdz0pf5ggrm9c5a8jb2y"; + version = "1.1.1.1"; + sha256 = "0nzg4m1nd41x6fyki5qva5jj80sl7jd1z1gd674v50zchkw71a9m"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers filepath FontyFruity JuicyPixels lens linear mtl - optparse-applicative rasterific-svg svg-tree text vector + base bytestring containers directory filepath FontyFruity + JuicyPixels lens linear mtl optparse-applicative rasterific-svg + svg-tree text vector ]; - jailbreak = true; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21079,7 +21088,7 @@ self: { glib Glob gtk gtksourceview2 hint mtl process syb ]; description = "A GTK-based abstract syntax tree viewer for custom languages and parsers"; - license = "BSD4"; + license = stdenv.lib.licenses.bsdOriginal; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -21091,7 +21100,7 @@ self: { sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn"; buildDepends = [ base containers syb ]; description = "Interfacing between hint and astview"; - license = "BSD4"; + license = stdenv.lib.licenses.bsdOriginal; }) {}; "async" = callPackage @@ -21217,21 +21226,22 @@ self: { ({ mkDerivation, aeson, atlassian-connect-descriptor, base , base64-bytestring, bytestring, case-insensitive, cipher-aes , configurator, containers, cryptohash, hostname, http-client - , http-media, http-types, jwt, mtl, network, network-api-support - , network-uri, snap, snap-core, split, text, time, time-units - , transformers + , http-client-tls, http-media, http-types, jwt, mtl, network + , network-api-support, network-uri, snap, snap-core, split, text + , time, time-units, transformers }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.5.1.0"; - sha256 = "02959rj5sdl28b3kj42ab1x83vcvkn61v5np7plgbqxbmrnnc9pr"; + version = "0.6.0.0"; + sha256 = "02kngpf1ply4222p4ahqndnlk8sz7w3d5i1411csh1g3nr9zsdw8"; buildDepends = [ aeson atlassian-connect-descriptor base base64-bytestring bytestring case-insensitive cipher-aes configurator containers - cryptohash hostname http-client http-media http-types jwt mtl - network network-api-support network-uri snap snap-core split text - time time-units transformers + cryptohash hostname http-client http-client-tls http-media + http-types jwt mtl network network-api-support network-uri snap + snap-core split text time time-units transformers ]; + jailbreak = true; homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core"; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = stdenv.lib.licenses.asl20; @@ -21255,6 +21265,7 @@ self: { aeson base bytestring Cabal cases HUnit network network-uri scientific text time-units unordered-containers vector ]; + jailbreak = true; description = "Code that helps you create a valid Atlassian Connect Descriptor"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -21520,10 +21531,9 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, enumerator, text }: mkDerivation { pname = "attoparsec-enumerator"; - version = "0.3.3"; - sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w"; + version = "0.3.4"; + sha256 = "127mj0v6342mzxnc73qki3k197vhwsff8qkf92gm5idyxdisg5dy"; buildDepends = [ attoparsec base bytestring enumerator text ]; - jailbreak = true; homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; description = "Pass input from an enumerator to an Attoparsec parser"; license = stdenv.lib.licenses.mit; @@ -21716,7 +21726,6 @@ self: { homepage = "https://github.com/fosskers/haskell-aur"; description = "Access metadata from the Arch Linux User Repository"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "authenticate" = callPackage @@ -21823,8 +21832,8 @@ self: { }: mkDerivation { pname = "auto"; - version = "0.4.2.2"; - sha256 = "1n2kknp7b8agkvn3nk6w6cabzh3n89jakzx8pi46ig2ghcxz90wf"; + version = "0.4.2.3"; + sha256 = "1vzsmmim3h3r0ikzci9zb32rm42gr0x2m1lmm11my5jcf88gwck7"; buildDepends = [ base base-orphans bytestring cereal containers deepseq MonadRandom profunctors random semigroups transformers @@ -22228,7 +22237,9 @@ self: { mkDerivation { pname = "aws-kinesis-client"; version = "0.4.0.2"; + revision = "1"; sha256 = "1vygs2qdnwjw8pygbsncc22cq9294hmlbzi2fysi3agva2qxzmwx"; + editedCabalFile = "4bd055f19f3ced5d6f52eec169220d7c5159cfa521128a3118aedecc9c3ad2f3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22239,6 +22250,7 @@ self: { monad-control mtl nats optparse-applicative random resourcet stm stm-chans stm-queue-extras text transformers unordered-containers ]; + jailbreak = true; description = "A producer & consumer client library for AWS Kinesis"; license = stdenv.lib.licenses.asl20; }) {}; @@ -22328,7 +22340,6 @@ self: { ]; description = "Amazon Route53 DNS service plugin for the aws package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sdk" = callPackage @@ -22570,8 +22581,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.3"; - sha256 = "1dw6ylb7w4hycanx07qm4gzmvi1xw5jsh89dagbyaz9z9spl5fm4"; + version = "0.5.7"; + sha256 = "1ffj3ql27826dv20pz98xg3wsaylfsrwgggwxwipw6l2jypk3z7i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22587,7 +22598,6 @@ self: { homepage = "https://github.com/sheyll/b9-vm-image-builder"; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babylon" = callPackage @@ -22601,7 +22611,6 @@ self: { buildDepends = [ array base containers random wx wxcore ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backdropper" = callPackage @@ -23015,8 +23024,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, unix }: mkDerivation { pname = "base-compat"; - version = "0.8.1.1"; - sha256 = "0j1k7yxahprbajzvfxvdfzz3frx8s8karq1kv8v02yh0lsw7hjki"; + version = "0.8.2"; + sha256 = "02m93hzgxg4bcnp7xcc2fdh2hrsc2h6fwl8hix5nx9k864kwf41q"; buildDepends = [ base unix ]; testDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; @@ -23036,12 +23045,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "base-noprelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-noprelude"; + version = "4.8.0.0"; + sha256 = "0kxpkahlwvmy86g94rawhv6x3kl761xf4s78jv1cjzglsb28q0zl"; + buildDepends = [ base ]; + homepage = "https://github.com/hvr/base-noprelude"; + description = "\"base\" package sans \"Prelude\" module"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec }: mkDerivation { pname = "base-orphans"; - version = "0.3.1"; - sha256 = "12nabqwniywwxsysdk0kh1zscdwyjk10z1fk3iqqcg0bqmyb67i5"; + version = "0.3.2"; + sha256 = "1qbnhxchl2kdjbwqz3mp7rq963w6y6ws4kflmv6hmcp25aaqh6pl"; buildDepends = [ base ghc-prim ]; testDepends = [ base hspec ]; homepage = "https://github.com/haskell-compat/base-orphans#readme"; @@ -23100,6 +23121,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base32string" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }: + mkDerivation { + pname = "base32string"; + version = "0.9.1"; + sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy"; + buildDepends = [ aeson base binary bytestring text ]; + testDepends = [ base binary bytestring hspec text ]; + homepage = "http://www.leonmergen.com/opensource.html"; + description = "Fast and safe representation of a Base-32 string"; + license = stdenv.lib.licenses.mit; + }) {}; + "base58-bytestring" = callPackage ({ mkDerivation, base, bytestring, quickcheck-assertions , quickcheck-instances, tasty, tasty-quickcheck @@ -23229,17 +23263,17 @@ self: { }) {}; "basic-prelude" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable - , lifted-base, ReadArgs, safe, system-filepath, text, transformers + ({ mkDerivation, base, bytestring, containers, filepath, hashable + , lifted-base, ReadArgs, safe, text, transformers , unordered-containers, vector }: mkDerivation { pname = "basic-prelude"; - version = "0.3.13"; - sha256 = "0kfqh5jf9lfxmqhfi74i13cgkwchfkyall4glh2inna3ish4qz5l"; + version = "0.4.1"; + sha256 = "041wnym7b8p70kcbkxxbgszmi2y88xs0ww357jrn0v6cc21h60j9"; buildDepends = [ - base bytestring containers hashable lifted-base ReadArgs safe - system-filepath text transformers unordered-containers vector + base bytestring containers filepath hashable lifted-base ReadArgs + safe text transformers unordered-containers vector ]; homepage = "https://github.com/snoyberg/basic-prelude"; description = "An enhanced core prelude; a common foundation for alternate preludes"; @@ -23608,7 +23642,6 @@ self: { homepage = "https://github.com/feuerbach/bert"; description = "BERT implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "besout" = callPackage @@ -23808,12 +23841,12 @@ self: { }) {}; "bifunctors" = callPackage - ({ mkDerivation, base, semigroupoids, semigroups, tagged }: + ({ mkDerivation, base, semigroups, tagged }: mkDerivation { pname = "bifunctors"; - version = "4.2.1"; - sha256 = "0zy4lz08r60h8lgrf67zqqrcslrnbmdi254ydv5mw69z57nnx3ng"; - buildDepends = [ base semigroupoids semigroups tagged ]; + version = "5"; + sha256 = "13990xdgx0n23qgi18ghhmsywj5zkr0a5bim0g8a4nzi0cx95ps1"; + buildDepends = [ base semigroups tagged ]; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; @@ -23972,6 +24005,7 @@ self: { QuickCheck storable-tuple unordered-containers vector vector-binary-instances vector-th-unbox ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; @@ -24341,7 +24375,6 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings" = callPackage @@ -25169,15 +25202,15 @@ self: { }) {}; "biophd" = callPackage - ({ mkDerivation, base, binary, biocore, bytestring, old-locale - , parsec, text, time + ({ mkDerivation, base, binary, biocore, bytestring, parsec, text + , time, time-locale-compat }: mkDerivation { pname = "biophd"; - version = "0.0.6"; - sha256 = "1206pa9ah473rvpj6yr769fwmjc3axl036ny3yzf52lhy6bcggbb"; + version = "0.0.8"; + sha256 = "0p3xfv61xzz29qg660pcsgns7r5q1cybk3hdvdnwf0cqdc9fhxbl"; buildDepends = [ - base binary biocore bytestring old-locale parsec text time + base binary biocore bytestring parsec text time time-locale-compat ]; homepage = "https://github.com/dfornika/biophd/wiki"; description = "Library for reading phd sequence files"; @@ -25344,11 +25377,11 @@ self: { }: mkDerivation { pname = "bitcoin-api-extra"; - version = "0.9.0"; - sha256 = "155fq7wfpij0rfc06ps1bq9mz8gm68nnlxh1170qq5rgqcc49f79"; + version = "0.9.1"; + sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4"; buildDepends = [ base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit - stm stm-chans stm-conduit text transformers + lens stm stm-chans stm-conduit text transformers ]; testDepends = [ base bitcoin-api bitcoin-tx bytestring conduit hspec http-client @@ -25702,6 +25735,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitx-bitcoin" = callPackage + ({ mkDerivation, aeson, base, bytestring, Decimal, hspec + , http-conduit, network, record, split, text, time + }: + mkDerivation { + pname = "bitx-bitcoin"; + version = "0.1.0.0"; + sha256 = "05k2cwkd9y327c75fhjqwyxhwrwxhalsx724xa0ng5dw3d30icc2"; + buildDepends = [ + aeson base bytestring Decimal http-conduit network record split + text time + ]; + testDepends = [ aeson base bytestring hspec record time ]; + description = "A Haskell library for working with the BitX bitcoin exchange"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -25914,24 +25964,13 @@ self: { version = "0.1.0.0"; sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw"; buildDepends = [ base blaze-html text ]; + jailbreak = true; homepage = "http://github.com/agrafix/blaze-bootstrap"; description = "Blaze helper functions for bootstrap pages"; license = stdenv.lib.licenses.mit; }) {}; "blaze-builder" = callPackage - ({ mkDerivation, base, bytestring, text }: - mkDerivation { - pname = "blaze-builder"; - version = "0.3.3.4"; - sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5"; - buildDepends = [ base bytestring text ]; - homepage = "http://github.com/meiersi/blaze-builder"; - description = "Efficient buffered output"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-builder_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , text, utf8-string @@ -25963,8 +26002,8 @@ self: { }) {}; "blaze-builder-enumerator" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, enumerator - , streaming-commons, transformers + ({ mkDerivation, base, blaze-builder, bytestring + , bytestring-builder, enumerator, streaming-commons, transformers }: mkDerivation { pname = "blaze-builder-enumerator"; @@ -25973,8 +26012,8 @@ self: { sha256 = "15mz4dfnngll61b1xv3hfazvzjfd8g9ym0hps1qiks1hl4c2kxah"; editedCabalFile = "28796d33301d22cfca6188f54699d9efd7721802bc5e9c88a394bec14c9c4fae"; buildDepends = [ - base blaze-builder bytestring enumerator streaming-commons - transformers + base blaze-builder bytestring bytestring-builder enumerator + streaming-commons transformers ]; homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; @@ -25995,47 +26034,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blaze-html_0_7_0_3" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring - , containers, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-html"; - version = "0.7.0.3"; - sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx"; - buildDepends = [ base blaze-builder blaze-markup bytestring text ]; - testDepends = [ - base blaze-builder blaze-markup bytestring containers HUnit - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "blaze-html" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring - , containers, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-html"; - version = "0.7.1.0"; - sha256 = "0krvyik9hdizvyx3r499vah34b1jnnv4ivm9h1ij7rgh9xjw34ja"; - buildDepends = [ base blaze-builder blaze-markup bytestring text ]; - testDepends = [ - base blaze-builder blaze-markup bytestring containers HUnit - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-html_0_8_0_2" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -26050,7 +26049,6 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -26120,50 +26118,13 @@ self: { aeson base doctest QuickCheck scientific tasty tasty-quickcheck text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/philopon/blaze-json"; description = "tiny library for encoding json"; license = stdenv.lib.licenses.mit; }) {}; - "blaze-markup_0_6_2_0" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.6.2.0"; - sha256 = "034aqkvxw0g6ry4d82bkvxky7w6yx4q6bp1wn4ydj9rqw8yh6m08"; - buildDepends = [ base blaze-builder bytestring text ]; - testDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.6.3.0"; - sha256 = "1x057jlp89js6xbbyp4ky7xf5wq1ckl516b8bzp4y3knz50jshll"; - buildDepends = [ base blaze-builder bytestring text ]; - testDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_7_0_2" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text @@ -26361,8 +26322,8 @@ self: { }: mkDerivation { pname = "bloomfilter"; - version = "2.0.0.0"; - sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f"; + version = "2.0.1.0"; + sha256 = "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc"; buildDepends = [ array base bytestring deepseq ]; testDepends = [ base bytestring QuickCheck random test-framework @@ -26439,10 +26400,10 @@ self: { pointful text wai wai-extra wai-websockets warp websockets wl-pprint-text ]; + jailbreak = true; homepage = "https://blunt.herokuapp.com"; description = "Convert between pointfree and pointful expressions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bmp" = callPackage @@ -26690,8 +26651,8 @@ self: { }: mkDerivation { pname = "bound"; - version = "1.0.4"; - sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky"; + version = "1.0.5"; + sha256 = "1vk2d8c0nvfk28a9l5d6vnxk48lha2xsp64bd7c1p3x8lygxj88f"; buildDepends = [ base bifunctors binary bytes cereal comonad hashable hashable-extras prelude-extras profunctors transformers @@ -26786,14 +26747,11 @@ self: { ({ mkDerivation, array, base, mtl, unix }: mkDerivation { pname = "brainfuck"; - version = "0.1"; - revision = "1"; - sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3"; - editedCabalFile = "154e3b46053499fc41f606429c8c4f0500e7ec1e1cbf8c3e89af275e06e9d7fa"; + version = "0.1.0.2"; + sha256 = "18xp0vlmh2n37x6rhczxw115cnips7vm9f560qsr395crqk5dzz9"; isLibrary = true; isExecutable = true; buildDepends = [ array base mtl unix ]; - jailbreak = true; description = "Brainfuck interpreter"; license = "GPL"; }) {}; @@ -26860,7 +26818,6 @@ self: { homepage = "https://github.com/rnhmjoj/breve"; description = "a url shortener"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brians-brain" = callPackage @@ -26894,6 +26851,7 @@ self: { jailbreak = true; description = "Simple part of speech tagger"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broadcast-chan" = callPackage @@ -26949,6 +26907,7 @@ self: { base binary bytestring cryptohash data-binary-ieee754 mtl network QuickCheck test-framework test-framework-quickcheck2 text time ]; + jailbreak = true; homepage = "http://github.com/mongodb-haskell/bson"; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = "unknown"; @@ -27369,6 +27328,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "byline" = callPackage + ({ mkDerivation, ansi-terminal, base, colour, containers + , exceptions, haskeline, mtl, terminfo-hs, text, transformers + }: + mkDerivation { + pname = "byline"; + version = "0.2.0.0"; + sha256 = "1194h9bhd1n9sxc224j22mir852b9c5ww2cq0sf9x8k3vlfpm1jl"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-terminal base colour containers exceptions haskeline mtl + terminfo-hs text transformers + ]; + homepage = "http://github.com/pjones/byline"; + description = "Library for creating command-line interfaces (colors, menus, etc.)"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "bytable" = callPackage ({ mkDerivation, base, bytestring, word24 }: mkDerivation { @@ -27584,8 +27562,8 @@ self: { ({ mkDerivation, alex, array, base, bytestring }: mkDerivation { pname = "bytestring-lexing"; - version = "0.4.3.2"; - sha256 = "09ymg1n21668wn4harxg0cqlz98fz990bangpy99w2z7d6cwbc05"; + version = "0.4.3.3"; + sha256 = "1gfbmxr91glzxmbl57f3ij9mapdfxal8pql0s7g3v4qxf7km2pq0"; buildDepends = [ array base bytestring ]; buildTools = [ alex ]; homepage = "http://code.haskell.org/~wren/"; @@ -27858,30 +27836,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "c2hs_0_20_1" = callPackage - ({ mkDerivation, array, base, containers, directory, dlist - , filepath, HUnit, language-c, pretty, process, shelly - , test-framework, test-framework-hunit, text, transformers - }: - mkDerivation { - pname = "c2hs"; - version = "0.20.1"; - sha256 = "1w2w9zxirzjd5lniwqakq59glgsh4mw3565x2l9qrin0bfjxkn3h"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - array base containers directory dlist filepath language-c pretty - process - ]; - testDepends = [ - base filepath HUnit shelly test-framework test-framework-hunit text - transformers - ]; - homepage = "https://github.com/haskell/c2hs"; - description = "C->Haskell FFI tool that gives some cross-language type safety"; - license = stdenv.lib.licenses.gpl2; - }) {}; - "c2hs" = callPackage ({ mkDerivation, array, base, containers, directory, dlist , filepath, HUnit, language-c, pretty, process, shelly @@ -28047,20 +28001,23 @@ self: { }) {}; "cabal-debian" = callPackage - ({ mkDerivation, base, Cabal, containers, data-default, debian - , deepseq, Diff, directory, exceptions, filepath, hsemail, HUnit - , lens, memoize, mtl, network-uri, parsec, pretty, process, pureMD5 - , regex-tdfa, set-extra, syb, text, unix, Unixutils, utf8-string + ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal + , containers, data-default, debian, deepseq, Diff, directory + , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl + , network-uri, newtype-generics, optparse-applicative, parsec + , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix + , Unixutils, utf8-string }: mkDerivation { pname = "cabal-debian"; - version = "4.27.1"; - sha256 = "0h9z6lqcx80zk19y080wr3djamvirjrn8in30h9hyb8j81l7hg5d"; + version = "4.27.2"; + sha256 = "1dmxs06x82pb0x4cyf5lhhgjf5mf0yx2yzl5r6g69awlkq5ylalz"; isLibrary = true; isExecutable = true; buildDepends = [ - base Cabal containers data-default debian deepseq Diff directory - exceptions filepath hsemail HUnit lens memoize mtl network-uri + ansi-wl-pprint base bifunctors Cabal containers data-default debian + deepseq Diff directory exceptions filepath hsemail HUnit lens + memoize mtl network-uri newtype-generics optparse-applicative parsec pretty process pureMD5 regex-tdfa set-extra syb text unix Unixutils utf8-string ]; @@ -28085,7 +28042,6 @@ self: { homepage = "http://github.com/jaspervdj/cabal-dependency-licenses"; description = "Compose a list of a project's transitive dependencies with their licenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dev" = callPackage @@ -28192,7 +28148,6 @@ self: { testDepends = [ base ]; description = "Simple interface to Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-install_1_18_1_0" = callPackage @@ -28253,6 +28208,7 @@ self: { pretty process QuickCheck regex-posix stm test-framework test-framework-hunit test-framework-quickcheck2 time unix zlib ]; + jailbreak = true; postInstall = '' mkdir $out/etc mv bash-completion $out/etc/bash_completion.d @@ -28448,15 +28404,14 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.9.5.1"; - sha256 = "0hqm7r209d5ny9860j7dwr3ksgm5xp4pgml9h379y4wf4ddwf0h2"; + version = "0.9.6"; + sha256 = "07ig7lwkf9lv10kacxcydpz3z6fhpmmpwcr6kq32xgh3larsf0g5"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal directory filepath process time unix ]; homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -28524,24 +28479,21 @@ self: { }) {}; "cabal-src" = callPackage - ({ mkDerivation, base, bytestring, Cabal, classy-prelude-conduit - , conduit, conduit-extra, containers, directory, filepath - , http-client, http-client-tls, http-conduit, http-types, network - , process, resourcet, shelly, streaming-commons, system-fileio - , system-filepath, tar, temporary, text, transformers + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , containers, directory, filepath, http-conduit, http-types + , network, process, resourcet, shelly, system-fileio + , system-filepath, tar, text, transformers }: mkDerivation { pname = "cabal-src"; - version = "0.2.5.1"; - sha256 = "0ym5lsgah4aq37mg074ab82kdjxwmcp0qax3jnalk2hvcm531k9z"; + version = "0.3.0"; + sha256 = "1x8fb7hly9cxhfacwrai1zam6737dgfhjs9g85826f2cp4vp0g29"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring Cabal classy-prelude-conduit conduit conduit-extra - containers directory filepath http-client http-client-tls + base bytestring conduit conduit-extra containers directory filepath http-conduit http-types network process resourcet shelly - streaming-commons system-fileio system-filepath tar temporary text - transformers + system-fileio system-filepath tar text transformers ]; homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; @@ -28597,7 +28549,6 @@ self: { version = "0.1.6"; sha256 = "0rffvz3khxdfbl9rfk1q47xqv013dwmd4sy8cy7y833175j2zibi"; buildDepends = [ base Cabal QuickCheck ]; - jailbreak = true; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; @@ -29084,6 +29035,7 @@ self: { isExecutable = true; buildDepends = [ base containers haskeline parsec ]; testDepends = [ base containers parsec QuickCheck ]; + jailbreak = true; homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = stdenv.lib.licenses.gpl2; @@ -29571,8 +29523,8 @@ self: { }: mkDerivation { pname = "cases"; - version = "0.1.2"; - sha256 = "02m4dlp0l4jd53j1ziq9hkxsj61m74b886ch7vx74n6caz90qnph"; + version = "0.1.2.1"; + sha256 = "0p2dfnyj887bnp414psbmkin4ybmflvgr1q2npvcih2sxianywkd"; buildDepends = [ attoparsec base-prelude loch-th text ]; testDepends = [ base HTF HUnit loch-th placeholders QuickCheck text @@ -29640,8 +29592,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.2.3"; - sha256 = "13fhim3ylxhkr7wy5dss3m1k3cqlhrvknzbqsi1yclfkvp4wzc2f"; + version = "0.4.2.4"; + sha256 = "1vf42v4n55i39zk5dimzk9z0l0jzyp9w9vhgrvzmi0f7nhfbv08a"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq text unordered-containers vector @@ -29651,7 +29603,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/tibbe/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; @@ -29670,6 +29621,7 @@ self: { containers mtl ]; testDepends = [ base QuickCheck ]; + jailbreak = true; homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; @@ -29754,7 +29706,6 @@ self: { homepage = "https://github.com/erochest/castle"; description = "A tool to manage shared cabal-install sandboxes"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casui" = callPackage @@ -29975,6 +29926,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cef" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, filepath + , text, time + }: + mkDerivation { + pname = "cef"; + version = "0.1.1"; + sha256 = "045sh0mfpwjpr3vc7bax89hv7aq29ak0xqhmyldj2p8allcfrv24"; + buildDepends = [ base bytestring text time ]; + testDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/picussecurity/haskell-cef.git"; + description = "CEF log format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ceilometer-common" = callPackage ({ mkDerivation, base, bimap, binary, bytestring, containers , data-ordlist, foldl, hspec, lens, lens-properties, mtl, pipes @@ -30159,8 +30125,8 @@ self: { }: mkDerivation { pname = "cf"; - version = "0.2"; - sha256 = "0lc7q5nm4c1rjsbvw1b794kxspxqfm124351jkpzi7a9l2gvqcka"; + version = "0.3"; + sha256 = "06r289lb3aq9wh2xggpg7pbxf60wkz1fmdy7ibyawa1sxpprrs07"; buildDepends = [ base ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -30230,6 +30196,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cg" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , directory, filepath, hashable, mtl, parallel, parsec, process + , split, text, unordered-containers, utf8-string, void + }: + mkDerivation { + pname = "cg"; + version = "0.0.9.0"; + sha256 = "0slsckr1xyn1b3vb2xhd2diqhr9cdbkn9g5hfsy0q6sjiy979vpl"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring cereal containers deepseq directory filepath + hashable mtl parallel parsec process split text + unordered-containers utf8-string void + ]; + description = "Parser for categorial grammars"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "cgen" = callPackage ({ mkDerivation, base, containers, directory, filepath, mtl, parsec , regex-posix, safe, template-haskell @@ -30334,8 +30320,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "chalk"; - version = "0.1.0.0"; - sha256 = "09apxk27s6j8ciq3d2zxhr70ihm9s79zhc2pyg1xb220h6p55swk"; + version = "0.1.0.1"; + sha256 = "0d9qp512ww5cpvv7pby4saqjxy9qyid3gf0gndqhglikcc0wayxy"; buildDepends = [ base ]; jailbreak = true; homepage = "http://github.com/joom/chalk"; @@ -30561,7 +30547,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Some monad transformers and typeclasses for abstraction of global dependencies"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chatty-text" = callPackage @@ -30574,7 +30559,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chatty-utils" = callPackage @@ -30587,7 +30571,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate" = callPackage @@ -30597,8 +30580,8 @@ self: { }: mkDerivation { pname = "cheapskate"; - version = "0.1.0.3"; - sha256 = "0my7dkaicdl95289s6li4qzjv9qvgddp51m8nh8lk7qmwx2x5kc6"; + version = "0.1.0.4"; + sha256 = "0drx1hlqvdcrij4097q6bxhbfcqm73jsqv1wwhd3hsnjdmr46ch2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -30845,7 +30828,6 @@ self: { homepage = "https://github.com/nfjinjing/chu2"; description = "FFI for Chu2 Agda Web Server Interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chuchu" = callPackage @@ -30870,16 +30852,15 @@ self: { "chunked-data" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers - , mono-traversable, semigroups, system-filepath, text, transformers - , vector + , mono-traversable, semigroups, text, transformers, vector }: mkDerivation { pname = "chunked-data"; - version = "0.1.0.1"; - sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r"; + version = "0.2.0"; + sha256 = "0wmjpb0vq0nqvy317gmzxqh8yqq1bx0h2r90vqfpq3cv3z4g784s"; buildDepends = [ base blaze-builder bytestring containers mono-traversable - semigroups system-filepath text transformers vector + semigroups text transformers vector ]; homepage = "https://github.com/fpco/chunked-data"; description = "Typeclasses for dealing with various chunked data representations"; @@ -31373,8 +31354,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.5.5"; - sha256 = "1s5r7sjkxri02zxsjnkdxd03sk2j77l5r819sjw1wi6930p2fwa4"; + version = "0.5.6"; + sha256 = "0x538nxibz4hiyij1s9ljrgjvsmizha4nacszil1530qh7ss34n9"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -31399,8 +31380,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5.4"; - sha256 = "08is6gr5z2i478lmah6liqinbp8r72zjqfcbfmrxa4vjr3ajrpw7"; + version = "0.5.5"; + sha256 = "0k6k45fhkwrr3azqhp278abf4kr7is67zsqyabf71hdyp68242dx"; buildDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -31511,20 +31492,20 @@ self: { ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl - , mutable-containers, primitive, QuickCheck, semigroups, stm - , system-filepath, text, time, time-locale-compat, transformers - , unordered-containers, vector, vector-instances + , mutable-containers, primitive, QuickCheck, semigroups, stm, text + , time, time-locale-compat, transformers, unordered-containers + , vector, vector-instances }: mkDerivation { pname = "classy-prelude"; - version = "0.11.1.1"; - sha256 = "1aincib2rpxbc7nyk8sbxhcdy0l4wr1005kn0h4bb4m3aa008f7a"; + version = "0.12.0"; + sha256 = "0g72084wnfqam0djpck76bb7dmphpjs1h32w361cqyvgxkyy1prw"; buildDepends = [ base basic-prelude bifunctors bytestring chunked-data containers dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base mono-traversable mtl mutable-containers primitive semigroups stm - system-filepath text time time-locale-compat transformers - unordered-containers vector vector-instances + text time time-locale-compat transformers unordered-containers + vector vector-instances ]; testDepends = [ base containers hspec QuickCheck transformers unordered-containers @@ -31537,15 +31518,15 @@ self: { "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , system-fileio, transformers, void + , transformers, void }: mkDerivation { pname = "classy-prelude-conduit"; - version = "0.11.1"; - sha256 = "0rjm8kzx34m1x3yndm9i2ybvw9lfddgaab1n51n8psml3yxckqic"; + version = "0.12.0"; + sha256 = "0sby5lbk16f7q3dd3qisv67m1bsgx9v99iwb95crbql3ghi99za1"; buildDepends = [ base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet system-fileio transformers void + monad-control resourcet transformers void ]; testDepends = [ base bytestring conduit hspec QuickCheck transformers @@ -31562,8 +31543,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "0.11.1"; - sha256 = "1481cs7l0bf4jy9q2rg35aw0pfzdhnj7kc22ll2n7jb2wg1xvcv3"; + version = "0.12.0"; + sha256 = "00w932g8pcv76qd16fjr93vaipnr02p3m5j8zhyqy1w9frc6pnqx"; buildDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -31594,37 +31575,40 @@ self: { }) {}; "clckwrks" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, blaze-html - , bytestring, cereal, containers, cryptopp, directory, filepath - , happstack-authenticate, happstack-hsp, happstack-server - , happstack-server-tls, hsp, hsx-jmacro, hsx2hs, ixset, jmacro, mtl - , network, network-uri, old-locale, openssl, process, random - , reform, reform-happstack, reform-hsp, safecopy, stm, tagsoup - , text, time, unordered-containers, utf8-string, uuid, vector - , web-plugins, web-routes, web-routes-happstack, web-routes-hsp - , web-routes-th, xss-sanitize + ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base + , blaze-html, bytestring, cereal, containers, directory, filepath + , happstack-authenticate, happstack-hsp, happstack-jmacro + , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs + , ixset, jmacro, lens, mtl, network, network-uri, old-locale + , openssl, process, random, reform, reform-happstack, reform-hsp + , safecopy, stm, tagsoup, text, time, time-locale-compat + , unordered-containers, utf8-string, uuid, vector, web-plugins + , web-routes, web-routes-happstack, web-routes-hsp, web-routes-th + , xss-sanitize }: mkDerivation { pname = "clckwrks"; - version = "0.22.4"; - sha256 = "1srgvnsmd3lhhp797kwwq6a0sr31i0kdlgzmrqi0qs1wg54nwyw6"; + version = "0.23.7"; + sha256 = "0bs7gcbb3xsq4b444jybilfvpxqm9xdwn135fdn1wchbiykqnwba"; buildDepends = [ - acid-state aeson attoparsec base blaze-html bytestring cereal - containers directory filepath happstack-authenticate happstack-hsp - happstack-server happstack-server-tls hsp hsx-jmacro ixset jmacro - mtl network network-uri old-locale process random reform + acid-state aeson aeson-qq attoparsec base blaze-html bytestring + cereal containers directory filepath happstack-authenticate + happstack-hsp happstack-jmacro happstack-server + happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl + network network-uri old-locale process random reform reform-happstack reform-hsp safecopy stm tagsoup text time - unordered-containers utf8-string uuid vector web-plugins web-routes - web-routes-happstack web-routes-hsp web-routes-th xss-sanitize + time-locale-compat unordered-containers utf8-string uuid vector + web-plugins web-routes web-routes-happstack web-routes-hsp + web-routes-th xss-sanitize ]; buildTools = [ hsx2hs ]; - extraLibraries = [ cryptopp openssl ]; + extraLibraries = [ openssl ]; jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) cryptopp; inherit (pkgs) openssl;}; + }) { inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl @@ -31632,8 +31616,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.2.13"; - sha256 = "09ygkr4wqcwc07pf0alf9dncsv4dl40v97qnilis3wsdc05gflip"; + version = "0.2.14"; + sha256 = "1dwvrxz2sjk61bbima9m70qv6gf4h4jx9yysmwnwpinmmqixwdi3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -31646,24 +31630,22 @@ self: { }) {}; "clckwrks-dot-com" = callPackage - ({ mkDerivation, base, clckwrks, clckwrks-plugin-bugs - , clckwrks-plugin-media, clckwrks-plugin-page - , clckwrks-theme-clckwrks, containers, happstack-server, hsp - , hsx2hs, mtl, network, text, web-plugins + ({ mkDerivation, base, clckwrks, clckwrks-plugin-media + , clckwrks-plugin-page, clckwrks-theme-clckwrks, containers + , happstack-server, hsp, hsx2hs, mtl, network, text, web-plugins }: mkDerivation { pname = "clckwrks-dot-com"; - version = "0.3.9"; - sha256 = "0q1y6lh9215p0c45195k05m774bmxyzm6jsvyncw2qngl77gambh"; + version = "0.3.11"; + sha256 = "0f39ws919qy00090l002k3g8dkcldq7rwayf0wyxg8mfycrnb700"; isLibrary = false; isExecutable = true; buildDepends = [ - base clckwrks clckwrks-plugin-bugs clckwrks-plugin-media - clckwrks-plugin-page clckwrks-theme-clckwrks containers - happstack-server hsp mtl network text web-plugins + base clckwrks clckwrks-plugin-media clckwrks-plugin-page + clckwrks-theme-clckwrks containers happstack-server hsp mtl network + text web-plugins ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "clckwrks.com"; license = stdenv.lib.licenses.bsd3; @@ -31731,8 +31713,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.9"; - sha256 = "0c72c7k1zpl6sqvb8fl5dr1in6nbr5ni3hj5mvfs54phw0b6qlqs"; + version = "0.6.13"; + sha256 = "0j6ijdq3n011h4d0gxxpjs35kwppp2kyjkg0bjcdw752ppk4y14w"; buildDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -31740,7 +31722,6 @@ self: { web-routes-th ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -31752,19 +31733,19 @@ self: { , containers, directory, filepath, happstack-hsp, happstack-server , hsp, hsx2hs, ixset, mtl, old-locale, random, reform , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, utf8-string, uuid, web-plugins, web-routes + , text, time, time-locale-compat, uuid, web-plugins, web-routes , web-routes-happstack, web-routes-th }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.3.6"; - sha256 = "1izz2mgznvwjy3689zw76rzyapq32kq0dvbs7147x6fx5rvsydz7"; + version = "0.3.10"; + sha256 = "0871fz0h3vqwsjrk7pz69nm8gi5ycxnfv1pip8nnf11wfqfcqlgb"; buildDepends = [ acid-state aeson attoparsec base clckwrks containers directory - filepath happstack-hsp happstack-server hsp ixset mtl old-locale - random reform reform-happstack reform-hsp safecopy tagsoup - template-haskell text time utf8-string uuid web-plugins web-routes - web-routes-happstack web-routes-th + filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl + old-locale random reform reform-happstack reform-hsp safecopy + tagsoup template-haskell text time time-locale-compat uuid + web-plugins web-routes web-routes-happstack web-routes-th ]; buildTools = [ hsx2hs ]; jailbreak = true; @@ -31775,14 +31756,18 @@ self: { }) {}; "clckwrks-theme-bootstrap" = callPackage - ({ mkDerivation, base, clckwrks, hsp, hsx2hs, text }: + ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp + , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins + }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.3.2"; - sha256 = "0bj1lxrzlhv4l37xb4jbb8h55l3mb2abyapsmlavcj0cld7ba7i2"; - buildDepends = [ base clckwrks hsp text ]; + version = "0.4.0"; + sha256 = "08sdklr7nikngkdcls9dwy0ij4nqrb1n6dnkm3cw73iaifsl6klz"; + buildDepends = [ + base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro + mtl text web-plugins + ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -31790,14 +31775,17 @@ self: { }) {}; "clckwrks-theme-clckwrks" = callPackage - ({ mkDerivation, base, clckwrks, containers, hsp, hsx2hs, text }: + ({ mkDerivation, base, clckwrks, containers, happstack-authenticate + , hsp, hsx2hs, mtl, text, web-plugins + }: mkDerivation { pname = "clckwrks-theme-clckwrks"; - version = "0.4.3"; - sha256 = "0mxb48sirbhvm4vkwwgqxh7x3bahfk34x8i20zcirvh8y6xxp3pm"; - buildDepends = [ base clckwrks containers hsp text ]; - buildTools = [ hsx2hs ]; - jailbreak = true; + version = "0.5.0"; + sha256 = "06szqp7mcak7ra1pzxzmj8hzhm1lmdr7nwjkxk1h8bba5ipcjwhv"; + buildDepends = [ + base clckwrks containers happstack-authenticate hsp hsx2hs mtl text + web-plugins + ]; homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -31877,7 +31865,6 @@ self: { homepage = "https://github.com/tanakh/cless"; description = "Colorized LESS"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clevercss" = callPackage @@ -32311,8 +32298,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.2"; - sha256 = "0xf34i09m9a3mf6mzn48v6pdbkagsv5c0wmr64ih8d43n2figazk"; + version = "0.3.3.1"; + sha256 = "0l42l8bpn69zqz3s2jby1blqg7sx7cxmpnpwr8spkmh5vy8c8m5g"; buildDepends = [ base bytestring text ]; testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; @@ -32375,10 +32362,8 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.12"; - revision = "1"; - sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy"; - editedCabalFile = "e37c92e6337ccbacd95f77938a1d0459f52cdb1a51c920a96610793cf2b5e4dc"; + version = "0.10.13"; + sha256 = "0vmz7f0ssrqlp6wzmc0mjqj4qczfgk58g0lr0yz7jamamlgpq4b6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -32414,8 +32399,8 @@ self: { ({ mkDerivation, base, mtl, split, syb, transformers }: mkDerivation { pname = "cmdlib"; - version = "0.3.5"; - sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl"; + version = "0.3.6"; + sha256 = "0mxk7yy3sglxc97my5lnphisg6fawifrbdbpz31h7ybiqccx4hsn"; isLibrary = true; isExecutable = true; buildDepends = [ base mtl split syb transformers ]; @@ -32482,7 +32467,6 @@ self: { buildDepends = [ array base containers ]; description = "Unification in a Commutative Monoid"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cnc-spec-compiler" = callPackage @@ -32626,27 +32610,27 @@ self: { }) {}; "codex" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, curl - , directory, either, filepath, hackage-db, machines - , machines-directory, MissingH, monad-loops, process, tar, text - , transformers, yaml, zlib + ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash + , directory, either, filepath, hackage-db, http-client, lens + , machines, machines-directory, MissingH, monad-loops, network + , process, tar, text, transformers, wreq, yaml, zlib }: mkDerivation { pname = "codex"; - version = "0.2.1.4"; - sha256 = "19w3s8f3yn6535lvcwzqkmydqxcdgx1khawax0n894r8lfz3zyj7"; + version = "0.3.0.6"; + sha256 = "1slgh54kvf01y991pqi51kj6lfq05l5gp8dkhwcya1l9gilfazr4"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring Cabal containers curl directory either filepath - hackage-db machines machines-directory MissingH monad-loops process - tar text transformers yaml zlib + base bytestring Cabal containers cryptohash directory either + filepath hackage-db http-client lens machines machines-directory + MissingH monad-loops network process tar text transformers wreq + yaml zlib ]; jailbreak = true; homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codo-notation" = callPackage @@ -32699,6 +32683,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "coinbase-exchange" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring + , byteable, bytestring, conduit, conduit-extra, cryptohash, deepseq + , hashable, http-client, http-client-tls, http-conduit, http-types + , mtl, network, old-locale, resourcet, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text, time, transformers + , transformers-base, uuid, uuid-aeson, vector, websockets, wuss + }: + mkDerivation { + pname = "coinbase-exchange"; + version = "0.1.0.0"; + sha256 = "0l09gjn0lk7v51s1gw52p0m9i8amhci93qpi98p1r1nlxx09xj3v"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aeson-casing base base64-bytestring byteable bytestring + conduit conduit-extra cryptohash deepseq hashable http-client + http-client-tls http-conduit http-types mtl network old-locale + resourcet scientific text time transformers transformers-base uuid + uuid-aeson vector websockets wuss + ]; + testDepends = [ + base bytestring http-client-tls http-conduit old-locale tasty + tasty-hunit tasty-quickcheck tasty-th time transformers uuid + ]; + jailbreak = true; + description = "Connector library for the coinbase exchange"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colada" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdargs, containers , fclabels, ghc-prim, ListZipper, monad-atom, mtl, nlp-scores @@ -32878,6 +32893,7 @@ self: { version = "0.3.0.2"; sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm"; buildDepends = [ base lens linear profunctors ]; + jailbreak = true; homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; license = stdenv.lib.licenses.bsd3; @@ -33116,8 +33132,10 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.5"; - sha256 = "07ilryqgvnkr4vmifg0dncgzmx87i2fbfbgrgc3jn1yz808s7wqf"; + version = "4.2.6"; + revision = "1"; + sha256 = "1dspysfyjk74di2wvv7xj8r92acqsynjl5gi3sh8m7hqb122m60i"; + editedCabalFile = "7a617c03c1147d1955930ac77cf2395f853195c2331468822aa58a5813b49556"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -33256,7 +33274,6 @@ self: { ]; description = "Compositional Data Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-automata" = callPackage @@ -33271,7 +33288,6 @@ self: { jailbreak = true; description = "Tree automata on Compositional Data Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-dags" = callPackage @@ -33291,9 +33307,9 @@ self: { test-framework-hunit test-framework-quickcheck2 unordered-containers vector ]; + jailbreak = true; description = "Compositional Data Types on DAGs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-param" = callPackage @@ -33303,17 +33319,15 @@ self: { }: mkDerivation { pname = "compdata-param"; - version = "0.8.0.2"; - sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs"; + version = "0.9"; + sha256 = "1b7kdg4g1mqpzy10wdxm90mbjfwmfpprkbb52ba9qbcg7scap4i4"; buildDepends = [ base compdata mtl template-haskell transformers ]; testDepends = [ base compdata containers HUnit mtl template-haskell test-framework test-framework-hunit transformers ]; - jailbreak = true; description = "Parametric Compositional Data Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compensated" = callPackage @@ -33430,6 +33444,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-extra" = callPackage + ({ mkDerivation, base, contravariant }: + mkDerivation { + pname = "composition-extra"; + version = "1.0.0.1"; + sha256 = "0i7jzn3grc23nhnp1i4ppbh30nq8pvfn35vz2vdfsivmaa5fnp5v"; + buildDepends = [ base contravariant ]; + description = "Combinators for unorthodox structure composition"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compressed" = callPackage ({ mkDerivation, base, comonad, containers, fingertree, hashable , keys, pointed, reducers, semigroupoids, semigroups @@ -33443,6 +33468,7 @@ self: { base comonad containers fingertree hashable keys pointed reducers semigroupoids semigroups unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/compressed/"; description = "Compressed containers and reducers"; license = stdenv.lib.licenses.bsd3; @@ -33552,6 +33578,7 @@ self: { buildDepends = [ base bifunctors exceptions mtl semigroupoids transformers void ]; + jailbreak = true; description = "Concurrent actions that may fail"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -33631,6 +33658,7 @@ self: { aeson base binary bytestring cmdargs concraft containers lazy-io mtl network process sgd split tagset-positional text transformers ]; + jailbreak = true; homepage = "http://zil.ipipan.waw.pl/Concraft"; description = "Morphological tagger for Polish"; license = stdenv.lib.licenses.bsd3; @@ -34007,25 +34035,25 @@ self: { "conduit-combinators" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, hspec, monad-control, mono-traversable, mtl + , directory, filepath, hspec, monad-control, mono-traversable, mtl , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , system-fileio, system-filepath, text, transformers - , transformers-base, unix, unix-compat, vector, void + , text, transformers, transformers-base, unix, unix-compat, vector + , void }: mkDerivation { pname = "conduit-combinators"; - version = "0.3.1"; - sha256 = "14cvd9vs31gbgggy3v6rsg7wckr08msw1s0fwqbyal73krm79f2r"; + version = "1.0.0"; + sha256 = "1ibbj3ipkys26np9d791ynpfzgrw3miclcj02bb0ipmvqngm90hv"; buildDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra monad-control mono-traversable mwc-random - primitive resourcet system-fileio system-filepath text transformers - transformers-base unix unix-compat vector void + conduit conduit-extra filepath monad-control mono-traversable + mwc-random primitive resourcet text transformers transformers-base + unix unix-compat vector void ]; testDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory hspec mono-traversable mtl mwc-random - QuickCheck safe silently system-filepath text transformers vector + conduit containers directory filepath hspec mono-traversable mtl + mwc-random QuickCheck safe silently text transformers vector ]; homepage = "https://github.com/fpco/conduit-combinators"; description = "Commonly used conduit functions, for both chunked and unchunked data"; @@ -34061,10 +34089,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.3"; - revision = "1"; - sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l"; - editedCabalFile = "d90996b02f7aeb417e54658bab2ecba414221de6cde817d2b18186d09e605091"; + version = "1.1.9"; + sha256 = "1bs28gs0xfsqywhm8bchap9zr10wxfrlpdphflhzkm8am2bgz55i"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -34181,14 +34207,14 @@ self: { }: mkDerivation { pname = "configifier"; - version = "0.0.3"; - sha256 = "0l86i7rjbqrppfyfc3ypkal3q0rv8ldxp39hii076dwk7kgvjy1z"; + version = "0.0.4"; + sha256 = "0wd32v9a0jmz9v732z2ph8spb2kh89zj48350kvvappfbqdfh09a"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring case-insensitive containers either mtl - pretty-show regex-easy safe string-conversions text - unordered-containers vector yaml + base bytestring case-insensitive containers either mtl pretty-show + regex-easy safe string-conversions text unordered-containers vector + yaml ]; testDepends = [ aeson aeson-pretty base case-insensitive hspec hspec-discover mtl @@ -35272,7 +35298,6 @@ self: { homepage = "https://github.com/relrod/copr-hs"; description = "Haskell interface to the Fedora Copr system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core" = callPackage @@ -35497,6 +35522,7 @@ self: { isExecutable = true; buildDepends = [ aeson base shakespeare tagsoup text ]; testDepends = [ aeson base HTF HUnit ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/country-codes"; description = "ISO 3166 country codes and i18n names"; license = stdenv.lib.licenses.bsd3; @@ -35624,18 +35650,18 @@ self: { base cprng-aes crypto-random crypto-random-effect extensible-effects ]; + jailbreak = true; homepage = "https://github.com/ibotty/crypto-random-effect"; description = "Run random effect using cprng-aes, a crypto pseudo number generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cpsa" = callPackage ({ mkDerivation, array, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "2.4.0"; - sha256 = "1xhqqrfz6jdmmil1b3awz1j7hfkcpla7vzindqdxhf99y81wd187"; + version = "2.5.0"; + sha256 = "1pdcpgfxba55sg19awcds8l6lw48waaz4dh43dlyb666hmhb2adh"; isLibrary = false; isExecutable = true; buildDepends = [ array base containers parallel ]; @@ -35993,24 +36019,24 @@ self: { "creatur" = callPackage ({ mkDerivation, array, base, binary, bytestring, cereal, cond - , directory, filepath, gray-extended, hdaemonize, HUnit + , directory, filepath, gray-extended, hdaemonize, hsyslog, HUnit , MonadRandom, mtl, old-locale, process, QuickCheck, random, split , temporary, test-framework, test-framework-hunit , test-framework-quickcheck2, time, transformers, unix, zlib }: mkDerivation { pname = "creatur"; - version = "5.9.5"; - sha256 = "0wzdggsgrxpifk8z8y4mqq029dmylvg16x19r28f688rgpz62y0j"; + version = "5.9.6"; + sha256 = "0lxmsd59sa37j8bc7y6v29s8wlscqa4xz15p60jiy5ks7am61wa5"; buildDepends = [ array base bytestring cereal cond directory filepath gray-extended - hdaemonize MonadRandom mtl old-locale process random split time - transformers unix zlib + hdaemonize hsyslog MonadRandom mtl old-locale process random split + time transformers unix zlib ]; testDepends = [ - array base binary cereal directory filepath HUnit MonadRandom mtl - QuickCheck temporary test-framework test-framework-hunit - test-framework-quickcheck2 + array base binary cereal directory filepath hsyslog HUnit + MonadRandom mtl QuickCheck temporary test-framework + test-framework-hunit test-framework-quickcheck2 ]; homepage = "https://github.com/mhwombat/creatur"; description = "Framework for artificial life experiments"; @@ -36378,7 +36404,6 @@ self: { modular-arithmetic QuickCheck random random-shuffle text transformers ]; - jailbreak = true; homepage = "https://github.com/fosskers/crypto-classical"; description = "An educational tool for studying classical cryptography schemes"; license = stdenv.lib.licenses.bsd3; @@ -36526,10 +36551,10 @@ self: { base bytestring crypto-random extensible-effects securemem transformers ]; + jailbreak = true; homepage = "https://github.com/ibotty/crypto-random-effect"; description = "A random effect using crypto-random"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-totp" = callPackage @@ -36638,7 +36663,27 @@ self: { homepage = "http://www.cryptol.net/"; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cryptonite" = callPackage + ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim + , integer-gmp, memory, tasty, tasty-hunit, tasty-kat + , tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.1"; + sha256 = "10rcz9547igjpg908cbgk5aws011g861ywprgf3x5yspml1nc6z5"; + buildDepends = [ + base bytestring deepseq ghc-prim integer-gmp memory + ]; + testDepends = [ + base byteable bytestring memory tasty tasty-hunit tasty-kat + tasty-quickcheck + ]; + homepage = "https://github.com/vincenthz/cryptonite"; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; }) {}; "cryptsy-api" = callPackage @@ -37073,14 +37118,13 @@ self: { ({ mkDerivation, base, GLUT, Yampa }: mkDerivation { pname = "cuboid"; - version = "0.14.1"; - sha256 = "10h14qzvv46pmqcwwsvil93da2g8ddk5cpqxwmi884v2svjvz7qm"; + version = "0.14.2"; + sha256 = "08l8qf98d5p9d5qyj3kh35rzp8fih77bd2pras4dkn7an39pmr6b"; isLibrary = false; isExecutable = true; buildDepends = [ base GLUT Yampa ]; description = "3D Yampa/GLUT Puzzle Game"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cuda" = callPackage @@ -37157,10 +37201,10 @@ self: { ({ mkDerivation, base, bytestring, hspec, rtld, time }: mkDerivation { pname = "curlhs"; - version = "0.1.5"; + version = "0.1.6"; revision = "1"; - sha256 = "0j0r238v3rlk9w7zby7lvh6drzy8d1hah6yzf4dz17hg27wb22ky"; - editedCabalFile = "54dc0c9c8004df751cde41989c305af8e60e6112def522a07bdaf54fd28f27cd"; + sha256 = "1yh7rfk9ppglpjymzzi2yc44g9bp0irnl2yvj77y55djdkmckq3b"; + editedCabalFile = "ac8dbe0348ce66746774f019fe62dbdaf40a200bed62f5b7fb0ecb9bd11cfa1c"; buildDepends = [ base bytestring rtld time ]; testDepends = [ base hspec ]; homepage = "https://github.com/kkardzis/curlhs"; @@ -37262,6 +37306,7 @@ self: { base bytestring crypto-api DRBG HUnit QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "http://github.com/acw/curve25519"; description = "Fast implementations of the curve25519 elliptic curve primitives"; license = stdenv.lib.licenses.bsd3; @@ -37280,6 +37325,7 @@ self: { ]; description = "Library for drawing curve based images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "custom-prelude" = callPackage @@ -37620,8 +37666,8 @@ self: { }) {}; "darcs-cabalized" = callPackage - ({ mkDerivation, array, base, bytestring, containers, curl, curses - , directory, html, HUnit, mtl, old-time, parsec, process + ({ mkDerivation, array, base, bytestring, containers, curl + , directory, html, HUnit, mtl, ncurses, old-time, parsec, process , QuickCheck, regex-compat, unix, zlib }: mkDerivation { @@ -37634,12 +37680,13 @@ self: { array base bytestring containers directory html HUnit mtl old-time parsec process QuickCheck regex-compat unix ]; - extraLibraries = [ curl curses zlib ]; + extraLibraries = [ curl ncurses zlib ]; homepage = "http://darcs.net/"; description = "David's Advanced Version Control System"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) curl; curses = null; inherit (pkgs) zlib;}; + }) { inherit (pkgs) curl; inherit (pkgs) ncurses; + inherit (pkgs) zlib;}; "darcs-fastconvert" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cmdlib, containers @@ -37790,7 +37837,9 @@ self: { mkDerivation { pname = "darkplaces-demo"; version = "0.1"; + revision = "1"; sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f"; + editedCabalFile = "d16b0f7e29060476084a0457d38e524e1965b05e591af570197f287d574a8d01"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -37805,17 +37854,64 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "darkplaces-rcon" = callPackage + ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec + , hspec-core, network, time + }: + mkDerivation { + pname = "darkplaces-rcon"; + version = "0.1"; + sha256 = "0ngxjb6zja7l905ixkr0cjyan21m311wc5dqdzacw5j5w7119v75"; + buildDepends = [ + base byteable bytestring cryptohash network time + ]; + testDepends = [ base bytestring hspec hspec-core ]; + jailbreak = true; + homepage = "https://github.com/bacher09/darkplaces-rcon"; + description = "Darkplaces rcon client library"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "darkplaces-rcon-util" = callPackage + ({ mkDerivation, base, bytestring, ConfigFile, containers + , darkplaces-rcon, darkplaces-text, directory, filepath, haskeline + , HostAndPort, hspec, hspec-core, mtl, optparse-applicative, text + , time, utf8-string + }: + mkDerivation { + pname = "darkplaces-rcon-util"; + version = "0.1.1"; + sha256 = "1xv9906ag2vgkzbk66f9r6lr5j6qwlwss246hjl7iriq315dmqlg"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring ConfigFile containers darkplaces-rcon + darkplaces-text directory filepath haskeline HostAndPort mtl + optparse-applicative text time utf8-string + ]; + testDepends = [ + base bytestring darkplaces-rcon darkplaces-text hspec hspec-core + text + ]; + jailbreak = true; + homepage = "https://github.com/bacher09/darkplaces-rcon"; + description = "Darplaces rcon utility"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "darkplaces-text" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, base, bytestring, text - , vector + ({ mkDerivation, alex, ansi-terminal, array, base, bytestring + , hspec, QuickCheck, text, utf8-string, vector }: mkDerivation { pname = "darkplaces-text"; - version = "0.1"; - sha256 = "08zqrivqz57r0ifjpgksm5l8h19zmsxcicwf97h3andds62v05lf"; - buildDepends = [ ansi-terminal array base bytestring text vector ]; + version = "0.2.1"; + sha256 = "12nsr005pk0v1nril61javh6nrjhqcvlif11mfhch8bvvcaiy4rm"; + buildDepends = [ + ansi-terminal array base bytestring text utf8-string vector + ]; + testDepends = [ base bytestring hspec QuickCheck ]; buildTools = [ alex ]; - jailbreak = true; homepage = "https://github.com/bacher09/darkplaces-text"; description = "Parser for darkplaces colorful text"; license = stdenv.lib.licenses.gpl2; @@ -37843,7 +37939,6 @@ self: { homepage = "http://www.github.com/jfeltz/dash-haskell"; description = "Command line tool to generate Dash docsets (IDE docs) from package haddock"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-accessor" = callPackage @@ -38232,6 +38327,7 @@ self: { buildDepends = [ base bifunctors ghc-prim semigroups split template-haskell ]; + jailbreak = true; homepage = "https://github.com/maxpow4h/data-filepath"; description = "A type safe file path data structure"; license = stdenv.lib.licenses.bsd3; @@ -38307,15 +38403,14 @@ self: { }: mkDerivation { pname = "data-hash"; - version = "0.2.0.0"; - sha256 = "1bfsbc4fkg3jqgbgka1mg6k1fizynvvxbhf2zb0x1apgr579mcrm"; + version = "0.2.0.1"; + sha256 = "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi"; buildDepends = [ array base containers ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Combinators for building fast hashing functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-interval" = callPackage @@ -38471,6 +38566,19 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "data-map-multikey" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "data-map-multikey"; + version = "0.0.1.2"; + sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf"; + buildDepends = [ base containers ]; + jailbreak = true; + homepage = "http://github.com/jhickner/data-map-multikey"; + description = "Data.Map with multiple, unique keys"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-memocombinators" = callPackage ({ mkDerivation, array, base, data-inttrie }: mkDerivation { @@ -38567,8 +38675,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-or"; - version = "1.0.0.4"; - sha256 = "17plwr0ayll8na73vhdsfxk86dnds4rpj8v6nww7shb6vk5v3hf5"; + version = "1.0.0.5"; + sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "A data type for non-exclusive disjunction"; @@ -38657,10 +38765,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "data-reify"; - version = "0.6"; - revision = "1"; - sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7"; - editedCabalFile = "60185d3fdb87fe62f297eb4473d58a7ccf93d1b6ee790a8b2faed79e1ac833c1"; + version = "0.6.1"; + sha256 = "00mjv6dc3fwhbqzrll02qxilwpfypahkzcdqnv17c4nbjqg0ldb1"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; @@ -38919,6 +39025,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "datadog" = callPackage + ({ mkDerivation, aeson, auto-update, base, buffer-builder + , bytestring, lens, lifted-base, monad-control, network, old-locale + , text, time, transformers-base + }: + mkDerivation { + pname = "datadog"; + version = "0.1.0.1"; + sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663"; + buildDepends = [ + aeson auto-update base buffer-builder bytestring lens lifted-base + monad-control network old-locale text time transformers-base + ]; + homepage = "https://github.com/iand675/datadog"; + description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; + license = stdenv.lib.licenses.mit; + }) {}; + "dataenc" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -39032,6 +39156,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "datetime-sb" = callPackage + ({ mkDerivation, base, HUnit, old-locale, old-time, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time + }: + mkDerivation { + pname = "datetime-sb"; + version = "0.2.4"; + sha256 = "1p2pn0jdidqcvmmi80njqm9z4amn1qp05nlxbnz1svpp6nc7amjf"; + buildDepends = [ base old-locale old-time time ]; + testDepends = [ + base HUnit old-locale old-time QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 time + ]; + homepage = "http://github.com/stackbuilders/datetime"; + description = "Utilities to make Data.Time.* easier to use."; + license = "GPL"; + }) {}; + "dawg" = callPackage ({ mkDerivation, base, binary, containers, mtl, transformers , vector, vector-binary @@ -39113,7 +39256,6 @@ self: { ]; description = "An implementation of relational database \"migrations\""; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus" = callPackage @@ -39636,6 +39778,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "decode-utf8" = callPackage + ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode + }: + mkDerivation { + pname = "decode-utf8"; + version = "1.2"; + sha256 = "10mj871j5gd4d8v8341lr5lr9avxxfph58sjhmd9kgywc10grqph"; + isLibrary = false; + isExecutable = true; + buildDepends = [ api-opentheory-unicode base opentheory-unicode ]; + description = "Decode a UTF-8 byte stream on standard input"; + license = stdenv.lib.licenses.mit; + }) {}; + "decoder-conduit" = callPackage ({ mkDerivation, base, binary, bytestring, conduit }: mkDerivation { @@ -40131,7 +40287,6 @@ self: { homepage = "/dev/null"; description = "Template Haskell code to generate instances of classes in dependent-sum package"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "depends" = callPackage @@ -40248,6 +40403,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derive-enumerable" = callPackage + ({ mkDerivation, base, data-default }: + mkDerivation { + pname = "derive-enumerable"; + version = "0.1.1.0"; + sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp"; + buildDepends = [ base data-default ]; + jailbreak = true; + homepage = "https://github.com/mgoszcz2/derive-enumerable"; + description = "Generic instances for enumerating complex data types"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "derive-gadt" = callPackage ({ mkDerivation, base, containers, haskell-src-exts , haskell-src-meta, pretty, template-haskell @@ -40556,8 +40724,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.7.0.1"; - sha256 = "1a4qzrakvis560azbwx234i7882kax1qs212g5ckkr9yvnyanp76"; + version = "0.7.0.2"; + sha256 = "0gkfnanrim060f1g4brp6qxdiq81fni1kml7n9x79pfqdmfhlhgq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40581,8 +40749,8 @@ self: { }: mkDerivation { pname = "diagrams-cairo"; - version = "1.3.0.1"; - sha256 = "04zcyvirlwzg4zrdrassxhfpfmp0hg263pzdi904nv2qp1idayqi"; + version = "1.3.0.2"; + sha256 = "1ja089hnq24fx5sd5r3r2z76pmwk5w6j93b7hha7m4jylcdjcnpp"; buildDepends = [ base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -40601,8 +40769,8 @@ self: { }: mkDerivation { pname = "diagrams-canvas"; - version = "1.3"; - sha256 = "1zqq77ka3p7y9szqvlazwwaamz1b7lg2l8dp2wz5wycignchl26b"; + version = "1.3.0.1"; + sha256 = "0ik2kfgs5fi1a51hn9g5sii0n4j9lb0xd9paydz342b7zizy0w70"; buildDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances @@ -40623,8 +40791,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.3.0.1"; - sha256 = "07y0kgss06pl4xjb2klj3397dadrgypync8vh3mkh8ss1zvfr1zf"; + version = "1.3.0.3"; + sha256 = "0sl99ikghfmiwa51iyacgrma844dqn44iw7c9ahx70r4l8j8is2q"; buildDepends = [ base circle-packing colour containers data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -40647,8 +40815,8 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.3"; - sha256 = "1abf2pxs659bqhl6d803ny11gacfa1wy5c1g47k0h8q9nq6jg3q9"; + version = "1.3.0.1"; + sha256 = "1whig632hx03ysiqidaxf29r67xl2skw0pkx454s036gdwl7sqj2"; buildDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl semigroups unordered-containers @@ -40680,8 +40848,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.3.0.2"; - sha256 = "0vm41w1cvlw1k2gp7d3iyjdi1sla91v5v0xd7d7zhfgx7cs1b6dn"; + version = "0.3.0.4"; + sha256 = "19dv368clrpjv2s0wd2ha61v80hlx4bkmy7qr9bgasaj3xxx3yqn"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40728,8 +40896,8 @@ self: { }: mkDerivation { pname = "diagrams-html5"; - version = "1.3"; - sha256 = "1g9a7wg7rdzqz0bl476gq7hbmsn369jdi67k9ikbjw7z9w060l5f"; + version = "1.3.0.1"; + sha256 = "1b6qrhqangdd2j3hzgslkq2sgk9wgk9ll9znfcmxpzc9k04aanqc"; buildDepends = [ base cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative split @@ -40751,8 +40919,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.3"; - sha256 = "0ap92ya3m74dq4x9zv1jx7cbb0cpzssgy8r7xqmzyq54grdxv01r"; + version = "1.3.0.1"; + sha256 = "04s21ms9w521fhm7hralq155lwisjv1pszz4cvpl3hc1jm1vwfa3"; buildDepends = [ active adjunctions array base colour containers data-default-class diagrams-core diagrams-solve directory distributive dual-tree @@ -40814,8 +40982,8 @@ self: { }: mkDerivation { pname = "diagrams-postscript"; - version = "1.3.0.0"; - sha256 = "1dbnmlwm6blkh8x5rvsvlm6is84bvy9aymayf5k7nhvz9qb82n8v"; + version = "1.3.0.1"; + sha256 = "0w6ck71hjjx0rl930v2wapznjvrg5jq538gnyidp2yshik8xh2rp"; buildDepends = [ base containers data-default-class diagrams-core diagrams-lib dlist filepath hashable lens monoid-extras mtl semigroups split @@ -40824,7 +40992,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -40850,8 +41017,8 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "1.3.1.0"; - sha256 = "0as845zjd3wwixzgiy9vv68ginscsn5194966nhch9mbwxm32ljb"; + version = "1.3.1.2"; + sha256 = "1shkwhi7yv8cmv8697z7qqax0z7brcmjqlc17hldfflzwniiyk81"; buildDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl @@ -40872,7 +41039,6 @@ self: { homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-solve" = callPackage @@ -40895,8 +41061,8 @@ self: { }: mkDerivation { pname = "diagrams-svg"; - version = "1.3.1.1"; - sha256 = "1agfyxv98j14pz6lhk8v5fvm534j7d0923260mrnd5ma6dvpshsw"; + version = "1.3.1.2"; + sha256 = "1kz70v0nccswd4df3240gy6liln4hi165zn8rm6f3palkxcfw3m3"; buildDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg @@ -40906,7 +41072,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -41091,7 +41256,6 @@ self: { homepage = "https://github.com/bgamari/digamma"; description = "A robust implementation of the digamma function"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digest" = callPackage @@ -41134,7 +41298,6 @@ self: { jailbreak = true; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-foundation-lucid" = callPackage @@ -41152,7 +41315,6 @@ self: { jailbreak = true; description = "Speed up form designing using digestive functors and foundation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors" = callPackage @@ -41175,7 +41337,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-aeson" = callPackage @@ -41195,10 +41356,10 @@ self: { aeson base bytestring digestive-functors HUnit mtl scientific tasty tasty-hunit text ]; + jailbreak = true; homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-blaze" = callPackage @@ -41215,7 +41376,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Blaze frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-happstack" = callPackage @@ -41232,7 +41392,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Happstack backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-heist" = callPackage @@ -41249,7 +41408,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-hsp" = callPackage @@ -41278,7 +41436,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Lucid frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-scotty" = callPackage @@ -41296,7 +41453,6 @@ self: { homepage = "https://bitbucket.org/wniare/digestive-functors-scotty"; description = "Scotty backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-snap" = callPackage @@ -41305,17 +41461,15 @@ self: { }: mkDerivation { pname = "digestive-functors-snap"; - version = "0.6.1.2"; - sha256 = "1rkapw7vgz0wfzm8g1lm8z9b7rzwzhsxsc4i7ilig23x16jw07hl"; + version = "0.6.1.3"; + sha256 = "11ah4rvi5fj9vjjzjw0m60s72qiizy1i4hnj44v88ajf2095aigh"; buildDepends = [ base bytestring containers digestive-functors directory filepath mtl snap-core text ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digit" = callPackage @@ -41484,6 +41638,7 @@ self: { buildDepends = [ base bytestring containers mtl network utf8-string ]; + jailbreak = true; homepage = "http://dankna.com/software/"; description = "Native implementation of the FastCGI protocol"; license = stdenv.lib.licenses.bsd3; @@ -41656,9 +41811,10 @@ self: { ({ mkDerivation, array, base, containers, mtl, parsec }: mkDerivation { pname = "disassembler"; - version = "0.2.0.0"; - sha256 = "125191kzflzdj2wnghfc3dzpdxqc44iir5ypvhsz5xb773cdxwxv"; + version = "0.2.0.1"; + sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c"; buildDepends = [ array base containers mtl parsec ]; + homepage = "https://github.com/mgrabmueller/disassembler"; description = "Disassembler for X86 & AMD64 machine code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -41701,6 +41857,7 @@ self: { buildDepends = [ adjunctions base comonad distributive keys semigroupoids ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/discrete-space-map"; description = "A discrete space map"; license = stdenv.lib.licenses.bsd3; @@ -41772,8 +41929,8 @@ self: { }: mkDerivation { pname = "distributed-process"; - version = "0.5.3"; - sha256 = "1jp85dd7scizs03cslrbgmaly735l2rv9yl5hq573xj3mjwmv5nz"; + version = "0.5.4"; + sha256 = "1yx2vspnpa478bn7n82ii6m6x0z43xwbr5995l3mm64sd0nmxp2s"; buildDepends = [ base binary bytestring containers data-accessor deepseq distributed-static ghc-prim hashable mtl network-transport @@ -42258,24 +42415,24 @@ self: { }) {}; "diversity" = callPackage - ({ mkDerivation, base, containers, fasta, math-functions - , MonadRandom, optparse-applicative, parsec, pipes, random-shuffle - , scientific, split + ({ mkDerivation, base, containers, data-ordlist, fasta + , math-functions, MonadRandom, optparse-applicative, parsec, pipes + , random-shuffle, scientific, split }: mkDerivation { pname = "diversity"; - version = "0.6.0.2"; - sha256 = "17sx8pkwmdksqk2g7jiid335znx03h1crxnhhk66vainif5my5bg"; + version = "0.6.3.0"; + sha256 = "176ichmxfkgjqrlpanpdbni54bzd6zp8hrqbknvg8cfa7faly2lx"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers fasta math-functions MonadRandom + base containers data-ordlist fasta math-functions MonadRandom optparse-applicative parsec pipes random-shuffle scientific split ]; + jailbreak = true; homepage = "https://github.com/GregorySchwartz/diversity"; description = "Return the diversity at each position for all sequences in a fasta file"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "djinn" = callPackage @@ -42540,6 +42697,7 @@ self: { homepage = "https://github.com/factisresearch/dockercook"; description = "A build tool for multiple docker image layers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docopt" = callPackage @@ -42548,8 +42706,8 @@ self: { }: mkDerivation { pname = "docopt"; - version = "0.7.0.1"; - sha256 = "1i8san365h3g1jhkwh4dyphczdfyd1558744hj4sv5q9lnq86l4q"; + version = "0.7.0.2"; + sha256 = "0c62lz0xmrd3ycnpmw254jbc5s999nb0xzrrkbv3cj3n9zzcyzak"; buildDepends = [ base containers parsec template-haskell th-lift ]; testDepends = [ aeson ansi-terminal base bytestring containers parsec split @@ -42638,7 +42796,6 @@ self: { testDepends = [ base doctest HUnit QuickCheck ]; description = "Allow QuickCheck-style property testing within doctest"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dom-lt" = callPackage @@ -42710,6 +42867,7 @@ self: { homepage = "http://github.com/egonschiele/dominion"; description = "A simulator for the board game Dominion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "domplate" = callPackage @@ -42718,13 +42876,12 @@ self: { }: mkDerivation { pname = "domplate"; - version = "0.1"; - sha256 = "116ljs471cdb21sjglk53wa8270axw7zbsm6ah785q1vabczgs8p"; + version = "0.1.0.1"; + sha256 = "1njzjxz7mymjfismmv8rxkqb24m0gindbsiszbjgy1wm1lwrspb4"; buildDepends = [ base bytestring containers tagsoup text unordered-containers vector yaml ]; - jailbreak = true; homepage = "https://github.com/valderman/domplate"; description = "A simple templating library using HTML5 as its template language"; license = stdenv.lib.licenses.bsd3; @@ -42874,7 +43031,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "download-media-content" = callPackage @@ -43189,6 +43345,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dsh-sql" = callPackage + ({ mkDerivation, aeson, algebra-dag, algebra-sql, base, bytestring + , bytestring-lexing, containers, Decimal, DSH, either, HDBC + , HDBC-odbc, HUnit, mtl, process, QuickCheck, random, semigroups + , set-monad, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "dsh-sql"; + version = "0.2.0.0"; + sha256 = "0f7r844d0jwn4vyfnj8nvksss16rwva63hsy22m2viv98nyyfyi2"; + buildDepends = [ + aeson algebra-dag algebra-sql base bytestring bytestring-lexing + containers Decimal DSH either HDBC HDBC-odbc mtl process random + semigroups set-monad template-haskell text vector + ]; + testDepends = [ + base bytestring bytestring-lexing containers DSH HDBC HDBC-odbc + HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text vector + ]; + description = "SQL backend for Database Supported Haskell (DSH)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dsmc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, entropy , hslogger, mwc-random, parallel, primitive, repa, strict @@ -43384,6 +43565,7 @@ self: { base containers MemoTrie QuickCheck test-framework test-framework-quickcheck2 thyme vector vector-space ]; + jailbreak = true; description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -43451,6 +43633,7 @@ self: { ]; description = "Efficient automatic differentiation and code generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dvdread" = callPackage @@ -43609,6 +43792,7 @@ self: { base cairo colour either GLFW-b GLUtil OpenGL pango pipes transformers ]; + jailbreak = true; homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -43699,6 +43883,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dynamic-pp" = callPackage + ({ mkDerivation, ansi-terminal, base, blaze-builder, bytestring + , Cabal, hashable, HUnit-Plus, unordered-containers, utf8-string + }: + mkDerivation { + pname = "dynamic-pp"; + version = "0.1.0"; + sha256 = "1i01k8c75yxdmxz3db4kajpqbgl8lcbfsp9rb9q2kzbk44fc2zpc"; + buildDepends = [ + ansi-terminal base blaze-builder bytestring Cabal hashable + unordered-containers utf8-string + ]; + testDepends = [ + ansi-terminal base blaze-builder bytestring Cabal hashable + HUnit-Plus unordered-containers utf8-string + ]; + homepage = "https://github.com/emc2/dynamic-pp"; + description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dynamic-state" = callPackage ({ mkDerivation, base, binary, bytestring, hashable , unordered-containers @@ -43712,7 +43917,6 @@ self: { ]; description = "Optionally serializable dynamic state keyed by type"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynobud" = callPackage @@ -43812,8 +44016,8 @@ self: { ({ mkDerivation, base, directory, filepath, time, unix }: mkDerivation { pname = "easy-file"; - version = "0.2.0"; - sha256 = "0v8skixq15rvyiyky1dcrfl9jrzkbi75vai8np11xy2kg7a8ym2a"; + version = "0.2.1"; + sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz"; buildDepends = [ base directory filepath time unix ]; homepage = "http://github.com/kazu-yamamoto/easy-file"; description = "Cross-platform File handling"; @@ -43980,14 +44184,18 @@ self: { }) {}; "eddie" = callPackage - ({ mkDerivation, base, cmdargs, hint }: + ({ mkDerivation, base, bifunctors, classy-prelude, hint + , optparse-applicative, safe + }: mkDerivation { pname = "eddie"; - version = "0.5.1"; - sha256 = "1kqrxv195r1dhrnizaml9v20jpwgxq66xdr7jfmri4ai0pvjpzmk"; + version = "1.0.0"; + sha256 = "1zq2xadpl33mxdn99aim5rscwqgpy5w0lk7pa3k3h9x3d3c3qzxx"; isLibrary = false; isExecutable = true; - buildDepends = [ base cmdargs hint ]; + buildDepends = [ + base bifunctors classy-prelude hint optparse-applicative safe + ]; homepage = "http://chiselapp.com/user/mwm/repository/eddie/"; description = "Command line file filtering with haskell"; license = stdenv.lib.licenses.bsd3; @@ -44096,7 +44304,6 @@ self: { homepage = "http://github.com/batterseapower/edit-distance"; description = "Levenshtein and restricted Damerau-Levenshtein edit distances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edit-distance-vector" = callPackage @@ -44171,8 +44378,8 @@ self: { }: mkDerivation { pname = "editor-open"; - version = "0.3.0.0"; - sha256 = "1yfwwd3z3w6yadqqv96n65795gsg418iid35cwgxyf9l1jgk79f1"; + version = "0.6.0.0"; + sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -44180,7 +44387,7 @@ self: { temporary transformers unix ]; homepage = "https://github.com/pharpend/editor-open"; - description = "Open the user's $EDITOR for text input"; + description = "Open the user's $VISUAL or $EDITOR for text input"; license = stdenv.lib.licenses.asl20; }) {}; @@ -44420,6 +44627,7 @@ self: { sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07"; buildDepends = [ base bytestring primitive vector ]; testDepends = [ base primitive vector ]; + jailbreak = true; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; @@ -44427,17 +44635,18 @@ self: { }) {}; "either" = callPackage - ({ mkDerivation, base, bifunctors, exceptions, free, monad-control - , MonadRandom, mtl, profunctors, semigroupoids, semigroups - , transformers, transformers-base + ({ mkDerivation, base, bifunctors, exceptions, free, mmorph + , monad-control, MonadRandom, mtl, profunctors, semigroupoids + , semigroups, transformers, transformers-base }: mkDerivation { pname = "either"; - version = "4.3.3.2"; - sha256 = "05j4mk1qlp72w70cahfw4nm506sl0wmkgffi2f5xazwjgkggw595"; + version = "4.4.1"; + sha256 = "1jq9b7mwljyqxmcs09bnqzza6710sfk2x444p3aagjlvq3mpvrci"; buildDepends = [ - base bifunctors exceptions free monad-control MonadRandom mtl - profunctors semigroupoids semigroups transformers transformers-base + base bifunctors exceptions free mmorph monad-control MonadRandom + mtl profunctors semigroupoids semigroups transformers + transformers-base ]; homepage = "http://github.com/ekmett/either/"; description = "An either monad transformer"; @@ -44480,6 +44689,7 @@ self: { aeson base bytestring ekg-core filepath network snap-core snap-server text time transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; @@ -44738,6 +44948,7 @@ self: { test-framework-quickcheck2 text transformers union-find unordered-containers ]; + jailbreak = true; homepage = "http://elm-lang.org"; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; @@ -44784,6 +44995,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elm-init" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , directory, file-embed, filepath, text + }: + mkDerivation { + pname = "elm-init"; + version = "0.1.1.1"; + sha256 = "1qb61m0jd4c63x8av5v3iaxw1k4isi2yzrqjw0xznkf8m07hz4vb"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson aeson-pretty base bytestring containers directory file-embed + filepath text + ]; + description = "Set up basic structure for an elm project"; + license = stdenv.lib.licenses.mit; + }) {}; + "elm-make" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, blaze-html , blaze-markup, bytestring, containers, directory, elm-compiler @@ -44924,6 +45153,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elocrypt" = callPackage + ({ mkDerivation, base, MonadRandom, proctest, QuickCheck, random + , tasty, tasty-quickcheck, tasty-th + }: + mkDerivation { + pname = "elocrypt"; + version = "0.4.0"; + sha256 = "0n19364jzifnb08pxzlsb05hpqz327zsfz138g0py3zy38wibszx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base MonadRandom random ]; + testDepends = [ + base MonadRandom proctest QuickCheck random tasty tasty-quickcheck + tasty-th + ]; + homepage = "https://www.github.com/sgillespie/elocrypt"; + description = "Generate easy-to-remember, hard-to-guess passwords"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email" = callPackage ({ mkDerivation, array, base, bytestring, encoding, HaskellNet , hsemail, old-locale, old-time, parsec, process, time @@ -44989,8 +45239,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.1.2"; - sha256 = "13r67kk5rjl54mwk4shap1rf8jdp1hsd6wpg4hgkf10vzk5vara5"; + version = "2.1.3"; + sha256 = "1jw15hyj6p1155i3h5n4f728x33ym21ibpirkdiid0ksf6cpk5jv"; buildDepends = [ attoparsec base bytestring ghc-prim ]; testDepends = [ base bytestring HUnit QuickCheck test-framework @@ -45156,8 +45406,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.5"; - sha256 = "09hndfmgvganfj2y53zj5dpy1dn8rain3fyxknr14ln8c75jprah"; + version = "1.2.6"; + sha256 = "1vxbpfldnqrw42vm8c0rqy4b56yig38mca5b83pl79f2z722l3v4"; buildDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -45359,7 +45609,6 @@ self: { homepage = "https://github.com/michalt/enummapset"; description = "IntMap and IntSet with Enum keys/elements"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enummapset-th" = callPackage @@ -45410,8 +45659,8 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "envparse"; - version = "0.2.0"; - sha256 = "069blfr1kwcd938x2yarbkvbi9nal1fi4qpmyccrb4vx2llqrxkb"; + version = "0.2.1"; + sha256 = "1pkxlda74wpl3f4xd5h69bcbgrw6q045hkdfj98dqd6z2czr2wcg"; buildDepends = [ base containers ]; testDepends = [ base containers hspec ]; homepage = "https://supki.github.io/envparse"; @@ -45512,8 +45761,8 @@ self: { }: mkDerivation { pname = "epub-metadata"; - version = "4.2"; - sha256 = "1pj0z6avdwvqrnjgwn7x5ajc7nagr575cilxmvzj22zlzhz4if3p"; + version = "4.3"; + sha256 = "0gw5mfysvfqk9daa4807qq4xh190a1pzxmwwi2xbnpz7m4kyffyk"; buildDepends = [ base bytestring containers directory filepath hxt mtl regex-compat zip-archive @@ -45522,7 +45771,7 @@ self: { base bytestring directory filepath HUnit hxt mtl regex-compat zip-archive ]; - homepage = "http://ui3.info/d/proj/epub-metadata.html"; + homepage = "http://hub.darcs.net/dino/epub-metadata"; description = "Library for parsing epub document metadata"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45533,8 +45782,8 @@ self: { }: mkDerivation { pname = "epub-tools"; - version = "2.5"; - sha256 = "0ksnzh2j1xa5jvql7b37dnld3pv1lqf62rfww6wv58hh3d1zmzwj"; + version = "2.7"; + sha256 = "17r7p68mdrc7mla65xwb5g8inh94hncqkg09igha9fyhnax4m3dk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -45544,7 +45793,7 @@ self: { testDepends = [ base directory epub-metadata filepath HUnit mtl parsec regex-compat ]; - homepage = "http://ui3.info/d/proj/epub-tools.html"; + homepage = "http://hub.darcs.net/dino/epub-tools"; description = "Command line utilities for working with epub files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45569,8 +45818,8 @@ self: { ({ mkDerivation, base, semigroupoids }: mkDerivation { pname = "eq"; - version = "4.0.3"; - sha256 = "1n2f20dh1rghv8c43dgdlpgamq61dy8dzh86v4p62a125pgawfn3"; + version = "4.0.4"; + sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4"; buildDepends = [ base semigroupoids ]; homepage = "http://github.com/ekmett/eq/"; description = "Leibnizian equality"; @@ -45686,7 +45935,6 @@ self: { homepage = "http://code.haskell.org/~mokus/erf-native"; description = "Native Haskell implementation of the interface from the erf package"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "erlang" = callPackage @@ -45846,6 +46094,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_0_0" = callPackage + ({ mkDerivation, base, safe, transformers }: + mkDerivation { + pname = "errors"; + version = "2.0.0"; + sha256 = "00s7vsqfvv23j3mpicrhspibbyzi5diqrdgajqx9n2snq8vxn9s5"; + buildDepends = [ base safe transformers ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ersatz" = callPackage ({ mkDerivation, array, base, bytestring, containers, data-default , directory, doctest, filepath, lens, mtl, parsec, process @@ -45939,8 +46198,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.2"; - sha256 = "1z49za7yid23ffymhycvbqypw3iabc2yn05p0klh7cd7frkj08j2"; + version = "2.2.3"; + sha256 = "11njnccxkhv2g6v8vh8jclhf0wxl0q4f61197qm439j64whzdj2c"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -46238,8 +46497,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.3.0.0"; - sha256 = "00ysjv6b4rkpy2zz3q2p9i50m3iil7q2frr3xznl4wpjiifhdpx3"; + version = "0.4.1.1"; + sha256 = "0d870kzcb08pc0ngrdkfibi0yq4zs5vcgg8acqpa8gdjaiksm8jg"; buildDepends = [ aeson base bytestring network suspend text timers websockets ]; @@ -46250,17 +46509,19 @@ self: { }) {}; "eventstore" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, cereal, containers - , network, protobuf, random, sodium, text, time, uuid + ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal + , containers, network, protobuf, random, sodium, stm, text, time + , unordered-containers, uuid }: mkDerivation { pname = "eventstore"; - version = "0.7.1.0"; - sha256 = "058r7csqf2lzcqskc9fv9lwr1h1glpirblyc51kn0qb16szigpwv"; + version = "0.7.2.1"; + sha256 = "0zhasybpvmi3f0kb2pipb03jnv4d710gcr6mphszgkj5179wvad2"; buildDepends = [ - aeson async base bytestring cereal containers network protobuf - random sodium text time uuid + aeson async attoparsec base bytestring cereal containers network + protobuf random sodium stm text time unordered-containers uuid ]; + jailbreak = true; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; @@ -46318,8 +46579,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exact-combinatorics"; - version = "0.2.0.7"; - sha256 = "05q31mh5x6i90n3ddxyqnhhjga7vbsbi947iywyqi53h2z2iw8f7"; + version = "0.2.0.8"; + sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Efficient exact computation of combinatoric functions"; @@ -46327,12 +46588,12 @@ self: { }) {}; "exact-pi" = callPackage - ({ mkDerivation, base, groups }: + ({ mkDerivation, base }: mkDerivation { pname = "exact-pi"; - version = "0.1.1.0"; - sha256 = "1n62886wjnnmdi1bjvw51ka21v882m1yc0m87kzq7kx7knvh1xxx"; - buildDepends = [ base groups ]; + version = "0.2.0.0"; + sha256 = "0az47bzrkhb5xmws1rpp080kvsq2pcxjgrm0wzjqqbcqiy5pi3f9"; + buildDepends = [ base ]; homepage = "https://github.com/dmcclean/exact-pi"; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; @@ -46410,6 +46671,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptional" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "exceptional"; + version = "0.1.4.3"; + sha256 = "0rhcqnpw97b9sy87nq7dqwiw8vl91h8yyix68d9sz10s9bi1xnlv"; + buildDepends = [ base ]; + homepage = "https://github.com/pharpend/exceptional"; + description = "Essentially the Maybe type with error messages"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "exceptions" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, test-framework , test-framework-quickcheck2, transformers, transformers-compat @@ -46423,6 +46696,7 @@ self: { base mtl QuickCheck stm test-framework test-framework-quickcheck2 transformers transformers-compat ]; + jailbreak = true; homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; @@ -46473,6 +46747,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exherbo-cabal" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , haddock-library, http-client, pcre-light, pretty + }: + mkDerivation { + pname = "exherbo-cabal"; + version = "0.1.0.0"; + sha256 = "0ap3j5shgy5l1crsyq6dkz2g4gd9y7r8vx4rsppib7y0gqqczpfm"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring Cabal containers haddock-library http-client + pcre-light pretty + ]; + jailbreak = true; + description = "Exheres generator for cabal packages"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exif" = callPackage ({ mkDerivation, base, exif }: mkDerivation { @@ -46530,6 +46824,7 @@ self: { jailbreak = true; description = "Extensible Pandoc"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expat-enumerator" = callPackage @@ -46791,6 +47086,7 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; + jailbreak = true; homepage = "https://github.com/msakai/extended-reals/"; description = "Extension of real numbers with positive/negative infinities"; license = stdenv.lib.licenses.bsd3; @@ -46830,24 +47126,24 @@ self: { "extensible-effects" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers - , transformers-base, type-aligned, void + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, transformers, transformers-base, type-aligned + , void }: mkDerivation { pname = "extensible-effects"; - version = "1.9.1.0"; - sha256 = "1xkddv9k7kqmz4v0pprkzhni8kc2wxkrfv1cqv1lvkjvp8js1zy6"; + version = "1.11.0.0"; + sha256 = "14f8x6gyq28n3lpap4f5bn290llj57my1k28km9r1nh14kxl1lp9"; buildDepends = [ base transformers transformers-base type-aligned void ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 void + test-framework-quickcheck2 test-framework-th void ]; - homepage = "https://github.com/RobotGymnast/extensible-effects"; + homepage = "https://github.com/suhailshergill/extensible-effects"; description = "An Alternative to Monad Transformers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible-exceptions" = callPackage @@ -46879,8 +47175,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.1"; - sha256 = "0i8vv5y7rmfbcnfkqm2ac027nw6csvjbivfywgxd93xig42rzg4y"; + version = "1.2"; + sha256 = "1bj84p3jpbv1vyjbm22plp56jnkas5qwx4bqvbcqgy843mr41225"; buildDepends = [ base directory filepath process time unix ]; testDepends = [ base directory filepath QuickCheck time unix ]; homepage = "https://github.com/ndmitchell/extra#readme"; @@ -47195,16 +47491,16 @@ self: { }) {}; "fasta" = callPackage - ({ mkDerivation, base, containers, foldl, lens, parsec, pipes - , pipes-group, pipes-text, split, text + ({ mkDerivation, base, bytestring, containers, foldl, lens, parsec + , pipes, pipes-bytestring, pipes-group, pipes-text, split, text }: mkDerivation { pname = "fasta"; - version = "0.6.1.1"; - sha256 = "1jwsf0mrr98wn5m4aavdqclv667kkgfqlgjn3dvrgnw8jrywzzd2"; + version = "0.7.2.0"; + sha256 = "1zsghi7883y4ygl0iammfh1dmnsnh3x4ly77jhxg8xz8saw7dbir"; buildDepends = [ - base containers foldl lens parsec pipes pipes-group pipes-text - split text + base bytestring containers foldl lens parsec pipes pipes-bytestring + pipes-group pipes-text split text ]; homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; @@ -47258,7 +47554,6 @@ self: { jailbreak = true; description = "find nearest neighbours by edit-distance"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fastirc" = callPackage @@ -47301,8 +47596,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.4"; - sha256 = "1l8r7d4iwwkq0m9cskwfv38i89cr8sqxidrc59z62yp05ilcs5r6"; + version = "0.23.1.5"; + sha256 = "07x4v8nq9mg0ydir708mv1bhpg3n5f449vv9ihgpyfdvm4w1bm4r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -47316,7 +47611,6 @@ self: { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage @@ -47329,7 +47623,6 @@ self: { homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-builder" = callPackage @@ -47345,7 +47638,6 @@ self: { ]; description = "Compile Fay code on cabal install, and ad-hoc recompile during development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-dom" = callPackage @@ -47358,7 +47650,6 @@ self: { homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-hsx" = callPackage @@ -47385,7 +47676,6 @@ self: { homepage = "https://github.com/faylang/fay-jquery"; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-ref" = callPackage @@ -47398,7 +47688,6 @@ self: { homepage = "https://github.com/A1kmm/fay-ref"; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-text" = callPackage @@ -47411,7 +47700,6 @@ self: { homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-uri" = callPackage @@ -47424,7 +47712,6 @@ self: { homepage = "https://github.com/faylang/fay-uri"; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb" = callPackage @@ -47437,8 +47724,8 @@ self: { }: mkDerivation { pname = "fb"; - version = "1.0.9"; - sha256 = "0f5zs1qnjkhrdlfvcl26l3j2xl58y97y7rh2dds12mvsyj7h446b"; + version = "1.0.10"; + sha256 = "11h2z8idndhvm1ijp6qylaqyg173qk1rybv9v0d73s2sq7jxbcx7"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cereal conduit conduit-extra crypto-api cryptohash @@ -47623,7 +47910,6 @@ self: { homepage = "https://github.com/relrod/fedora-packages-hs"; description = "Haskell interface to the Fedora Packages webapp API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed" = callPackage @@ -47632,8 +47918,8 @@ self: { }: mkDerivation { pname = "feed"; - version = "0.3.9.4"; - sha256 = "18jq1zw1qb2z6lga2vpn4z7dsylglgzl4bskb9x2skw9wv7pgsnk"; + version = "0.3.9.5"; + sha256 = "1kbi0hb2ywp5qbhjw65p86bj4cxag9ngi5dvjcjd63r673kwicv1"; buildDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -47644,7 +47930,6 @@ self: { homepage = "https://github.com/bergmark/feed"; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-cli" = callPackage @@ -47741,6 +48026,7 @@ self: { tasty tasty-golden tasty-quickcheck ]; extraLibraries = [ gcc_s ]; + jailbreak = true; homepage = "http://feldspar.github.com"; description = "Compiler for the Feldspar language"; license = stdenv.lib.licenses.bsd3; @@ -47786,6 +48072,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fen2s" = callPackage + ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode + }: + mkDerivation { + pname = "fen2s"; + version = "1.2"; + sha256 = "01111rxpdd9pqpjs54krx4z67k3abjglw9zbvn5j97z9zdj5qr81"; + isLibrary = true; + isExecutable = true; + buildDepends = [ api-opentheory-unicode base opentheory-unicode ]; + testDepends = [ api-opentheory-unicode base opentheory-unicode ]; + description = "Converting a chess position from FEN notation to text"; + license = stdenv.lib.licenses.mit; + }) {}; + "fences" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47925,7 +48226,6 @@ self: { jailbreak = true; description = "Bindings to the FFTW library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage @@ -47939,7 +48239,6 @@ self: { homepage = "https://github.com/adamwalker/haskell-fftw-simple"; description = "Low level bindings to FFTW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) fftw;}; "fgl" = callPackage @@ -48070,6 +48369,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-collection" = callPackage + ({ mkDerivation, base, bytestring, clock, directory, zip-archive }: + mkDerivation { + pname = "file-collection"; + version = "0.1.1.9"; + sha256 = "06bcj143j85p8m519zn88z6qn4bg5ifrw5pv5yva5x49gc3jq6gc"; + buildDepends = [ base bytestring clock directory zip-archive ]; + homepage = "https://github.com/joelwilliamson/file-collection"; + description = "Provide a uniform interface over file archives and directories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "file-command-qq" = callPackage ({ mkDerivation, base, parsec, process, system-filepath , template-haskell, text @@ -48143,16 +48454,17 @@ self: { "filediff" = callPackage ({ mkDerivation, base, bytestring, data-default - , data-memocombinators, directory, either, mtl, rainbow, tasty - , tasty-hunit, text, threads, time, transformers, Zora + , data-memocombinators, directory, either, hashmap, mtl, rainbow + , tasty, tasty-hunit, text, threads, time, transformers, Zora }: mkDerivation { pname = "filediff"; - version = "1.0.0.1"; - sha256 = "1341xriaylrvclbz8c5pc1dppbz4kqq1hmbrga0dlpb6vr83amv2"; + version = "2.0.0"; + sha256 = "15a02dya0qhgxq98whxza268vqsrkw6b1ipdskw3hwnjp02hnc9p"; buildDepends = [ base bytestring data-default data-memocombinators directory either - mtl rainbow tasty tasty-hunit text threads time transformers Zora + hashmap mtl rainbow tasty tasty-hunit text threads time + transformers Zora ]; testDepends = [ base directory either mtl tasty tasty-hunit text time transformers @@ -48199,6 +48511,7 @@ self: { sha256 = "0a5hhgfxh91clkk6c9iipdd0y3wb9y6lx2hhraaaa73b8y83afx4"; buildDepends = [ base ]; testDepends = [ base QuickCheck ]; + jailbreak = true; homepage = "https://github.com/haskell/filepath#readme"; description = "Library for manipulating FilePaths in a cross platform way"; license = stdenv.lib.licenses.bsd3; @@ -48428,8 +48741,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "first-class-patterns"; - version = "0.3.2.1"; - sha256 = "07ak85jkxli1yhj75mpvam0av8iz5qpbx6m5kzw04fqg3vcfrj8j"; + version = "0.3.2.2"; + sha256 = "0da7mayn8lcizwjv06rafkgrsj257fhkj5xsxk7nx00n3aazzr68"; buildDepends = [ base transformers ]; homepage = "https://github.com/reinerp/first-class-patterns"; description = "First class patterns and pattern matching, using type families"; @@ -48584,7 +48897,6 @@ self: { homepage = "http://github.com/jvranish/FixedList/tree/master"; description = "A fixed length list type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-point" = callPackage @@ -48728,12 +49040,11 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bytestring, text }: mkDerivation { pname = "fixedwidth-hs"; - version = "0.3.0.0"; - sha256 = "0azqjz559vrz4l65ylvnlihlfvblycwnbb9w0rq7kpcfb4rj2iic"; + version = "0.4.0.1"; + sha256 = "0k4lidf95nb4a735331xdr77643b1yb15xllplxknbxxq9r2z3px"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec base bytestring text ]; - jailbreak = true; homepage = "https://github.com/michaelochurch/fixedwidth-hs"; description = "Quick parsing of fixed-width data formats"; license = stdenv.lib.licenses.mit; @@ -49070,7 +49381,6 @@ self: { homepage = "http://taylor.fausak.me/flow/"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow2dot" = callPackage @@ -49094,18 +49404,18 @@ self: { "flowdock" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , http-client, http-client-tls, lens, mtl, pipes, pipes-aeson - , pipes-http, pipes-parse, template-haskell, text - , unordered-containers, uuid + , http-client, http-client-tls, lens, lens-action, mtl, network + , pipes, pipes-aeson, pipes-http, pipes-parse, template-haskell + , text, unordered-containers, uuid }: mkDerivation { pname = "flowdock"; - version = "0.2.0.0"; - sha256 = "1lmjhy6cxdr86pia9v04h4q40w0401r3a2srsdhgwbgxzj3syi1r"; + version = "0.3.0.0"; + sha256 = "199n32q64gw6i381kn70x5avrh3r2al1nj3f90nibivpip886zgc"; buildDepends = [ aeson base base64-bytestring bytestring http-client http-client-tls - lens mtl pipes pipes-aeson pipes-http pipes-parse template-haskell - text unordered-containers uuid + lens lens-action mtl network pipes pipes-aeson pipes-http + pipes-parse template-haskell text unordered-containers uuid ]; jailbreak = true; homepage = "https://github.com/brewtown/hs-flowdock"; @@ -49308,6 +49618,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "fold-debounce" = callPackage + ({ mkDerivation, base, data-default, hspec, stm, time }: + mkDerivation { + pname = "fold-debounce"; + version = "0.1.0.0"; + sha256 = "1g22npjhjc35n05gyqrfk9cqr3m976cgdav3f8w1f2hbwvnfbxy7"; + buildDepends = [ base data-default stm time ]; + testDepends = [ base hspec stm ]; + homepage = "https://github.com/debug-ito/fold-debounce"; + description = "Fold multiple events that happen in a given period of time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "foldl" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, text, transformers, vector @@ -49364,6 +49687,7 @@ self: { base bytestring deepseq directory doctest filepath mtl semigroups ]; configureFlags = [ "-f-test-hlint" ]; + jailbreak = true; homepage = "http://github.com/ekmett/folds"; description = "Beautiful Folding"; license = stdenv.lib.licenses.bsd3; @@ -49479,8 +49803,8 @@ self: { }: mkDerivation { pname = "force-layout"; - version = "0.4.0.0"; - sha256 = "0rmspkl8j1z2n8r6d3dcd573z73yzn6c9r49f57syfvalq0xrzdk"; + version = "0.4.0.1"; + sha256 = "1qchmhn6hp91gzds6yqjn4kssp7n3g7vqhl919wf8d3nn4ykz3av"; buildDepends = [ base containers data-default-class lens linear ]; description = "Simple force-directed layout"; license = stdenv.lib.licenses.bsd3; @@ -49951,17 +50275,17 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, bifunctors, comonad, distributive, mtl - , prelude-extras, profunctors, semigroupoids, semigroups - , template-haskell, transformers + ({ mkDerivation, base, bifunctors, comonad, distributive + , exceptions, mtl, prelude-extras, profunctors, semigroupoids + , semigroups, template-haskell, transformers }: mkDerivation { pname = "free"; - version = "4.11"; - sha256 = "0k645n6ywy1as2lmw4gv2bmmr9y67pcnar0jhhf9kpaqvl5s2h5y"; + version = "4.12.1"; + sha256 = "0sr8phvrb4ny8j1wzq55rdn8q4br23q4pw2j276npr844825jr9p"; buildDepends = [ - base bifunctors comonad distributive mtl prelude-extras profunctors - semigroupoids semigroups template-haskell transformers + base bifunctors comonad distributive exceptions mtl prelude-extras + profunctors semigroupoids semigroups template-haskell transformers ]; homepage = "http://github.com/ekmett/free/"; description = "Monads for free"; @@ -50074,6 +50398,7 @@ self: { array base bytestring containers free-theorems haskell-src mtl old-locale old-time parsec pretty syb utf8-string xhtml ]; + jailbreak = true; description = "Taming Selective Strictness"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -50247,10 +50572,10 @@ self: { testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 vector ]; + jailbreak = true; homepage = "https://github.com/RaphaelJ/friday"; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-devil" = callPackage @@ -50268,7 +50593,6 @@ self: { homepage = "https://github.com/RaphaelJ/friday-devil"; description = "Uses the DevIL C library to read and write images from and to files and memory buffers"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) libdevil;}; "friendly-time" = callPackage @@ -50281,7 +50605,6 @@ self: { testDepends = [ base hspec old-locale time ]; description = "Print time information in friendly ways"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frisby" = callPackage @@ -50360,6 +50683,7 @@ self: { homepage = "http://projects.haskell.org/fsmActions/"; description = "Finite state machines and FSM actions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fsnotify" = callPackage @@ -50398,7 +50722,6 @@ self: { homepage = "http://www.cse.chalmers.se/alumni/markus/fstStudio/"; description = "Finite state transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fsutils" = callPackage @@ -50549,8 +50872,8 @@ self: { }: mkDerivation { pname = "full-text-search"; - version = "0.2.1.1"; - sha256 = "1rz4gimbk32677158321xs36pkc5ywjhm2sisw8hrwa3zlfjkrfc"; + version = "0.2.1.3"; + sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk"; isLibrary = true; isExecutable = true; buildDepends = [ array base containers text vector ]; @@ -50561,7 +50884,6 @@ self: { jailbreak = true; description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fullstop" = callPackage @@ -50631,6 +50953,7 @@ self: { jailbreak = true; description = "Combinators that allow for a more functional/monadic style of Arrow programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "functor-apply" = callPackage @@ -50678,10 +51001,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "functor-monadic"; - version = "0.1.0.2"; - sha256 = "03jipdzark9dhwlym7ky887zzl3cdsc18wwwmg5szl1wgg30li1n"; + version = "0.1.0.3"; + sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg"; buildDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/ombocomp/FunctorMonadic/"; description = "Monad-style combinators for functors"; license = stdenv.lib.licenses.asl20; @@ -51276,8 +51598,8 @@ self: { ({ mkDerivation, base, List, transformers }: mkDerivation { pname = "generator"; - version = "0.5.4"; - sha256 = "1yphw9ira01c0989gq1hrh53xcd3qvq8fib5k1bpsmb313j7x8b8"; + version = "0.5.5"; + sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd"; buildDepends = [ base List transformers ]; homepage = "http://github.com/yairchu/generator/tree"; description = "Python-generators notation for creation of monadic lists"; @@ -51320,8 +51642,8 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.5"; - sha256 = "109jxrny3r1wsf2kr23vvgdid4rmq5lpqjlfbk4n7yxb9bvdbhy5"; + version = "0.2.0.6"; + sha256 = "13jlr9dq3d0v9f7hjxq5qxs8llhj8mbnja14xjkxc28vdbnzv62l"; buildDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -51494,12 +51816,17 @@ self: { }) {}; "generic-xmlpickler" = callPackage - ({ mkDerivation, base, generic-deriving, hxt, text }: + ({ mkDerivation, base, generic-deriving, hxt, hxt-pickle-utils + , tasty, tasty-hunit, tasty-th, text + }: mkDerivation { pname = "generic-xmlpickler"; - version = "0.1.0.0"; - sha256 = "0ybh3laciskf7yyhb8li4l8w758avgywfl7gy0df16im3x0cx0jy"; + version = "0.1.0.2"; + sha256 = "1nc7gi54y144ivgbv9qbyg143s4rvn4w514lgcb6z05sx7cyiajn"; buildDepends = [ base generic-deriving hxt text ]; + testDepends = [ + base hxt hxt-pickle-utils tasty tasty-hunit tasty-th + ]; homepage = "http://github.com/silkapp/generic-xmlpickler"; description = "Generic generation of HXT XmlPickler instances using GHC Generics"; license = stdenv.lib.licenses.bsd3; @@ -51561,6 +51888,7 @@ self: { homepage = "http://projects.haskell.org/GenI"; description = "GenI graphical user interface"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geni-util" = callPackage @@ -51635,9 +51963,10 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.6.0.6"; - sha256 = "1fgs9aak7l7r3xlgna1kbq43zm55nd43phsv0w4ssy305dqylshj"; + version = "0.6.0.7"; + sha256 = "0az8q9jjakbi891ypzm4qg8ys78102zqxqpznk6mm08ng2hzb0wz"; buildDepends = [ base mtl template-haskell ]; + homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52067,13 +52396,12 @@ self: { }: mkDerivation { pname = "ghc-heap-view"; - version = "0.5.3"; - sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0"; + version = "0.5.4"; + sha256 = "02n414m1lb6lilrkmjss2pd1s7hd4lf2sga7ql2ahib69kygzhx1"; buildDepends = [ base binary bytestring containers ghc template-haskell transformers ]; testDepends = [ base deepseq ]; - jailbreak = true; postInstall = '' ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" @@ -52141,9 +52469,9 @@ self: { ({ mkDerivation, async, base, Cabal, containers, data-default , deepseq, directory, djinn-ghc, doctest, emacs, filepath, ghc , ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec - , io-choice, makeWrapper, monad-control, monad-journal, mtl - , old-time, pretty, process, split, syb, temporary, text, time - , transformers, transformers-base + , io-choice, monad-control, monad-journal, mtl, old-time, pretty + , process, split, syb, temporary, text, time, transformers + , transformers-base }: mkDerivation { pname = "ghc-mod"; @@ -52164,7 +52492,7 @@ self: { monad-control monad-journal mtl old-time pretty process split syb temporary text time transformers transformers-base ]; - buildTools = [ emacs makeWrapper ]; + buildTools = [ emacs ]; configureFlags = "--datasubdir=ghc-mod-5.2.1.2"; postInstall = '' cd $out/share/ghc-mod-5.2.1.2 @@ -52177,7 +52505,7 @@ self: { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) emacs; inherit (pkgs) makeWrapper;}; + }) { inherit (pkgs) emacs;}; "ghc-mtl" = callPackage ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl @@ -52221,8 +52549,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.6.0"; - sha256 = "1j0axpzm1ysi6sv80rr2bka1wycinrnqvkpnxlb18yb3zbwijz76"; + version = "0.1.7.0"; + sha256 = "0cb0d9szrimlflxh67ad74cqfi6yc2cr1bcl17c6b23ccnyqbq73"; buildDepends = [ base ghc ]; buildTools = [ cpphs happy ]; patchPhase = '' @@ -52294,9 +52622,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ghc-prof-flamegraph"; - version = "0.1.0.0"; - sha256 = "1hrikiv6a8l7pq9j7zjb98zl1qlb8gdggfkcw49zmk7zay0bd1c2"; - isLibrary = false; + version = "0.1.2.1"; + sha256 = "0nzk3h65iqnmva7n2m00kknllqbmg95xav4g5rpizhridpivg9hb"; + isLibrary = true; isExecutable = true; buildDepends = [ base ]; description = "Generates data to be used with flamegraph.pl from .prof files."; @@ -52479,7 +52807,6 @@ self: { homepage = "https://github.com/larskuhtz/ghci-pretty"; description = "colored pretty-printing within ghci"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcid" = callPackage @@ -52545,24 +52872,17 @@ self: { }) {}; "ghcjs-websockets" = callPackage - ({ mkDerivation, base, base64-bytestring, binary, bytestring - , ghcjs-base, text + ({ mkDerivation, base, base64-bytestring, binary, bytestring, text }: mkDerivation { pname = "ghcjs-websockets"; - version = "0.3.0.0"; - revision = "1"; - sha256 = "09ll2fyfbbflciq6mxhclgypn800qmm7l8dk9gcclphraf2x9jy3"; - editedCabalFile = "cfc25baa01cf440b2f965ca3ee738467f8138adb74f759b9a225717ed183c66a"; - buildDepends = [ - base base64-bytestring binary bytestring ghcjs-base text - ]; - jailbreak = true; + version = "0.3.0.3"; + sha256 = "0fj2ya2irfhpgqz4n0cszs4s7p359k8aywdbmsw9q18w2z9gicz7"; + buildDepends = [ base base64-bytestring binary bytestring text ]; homepage = "http://github.com/mstksg/ghcjs-websockets"; description = "GHCJS interface for the Javascript Websocket API"; license = stdenv.lib.licenses.mit; - broken = true; - }) { ghcjs-base = null;}; + }) {}; "ghclive" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring @@ -52690,6 +53010,7 @@ self: { aeson base bytestring cassava containers directory filepath shake split text unordered-containers vector yaml ]; + jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -52742,8 +53063,8 @@ self: { , 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 + , network-multicast, network-protocol-xmpp, network-uri, openssh + , optparse-applicative, path-pieces, perl, persistent , persistent-sqlite, persistent-template, process, QuickCheck , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck @@ -52754,8 +53075,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150508"; - sha256 = "07p9ifk1h0i9gmg36vdrn6nkp0m46g4pkv1jkjm7ip5bgc76382c"; + version = "5.20150528"; + sha256 = "1d7760c3wq0zq9q1zs1y9hjlzjjqcdg88wfi0k5hsmwgiysn2pr2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -52765,7 +53086,7 @@ self: { 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 + network-multicast network-protocol-xmpp network-uri optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit @@ -52974,7 +53295,6 @@ self: { homepage = "github.com/aloiscochard/git-sanity"; description = "A sanity checker for your git history"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-vogue" = callPackage @@ -53071,7 +53391,6 @@ self: { homepage = "https://github.com/jwiegley/github"; description = "Access to the Github API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-backup" = callPackage @@ -53096,7 +53415,6 @@ self: { homepage = "https://github.com/joeyh/github-backup"; description = "backs up everything github knows about a repository, to the repository"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) git;}; "github-post-receive" = callPackage @@ -53138,7 +53456,6 @@ self: { homepage = "https://github.com/greenrd/github-utils"; description = "Useful functions that use the GitHub API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitignore" = callPackage @@ -53155,6 +53472,7 @@ self: { aeson base base64-bytestring bytestring http-conduit network safe text ]; + jailbreak = true; homepage = "https://github.com/relrod/gitignore"; description = "Apply GitHub .gitignore templates to already existing repositories."; license = stdenv.lib.licenses.bsd3; @@ -53185,29 +53503,28 @@ self: { random recaptcha safe SHA split syb tagsoup text time uri url utf8-string uuid xhtml xml xss-sanitize zlib ]; + jailbreak = true; homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath , hashable, lifted-async, lifted-base, monad-control, monad-logger - , mtl, resourcet, semigroups, system-filepath, tagged, text, time - , transformers, unix, unordered-containers + , mtl, resourcet, semigroups, tagged, text, time, transformers + , unix, unordered-containers }: mkDerivation { pname = "gitlib"; - version = "3.1.0.1"; - sha256 = "0h6drwxb8nc3nsw9b5w6xaqpwnila0i546w4xykxb61lybjdmw2g"; + version = "3.1.0.2"; + sha256 = "05l5i2s0212sx3bzw6r9njanjv1q1gmqc7f6g1z1sy9fibyxcwah"; buildDepends = [ base base16-bytestring bytestring conduit conduit-combinators containers directory exceptions filepath hashable lifted-async lifted-base monad-control monad-logger mtl resourcet semigroups - system-filepath tagged text time transformers unix - unordered-containers + tagged text time transformers unix unordered-containers ]; description = "API library for working with Git repositories"; license = stdenv.lib.licenses.mit; @@ -53218,17 +53535,19 @@ self: { , containers, directory, exceptions, gitlib, gitlib-test, hspec , hspec-expectations, monad-control, mtl, old-locale, parsec , process-extras, shelly, system-filepath, tagged, text, time - , transformers, transformers-base, unordered-containers + , time-locale-compat, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "gitlib-cmdline"; - version = "3.1.0.1"; - sha256 = "1vsn7sz71vj79ghcn9wmzf0jnjnaiibvx0k4q8vm4q8aqnl7rvl4"; + version = "3.1.0.2"; + sha256 = "1dridps65mw06r9slza80vl21f5n1kq1if7gnwcrbagicvy45p0k"; buildDepends = [ base bytestring conduit conduit-combinators containers directory exceptions gitlib monad-control mtl old-locale parsec - process-extras shelly system-filepath tagged text time transformers - transformers-base unordered-containers + process-extras shelly system-filepath tagged text time + time-locale-compat transformers transformers-base + unordered-containers ]; testDepends = [ base gitlib gitlib-test hspec hspec-expectations system-filepath @@ -53268,8 +53587,8 @@ self: { }: mkDerivation { pname = "gitlib-libgit2"; - version = "3.1.0.4"; - sha256 = "0657m22xybk54rpyzhdv27089nh85a1n0v47w06q9h5pakq3vfv7"; + version = "3.1.0.5"; + sha256 = "1xnzks7jwl7d0xf7qgz9gmqf4n1yn3qvjrs73prla8n063kgdh95"; buildDepends = [ base bytestring conduit conduit-combinators containers directory exceptions fast-logger filepath gitlib hlibgit2 lifted-async @@ -53334,8 +53653,8 @@ self: { }: mkDerivation { pname = "gitlib-test"; - version = "3.1.0.2"; - sha256 = "0nny0fp1j3g5fsxskqnlwcqrrxn74yjxkg9avfqdgai8b585yka2"; + version = "3.1.0.3"; + sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py"; buildDepends = [ base bytestring conduit conduit-combinators exceptions gitlib hspec hspec-expectations HUnit monad-control tagged text time @@ -53408,8 +53727,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.6"; - sha256 = "1wdhp5q84cv59ssygbgy8pd7gm76wkl2zvcbmi83wml1x9a7xmjd"; + version = "0.7.7"; + sha256 = "0lsz8gq3cmkh6s9hhxnr3m95ibra9y63230jyqhwk9wamid2x2pg"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -53458,6 +53777,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "glambda" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, directory + , errors, haskeline, mtl, parsec, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "glambda"; + version = "1.0"; + sha256 = "01bqh7g76a02qvzqm8di6ig84k0v7crd9aljsg339h7d3y7grxhf"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-wl-pprint base containers directory errors haskeline mtl + parsec + ]; + testDepends = [ + ansi-wl-pprint base errors mtl parsec tasty tasty-hunit + template-haskell + ]; + homepage = "https://github.com/goldfirere/glambda"; + description = "A simply typed lambda calculus interpreter, written with GADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "glapp" = callPackage ({ mkDerivation, base, containers, GLFW-b, lens, mtl, OpenGL }: mkDerivation { @@ -53692,7 +54035,6 @@ self: { homepage = "https://github.com/Twey/gloss-banana"; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-devil" = callPackage @@ -53967,7 +54309,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnutls/"; description = "Bindings for GNU libgnutls"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) gnutls;}; "goa" = callPackage @@ -54119,6 +54460,7 @@ self: { testDepends = [ base bytestring hspec http-conduit http-types load-env ]; + jailbreak = true; description = "Google OAuth2 token negotiation"; license = stdenv.lib.licenses.mit; }) {}; @@ -54679,13 +55021,12 @@ self: { ({ mkDerivation, array, base, containers }: mkDerivation { pname = "graph-wrapper"; - version = "0.2.4.3"; - sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg"; + version = "0.2.4.4"; + sha256 = "0ks4mj1f3ky8h8p9kc1djslbzs2vvlh9frab8jl09x63b15f8xzd"; buildDepends = [ array base containers ]; - homepage = "http://www.github.com/batterseapower/graph-wrapper"; + homepage = "https://github.com/soenkehahn/graph-wrapper"; description = "A wrapper around the standard Data.Graph with a less awkward interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphbuilder" = callPackage @@ -54856,6 +55197,7 @@ self: { polyparse process temporary text transformers wl-pprint-text ]; testDepends = [ base containers fgl filepath QuickCheck text ]; + jailbreak = true; homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; @@ -54900,6 +55242,7 @@ self: { testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/gray-extended"; description = "Gray encoding schemes"; license = stdenv.lib.licenses.bsd3; @@ -54956,8 +55299,8 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.2"; - sha256 = "0bb9cykr47sbkccnfcxaq3fx2q0m4c3cvfjhdg2jqwvn0jsp98ik"; + version = "7.8.4"; + sha256 = "1jci2191l6k1qlch54id7z05zn9lp5lzyh7g6hm9s522z97lgb2k"; buildDepends = [ base cereal containers ]; testDepends = [ base containers QuickCheck test-framework @@ -55007,7 +55350,9 @@ self: { mkDerivation { pname = "groundhog"; version = "0.7.0.3"; + revision = "1"; sha256 = "0n5c501wfyqcl1iy4017yyxp95kz7mb4lgc0mjjk9si36ixkww9r"; + editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring containers monad-control monad-logger mtl scientific text time @@ -55037,7 +55382,6 @@ self: { homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-mysql" = callPackage @@ -55107,7 +55451,6 @@ self: { ]; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "group-with" = callPackage @@ -55237,7 +55580,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-gsasl/"; description = "Bindings for GNU libgsasl"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) gsasl;}; "gsc-weighting" = callPackage @@ -55354,8 +55696,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.13.6"; - sha256 = "1xj3vafk6rhy5nifixsp72n88i0idlknggcq1w626jfszx5anx2c"; + version = "0.13.7"; + sha256 = "1mrrd8hkpyhk40x9yg2b62i1d5d72p8g561wrhp80cd8f654cfij"; buildDepends = [ array base bytestring cairo containers gio glib mtl pango text ]; @@ -55631,8 +55973,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.13.6"; - sha256 = "12fsbl56gf8inxvg7jqad2j689gpwp4bwznyz153y6xzgqs7vaq0"; + version = "0.13.7"; + sha256 = "15jgv5ci79r36jy6h5hq04zffryx5bbv2sknxnydn0cxng6kvgr9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -55774,6 +56116,7 @@ self: { homepage = "http://code.atnnn.com/project/guess"; description = "Generate simple combinators given their type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gulcii" = callPackage @@ -55880,21 +56223,37 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hBDD"; - version = "0.0.2"; - sha256 = "15pq6r8kz7ki1siz9xihd85qck9gnkp17cdz331srgr5kzij3lgv"; + version = "0.0.3"; + sha256 = "1jj8hj8wl95fy0n1qixhra4sqlmgddgn080plk7q7iv000qv67gk"; buildDepends = [ base ]; description = "An abstraction layer for BDD libraries"; license = "LGPL"; }) {}; + "hBDD-CMUBDD" = callPackage + ({ mkDerivation, base, bdd, c2hs, containers, deepseq, hBDD, mem + , unix + }: + mkDerivation { + pname = "hBDD-CMUBDD"; + version = "0.0.3"; + sha256 = "16pvi496qi3q2rrw08p6lndnsz6d6p65i8m10ldjlh143y8k9ga9"; + buildDepends = [ base containers deepseq hBDD unix ]; + buildTools = [ c2hs ]; + extraLibraries = [ bdd mem ]; + description = "An FFI binding to CMU/Long's BDD library"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) { bdd = null; mem = null;}; + "hBDD-CUDD" = callPackage ({ mkDerivation, base, c2hs, containers, cudd, deepseq, epd, hBDD , mtr, st, unix, util }: mkDerivation { pname = "hBDD-CUDD"; - version = "0.0.2"; - sha256 = "0rjfycxnhwwylpdb5sm4kqzypfbigzmx6azrs44sixmkq0cv5yb4"; + version = "0.0.3"; + sha256 = "1r94nj23pj134bd5b2mqk01g8xvbcn4ik2xs9yp01v1jg2clhjha"; buildDepends = [ base containers deepseq hBDD unix ]; buildTools = [ c2hs ]; extraLibraries = [ cudd epd mtr st util ]; @@ -56086,7 +56445,6 @@ self: { homepage = "https://github.com/BioHaskell/hPDB-examples"; description = "Examples for hPDB library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPushover" = callPackage @@ -56214,10 +56572,10 @@ self: { ({ mkDerivation, base, directory, gtk3, process, split, text }: mkDerivation { pname = "hXmixer"; - version = "0.2.5.0"; + version = "0.3.0.0"; revision = "2"; - sha256 = "0nl6ylprxc1mz96713n222gy1b3pifkp3mb42v181w1iwms405y5"; - editedCabalFile = "3d625ce1058f3df1e7384767fe12bc7a364a0c3ee075a6033bf8e91cfc5c8acc"; + sha256 = "1n9wlg6inzvnyqkx61bpbgx744q25zpjhkihwbqv6569lgir1h4x"; + editedCabalFile = "ba9345a3146b34d0101920f9efd6af7f435188dd7ae53b50d76cc0851f13014f"; isLibrary = false; isExecutable = true; buildDepends = [ base directory gtk3 process split text ]; @@ -56237,6 +56595,7 @@ self: { testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/haar"; description = "Haar wavelet transforms"; license = stdenv.lib.licenses.bsd3; @@ -56550,7 +56909,6 @@ self: { homepage = "https://github.com/nfjinjing/hack2-contrib"; description = "Hack2 contrib"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-contrib-extra" = callPackage @@ -56569,7 +56927,6 @@ self: { homepage = "https://github.com/nfjinjing/hack2-contrib"; description = "Hack2 contrib extra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-handler-happstack-server" = callPackage @@ -56629,7 +56986,6 @@ self: { homepage = "https://github.com/nfjinjing/hack2-handler-snap-server"; description = "Hack2 Snap server handler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-handler-warp" = callPackage @@ -56878,8 +57234,8 @@ self: { }: mkDerivation { pname = "hackager"; - version = "1.0.1"; - sha256 = "03vnqrvb1iby58gnd6hrx1c5q3zvfy3szp8qwp10c9s4cdddxyvy"; + version = "1.2.0.1"; + sha256 = "06lrsfs70zjhxqsz93wmhrmyq1v64kiq0580f9im9nw69w4yl4ax"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -56949,6 +57305,7 @@ self: { ]; description = "Hackage and Portage integration tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hactor" = callPackage @@ -57060,24 +57417,6 @@ self: { }) {}; "haddock-library" = callPackage - ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec - , QuickCheck - }: - mkDerivation { - pname = "haddock-library"; - version = "1.1.1"; - sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m"; - buildDepends = [ base bytestring deepseq ]; - testDepends = [ - base base-compat bytestring deepseq hspec QuickCheck - ]; - jailbreak = true; - homepage = "http://www.haskell.org/haddock/"; - description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haddock-library_1_2_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec , QuickCheck, transformers }: @@ -57259,6 +57598,7 @@ self: { http-client http-client-tls http-types tagsoup text time transformers ]; + jailbreak = true; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -57451,8 +57791,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.9.0"; - sha256 = "0z0gfs7czqwrkgd43pcx6rjdsgwpkhan5pmgfbkiixih993f9s2l"; + version = "4.7.0.0"; + sha256 = "1c2awifpsplfr3x5aj7v9pymfmfj74i4j3djgggxr9vj5d372njq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -57535,7 +57875,6 @@ self: { homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation"; description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-contrib-links" = callPackage @@ -57670,6 +58009,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "halive" = callPackage + ({ mkDerivation, base, bin-package-db, directory, filepath + , foreign-store, fsnotify, ghc, ghc-paths, system-filepath + , transformers + }: + mkDerivation { + pname = "halive"; + version = "0.1.0.1"; + revision = "1"; + sha256 = "0wzajzh7lihj5l906ia5ni12dih0ar7f8apnq4ncypkw4ym1d4j6"; + editedCabalFile = "60b322e7402b0dc957944334003fdf00ae5cdf0233663904dc397409aa153598"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bin-package-db directory filepath foreign-store fsnotify ghc + ghc-paths system-filepath transformers + ]; + homepage = "https://github.com/lukexi/halive"; + description = "A live recompiler"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "halma" = callPackage ({ mkDerivation, async, base, containers, data-default , diagrams-cairo, diagrams-gtk, diagrams-lib, grid, gtk, HUnit, mtl @@ -57693,7 +58054,6 @@ self: { homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haltavista" = callPackage @@ -57808,7 +58168,6 @@ self: { homepage = "http://code.google.com/p/hgdata"; description = "Library and command-line utility for accessing Google services and APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "handa-geodata" = callPackage @@ -57908,7 +58267,6 @@ self: { ]; description = "IPv4 Network Stack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pcap" = callPackage @@ -57922,7 +58280,6 @@ self: { homepage = "https://github.com/tolysz/hans-pcap"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pfq" = callPackage @@ -57941,27 +58298,26 @@ self: { "hapistrano" = callPackage ({ mkDerivation, base, base-compat, directory, either, filepath - , hspec, mtl, old-locale, process, temporary, time, transformers + , hspec, mtl, old-locale, process, temporary, time + , time-locale-compat, transformers }: mkDerivation { pname = "hapistrano"; - version = "0.2.0.1"; - sha256 = "0k8715gaay1fjwgdsjk3h7vffj0bx217l1yn8wr6sfh4v7azg1f6"; + version = "0.2.0.2"; + sha256 = "1bw37wb7wwf6qagp5q0i9biy5cma6i0yvn7z051da3gnad89iil1"; isLibrary = true; isExecutable = true; buildDepends = [ base base-compat either filepath mtl old-locale process time - transformers + time-locale-compat transformers ]; testDepends = [ base base-compat directory either filepath hspec mtl old-locale - process temporary time transformers + process temporary time time-locale-compat transformers ]; - jailbreak = true; homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -58103,23 +58459,29 @@ self: { }) {}; "happstack-authenticate" = callPackage - ({ mkDerivation, acid-state, aeson, authenticate, base, blaze-html - , bytestring, containers, fb, happstack-server, http-conduit - , http-types, ixset, mtl, pwstore-purehaskell, QuickCheck, reform - , reform-blaze, reform-happstack, safecopy, text, time - , unordered-containers, web-routes, web-routes-happstack + ({ mkDerivation, acid-state, aeson, authenticate, base + , base64-bytestring, boomerang, bytestring, containers + , data-default, filepath, happstack-hsp, happstack-jmacro + , happstack-server, hsp, hsx-jmacro, hsx2hs, http-conduit + , http-types, ixset-typed, jmacro, jwt, lens, mime-mail, mtl + , pwstore-purehaskell, random, safecopy, shakespeare, text, time + , unordered-containers, web-routes, web-routes-boomerang + , web-routes-happstack, web-routes-hsp, web-routes-th }: mkDerivation { pname = "happstack-authenticate"; - version = "0.10.16"; - sha256 = "15r725mmfln8hhk13ypg497xy4x88cxyd4gqmgfg6dpmrmgvdvgw"; + version = "2.1.4"; + sha256 = "075bncl5mz7hi674gyhd9mrnf3xb8zn5frcy39dj5m7jrsrdy91z"; buildDepends = [ - acid-state aeson authenticate base blaze-html bytestring containers - fb happstack-server http-conduit http-types ixset mtl - pwstore-purehaskell QuickCheck reform reform-blaze reform-happstack - safecopy text time unordered-containers web-routes - web-routes-happstack + acid-state aeson authenticate base base64-bytestring boomerang + bytestring containers data-default filepath happstack-hsp + happstack-jmacro happstack-server hsp hsx-jmacro hsx2hs + http-conduit http-types ixset-typed jmacro jwt lens mime-mail mtl + pwstore-purehaskell random safecopy shakespeare text time + unordered-containers web-routes web-routes-boomerang + web-routes-happstack web-routes-hsp web-routes-th ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; @@ -58131,17 +58493,15 @@ self: { }: mkDerivation { pname = "happstack-clientsession"; - version = "7.2.7"; - sha256 = "1zwdcnsdq9nb88wf0mc8vh4wkw5kl5r39mmhq098ny3wpvwnp7lx"; + version = "7.3.0"; + sha256 = "1dh6l52mfd6p9y39lr0qax1gs7rxpamy21iwxca7ylbhlqyxfa2g"; buildDepends = [ base bytestring cereal clientsession happstack-server monad-control mtl safecopy transformers-base ]; - jailbreak = true; homepage = "http://happstack.com"; description = "client-side session data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-contrib" = callPackage @@ -58281,7 +58641,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using Fay with Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-foundation" = callPackage @@ -58369,8 +58728,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.4"; - sha256 = "08msr1l0fan2xs1bmczv9cjbik984m2c7hpzqjkgh3mkwwgf1nqf"; + version = "7.3.5"; + sha256 = "0p8hidcdrqj7n4b9a5gbc0ic279wjmxvjacn6b8nzcnridq3mif6"; buildDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -58426,17 +58785,15 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.9"; - sha256 = "005naz3zxl01vpz8w4n66dbd8sj94gazpj16rxf3li7zh0pixpsg"; + version = "7.0.10"; + sha256 = "0kzp3dfy2qrd9bwq3lwnxvh1zibw7kib8w8rfqz36k0ywdwq8768"; buildDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for using JMacro with Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-lite" = callPackage @@ -58496,10 +58853,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.3"; - revision = "1"; - sha256 = "0ij359i1lmxs1gpzl6spli94s0mpp6mbbhjcf4jrbxkpavdg8g73"; - editedCabalFile = "3da7c2f6d5add9d58bc1013cdb0f64bb07aec1ebc88bac40372c4533ed932cf6"; + version = "7.4.4"; + sha256 = "1whyv6rb4b9x9m381fs8938n74dgq7hd9gpznwnlzh76ah2nanjf"; buildDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -58521,8 +58876,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.1.5"; - sha256 = "148xryarw10i2smqd136yfa9snfvlxrx62974zvavcn2jfimmcny"; + version = "7.1.6"; + sha256 = "00fmgws8hc0v1lsmxlj478xdbmlpgaz581m9hqw5nfjljg8mi74w"; buildDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -58806,7 +59161,6 @@ self: { homepage = "http://www.cs.chalmers.se/~d00nibro/harp/"; description = "HaRP allows pattern-matching with regular expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "harpy" = callPackage @@ -58815,15 +59169,15 @@ self: { }: mkDerivation { pname = "harpy"; - version = "0.5.0.0"; - sha256 = "11h235j9348i01qcmvc389khl8xp5azj3y31g75cs59kiblz1bk7"; + version = "0.6.0.2"; + sha256 = "1rlbakwqfjfr3d71jc6d5nyw5ms0y9wmb79p8jax45rxk1a8cfry"; buildDepends = [ array base containers disassembler mtl parsec pretty template-haskell ]; - homepage = "http://code.haskell.org/harpy/"; + homepage = "https://github.com/mgrabmueller/harpy"; description = "Runtime code generation for x86 machine code"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -58992,10 +59346,8 @@ self: { }: mkDerivation { pname = "hashable-extras"; - version = "0.2.0.1"; - revision = "1"; - sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s"; - editedCabalFile = "0797bee08c6190172fa48ce7f2821160efcd26f9fcf2afce08ea64737c1aef7d"; + version = "0.2.1"; + sha256 = "02hzffyns0id9vhaqzax7ijprh1pfb8llrfi67hmji2wrh3nvmml"; buildDepends = [ base bifunctors bytestring generic-deriving hashable transformers ]; @@ -59072,6 +59424,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hashids" = callPackage + ({ mkDerivation, base, bytestring, containers, split }: + mkDerivation { + pname = "hashids"; + version = "1.0.2.1"; + sha256 = "03q0fcxiw4yncmbdirnh6kaz9jhyxqy348dnrvgkbn4mzkh8fi2z"; + buildDepends = [ base bytestring containers split ]; + homepage = "http://hashids.org/"; + description = "Hashids generates short, unique, non-sequential ids from numbers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashmap" = callPackage ({ mkDerivation, base, containers, deepseq, hashable }: mkDerivation { @@ -59700,27 +60065,27 @@ self: { "haskell-neo4j-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit - , lifted-base, mtl, QuickCheck, resourcet, scientific + , lifted-base, mtl, network-uri, QuickCheck, resourcet, scientific , test-framework, test-framework-hunit, test-framework-quickcheck2 , test-framework-th, text, transformers, transformers-base , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.15"; - sha256 = "1gxnwz7xzf4l0d4hwi8ij95910d38l89i9x3sw051zwn4fzns1cv"; + version = "0.3.1.2"; + sha256 = "1qb2m6bxpw24ll1r0hyicmddn9plm55ipdgbykd6yrw1cfrm9qz7"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP - http-conduit http-types lifted-base mtl resourcet scientific text - transformers transformers-base transformers-compat + http-conduit http-types lifted-base mtl network-uri resourcet + scientific text transformers transformers-base transformers-compat unordered-containers vector ]; testDepends = [ aeson base bytestring Cabal data-default hashable HTTP http-conduit - http-types HUnit lifted-base mtl QuickCheck resourcet scientific - test-framework test-framework-hunit test-framework-quickcheck2 - test-framework-th text transformers transformers-base - transformers-compat unordered-containers vector + http-types HUnit lifted-base mtl network-uri QuickCheck resourcet + scientific test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + transformers-base transformers-compat unordered-containers vector ]; jailbreak = true; homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client"; @@ -59760,7 +60125,6 @@ self: { homepage = "http://documentup.com/haskell-suite/haskell-packages"; description = "Haskell suite library for package management and integration with Cabal"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-pdf-presenter" = callPackage @@ -60556,6 +60920,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskellscript" = callPackage + ({ mkDerivation, base, cryptohash, directory, either, filepath, mtl + , process, text + }: + mkDerivation { + pname = "haskellscript"; + version = "0.2.3"; + sha256 = "0jrvvbpx35dhrwvknrxcwg1j1yi0mwzrnzrr2hsxja21drrqklf3"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base cryptohash directory either filepath mtl process text + ]; + homepage = "http://github.com/seanparsons/haskellscript/"; + description = "Command line tool for running Haskell scripts with a hashbang"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskelm" = callPackage ({ mkDerivation, aeson, base, binary, containers, directory, Elm , haskell-src-exts, haskell-src-meta, mtl, parsec, pretty @@ -61067,8 +61449,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.7.3"; - sha256 = "0a8wcncqz2k1lj2cad96rg9xi9116q0x209jfbpkcp8sbi3n3rb8"; + version = "0.7.3.1"; + sha256 = "1brd3k6v2irg6myp08gl859v5fmmdm2cgq3wqn367k388p3b58c4"; buildDepends = [ attoparsec base base-prelude either hasql-backend list-t mmorph monad-control mtl resource-pool template-haskell text transformers @@ -61095,6 +61477,7 @@ self: { buildDepends = [ base-prelude bytestring either free list-t text transformers vector ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/hasql-backend"; description = "API for backends of \"hasql\""; license = stdenv.lib.licenses.mit; @@ -61110,8 +61493,8 @@ self: { }: mkDerivation { pname = "hasql-postgres"; - version = "0.10.3"; - sha256 = "12452z4li3b30zw1ar4x2r14q93vx06165g3rdj9s1wxjzsnsr4w"; + version = "0.10.3.1"; + sha256 = "0vdqmn7z9w530f2p5ajgfccr0prr2zcivzww0j574v3n9lbi7q1c"; buildDepends = [ aeson attoparsec base-prelude bytestring either free hashable hashtables hasql-backend list-t loch-th mmorph placeholders @@ -61211,7 +61594,9 @@ self: { mkDerivation { pname = "haste-compiler"; version = "0.4.4.4"; + revision = "1"; sha256 = "19raiciwll7pgc73h2h704yi9wcifcn7s2gxyjrndp6d7kf1ygyy"; + editedCabalFile = "de636e39473869692b1fa1dd6047fc2987b6f63c1403a511aab6bd1dcaa98f6f"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61376,6 +61761,7 @@ self: { aeson base bytestring containers hashable HUnit text unordered-containers ]; + jailbreak = true; homepage = "https://github.com/facebook/Haxl"; description = "A Haskell library for efficient, concurrent, and concise data access"; license = stdenv.lib.licenses.bsd3; @@ -61665,26 +62051,28 @@ self: { "hbro" = callPackage ({ mkDerivation, aeson, base, bytestring, classy-prelude, cond - , containers, data-default-class, dyre, errors, fast-logger, glib - , gtk3, lens, lifted-async, lifted-base, monad-control - , monad-logger, mtl, network-uri, optparse-applicative, pango - , parsec, process, resourcet, safe, semigroups, stm-chans - , system-fileio, text, time, transformers, transformers-base, unix - , webkitgtk3, zeromq4-haskell + , containers, data-default-class, directory, dyre, errors + , exceptions, fast-logger, filepath, glib, gtk3, lens, lifted-async + , lifted-base, monad-control, monad-logger, mtl, network-uri + , optparse-applicative, pango, parsec, process, resourcet, safe + , semigroups, stm-chans, text, time, transformers + , transformers-base, unix, webkitgtk3, zeromq4-haskell }: mkDerivation { pname = "hbro"; - version = "1.3.0.0"; - sha256 = "114g9dz9f7s59s9d8hb38qffmdif617nhbs2z9vsdqmylgirirmz"; + version = "1.4.0.0"; + revision = "1"; + sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr"; + editedCabalFile = "331a844037ba6df7831151e45e40223eed66313dabef7dc0285a6e658747b15c"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring classy-prelude cond containers - data-default-class dyre errors fast-logger glib gtk3 lens - lifted-async lifted-base monad-control monad-logger mtl network-uri - optparse-applicative pango parsec process resourcet safe semigroups - stm-chans system-fileio text time transformers transformers-base - unix webkitgtk3 zeromq4-haskell + data-default-class directory dyre errors exceptions fast-logger + filepath glib gtk3 lens lifted-async lifted-base monad-control + monad-logger mtl network-uri optparse-applicative pango parsec + process resourcet safe semigroups stm-chans text time transformers + transformers-base unix webkitgtk3 zeromq4-haskell ]; homepage = "https://github.com/k0ral/hbro"; description = "Minimal extensible web-browser"; @@ -61693,20 +62081,18 @@ self: { "hbro-contrib" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , classy-prelude, containers, glib, gtk3, hbro, lens, monad-control - , mtl, network-uri, pango, parsec, process, resourcet, safe - , system-fileio, text, time, transformers-base, unix, webkitgtk3 + , classy-prelude, containers, directory, glib, gtk3, hbro, lens + , monad-control, mtl, network-uri, pango, parsec, process + , resourcet, safe, text, time, transformers-base, unix, webkitgtk3 }: mkDerivation { pname = "hbro-contrib"; - version = "1.3.0.0"; - revision = "1"; - sha256 = "09q7n5x61gsrjcv7ixh36daq3hj4sip5iph5ll7pfwpqd9mhxq95"; - editedCabalFile = "1df0341291f1e2820b8b0833b4951a555a96df54b3ef7cee754d32a6e53c69f0"; + version = "1.4.0.0"; + sha256 = "0v7qxg1phac5m06raspaq6782iid7rnvkinkji0fs0yjigbblps2"; buildDepends = [ - aeson aeson-pretty base bytestring classy-prelude containers glib - gtk3 hbro lens monad-control mtl network-uri pango parsec process - resourcet safe system-fileio text time transformers-base unix + aeson aeson-pretty base bytestring classy-prelude containers + directory glib gtk3 hbro lens monad-control mtl network-uri pango + parsec process resourcet safe text time transformers-base unix webkitgtk3 ]; homepage = "https://github.com/k0ral/hbro-contrib"; @@ -61881,12 +62267,12 @@ self: { }: mkDerivation { pname = "hdaemonize"; - version = "0.5.0.0"; - sha256 = "15dyaa9rbmsjp3sg9yxg1i90kfy9rvlzmwg5kl8kwal69ajzjjgv"; + version = "0.5.0.1"; + sha256 = "03daf8qb8x0503h5k2vr6r4lyv6fv1a5n6mhykx5872khl81d8ms"; buildDepends = [ base extensible-exceptions filepath hsyslog mtl unix ]; - homepage = "http://github.com/madhadron/hdaemonize"; + homepage = "http://github.com/greydot/hdaemonize"; description = "Library to handle the details of writing daemons for UNIX"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62198,11 +62584,9 @@ self: { network process text transformers ]; testDepends = [ base containers mtl ]; - jailbreak = true; homepage = "https://github.com/mvoidex/hdocs"; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdph" = callPackage @@ -62448,6 +62832,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hein" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , http-conduit, process, transformers + }: + mkDerivation { + pname = "hein"; + version = "0.1.0.2"; + sha256 = "10g07m73iaq9v17hv2wx0mmza8vmlakyjjqfhb4rgf73pikfhvsf"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring directory filepath http-conduit process + transformers + ]; + jailbreak = true; + homepage = "https://github.com/khanage/heineken"; + description = "An extensible build helper for haskell, in the vein of leiningen"; + license = stdenv.lib.licenses.asl20; + }) {}; + "heist" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, containers, directory, directory-tree, dlist, errors @@ -62458,9 +62862,9 @@ self: { mkDerivation { pname = "heist"; version = "0.14.1"; - revision = "2"; + revision = "4"; sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; - editedCabalFile = "73ce4cfe9090a973644268118b4d765577c2e8ddeeb1ad245d335772f5369d34"; + editedCabalFile = "d61d5b4f4b360c12b46179000fe761037a23182489362188c929476a42248876"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist errors filepath hashable @@ -62880,20 +63284,20 @@ self: { }) {}; "hermit" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, base, containers - , data-default-class, directory, ghc, happy, haskeline, kure - , marked-pretty, mtl, operational, process, stm, temporary - , terminfo, transformers, transformers-compat + ({ mkDerivation, alex, ansi-terminal, array, base, base-compat + , containers, data-default-class, directory, ghc, happy, haskeline + , kure, marked-pretty, mtl, process, stm, temporary, terminfo + , transformers, transformers-compat }: mkDerivation { pname = "hermit"; - version = "0.7.1.0"; - sha256 = "0ckjh7ql2s6l09lbgdn9plfpvmdcx6b3yh9lbdih9l4lcf1k8f56"; + version = "1.0.0.0"; + sha256 = "1m3dgp22ix3l64basv8bx0k9waagi0rckprpgqnfpxnir7cbhrkv"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal array base containers data-default-class directory - ghc haskeline kure marked-pretty mtl operational process stm + ansi-terminal array base base-compat containers data-default-class + directory ghc haskeline kure marked-pretty mtl process stm temporary terminfo transformers transformers-compat ]; buildTools = [ alex happy ]; @@ -63033,7 +63437,8 @@ self: { }) {}; "hetris" = callPackage - ({ mkDerivation, array, base, curses, hscurses, old-time, random }: + ({ mkDerivation, array, base, hscurses, ncurses, old-time, random + }: mkDerivation { pname = "hetris"; version = "0.2"; @@ -63041,12 +63446,12 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ array base hscurses old-time random ]; - extraLibraries = [ curses ]; + extraLibraries = [ ncurses ]; homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/"; description = "Text Tetris"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { curses = null;}; + }) { inherit (pkgs) ncurses;}; "heukarya" = callPackage ({ mkDerivation, base, containers, deepseq, parallel, random, text @@ -63345,8 +63750,8 @@ self: { }: mkDerivation { pname = "hfoil"; - version = "0.2.0.1"; - sha256 = "0y8amvxx77368z48gdg414iwhp1fkhdscn6gzvwb4i3vga98mga4"; + version = "0.2.0.2"; + sha256 = "0jwnyfl1rcd2439738jgs0rgl0p09d1j877z84g0ax3xh7cm4zj1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -63355,6 +63760,7 @@ self: { ]; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hfov" = callPackage @@ -63884,8 +64290,8 @@ self: { }: mkDerivation { pname = "highlighting-kate"; - version = "0.5.15"; - sha256 = "0ig9yz7cd08wkvhbfw8rlg4flclsk2lqqx0zkl8721zgviqj9rg4"; + version = "0.6"; + sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -63992,8 +64398,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.4.2"; - sha256 = "14g3sqkps2bg8fc8vp5f632hj7msbl4kj0baasykxvf0iylgj7ii"; + version = "4.5.3"; + sha256 = "0fnkqdxqnfmh4mg844vbgbp4s31pq4jkc00n7dkg81xq0983nsxc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -64140,8 +64546,8 @@ self: { }: mkDerivation { pname = "hint"; - version = "0.4.2.2"; - sha256 = "1gv4nmwqp8xxvz90g9k48bixpc3cabx8591vj1zv6aah8fbng06w"; + version = "0.4.2.3"; + sha256 = "1ds09bd369qmy2672vkhll8igbp63q83wdzwkpky4ab9pac3yayg"; buildDepends = [ base directory exceptions extensible-exceptions filepath ghc ghc-mtl ghc-paths mtl random unix @@ -64199,20 +64605,21 @@ self: { "hipbot" = callPackage ({ mkDerivation, aeson, base, bifunctors, blaze-builder, bytestring , either, exceptions, http-client, http-client-tls, http-types, jwt - , lens, mtl, network-uri, postgresql-simple, safe, stm, text, time - , transformers, unordered-containers, utf8-string, wai, wai-lens - , webcrank-wai, wreq + , lens, mtl, network-uri, postgresql-simple, resource-pool, safe + , stm, text, time, transformers, unordered-containers, utf8-string + , wai, wai-lens, webcrank-wai, wreq }: mkDerivation { pname = "hipbot"; - version = "0.2.1"; - sha256 = "12rixjkgxg43nwi93sr04vv8c9cw3v6rsyfpyklcpibcjg0yn6yn"; + version = "0.3.0.2"; + sha256 = "04czq0ix78amd217cf5yj8yvkr4hpsaa38rdmjish40b63crnba3"; buildDepends = [ aeson base bifunctors blaze-builder bytestring either exceptions http-client http-client-tls http-types jwt lens mtl network-uri - postgresql-simple safe stm text time transformers + postgresql-simple resource-pool safe stm text time transformers unordered-containers utf8-string wai wai-lens webcrank-wai wreq ]; + jailbreak = true; homepage = "https://github.com/purefn/hipbot"; description = "A library for building HipChat Bots"; license = stdenv.lib.licenses.bsd3; @@ -64413,6 +64820,7 @@ self: { version = "0.1.0"; sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v"; buildDepends = [ base binary text text-binary ]; + jailbreak = true; homepage = "https://github.com/kawu/hist-pl/tree/master/types"; description = "Types in the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; @@ -64611,6 +65019,7 @@ self: { aeson base http-types HUnit test-framework test-framework-hunit text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/seagreen/hjsonpointer"; description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; @@ -64625,8 +65034,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "0.5.3.2"; - sha256 = "0w4m50glqvqipv99bk55jipzdga8dwics0sw1k52kmbf34qac5ih"; + version = "0.6.0.0"; + sha256 = "01v2nb77bp94jx9va757b2iimvvi9p73aqw7izyrqp1li4gd6yq2"; buildDepends = [ aeson base bytestring file-embed hashable hjsonpointer http-client http-types regexpr scientific text unordered-containers vector @@ -64798,7 +65207,6 @@ self: { buildDepends = [ base Cabal Decimal hledger-lib statistics time ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -64958,8 +65366,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.20"; - sha256 = "1nm6z0v040ma5wkzfv8nhplpq7dnaf645bax2r3q5fj6j4cv1hzh"; + version = "1.9.21"; + sha256 = "14v3rdjjlml9nimdk7d5dvir2bw78ai49yylvms9lnzmw29s3546"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -65146,20 +65554,18 @@ self: { }) { inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage - ({ mkDerivation, base, binary, blas, hmatrix, lapack - , storable-complex - }: + ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.2.1"; - sha256 = "1sfyvp5dlxcfqwpfwzqly9h8g26lm8470xaqcw6nj15dya1zl1fj"; + version = "0.3.0.2"; + sha256 = "1n0p7pg9rsdckcysczg7l8rqfm3xw1rc2jzp0khb1i33nhbr7bzn"; buildDepends = [ base binary hmatrix storable-complex ]; - extraLibraries = [ blas lapack ]; + pkgconfigDepends = [ gsl ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas; lapack = null;}; + }) { inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: @@ -65416,8 +65822,8 @@ self: { "hmp3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , curses, directory, mersenne-random, old-time, pcre-light, process - , unix, zlib + , directory, mersenne-random, ncurses, old-time, pcre-light + , process, unix, zlib }: mkDerivation { pname = "hmp3"; @@ -65429,12 +65835,12 @@ self: { array base binary bytestring containers directory mersenne-random old-time pcre-light process unix zlib ]; - extraLibraries = [ curses ]; + extraLibraries = [ ncurses ]; homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html"; description = "An ncurses mp3 player written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { curses = null;}; + }) { inherit (pkgs) ncurses;}; "hmpfr" = callPackage ({ mkDerivation, base, integer-gmp, mpfr }: @@ -65597,6 +66003,7 @@ self: { buildDepends = [ aeson base bytestring http-conduit http-types text ]; + jailbreak = true; homepage = "https://github.com/freizl/hoauth2"; description = "hoauth2"; license = stdenv.lib.licenses.bsd3; @@ -65858,7 +66265,6 @@ self: { homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "homeomorphic" = callPackage @@ -65952,8 +66358,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "hood"; - version = "0.2"; - sha256 = "16p6jr9mkd1qv725655awcx623samrkcswlpml0kvhbm1i5kfmcn"; + version = "0.2.1"; + sha256 = "1f98v1bqrmh6cmmbsmcsdm3f250imp4rk0zi34di8fzlyqfcf2yh"; buildDepends = [ array base ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood"; description = "Debugging by observing in place"; @@ -66193,8 +66599,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "4.2.40"; - sha256 = "11clwdqgsg38lw0jc382xkazlgm8lpa7d8sydgi14wkgwy4v9zqv"; + version = "4.2.41"; + sha256 = "1gm1sw7d88vzh53myqjzls2sxc3cnk1ni31dcagkj54khh0h7f56"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -66969,25 +67375,26 @@ self: { }) {}; "hpqtypes" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, HUnit, lifted-base, monad-control, mtl, postgresql - , QuickCheck, random, resource-pool, test-framework - , test-framework-hunit, text, time, transformers, transformers-base - , vector + ({ mkDerivation, aeson, base, bytestring, containers + , data-default-class, exceptions, HUnit, lifted-base, monad-control + , mtl, postgresql, QuickCheck, random, resource-pool, scientific + , test-framework, test-framework-hunit, text, time, transformers + , transformers-base, unordered-containers, vector }: mkDerivation { pname = "hpqtypes"; - version = "1.4.0"; - sha256 = "0sq4abqqqq71yw2rgpx5xmm7h8fhcj654vbkhb4wlgi1g5kj9kh1"; + version = "1.4.1"; + sha256 = "00ira3zsw9m5vm6pqdgf4v276b7y0crqiwlw3nw99f74xj5qds19"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring containers data-default-class exceptions HUnit - lifted-base monad-control mtl QuickCheck random resource-pool - test-framework test-framework-hunit text time transformers - transformers-base vector + aeson base bytestring containers data-default-class exceptions + HUnit lifted-base monad-control mtl QuickCheck random resource-pool + scientific test-framework test-framework-hunit text time + transformers transformers-base unordered-containers vector ]; extraLibraries = [ postgresql ]; + homepage = "https://github.com/scrive/hpqtypes"; description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) postgresql;}; @@ -67215,8 +67622,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.1.3"; - sha256 = "1gzbdpsighs8jj92gi1xsrhpb7zh5mc86wiv4fszmgfrwaq1w8ab"; + version = "0.3.1.4"; + sha256 = "0pymwdpdl1xwjcgpblsrfyyib4sz2avxwidgxzr2bac91lhf3fpm"; buildDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -67444,8 +67851,8 @@ self: { ({ mkDerivation, base, haskell-src, hspec }: mkDerivation { pname = "hs-inspector"; - version = "0.5.1.0"; - sha256 = "189ch2hr39n73cgrrg94kx8rqnm4j0s2bsg5xij85bw96w8d44y5"; + version = "0.5.2.0"; + sha256 = "0w9ijl56v0gnx6arz0vvrg740kkhw0vqgkzdvmgf22z9vn99fny8"; buildDepends = [ base haskell-src ]; testDepends = [ base haskell-src hspec ]; description = "Haskell source code analyzer"; @@ -67647,7 +68054,6 @@ self: { homepage = "https://github.com/codygman/hs-scrape/"; description = "Simple and easy web scraping and automation in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-twitter" = callPackage @@ -67840,8 +68246,8 @@ self: { }: mkDerivation { pname = "hsb2hs"; - version = "0.2"; - sha256 = "013n3l80449wxmbfmcidg8mdjk4nkxv7s3jcbfy5g4jps6gsg1fx"; + version = "0.3"; + sha256 = "16awid7ybqbnja77swphq3csg476pk8l6ygjl5r5ndprahzkdrh5"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -67928,7 +68334,6 @@ self: { ]; description = "Backend for uploading benchmark data to Google Fusion Tables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc2hs" = callPackage @@ -68199,8 +68604,8 @@ self: { }: mkDerivation { pname = "hsc3-server"; - version = "0.9.2"; - sha256 = "1lq4y57d555jb0yi10n4j69h4whwsm5h2k6j4r7f9avds5ahh6s2"; + version = "0.10.0"; + sha256 = "00lw0mj76i2fqhx81d258mqdwqxy8313574i2i8vrjn0mn4bbg2p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -68395,6 +68800,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hscuid" = callPackage + ({ mkDerivation, base, containers, formatting, hostname, random + , text, time, transformers, unix + }: + mkDerivation { + pname = "hscuid"; + version = "1.0.0"; + sha256 = "19py373zmfmfr52grvv4gimm4i0gnsiy6xxp60m8b6bb4cbiyj75"; + buildDepends = [ + base formatting hostname random text time transformers unix + ]; + testDepends = [ base containers ]; + homepage = "https://github.com/eightyeight/hscuid"; + description = "Collision-resistant IDs"; + license = stdenv.lib.licenses.mit; + }) {}; + "hscurses" = callPackage ({ mkDerivation, base, exceptions, mtl, old-locale, old-time, unix }: @@ -68582,7 +69004,6 @@ self: { homepage = "https://github.com/tmhedberg/hsenv"; description = "Virtual Haskell Environment builder"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hserv" = callPackage @@ -68733,24 +69154,25 @@ self: { }) {}; "hsignal" = callPackage - ({ mkDerivation, array, base, binary, blas, bytestring, hmatrix - , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl + ({ mkDerivation, array, base, binary, blas, bytestring, gsl + , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl , storable-complex }: mkDerivation { pname = "hsignal"; - version = "0.2.7"; - sha256 = "1a75n22rk5lpzf1fnwdpw61azibavy9x45wz1cp0l1c49477fxs0"; + version = "0.2.7.1"; + sha256 = "1dzga1cgxrk7i65zrmpg22521islp4xzfc95ph7kla2acxzr6q0x"; buildDepends = [ array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats hstatistics mtl storable-complex ]; extraLibraries = [ blas lapack ]; + pkgconfigDepends = [ gsl ]; homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas; lapack = null;}; + }) { inherit (pkgs) blas; inherit (pkgs) gsl; lapack = null;}; "hsilop" = callPackage ({ mkDerivation, base, haskeline }: @@ -68804,7 +69226,6 @@ self: { ]; description = "Package for user configuration files (INI)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hskeleton" = callPackage @@ -68867,8 +69288,8 @@ self: { }: mkDerivation { pname = "hslogger"; - version = "1.2.8"; - sha256 = "0i7cji7d23kv8m0vr32ws8zm4ah5vxzb1ykv833m7i6m2g1p4dfy"; + version = "1.2.9"; + sha256 = "0xml1xgkj4hjjxypnjiia7y330a0nh5fcnkwhmnrwsw7hckwqqmy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -68883,10 +69304,9 @@ self: { ({ mkDerivation, base, hslogger, mtl, template-haskell }: mkDerivation { pname = "hslogger-template"; - version = "2.0.2"; - sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3"; + version = "2.0.3"; + sha256 = "1q5g2jgx4yjzvbrc22qcxrb3r9cma64jg90wzx9yc19yxq0fa95k"; buildDepends = [ base hslogger mtl template-haskell ]; - jailbreak = true; description = "Automatic generation of hslogger functions"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -68946,6 +69366,22 @@ self: { license = stdenv.lib.licenses.mit; }) { inherit (pkgs) lua;}; + "hslua_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit, lua + , text + }: + mkDerivation { + pname = "hslua"; + version = "0.4.0"; + sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p"; + buildDepends = [ base bytestring ]; + testDepends = [ base bytestring hspec hspec-contrib HUnit text ]; + extraLibraries = [ lua ]; + configureFlags = [ "-fsystem-lua" ]; + description = "A Lua language interpreter embedding in Haskell"; + license = stdenv.lib.licenses.mit; + }) { inherit (pkgs) lua;}; + "hsmagick" = callPackage ({ mkDerivation, base, bytestring, bzip2, directory, filepath , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2 @@ -69283,8 +69719,8 @@ self: { }: mkDerivation { pname = "hspec-contrib"; - version = "0.2.1"; - sha256 = "0m7h0bl34qp8yc5pdlk9hn3a9drd11qy7qkqx3lqh2kzr7wbffj0"; + version = "0.2.2"; + sha256 = "1jdiv41kf73x8rygj7439wrgm345qlfbkshhdy8ikrqs1k43grw6"; buildDepends = [ base hspec-core HUnit logging-facade ]; testDepends = [ base hspec hspec-core HUnit logging-facade QuickCheck @@ -69390,7 +69826,6 @@ self: { homepage = "https://github.com/hspec/hspec-expectations#readme"; description = "hspec-expectations with pretty printing on failure"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-experimental" = callPackage @@ -69452,6 +69887,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-monad-control" = callPackage + ({ mkDerivation, base, hspec-core, monad-control, transformers + , transformers-base + }: + mkDerivation { + pname = "hspec-monad-control"; + version = "0.1.0.0"; + sha256 = "07ry4nghrjbrlv6slv2a1m67r5ajdss7ifyzph0zwa96bjl1w124"; + buildDepends = [ + base hspec-core monad-control transformers transformers-base + ]; + description = "Orphan instances of MonadBase and MonadBaseControl for SpecM"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-server" = callPackage ({ mkDerivation, base, containers, hspec, hspec-contrib, hspec-core , hspec-expectations, HUnit, process, regex-posix, temporary @@ -69502,8 +69952,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "0.3.2.6"; - sha256 = "12kmkixr7azd33r5fx3z4siw0xdkda4sfxwi75vlm5w9w07ackpn"; + version = "0.3.2.9"; + sha256 = "1m324bjln2i6qz7ym26m82s1qiaq0i0sq4yfscc3bh1s6p8r5vva"; buildDepends = [ base bytestring containers digestive-functors HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers @@ -69517,7 +69967,6 @@ self: { homepage = "https://github.com/dbp/hspec-snap"; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-test-framework" = callPackage @@ -69783,7 +70232,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) qt5;}; + }) { qt5 = null;}; "hsqml-demo-morris" = callPackage ({ mkDerivation, base, containers, deepseq, directory, hsqml @@ -70295,6 +70744,7 @@ self: { base base64-bytestring bytestring containers filepath hxt split zlib ]; + jailbreak = true; description = "Import from the Tiled map editor"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70325,17 +70775,16 @@ self: { "html-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra - , containers, hspec, HUnit, resourcet, system-filepath - , tagstream-conduit, text, transformers, xml-conduit, xml-types + , containers, hspec, HUnit, resourcet, tagstream-conduit, text + , transformers, xml-conduit, xml-types }: mkDerivation { pname = "html-conduit"; - version = "1.1.1.2"; - sha256 = "116sg4wig2irqqaha257h99ajgqdq6i3jbksvqn1ywqzq96lcx34"; + version = "1.2.0"; + sha256 = "0jj02s71a9fk9mrk7bqms93y1m2zz96jg4rd7jn486ln1w49c43m"; buildDepends = [ base bytestring conduit conduit-extra containers resourcet - system-filepath tagstream-conduit text transformers xml-conduit - xml-types + tagstream-conduit text transformers xml-conduit xml-types ]; testDepends = [ base bytestring containers hspec HUnit xml-conduit @@ -70385,8 +70834,8 @@ self: { ({ mkDerivation, base, hxt, kure }: mkDerivation { pname = "html-kure"; - version = "0.2"; - sha256 = "022m9lm642g7as0a5qkgmmamsh51kgx9nk6y01wgq24ln65injmr"; + version = "0.2.1"; + sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l"; buildDepends = [ base hxt kure ]; homepage = "www.ittc.ku.edu/csdl/fpg/software/html-kure"; description = "HTML rewrite engine, using KURE"; @@ -70497,7 +70946,6 @@ self: { homepage = "http://github.com/pirapira/htodo"; description = "A todo application"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "htoml" = callPackage @@ -70915,6 +71363,7 @@ self: { buildDepends = [ base bytestring HTTP iconv mime mtl parsec text utf8-string zlib ]; + jailbreak = true; homepage = "http://github.com/achudnov/http-encodings"; description = "A library for encoding and decoding bodies of HTTP messages"; license = stdenv.lib.licenses.bsd3; @@ -71067,8 +71516,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.4.1.2"; - sha256 = "1gggn5l08g7mxbka0h7h8w687y3awbm19395fi6wvis76isyz8wy"; + version = "0.4.2"; + sha256 = "10cd6h1n1fp55jpwcp4nnk64yslxy2cnm7rhzd25xvi5fkhfl61i"; buildDepends = [ async base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default-class http-client http-types @@ -71142,11 +71591,9 @@ self: { snap-core snap-server system-fileio system-filepath text transformers unordered-containers ]; - jailbreak = true; homepage = "http://research.operationaldynamics.com/projects/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-test" = callPackage @@ -71699,6 +72146,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "huttons-razor" = callPackage + ({ mkDerivation, base, parsec, parsec-numbers }: + mkDerivation { + pname = "huttons-razor"; + version = "0.1.1.0"; + sha256 = "1wwphyg2fm34gxn7s7a4q7p8fyab3c7am4fmw1x50gkrmkwgd72s"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base parsec parsec-numbers ]; + homepage = "https://github.com/steshaw/huttons-razor"; + description = "Quick implemention of Hutton's Razor"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "huzzy" = callPackage ({ mkDerivation, base, easyplot }: mkDerivation { @@ -72257,11 +72718,9 @@ self: { sha256 = "0aq4svvwcys06mv172zz4yp624f6mnjg94lycj4r66xhm8m3fv4i"; buildDepends = [ base bytestring containers mtl pretty text ]; testDepends = [ base Cabal containers mtl QuickCheck ]; - jailbreak = true; homepage = "https://www.github.com/ktvoelker/hydrogen"; description = "An alternate Prelude"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hydrogen-cli" = callPackage @@ -72529,6 +72988,7 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; + jailbreak = true; homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; @@ -72673,6 +73133,7 @@ self: { ]; description = "Internationalization for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iCalendar" = callPackage @@ -72708,6 +73169,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "iap-verifier" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , conduit, http-conduit, monads-tf, text, transformers + }: + mkDerivation { + pname = "iap-verifier"; + version = "0.1.0.1"; + sha256 = "0mf55kx2y5q8qldgqcq805r3565nxngjm7nwq4q2xy54s7m2fsha"; + buildDepends = [ + aeson base base64-bytestring bytestring conduit http-conduit + monads-tf text transformers + ]; + jailbreak = true; + homepage = "http://github.com/tattsun/iap-verifier"; + description = "A simple wrapper of In-App-Purchase receipt validate APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "iban" = callPackage ({ mkDerivation, base, containers, HUnit, iso3166-country-codes , tasty, tasty-hunit, text, unordered-containers @@ -72732,8 +73211,11 @@ self: { mkDerivation { pname = "iconv"; version = "0.4.1.2"; + revision = "1"; sha256 = "0sd7by7idcnw368mdc1rs3j4xwbzdvgvkd5p1bwgw7wcd272c142"; + editedCabalFile = "dec449ecde9679a092fc8513cec0bfe72031aa309b9b9795db572a726a976451"; buildDepends = [ base bytestring ]; + jailbreak = true; description = "String encoding conversion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -72770,9 +73252,9 @@ self: { template-haskell temporary test-framework test-framework-hunit text unix utf8-string ]; + jailbreak = true; description = "An IDE backend library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ide-backend-common" = callPackage @@ -72783,14 +73265,15 @@ self: { }: mkDerivation { pname = "ide-backend-common"; - version = "0.9.1.1"; - sha256 = "1k3sp9byqmhk80l918jnklck635dp1cfx48akah483jkhzjph0fj"; + version = "0.9.1.2"; + sha256 = "1cj594vq0x87h9mvwsj9mplacrdn999bbsknjwdpvrpsbadlx5q7"; buildDepends = [ aeson async attoparsec base binary bytestring bytestring-trie containers crypto-api data-accessor directory filepath fingertree mtl pretty-show pureMD5 tagged template-haskell temporary text transformers unix ]; + jailbreak = true; description = "Shared library used be ide-backend and ide-backend-server"; license = stdenv.lib.licenses.mit; }) {}; @@ -72959,12 +73442,12 @@ self: { , network, optparse-applicative, parsers, pretty, process, safe , split, text, time, transformers, transformers-compat, trifecta , uniplate, unix, unordered-containers, utf8-string, vector - , vector-binary-instances, xml, zlib + , vector-binary-instances, xml, zip-archive, zlib }: mkDerivation { pname = "idris"; - version = "0.9.17.1"; - sha256 = "16a3z7jq1pmqnb411aqn9qmirwyzpx3bqb0hrawc1404kbq7gdx7"; + version = "0.9.18.1"; + sha256 = "0xd4kqnjdx427l26b07rrw9bnrxb8zrsqy93wayf4rmg6l8rymj8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -72974,7 +73457,7 @@ self: { haskeline lens libffi mtl network optparse-applicative parsers pretty process safe split text time transformers transformers-compat trifecta uniplate unix unordered-containers - utf8-string vector vector-binary-instances xml zlib + utf8-string vector vector-binary-instances xml zip-archive zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; @@ -72983,7 +73466,6 @@ self: { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) boehmgc; inherit (pkgs) gmp;}; "ieee" = callPackage @@ -73142,7 +73624,6 @@ self: { homepage = "https://github.com/dmcclean/igrf"; description = "International Geomagnetic Reference Field"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell" = callPackage @@ -73158,8 +73639,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.6.0.0"; - sha256 = "15fsan1dxlmd7y31630rqrg9gaa205g3s89vlqnxjv0dfvs86qf0"; + version = "0.6.3.0"; + sha256 = "0apkidaa0b8xq80y8hvijpkwyv6vl3v8pq19lxjq53y3hs3nqcqm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73243,13 +73724,12 @@ self: { }: mkDerivation { pname = "ihaskell-charts"; - version = "0.2.0.0"; - sha256 = "0zncvhjr3nkpr80m5lhl52jq1ha8ml14bjkykkg6d2l1pqnrb3mg"; + version = "0.2.1.0"; + sha256 = "0gw737kg5sjmlf43b2wmnjq9k1p4mc5j4b5q50qa2q1n48lz8c0q"; buildDepends = [ base bytestring Chart Chart-cairo classy-prelude data-default-class directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; @@ -73257,18 +73737,17 @@ self: { }) {}; "ihaskell-diagrams" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, diagrams + ({ mkDerivation, active, base, bytestring, classy-prelude, diagrams , diagrams-cairo, diagrams-lib, directory, ihaskell }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.2.0.0"; - sha256 = "1if010ky6raw4g0wl24iww1i8qygy4jwd4f8yi9axhxzqzknmqvi"; + version = "0.2.2.0"; + sha256 = "0nxspimzzz7pn7lbbgqfq3k83gp4kdxw3cj2c6dlzjvx1bhpqp74"; buildDepends = [ - base bytestring classy-prelude diagrams diagrams-cairo diagrams-lib - directory ihaskell + active base bytestring classy-prelude diagrams diagrams-cairo + diagrams-lib directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; @@ -73308,12 +73787,11 @@ self: { }: mkDerivation { pname = "ihaskell-juicypixels"; - version = "0.2.0.0"; - sha256 = "058a7wcksbmxq2nahyvpbckd24ziya5f99vmlb3l9wgy9a3i4v2k"; + version = "0.2.2.0"; + sha256 = "0c50xsdlmaq4fz92hicljjdpqwvsprw3a1z7fdfzwjdc25gkd2mr"; buildDepends = [ base bytestring classy-prelude directory ihaskell JuicyPixels ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; @@ -73359,6 +73837,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihaskell-plot" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, ihaskell, plot + }: + mkDerivation { + pname = "ihaskell-plot"; + version = "0.2.0.0"; + sha256 = "18ghf6fscqqbk3rag1g9rz3knm39r7i4mhj8sxmj195skrmkydpc"; + buildDepends = [ base bytestring classy-prelude ihaskell plot ]; + homepage = "http://www.github.com/gibiansky/ihaskell"; + description = "IHaskell display instance for Plot (from plot package)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-rlangqq" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , directory, filepath, ihaskell, ihaskell-blaze, Rlang-QQ, split @@ -73366,15 +73858,15 @@ self: { }: mkDerivation { pname = "ihaskell-rlangqq"; - version = "0.2.0.1"; - sha256 = "1si38n47p57kwqsmsqw9bnv4k6z3zd6n8f5kmsmmbcmjdqmi7i86"; + version = "0.2.2.0"; + sha256 = "1kjp7nmmwjh4wc2b5xqw5f8hg9jq3a8p6rdxcd61qp2iizm4r372"; buildDepends = [ base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat ]; - jailbreak = true; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihttp" = callPackage @@ -73580,7 +74072,9 @@ self: { mkDerivation { pname = "imm"; version = "0.6.0.3"; + revision = "1"; sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l"; + editedCabalFile = "c14d5caa0066c05d15589dfbb663c5397bcb6d12ab4477de1d7572e3a16b132d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73812,6 +74306,7 @@ self: { base beamable bytestring containers ghc-prim QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; description = "type classes for incremental updates to data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -73932,7 +74427,6 @@ self: { buildDepends = [ base gtk HDBC HDBC-sqlite3 ]; description = "Indian Language Font Converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indices" = callPackage @@ -73986,7 +74480,6 @@ self: { homepage = "https://github.com/sinelaw/infernu"; description = "Type inference and checker for JavaScript (experimental)"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "infinite-search" = callPackage @@ -74071,8 +74564,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "0.9.1.1"; - sha256 = "0ijc97xj1fz8ahfg0dha5mmbvd5nsb38dlvyvrwq2gpr0j79138r"; + version = "0.9.1.2"; + sha256 = "1nn1vflzb4c8xvvnnxl3ph947nxy5ibyh8bzrp2ddwjb62xm2l00"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74107,10 +74600,10 @@ self: { persistent persistent-postgresql shakespeare text time time-locale-compat yesod yesod-auth yesod-core yesod-form ]; + jailbreak = true; homepage = "http://doomanddarkness.eu/pub/informative"; description = "A yesod subsite serving a wiki"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ini" = callPackage @@ -74155,6 +74648,44 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "inline-c" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring + , containers, cryptohash, directory, filepath, gsl, gslcblas, hspec + , mtl, parsec, parsers, QuickCheck, raw-strings-qq, regex-posix + , template-haskell, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.5.3.1"; + sha256 = "1n4w1lr3jwx4dwcks0c7rc79hdf4jwsgl3famivrdls01fqv9dhi"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-wl-pprint base binary bytestring containers cryptohash + directory filepath mtl parsec parsers QuickCheck template-haskell + transformers unordered-containers vector + ]; + testDepends = [ + ansi-wl-pprint base containers hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers vector + ]; + extraLibraries = [ gsl gslcblas ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + }) { inherit (pkgs) gsl; gslcblas = null;}; + + "inline-c-cpp" = callPackage + ({ mkDerivation, base, inline-c, template-haskell }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.1.0.0"; + sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf"; + buildDepends = [ base inline-c template-haskell ]; + testDepends = [ base ]; + description = "Lets you embed C++ code into Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -74260,6 +74791,7 @@ self: { testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/hvr/int-cast"; description = "Checked conversions between integral types"; license = stdenv.lib.licenses.bsd3; @@ -74865,6 +75397,7 @@ self: { pkgconfigDepends = [ ipopt nlopt ]; description = "haskell binding to ipopt and nlopt including automatic differentiation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) ipopt; inherit (pkgs) nlopt;}; "ipprint" = callPackage @@ -74876,7 +75409,6 @@ self: { buildDepends = [ base Extra haskell-src ]; description = "Tiny helper for pretty-printing values in ghci console"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iproute" = callPackage @@ -74948,18 +75480,19 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , directory, filepath, mtl, parsec, SHA, tar, text, transformers - , unix, uuid, zeromq4-haskell + , uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.6.0.0"; - sha256 = "0pk49hz2ba2ikd96nymrlk7nrd5sw1fmy7xbx24hrri5izqfjjli"; + version = "0.6.1.0"; + sha256 = "1dmmrkph3myc67wp4ibx2l10dkxpkgzh7i4shbjbqag39ljb0q60"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring cereal containers directory filepath mtl - parsec SHA tar text transformers unix uuid zeromq4-haskell + parsec SHA tar text transformers uuid zeromq4-haskell ]; + jailbreak = true; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; @@ -75052,10 +75585,10 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "1.0"; + version = "1.1.0.1"; revision = "1"; - sha256 = "02ymy4zar7jl14pkhl6f4l42yzb1jv8apdsf86sv39sw9yygs305"; - editedCabalFile = "1fbb89234408096eb458a63862ebd84dcb5b103b93d587548490e9a5dc2d6b31"; + sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257"; + editedCabalFile = "e0fedfac6e4dccddc4034d99d9123c69127309df42c2a338a8643f4cf48b1a50"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -75064,7 +75597,6 @@ self: { free haskell-lexer lens network old-locale split stm text time tls transformers vty x509 x509-store x509-system x509-validation ]; - jailbreak = true; homepage = "https://github.com/glguy/irc-core"; description = "An IRC client library and text client"; license = stdenv.lib.licenses.bsd3; @@ -75124,6 +75656,7 @@ self: { buildDepends = [ base QuickCheck ]; description = "Real numbers and intervals with relatively efficient exact arithmetic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iron-mq" = callPackage @@ -75137,7 +75670,6 @@ self: { homepage = "https://github.com/arnoblalam/iron_mq_haskell"; description = "Iron.IO message queueing client library"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ironforge" = callPackage @@ -75156,7 +75688,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "A technical demo for Antisplice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "is" = callPackage @@ -75880,7 +76411,9 @@ self: { mkDerivation { pname = "jailbreak-cabal"; version = "1.3"; + revision = "2"; sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2"; + editedCabalFile = "eb10d8166cc3a40e8d731ab1fba7d37ef57d155d6122c7234297ddbf776ec28a"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal ]; @@ -76132,8 +76665,8 @@ self: { }: mkDerivation { pname = "jmacro"; - version = "0.6.11"; - sha256 = "1b45graag0nmadaf1ssaps4g9p7xx7d2h7dy84nzmdhrpvdlw4xs"; + version = "0.6.13"; + sha256 = "0b7l4h3apkj41w69wg3ympflh2l53vbmyvs6xf20xn57d6p8lhn4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76143,7 +76676,6 @@ self: { ]; description = "QuasiQuotation library for programmatic generation of Javascript code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc" = callPackage @@ -76153,8 +76685,8 @@ self: { }: mkDerivation { pname = "jmacro-rpc"; - version = "0.3"; - sha256 = "1fkcky2f51764xcbbwnxpxyhk2mmnp364hf8njfcjsijanv938zw"; + version = "0.3.2"; + sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3"; buildDepends = [ aeson attoparsec base blaze-html bytestring containers contravariant jmacro mtl scientific split text unordered-containers @@ -76163,7 +76695,6 @@ self: { homepage = "http://hub.darcs.net/gershomb/jmacro"; description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc-happstack" = callPackage @@ -76172,8 +76703,8 @@ self: { }: mkDerivation { pname = "jmacro-rpc-happstack"; - version = "0.3.1"; - sha256 = "0b77nrvrh1wzsp6djji0hkgl6flyl664l7kzbf5kpi30mqh45a6a"; + version = "0.3.2"; + sha256 = "0r5h8hlsjppnhqdxa0dsrjkpv3pldbkv5v4dryd4km2v38yfxkcr"; buildDepends = [ aeson base blaze-html bytestring containers happstack-server jmacro jmacro-rpc mtl @@ -76181,7 +76712,6 @@ self: { homepage = "http://hub.darcs.net/gershomb/jmacro-rpc"; description = "Happstack backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc-snap" = callPackage @@ -76198,7 +76728,6 @@ self: { homepage = "http://hub.darcs.net/gershomb/jmacro-rpc"; description = "Snap backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jobqueue" = callPackage @@ -76293,13 +76822,13 @@ self: { , bifunctors, byteable, bytestring, crypto-pubkey , crypto-pubkey-types, crypto-random, cryptohash , data-default-class, ghc-prim, hspec, integer-gmp, lens - , network-uri, old-locale, safe, semigroups, template-haskell, text - , time, unordered-containers, vector, x509 + , network-uri, safe, semigroups, template-haskell, text, time + , unordered-containers, vector, x509 }: mkDerivation { pname = "jose"; - version = "0.3.41.1"; - sha256 = "1grb1yq3knm7hniqiivkx76mxkgacyq2qa12mv5lz097w7bldf4l"; + version = "0.3.41.2"; + sha256 = "0pamg1wkp85zpwnbsvmsszy7nxsifl3zhbxvfmh44n0b6d2wg4w5"; buildDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable bytestring crypto-pubkey crypto-pubkey-types crypto-random @@ -76310,9 +76839,9 @@ self: { testDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable bytestring crypto-pubkey crypto-pubkey-types crypto-random - cryptohash data-default-class hspec lens network-uri old-locale - safe semigroups template-haskell text time unordered-containers - vector x509 + cryptohash data-default-class hspec lens network-uri safe + semigroups template-haskell text time unordered-containers vector + x509 ]; jailbreak = true; homepage = "https://github.com/frasertweedale/hs-jose"; @@ -76326,19 +76855,17 @@ self: { , bytestring, cereal, cipher-aes, containers, cprng-aes , crypto-cipher-types, crypto-numbers, crypto-pubkey , crypto-pubkey-types, crypto-random, cryptohash, doctest, either - , errors, hspec, HUnit, mtl, QuickCheck, text, time - , unordered-containers, vector + , hspec, HUnit, mtl, QuickCheck, text, time, unordered-containers + , vector }: mkDerivation { pname = "jose-jwt"; - version = "0.5"; - revision = "2"; - sha256 = "0pk6fq3wsbl6pl79dcyns1c94xmv98acfr6rbxhyfqmc5lys759s"; - editedCabalFile = "e3f6e8d368c88a0be06d656e627e86b8ad481cf75578a97af2a5c29bf0bb55b6"; + version = "0.6.2"; + sha256 = "0fw3b34ghpjpm56iln1i46kr8dcj1yv8gmalgdl7ym7n9bvgrfzq"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey - crypto-pubkey-types crypto-random cryptohash errors mtl text time + crypto-pubkey-types crypto-random cryptohash either mtl text time unordered-containers vector ]; testDepends = [ @@ -76350,6 +76877,7 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jpeg" = callPackage @@ -76408,8 +76936,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.2.0.4"; - sha256 = "154f75lhlqixrmwrvzcdvmvmila7cj8hzgch2020yamlwyi4gnk8"; + version = "0.2.0.5"; + sha256 = "0avl5gvq3sv2fk524hazfk1xgb9rlyqqqrvnxb63psjds7s6rxp1"; buildDepends = [ base lens template-haskell text transformers webkitgtk3 webkitgtk3-javascriptcore @@ -76513,8 +77041,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "1.0"; - sha256 = "0vny84qr14i2q7hkvmngbryn6r9hxsmk6c5dw6f93s8cn0ymgsk8"; + version = "1.0.1"; + sha256 = "0p06zv61giwbnwcdcg8fq7mmw3islcj807df4xhaxggr8r3dwywv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76527,6 +77055,7 @@ self: { hashable hflags lens mtl pretty process QuickCheck scientific smallcheck text uniplate unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -76587,6 +77116,7 @@ self: { homepage = "http://github.com/snoyberg/json-enumerator"; description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-extra" = callPackage @@ -76696,8 +77226,8 @@ self: { }: mkDerivation { pname = "json-rpc-client"; - version = "0.1.2.0"; - sha256 = "1arn4ik9fyicb875ac0y7dp9ahipvip8fq2mr95vvmhym921ca64"; + version = "0.1.4.0"; + sha256 = "1lcjwf6j6j3azrrmbdhffm8a27d6gn48zrgp3w89x9ckgflyby22"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76709,7 +77239,6 @@ self: { scientific test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - jailbreak = true; description = "JSON-RPC 2.0 on the client side."; license = stdenv.lib.licenses.mit; }) {}; @@ -76721,8 +77250,8 @@ self: { }: mkDerivation { pname = "json-rpc-server"; - version = "0.1.5.0"; - sha256 = "1328366gdcsgfwqjzqgz07nnxn2j8gpbrcr6888wq1br0bxyczj5"; + version = "0.1.6.0"; + sha256 = "0qlmv4l0p70rij18m380myw2p1mhdq432kc0yky3n8rx8n29dlfq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76744,8 +77273,8 @@ self: { }: mkDerivation { pname = "json-schema"; - version = "0.7.3.5"; - sha256 = "1x7bm83745nsf947kb4m3h8zh4li1548dpbcm2yz16ppg5db182h"; + version = "0.7.3.6"; + sha256 = "0x1aj5scd0k0qapivn784y5np82fhr982sqvb64jw619aql5s6bv"; buildDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -76770,6 +77299,7 @@ self: { aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector ]; + jailbreak = true; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76926,8 +77456,8 @@ self: { }: mkDerivation { pname = "jsonschema-gen"; - version = "0.3.0.0"; - sha256 = "0jjqn5y5rxgm92y26p00kd5rkh4z1kyavj0v5axpbs9a9a08aplx"; + version = "0.3.0.1"; + sha256 = "18hc6a7ihjpnnnjsx4r403w2zx2nzxa4qvj4picdw83r4sgjvv2d"; buildDepends = [ aeson base bytestring containers scientific tagged text time unordered-containers vector @@ -76969,8 +77499,8 @@ self: { }: mkDerivation { pname = "jsontsv"; - version = "0.1.4.6"; - sha256 = "05rfpzs7ln87n17dbq22g990hkiqwwr656w6l2mrqfnq10qzx8xc"; + version = "0.1.5.0"; + sha256 = "0qilhv14q51g3dzsxk0zp5fp2igy7m79lq1qsk1myrd6iyannxc5"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -77122,10 +77652,8 @@ self: { }: mkDerivation { pname = "kan-extensions"; - version = "4.2.1"; - revision = "1"; - sha256 = "0lymh1njw1zh9is6zk3bmr7jylna28632l4pylh6chlxpjvy4zwl"; - editedCabalFile = "c0b1fdbd894c452f2658615bb14db240921b9ba5115f4f232d173ecbdae83ead"; + version = "4.2.2"; + sha256 = "0dqqlrzrhz8di5hp4kby3205inpj2r30bl75zyy24nq4hgans7g5"; buildDepends = [ adjunctions array base comonad containers contravariant distributive free mtl semigroupoids tagged transformers @@ -77364,6 +77892,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "keera-hails-reactivevalues" = callPackage + ({ mkDerivation, base, contravariant }: + mkDerivation { + pname = "keera-hails-reactivevalues"; + version = "0.0.3.4"; + sha256 = "0qqp4ss0prl3z4bwrsd5jmbvdmhh7x3m846b58dd7ibb0bycp1pb"; + buildDepends = [ base contravariant ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Reactive Values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keiretsu" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring , conduit, conduit-extra, directory, filepath, hslogger, network @@ -77393,15 +77933,15 @@ self: { , conduit-extra, containers, data-default, directory, filepath , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy , http-types, HUnit, lifted-base, mtl, network, process, random - , regex-tdfa, stm, system-fileio, system-filepath, tar - , template-haskell, text, time, transformers, unix, unix-compat - , unordered-containers, vector, wai, wai-app-static, wai-extra - , warp, warp-tls, yaml, zlib + , regex-tdfa, stm, system-filepath, tar, template-haskell, text + , time, transformers, unix, unix-compat, unordered-containers + , vector, wai, wai-app-static, wai-extra, warp, warp-tls, yaml + , zlib }: mkDerivation { pname = "keter"; - version = "1.3.10.1"; - sha256 = "1bqy0g0255xqnlk9qn2ykwlszwdliqhcrdm4bjfac1d2lf27vs7r"; + version = "1.4.1"; + sha256 = "1pxvddb6mkxq4j7w0l3zgvarlj8kvrd4c75mivsia330wzkhc4ay"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77409,10 +77949,9 @@ self: { case-insensitive conduit conduit-extra containers data-default directory filepath fsnotify http-client http-conduit http-reverse-proxy http-types lifted-base mtl network process - random regex-tdfa stm system-fileio system-filepath tar - template-haskell text time transformers unix unix-compat - unordered-containers vector wai wai-app-static wai-extra warp - warp-tls yaml zlib + random regex-tdfa stm system-filepath tar template-haskell text + time transformers unix unix-compat unordered-containers vector wai + wai-app-static wai-extra warp warp-tls yaml zlib ]; testDepends = [ base bytestring conduit hspec HUnit transformers unix @@ -77471,16 +78010,16 @@ self: { }) {}; "keys" = callPackage - ({ mkDerivation, array, base, comonad, containers, free - , semigroupoids, semigroups, transformers + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, transformers, unordered-containers }: mkDerivation { pname = "keys"; - version = "3.10.1"; - sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n"; + version = "3.10.2"; + sha256 = "1xmyhsqpz4rvm2i8f8xgd1wpj8qlps0lvbif1li73lzg13jiwps2"; buildDepends = [ - array base comonad containers free semigroupoids semigroups - transformers + array base comonad containers free hashable semigroupoids + semigroups transformers unordered-containers ]; homepage = "http://github.com/ekmett/keys/"; description = "Keyed functors and containers"; @@ -78123,6 +78662,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lambda-options" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "lambda-options"; + version = "0.6.0.0"; + sha256 = "12w53cpqlqcnx3f54xx14dj532xdwdrdp8yz2a43jb3rdf9ffz5c"; + buildDepends = [ base containers mtl ]; + jailbreak = true; + homepage = "https://github.com/thomaseding/lambda-options"; + description = "A modern command-line parser for Haskell"; + license = "unknown"; + }) {}; + "lambda-placeholders" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -78256,7 +78808,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -78280,6 +78831,7 @@ self: { parsec pretty process QuickCheck regex-tdfa show split syb transformers utf8-string vector-space ]; + jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; @@ -78302,7 +78854,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "IRC plugins for lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-misc-plugins" = callPackage @@ -78326,7 +78877,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-novelty-plugins" = callPackage @@ -78361,10 +78911,10 @@ self: { base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string ]; + jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot reference plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-social-plugins" = callPackage @@ -78381,7 +78931,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Social plugins for Lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-trusted" = callPackage @@ -78404,9 +78953,9 @@ self: { mkDerivation { pname = "lambdabot-utils"; version = "4.2.2"; - revision = "1"; + revision = "3"; sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7"; - editedCabalFile = "1936d25bbfb2ce39465857c136e0d77c656714feb2c1936024da4d763e9dbbf3"; + editedCabalFile = "f54d43d6964d63f1d8796606419b512a6e7b87b1defe960748c27c7417f59a08"; buildDepends = [ base binary bytestring containers haskell-src mtl network old-time process random regex-compat regex-posix syb tagsoup unix @@ -78931,27 +79480,27 @@ self: { version = "0.2"; sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf"; buildDepends = [ base bifunctors parsers ]; + jailbreak = true; description = "Something similar to Dijkstra's guarded command language"; license = stdenv.lib.licenses.mit; }) {}; "language-glsl" = callPackage - ({ mkDerivation, base, HUnit, parsec, pretty, prettyclass - , test-framework, test-framework-hunit + ({ mkDerivation, base, HUnit, parsec, prettyclass, test-framework + , test-framework-hunit }: mkDerivation { pname = "language-glsl"; - version = "0.1.1"; - sha256 = "06dc339a2cddzgjda3nzprgr0v2clbhlpl8j81m04i66bbj2l15y"; + version = "0.2.0"; + sha256 = "1wmfzif1cc3a8sls3swms9x54hm9ic8y301zav6fg4mr7xa4hqr3"; isLibrary = true; isExecutable = true; - buildDepends = [ base parsec pretty prettyclass ]; + buildDepends = [ base parsec prettyclass ]; testDepends = [ base HUnit parsec prettyclass test-framework test-framework-hunit ]; description = "GLSL abstract syntax tree, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-go" = callPackage @@ -79188,7 +79737,6 @@ self: { array base containers monads-tf pretty transformers utf8-string ]; buildTools = [ alex happy ]; - jailbreak = true; homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; @@ -79400,12 +79948,17 @@ self: { }) {}; "lattices" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, deepseq, hashable + , unordered-containers + }: mkDerivation { pname = "lattices"; - version = "1.2.1.1"; - sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6"; - buildDepends = [ base containers ]; + version = "1.3"; + sha256 = "1jp63rh1girf9ka0lfi219wlisni8dsckf67h6413ihdxdh2mp3l"; + buildDepends = [ + base containers deepseq hashable unordered-containers + ]; + homepage = "http://github.com/phadej/lattices/"; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79715,12 +80268,14 @@ self: { }) {}; "leapseconds-announced" = callPackage - ({ mkDerivation, base, time }: + ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "leapseconds-announced"; - version = "2015"; - sha256 = "14k57jw0n9nqrc9rrqsjiafk3li7z8azf9cm72gm3yrms72ph3m8"; + version = "2015.0.0.1"; + sha256 = "0k8khjfq1cr8wb2wgwwk7yv6461h7z6wf6qn21qd9zq9i22bpyhm"; buildDepends = [ base time ]; + testDepends = [ base QuickCheck time ]; + homepage = "https://github.com/bjornbm/leapseconds-announced"; description = "Leap seconds announced at library release time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79816,8 +80371,8 @@ self: { }: mkDerivation { pname = "leksah"; - version = "0.14.4.0"; - sha256 = "13p6fil3s8pgjgicxgkn1qfcdhvv5j0lilk85a66nz7vw4rg3x2v"; + version = "0.15.0.1"; + sha256 = "169vrqdxcx8xkilrw3dh5zmdsb876fny4n0k5gzvi8fian0dl8nh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -79835,7 +80390,6 @@ self: { leksah-server ltk monad-loops QuickCheck text transformers webkitgtk3 ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; @@ -79843,31 +80397,30 @@ self: { }) {}; "leksah-server" = callPackage - ({ mkDerivation, attoparsec, attoparsec-conduit, base, binary - , binary-shared, bytestring, Cabal, conduit, conduit-extra - , containers, deepseq, directory, executable-path, filepath, ghc - , haddock-api, hslogger, HTTP, HUnit, ltk, network, network-uri - , parsec, pretty, process, resourcet, strict, text, time - , transformers, unix + ({ mkDerivation, attoparsec, attoparsec-conduit, base + , bin-package-db, binary, binary-shared, bytestring, Cabal, conduit + , conduit-extra, containers, deepseq, directory, executable-path + , filepath, ghc, haddock-api, haddock-library, hslogger, HTTP + , HUnit, ltk, network, network-uri, parsec, pretty, process + , resourcet, strict, text, time, transformers, unix }: mkDerivation { pname = "leksah-server"; - version = "0.14.3.2"; - sha256 = "0gbjxbma0jyw0jli63f3apfsap9by6nr75qx77773nj2l48hxz3w"; + version = "0.15.0.1"; + sha256 = "04sxfzl8p9fk8qkzmwnm7fkg5sgrzjx0992kivgbrnyx7wh06xsp"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec attoparsec-conduit base binary binary-shared bytestring - Cabal conduit conduit-extra containers deepseq directory - executable-path filepath ghc haddock-api hslogger HTTP ltk network - network-uri parsec pretty process resourcet strict text time - transformers unix + attoparsec attoparsec-conduit base bin-package-db binary + binary-shared bytestring Cabal conduit conduit-extra containers + deepseq directory executable-path filepath ghc haddock-api + haddock-library hslogger HTTP ltk network network-uri parsec pretty + process resourcet strict text time transformers unix ]; testDepends = [ base conduit conduit-extra hslogger HUnit process resourcet transformers ]; - jailbreak = true; homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; @@ -79889,44 +80442,6 @@ self: { homepage = "https://www.lendingclub.com/developers/lc-api.action"; description = "Bindings for the LendingClub marketplace API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "lens_4_7_0_1" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, comonad - , containers, contravariant, deepseq, directory, distributive - , doctest, exceptions, filepath, free, generic-deriving, ghc-prim - , hashable, hlint, HUnit, mtl, nats, parallel, primitive - , profunctors, QuickCheck, reflection, semigroupoids, semigroups - , simple-reflect, split, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, text, transformers, transformers-compat - , unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.7.0.1"; - revision = "3"; - sha256 = "1j9d7g4sj38zq2r8vhy05b2kbxx1sg2k0b3yx05lbxlb79wcm1j1"; - editedCabalFile = "6ac87d4c8600c9497c965d54b1e97f10d0073bed3c45381b78d1ba4b81da57c8"; - buildDepends = [ - array base bifunctors bytestring comonad containers contravariant - distributive exceptions filepath free ghc-prim hashable mtl - parallel primitive profunctors reflection semigroupoids semigroups - split tagged template-haskell text transformers transformers-compat - unordered-containers vector void - ]; - testDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving hlint HUnit mtl nats parallel QuickCheck - semigroups simple-reflect split test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; }) {}; "lens" = callPackage @@ -79942,8 +80457,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.9.1"; - sha256 = "1ic8zvwl1cz9qppwqp713r7savvnqij0gclpdgxmnnh67l962170"; + version = "4.11"; + sha256 = "1699jbsdgffnhzpy6c2k6ld13crqibm7vc3x2gx95gwzx5hlccxm"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable @@ -79970,8 +80485,8 @@ self: { }: mkDerivation { pname = "lens-action"; - version = "0.1.0.1"; - sha256 = "0ycasfbwkqc3v3frjq8kfm1nzj7g1vr25ywzf0irk05gfhxfpvig"; + version = "0.2.0.1"; + sha256 = "164fka3krz32zhxnhkylnkmgnx2qj4qvn6y1hfwwla4ddn0axm9n"; buildDepends = [ base comonad contravariant lens mtl profunctors semigroupoids semigroups transformers @@ -79980,6 +80495,7 @@ self: { homepage = "http://github.com/ekmett/lens-action/"; description = "Monadic Getters and Folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-aeson" = callPackage @@ -79990,7 +80506,9 @@ self: { mkDerivation { pname = "lens-aeson"; version = "1.0.0.4"; + revision = "1"; sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v"; + editedCabalFile = "252661ca9f157ea5cb0aa6684c50fa1b84a2a3ed300c2eaec9ffb82eb18e7ddd"; buildDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -80058,10 +80576,9 @@ self: { ({ mkDerivation, base, lens, QuickCheck, transformers }: mkDerivation { pname = "lens-properties"; - version = "4.7"; - sha256 = "07acd6a9qp0z06nxb33ml8fa470i04v8bxyrhf7i30lvyy40gfik"; + version = "4.11"; + sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w"; buildDepends = [ base lens QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; @@ -80113,7 +80630,6 @@ self: { homepage = "http://github.com/jvranish/Lenses/tree/master"; description = "Simple Functional Lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lensref" = callPackage @@ -80149,8 +80665,8 @@ self: { }: mkDerivation { pname = "leveldb-haskell"; - version = "0.6.2"; - sha256 = "0gx9rn5vbmy5nq1n2ga1v5v7b7p11d0rxhdh75pz4dqgazxyjlax"; + version = "0.6.3"; + sha256 = "0vljwjcd9m63wk7zmkl2s6b6kpjn7hqmwwg0p2bjm0d7ras69pk5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -80165,6 +80681,7 @@ self: { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage @@ -80227,8 +80744,8 @@ self: { }: mkDerivation { pname = "lexer-applicative"; - version = "1.1"; - sha256 = "1yl4404w5pmmpa1l7j4zlm5lg24jglxff04qdc757bd1r0bklbw1"; + version = "2.1"; + sha256 = "1xryc4nnfs7vzvmdszksmzjmz0pi1gpip0qr3gf2lv0baayma7zj"; buildDepends = [ base regex-applicative srcloc ]; testDepends = [ base deepseq regex-applicative srcloc tasty tasty-hunit @@ -80441,18 +80958,18 @@ self: { "libconfig" = callPackage ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config - , deepseq, doctest, doctest-prop, hashable, lens, profunctors, text - , text-binary, transformers, transformers-compat + , deepseq, doctest, doctest-prop, hashable, text, text-binary + , transformers, transformers-compat }: mkDerivation { pname = "libconfig"; version = "0.3.0.0"; sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12"; buildDepends = [ - base binary cereal cereal-text deepseq hashable profunctors text - text-binary transformers transformers-compat + base binary cereal cereal-text deepseq hashable text text-binary + transformers transformers-compat ]; - testDepends = [ base doctest doctest-prop lens ]; + testDepends = [ base doctest doctest-prop ]; buildTools = [ c2hs ]; extraLibraries = [ config ]; homepage = "https://github.com/peddie/libconfig-haskell"; @@ -80510,13 +81027,12 @@ self: { ({ mkDerivation, base, mtl, process }: mkDerivation { pname = "libgit"; - version = "0.3.0"; - sha256 = "0k2287d84s0p73md1mfcyg1qy1l5ncgrvmkaa7607d8zlk9b8ci6"; + version = "0.3.1"; + sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x"; buildDepends = [ base mtl process ]; - homepage = "http://github.com/vincenthz/hs-tls"; + homepage = "https://github.com/vincenthz/hs-libgit"; description = "Simple Git Wrapper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libgraph" = callPackage @@ -80710,6 +81226,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "libpafe" = callPackage + ({ mkDerivation, base, bytestring, iconv, pafe }: + mkDerivation { + pname = "libpafe"; + version = "0.1.0.0"; + sha256 = "1qb67zb7fh582ws1j1hi704dkzp7am0jjxjnab29kpm6i3xmzprk"; + buildDepends = [ base ]; + testDepends = [ base bytestring iconv ]; + extraLibraries = [ pafe ]; + jailbreak = true; + description = "Wrapper for libpafe"; + license = stdenv.lib.licenses.gpl2; + }) { pafe = null;}; + "libpq" = callPackage ({ mkDerivation, base, bytestring, postgresql, unix }: mkDerivation { @@ -80971,8 +81501,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.7.0"; - sha256 = "1i9wm7pz8mh0gjyp7jhf3as82yi1axskv1mp5596gq7pszgglyd6"; + version = "0.7.0.1"; + sha256 = "0skfpgqlxni3bdn7pdg2732xkijmwsz655962wrbmflh987ms8y3"; buildDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -81123,6 +81653,7 @@ self: { testDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th ]; + jailbreak = true; homepage = "https://github.com/amosr/limp"; description = "representation of Integer Linear Programs"; license = stdenv.lib.licenses.mit; @@ -81167,6 +81698,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "line-break" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "line-break"; + version = "0.1.0.0"; + sha256 = "01w5bk58n14vni6cb8rc4ri3hpgism1c78jk605927yf2llxnc14"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base ]; + description = "Convert newlines in text"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "line2pdf" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -81191,8 +81735,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.18.0.1"; - sha256 = "06gbrmr7yv9s6la14g22lwqfjyfr0xrlmkrffizy4n01xknmkbig"; + version = "1.18.1.1"; + sha256 = "1qgpv6c3q4ljqc3223iyj49piqs9xx58zmnpvg76wkaygsnnzq9p"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -81218,7 +81762,6 @@ self: { homepage = "http://github.com/ekmett/linear-accelerate/"; description = "Instances to use linear vector spaces on accelerate backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-algebra-cblas" = callPackage @@ -81299,34 +81842,35 @@ self: { }) {}; "linearscan" = callPackage - ({ mkDerivation, base, containers, mtl, transformers }: + ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.4.0.0"; - sha256 = "170dppl4hgfrxpqix19a7nf1dv46wc46s797h8ppa2j0xvcdf4xs"; - buildDepends = [ base containers mtl transformers ]; - jailbreak = true; + version = "0.6.0.0"; + sha256 = "0lprqpdrimrkdd2jmvbp9lpjnknr7a9bpiwh0rcx1jp5f777xfys"; + buildDepends = [ base containers ghc-prim mtl transformers ]; homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan-hoopl" = callPackage - ({ mkDerivation, base, containers, free, hoopl, hspec - , hspec-expectations, lens-family-core, linearscan, transformers + ({ mkDerivation, base, containers, deepseq, free, fuzzcheck, hoopl + , hspec, hspec-expectations, lens-family-core, linearscan + , QuickCheck, tardis, transformers }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.4.0.1"; - sha256 = "0b8p1ij5rsap4z7cfs5byrn2ixm997ppl3z41m82kmk1vzsj04my"; + version = "0.6.0.0"; + sha256 = "0sag9590df05fs46fv846hqwwiab85i9dsx4xn4y9w4islxi8hkb"; buildDepends = [ - base containers free hoopl linearscan transformers + base containers free hoopl linearscan QuickCheck tardis + transformers ]; testDepends = [ - base containers hoopl hspec hspec-expectations lens-family-core - linearscan transformers + base containers deepseq fuzzcheck hoopl hspec hspec-expectations + lens-family-core linearscan QuickCheck tardis transformers ]; - jailbreak = true; homepage = "http://github.com/jwiegley/linearscan-hoopl"; description = "Makes it easy to use the linearscan register allocator with Hoopl"; license = stdenv.lib.licenses.bsd3; @@ -81424,7 +81968,6 @@ self: { homepage = "https://github.com/hlian/linklater"; description = "The fast and fun way to write Slack.com bots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linux-blkid" = callPackage @@ -81676,6 +82219,7 @@ self: { version = "0.1.0.2"; sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c"; buildDepends = [ base QuickCheck ]; + jailbreak = true; description = "Generators for random sequences of English-like nonsense text"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81684,13 +82228,13 @@ self: { ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty - , process, syb, text, text-format, transformers - , unordered-containers + , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format + , transformers, unordered-containers, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.2.3.2"; - sha256 = "0gm2cy4a1l6kh65cwj3ssv9r9ry4nk2sjr3cqhkp5i7mhmpc6q58"; + version = "0.3.0.1"; + sha256 = "00s5ch8i96nqjy2kq6y3i25mji3ld6z8121ngpbz87zbgp3zwhaw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81699,12 +82243,16 @@ self: { intern mtl parsec pretty process syb text text-format transformers unordered-containers ]; - buildTools = [ ocaml ]; + testDepends = [ + base directory filepath process tasty tasty-hunit tasty-rerun text + ]; + buildTools = [ ocaml z3 ]; configureFlags = [ "-fbuild-external" ]; homepage = "https://github.com/ucsd-progsys/liquid-fixpoint"; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) ocaml;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) { inherit (pkgs) ocaml; inherit (pkgs) z3;}; "liquidhaskell" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors @@ -81713,12 +82261,12 @@ self: { , hashable, hpc, hscolour, intern, liquid-fixpoint, mtl , optparse-applicative, parsec, pretty, process, syb, tagged, tasty , tasty-hunit, tasty-rerun, template-haskell, text, time - , unordered-containers, vector + , unordered-containers, vector, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.3.1.0"; - sha256 = "0dcrgbwchssp62n8ywkdfa70dvx186338s3gyyj7rlfvxilfqc7k"; + version = "0.4.1.1"; + sha256 = "1yxg6zii0mbsri5j37k2s976nyglijyjfgz9vwafiqdrca328z4s"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81732,12 +82280,12 @@ self: { base directory filepath optparse-applicative process tagged tasty tasty-hunit tasty-rerun ]; - doCheck = false; + buildTools = [ z3 ]; homepage = "http://goto.ucsd.edu/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) z3;}; "lispparser" = callPackage ({ mkDerivation, base, parsec }: @@ -81754,8 +82302,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-extras"; - version = "0.4.1.3"; - sha256 = "16w10xgh2y76q8aj5pgw4zq5p2phjzf5g1bmkacrm8gbwkp4v71s"; + version = "0.4.1.4"; + sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Common not-so-common functions for lists"; @@ -81823,7 +82371,6 @@ self: { ]; description = "List all remote forwards for mail accounts stored in a SQL database"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t" = callPackage @@ -81839,6 +82386,7 @@ self: { transformers-base ]; testDepends = [ base-prelude HTF mmorph mtl-prelude ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t"; description = "ListT done right"; license = stdenv.lib.licenses.mit; @@ -81912,8 +82460,8 @@ self: { }: mkDerivation { pname = "list-t-libcurl"; - version = "0.2.0.2"; - sha256 = "1scvspy8kdyqyv2iv0alnh9qal5dlxy3pbcz5k7ib0v02acj9jhz"; + version = "0.3.0.0"; + sha256 = "1hcgxr87q7k6ixisj4p4gghm7nqb1l7bg361rcnqxf1145xmyyr5"; buildDepends = [ base base-prelude bytestring curlhs either list-t mtl-prelude resource-pool stm @@ -81984,10 +82532,9 @@ self: { ({ mkDerivation, base, exceptions }: mkDerivation { pname = "listsafe"; - version = "0.1.0.0"; - sha256 = "0mkyhanay0zr318cc01wgp4qxwpqj1wzydqlq7c12hbfrjb1ah4b"; + version = "0.1.0.1"; + sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs"; buildDepends = [ base exceptions ]; - jailbreak = true; homepage = "https://github.com/ombocomp/listsafe"; description = "Safe wrappers for partial list functions, supporting MonadThrow"; license = stdenv.lib.licenses.asl20; @@ -82590,8 +83137,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.1.1"; - sha256 = "0kzziark5y41ig6z3qaa66x5avibwp6k74qcs9jf38hnl9z74pfr"; + version = "0.2.0"; + sha256 = "1mm41m8vg7n6hnnrg47qy2pbhsxgykclz3wypjsf1zj5wbqdd2w0"; buildDepends = [ aeson aeson-pretty base bytestring deepseq exceptions hpqtypes monad-control monad-time mtl old-locale split stm text time @@ -82610,8 +83157,8 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.10.0.1"; - sha256 = "04k7k8p1p8fgzyms21ry4qf1l987k3pvs673sq9rh1h6hmk9bsg2"; + version = "0.10.1"; + sha256 = "0gbs902l5fh5pqhcj31g0a5d2irjx11sw3jhk69c9hcfssclnd8h"; buildDepends = [ base binary bytes cereal comonad deepseq distributive generic-deriving hashable hashable-extras safecopy semigroupoids @@ -82664,8 +83211,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.3"; - sha256 = "0m1d0g14p6yb4g4irhisfchx3241b2vlm4g527rhwpr8lxd3fqzp"; + version = "0.13.3.1"; + sha256 = "0rqnp2zkp247sb3parn3ywsk9clasy4l906a1wyrrybc3p72126s"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -82706,7 +83253,6 @@ self: { testDepends = [ base hspec monad-logger unix ]; description = "Simplified logging in IO for application writers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage @@ -82749,8 +83295,8 @@ self: { }: mkDerivation { pname = "logic-TPTP"; - version = "0.4.2.0"; - sha256 = "1pqs0hr05b4jsnf73fqfgqng3h63dlswlx18142fbkv1bhphg8al"; + version = "0.4.3.0"; + sha256 = "0hjznn92ippwgrsmklj02w2pf6dfylyiw1kifa4svjqwa9mx4hpv"; buildDepends = [ ansi-wl-pprint array base containers mtl pointed QuickCheck syb transformers transformers-compat @@ -82758,7 +83304,6 @@ self: { buildTools = [ alex happy ]; description = "Import, export etc. for TPTP, a syntax for first-order logic"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logic-classes" = callPackage @@ -83179,14 +83724,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ltext" = callPackage + ({ mkDerivation, aeson, base, composition, composition-extra + , containers, data-default, directory, hspec, mtl + , optparse-applicative, parsec, pretty, text, transformers, yaml + }: + mkDerivation { + pname = "ltext"; + version = "0.0.0.1"; + sha256 = "1qz4gpdfjqrq6rgbf3zqcmwkf0x0kphnpr4y7q47wb12wq7xaqa1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base composition composition-extra containers data-default + directory mtl optparse-applicative parsec pretty text transformers + yaml + ]; + testDepends = [ base hspec ]; + description = "Higher-order file applicator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ltk" = callPackage ({ mkDerivation, base, Cabal, containers, filepath, ghc, glib, gtk3 , mtl, parsec, pretty, text, transformers }: mkDerivation { pname = "ltk"; - version = "0.15.0.0"; - sha256 = "1hl9cbr8n2nczsz8gkd4lkcmf3bhzcji82p8ym176abzyz2i3h09"; + version = "0.15.0.1"; + sha256 = "0qw689ip8kibczjvar6bicns6g8a0zwlb6vdcmpicxxmpr1p7g16"; buildDepends = [ base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text transformers @@ -83282,7 +83848,9 @@ self: { mkDerivation { pname = "lucid"; version = "2.9.2"; + revision = "1"; sha256 = "0r3bzh9pmcqsac5id064jcscn9x2pyfhpazdzvz0666smf4b9jah"; + editedCabalFile = "62ded561d5846fbcbe77e7f491c5fed2f4beddbf5cda336685f3d980df525218"; buildDepends = [ base blaze-builder bytestring containers hashable mtl text transformers unordered-containers @@ -83617,10 +84185,10 @@ self: { }: mkDerivation { pname = "machines"; - version = "0.4.1"; + version = "0.5.1"; revision = "1"; - sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; - editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; + sha256 = "1dyvyy0yv9qha1ff2nfrl304vmmbi4hd881jyj3xpqhgc3zz8ab2"; + editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d"; buildDepends = [ base comonad containers free mtl pointed profunctors semigroups transformers void @@ -83629,7 +84197,6 @@ self: { homepage = "http://github.com/ekmett/machines/"; description = "Networked stream transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-directory" = callPackage @@ -83638,16 +84205,14 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.0"; - sha256 = "1b1jv23ijhm51nggxrncjhz24k4pl4nvj6s9h3jabr0gsnsb8y2v"; + version = "0.2.0.6"; + sha256 = "03faha5zbxikbrz40wb0qar8qyjkzaylnk78ba925vms57dwwxva"; buildDepends = [ base directory filepath machines machines-io transformers ]; - jailbreak = true; - homepage = "http://github.com/aloiscochard/machines-io"; + homepage = "http://github.com/aloiscochard/machines-directory"; description = "Directory (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-io" = callPackage @@ -83656,15 +84221,14 @@ self: { }: mkDerivation { pname = "machines-io"; - version = "0.2.0.0"; - sha256 = "0qjbfwyhscjmjbfj709kb9xr5p3yz4v21aq2g4dv1abqwgf85x03"; + version = "0.2.0.6"; + sha256 = "19xi9ia2f18nwqx58qb4l1hc2cv25jwcsl4qxd7snp4ynjyy6ln1"; buildDepends = [ base bytestring chunked-data machines transformers ]; homepage = "http://github.com/aloiscochard/machines-io"; description = "IO utilities for the machines library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-process" = callPackage @@ -83672,13 +84236,12 @@ self: { }: mkDerivation { pname = "machines-process"; - version = "0.2.0.0"; - sha256 = "028l6hijabrgnn5klm1bv35h2z2qmm1r49bj1bvvaffhn5fdpz7y"; + version = "0.2.0.4"; + sha256 = "1v0jskb8m1s7cd51672v4fj9sjy5l1q01vm6qyvkrsabjp04lq4l"; buildDepends = [ base chunked-data machines machines-io process ]; - homepage = "http://github.com/aloiscochard/machines-io"; + homepage = "http://github.com/aloiscochard/machines-process"; description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-zlib" = callPackage @@ -83693,7 +84256,6 @@ self: { homepage = "https://github.com/lshift/machines-zlib"; description = "Decompression support for machines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "macho" = callPackage @@ -83749,7 +84311,7 @@ self: { }) {}; "mage" = callPackage - ({ mkDerivation, array, base, containers, curses, mtl, random }: + ({ mkDerivation, array, base, containers, mtl, ncurses, random }: mkDerivation { pname = "mage"; version = "1.1.0"; @@ -83757,12 +84319,12 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ array base containers mtl random ]; - extraLibraries = [ curses ]; + extraLibraries = [ ncurses ]; homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz"; description = "Rogue-like"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { curses = null;}; + }) { inherit (pkgs) ncurses;}; "magic" = callPackage ({ mkDerivation, base, magic }: @@ -83784,6 +84346,7 @@ self: { version = "0.3.0.0"; sha256 = "0bk4a9kw2jxvvz81ppj6qh3kk8cbknnqmg6vvkd0kpn70rcx0hnv"; buildDepends = [ base deepseq profunctors semigroups ]; + jailbreak = true; homepage = "https://github.com/cutsea110/magma"; description = "magma is an algebraic structure consisting a set together with an binary operation"; license = stdenv.lib.licenses.bsd3; @@ -83830,7 +84393,6 @@ self: { homepage = "https://github.com/nfjinjing/maid"; description = "A simple static web server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mailbox-count" = callPackage @@ -83855,7 +84417,6 @@ self: { ]; description = "Count mailboxes in a SQL database"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mailchimp-subscribe" = callPackage @@ -83872,6 +84433,7 @@ self: { aeson base http-client http-client-tls http-types reflection scotty text transformers wai-extra ]; + jailbreak = true; homepage = "https://github.com/mietek/mailchimp-subscribe/"; description = "MailChimp subscription request handler"; license = stdenv.lib.licenses.mit; @@ -83904,7 +84466,9 @@ self: { mkDerivation { pname = "mainland-pretty"; version = "0.2.7.2"; + revision = "1"; sha256 = "0spn95apa05bx2akcl13kmg0vlyyakca3jx1960ja4z9dm9lwadd"; + editedCabalFile = "e766e6766217250919472995c93de5f98496d1b03d73d498668400408f845ee6"; buildDepends = [ base containers srcloc text ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Pretty printing designed for printing source code"; @@ -83979,7 +84543,6 @@ self: { homepage = "https://github.com/Philonous/make-package"; description = "Make a cabalized package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "makedo" = callPackage @@ -84408,9 +84971,9 @@ self: { aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit tasty-quickcheck text ]; + jailbreak = true; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mandulia" = callPackage @@ -84443,8 +85006,8 @@ self: { }: mkDerivation { pname = "mangopay"; - version = "1.11"; - sha256 = "1ipw08z1p4kl9b682jl061g87df8kljxn4cdbfz6fx7g82ab58g3"; + version = "1.11.1"; + sha256 = "0yiy432i4pbq4wd2p52f060qb9wbqqfrw4fv6li0w3ls668pc6pc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -84529,20 +85092,20 @@ self: { "markdown" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , conduit, conduit-extra, containers, data-default, hspec - , system-fileio, system-filepath, text, transformers, xss-sanitize + , conduit, conduit-extra, containers, data-default, directory + , filepath, hspec, text, transformers, xss-sanitize }: mkDerivation { pname = "markdown"; - version = "0.1.13.1"; - sha256 = "0b10cvz5yryzrzfg2j0pikhfxcly7x4hfmjwnwycs4hy97h2rdnq"; + version = "0.1.13.2"; + sha256 = "15aiwjs006g8aajw88rgfvrpcwaxml9hnpz7jrhmdm2pqxfrkb8z"; buildDepends = [ attoparsec base blaze-html blaze-markup conduit conduit-extra containers data-default text transformers xss-sanitize ]; testDepends = [ - base blaze-html conduit conduit-extra containers hspec - system-fileio system-filepath text transformers + base blaze-html conduit conduit-extra containers directory filepath + hspec text transformers ]; homepage = "https://github.com/snoyberg/markdown"; description = "Convert Markdown to HTML, with XSS protection"; @@ -84623,15 +85186,15 @@ self: { }) {}; "marked-pretty" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, ghc-prim }: mkDerivation { pname = "marked-pretty"; - version = "0.1"; - sha256 = "0xwymfwja9fh4wgqpqczi9zrn9bynxy069sfcg5d14zd5j54zy8w"; - isLibrary = true; - isExecutable = true; - buildDepends = [ base ]; - description = "Pretty-printing library, with scoping, based on pretty-1.0.0.0"; + version = "1.1.2.1"; + sha256 = "01dsqdckrm93ydc5frsxj55vgj238213qr31n1iybjdmw5x2r0dl"; + buildDepends = [ base deepseq ghc-prim ]; + testDepends = [ base ]; + homepage = "https://github.com/ku-fpg/marked-pretty"; + description = "Pretty-printing library, with scoping, based on pretty"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -84674,15 +85237,16 @@ self: { }) {}; "markup" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, hspec, lucid, mtl - , text, transformers, urlpath + ({ mkDerivation, base, blaze-html, blaze-markup, comonad, hspec + , lucid, mtl, text, transformers, urlpath }: mkDerivation { pname = "markup"; - version = "0.0.7"; - sha256 = "0rzq7gpwaq7x7q9qcjfyybviydcp0map3ikxbci3379g1hikfan4"; + version = "1.1.0"; + sha256 = "0p037nq20vdbrvn29n3xlaval98fs0lml3y5h0j9fy04x6zcdkz8"; buildDepends = [ - base blaze-html blaze-markup lucid mtl text transformers urlpath + base blaze-html blaze-markup comonad lucid mtl text transformers + urlpath ]; testDepends = [ base hspec ]; description = "Abstraction for markup languages"; @@ -84789,6 +85353,7 @@ self: { jailbreak = true; description = "Markup language preprocessor for Haskell"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "masakazu-bot" = callPackage @@ -84904,6 +85469,7 @@ self: { jailbreak = true; description = "Discover your (academic) ancestors!"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathlink" = callPackage @@ -84949,7 +85515,6 @@ self: { testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matrix" = callPackage @@ -84959,7 +85524,9 @@ self: { mkDerivation { pname = "matrix"; version = "0.3.4.3"; + revision = "1"; sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg"; + editedCabalFile = "f586a9d89c7279218a0436d0b8a6adaabc22414caca30774904821bd40cc5ace"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A native implementation of matrix operations"; @@ -85160,6 +85727,7 @@ self: { buildDepends = [ base containers hakaru hmatrix mwc-random primitive statistics ]; + jailbreak = true; description = "Combinators for MCMC sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85202,6 +85770,7 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal base directory pandoc terminfo ]; + jailbreak = true; homepage = "https://github.com/dorafmon/mdcat"; description = "Markdown viewer in your terminal"; license = stdenv.lib.licenses.mit; @@ -85293,16 +85862,17 @@ self: { "meep" = callPackage ({ mkDerivation, base, bifunctors, doctest, hspec - , hspec-expectations-lens, lens, QuickCheck, semigroups + , hspec-expectations-lens, lens, QuickCheck, semigroupoids + , semigroups }: mkDerivation { pname = "meep"; - version = "0.1.1.0"; - sha256 = "1rk5mrvmk07m5zdayfvxirak58d1bxwb04sgg0gcx07w8q8k4yyq"; - buildDepends = [ base bifunctors lens semigroups ]; + version = "0.1.2.0"; + sha256 = "1jr3zgja3m40ajygi1jqsxfwhsf7yf0lwblffd8z096w67pn4idr"; + buildDepends = [ base bifunctors lens semigroupoids semigroups ]; testDepends = [ base bifunctors doctest hspec hspec-expectations-lens lens - QuickCheck semigroups + QuickCheck semigroupoids semigroups ]; description = "A silly container"; license = stdenv.lib.licenses.bsd3; @@ -85370,8 +85940,10 @@ self: { }: mkDerivation { pname = "memcache"; - version = "0.0.1"; - sha256 = "1fzppfyizli64g7dwsdayn5qlbxi8fp1cwwxgw391w5gl07h228f"; + version = "0.1.0.0"; + revision = "1"; + sha256 = "1x2lw802m02p9z28rsmvwczsax9f6vl16p9kwjq4zmn8ak0s74m5"; + editedCabalFile = "6e2508fa18aae99fee1c0aa41cc86e97d73ff504647b5265e54adf3566ca81e7"; buildDepends = [ base binary blaze-builder bytestring hashable network resource-pool time vector vector-algorithms @@ -85424,7 +85996,6 @@ self: { ]; description = "Memcache procotol library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memcached" = callPackage @@ -85503,6 +86074,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.5"; + sha256 = "0lz3w1faxlgyx0sc7nk5wg83zfks5595mxmlrspmbd4d85jk4nvh"; + buildDepends = [ base bytestring deepseq ghc-prim ]; + testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abtraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memscript" = callPackage ({ mkDerivation, base, readline }: mkDerivation { @@ -85700,8 +86287,8 @@ self: { }: mkDerivation { pname = "metrics"; - version = "0.2.1.0"; - sha256 = "1q3j4ssij3v688yhn0zzs1bvyp21p0vnp2760qbvha1a7g0m8gif"; + version = "0.3.0.0"; + sha256 = "1g1nxb7q834nslrmgmqarbbq3ah60k2fqj71k55z9dj4waqgx2sg"; buildDepends = [ ansi-terminal base bytestring containers lens mtl mwc-random primitive text time unix unordered-containers vector @@ -85905,6 +86492,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "midi-music-box" = callPackage + ({ mkDerivation, base, containers, diagrams-lib + , diagrams-postscript, event-list, midi, non-empty + , optparse-applicative, utility-ht + }: + mkDerivation { + pname = "midi-music-box"; + version = "0.0"; + sha256 = "0hnlnjgn378mkrhky8fvpzs6i34s3n6lx81mf3hnxmb1vgwy2nmf"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers diagrams-lib diagrams-postscript event-list midi + non-empty optparse-applicative utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/midi-music-box"; + description = "Convert MIDI file to music box punch tape"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "midi-util" = callPackage ({ mkDerivation, base, containers, event-list, midi, non-negative }: @@ -85937,7 +86544,6 @@ self: { homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midisurface" = callPackage @@ -86372,8 +86978,8 @@ self: { }: mkDerivation { pname = "miniutter"; - version = "0.4.4.1"; - sha256 = "1raq5dq6mx56ddyq5hnh9r2yflry6prcjf17p15ds1w5r8cp8yx1"; + version = "0.4.4.2"; + sha256 = "1nr08cm6qrww01sqxvr4bmkhxxihcl9sm8077gl25alj1s3gq21s"; buildDepends = [ base binary containers ghc-prim minimorph text ]; testDepends = [ base containers HUnit test-framework test-framework-hunit text @@ -86383,6 +86989,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "minst-idx" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, hspec, vector + }: + mkDerivation { + pname = "minst-idx"; + version = "0.1.2.2"; + sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv"; + buildDepends = [ base binary bytestring vector ]; + testDepends = [ base binary directory hspec vector ]; + homepage = "https://github.com/kryoxide/minst-idx/"; + description = "Read and write IDX data that is used in e.g. the MINST database."; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mirror-tweet" = callPackage ({ mkDerivation, authenticate-oauth, base, bytestring, conduit , lens, monad-logger, text, transformers, twitter-conduit @@ -86605,13 +87225,14 @@ self: { }) {}; "mockery" = callPackage - ({ mkDerivation, base, directory, hspec, temporary }: + ({ mkDerivation, base, directory, hspec, logging-facade, temporary + }: mkDerivation { pname = "mockery"; - version = "0.1.0"; - sha256 = "0jl2561jknvp86anccw6pwy8w95jnxm635jpsal47y90mdjf1qbl"; - buildDepends = [ base directory temporary ]; - testDepends = [ base directory hspec temporary ]; + version = "0.2.0"; + sha256 = "18a9zz964crhjb1xdzv38pwg458lxajhvjpqd08klb1w7kh57hlj"; + buildDepends = [ base directory logging-facade temporary ]; + testDepends = [ base directory hspec logging-facade temporary ]; description = "Support functions for automated testing"; license = stdenv.lib.licenses.mit; }) {}; @@ -86699,6 +87320,7 @@ self: { homepage = "https://github.com/DanBurton/modular-prelude#readme"; description = "A new Prelude featuring first class modules"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modular-prelude-classy" = callPackage @@ -86793,7 +87415,6 @@ self: { homepage = "https://github.com/nfjinjing/moe"; description = "html with style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mohws" = callPackage @@ -87017,8 +87638,8 @@ self: { }: mkDerivation { pname = "monad-journal"; - version = "0.7"; - sha256 = "1bfm5p027vf8dz92m6s47z06h05j2jv4pbwkl31svrz5pi5a9lz2"; + version = "0.7.1"; + sha256 = "1bfj9yy7hkixii31fbxdydjwx9ln6snm40w6l5vph2skcrms9bvr"; buildDepends = [ base either monad-control mtl transformers transformers-base ]; @@ -87317,6 +87938,7 @@ self: { version = "4.0.0.1"; sha256 = "017cxiavxfw0f08sr0d6m3avla1lplmdj51rxpf1103ripq20r53"; buildDepends = [ base semigroupoids ]; + jailbreak = true; homepage = "http://github.com/ekmett/monad-products"; description = "Monad products"; license = stdenv.lib.licenses.bsd3; @@ -87352,8 +87974,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "monad-skeleton"; - version = "0.1.1"; - sha256 = "14rwxhjkp3msycrpxna0sdyfyy6r8v7rqrz476p07gsmd6avpsrx"; + version = "0.1.2"; + sha256 = "13lkbbvajfl4lr6r5plmxvqk6bxn7mp6acsyfxwh2yr6krzdlb82"; buildDepends = [ base containers ghc-prim ]; homepage = "https://github.com/fumieval/monad-skeleton"; description = "An undead monad"; @@ -87788,8 +88410,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.0.4"; - sha256 = "1gcv2vzmg6vllvpl8pzfkwmf4rqwldz4p0l4gl78hixbbilx0pgy"; + version = "2.0.5"; + sha256 = "09ysw5sp7x8pyfsjj1qgfq3wm8l0cpxkv9g9x117iss04bfk0p3h"; buildDepends = [ array base binary bson bytestring containers cryptohash hashtables lifted-base monad-control mtl network parsec random random-shuffle @@ -87879,7 +88501,9 @@ self: { mkDerivation { pname = "mono-traversable"; version = "0.9.1"; + revision = "1"; sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc"; + editedCabalFile = "28392123a8b245f7bc2c13bb63f5c3008118ed38e107cf0534be37461fb64daf"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -87898,8 +88522,8 @@ self: { ({ mkDerivation, base, groups, semigroupoids, semigroups }: mkDerivation { pname = "monoid-extras"; - version = "0.4.0.0"; - sha256 = "0j8lc03zamxplyw5k8kv8qa78j5xkmf581rz4iw2v9qhbx66cfpx"; + version = "0.4.0.1"; + sha256 = "0jcyjqmk4s64j05qisvibmy87m5xi5n837wsivq7lml8lfyrj7yf"; buildDepends = [ base groups semigroupoids semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = stdenv.lib.licenses.bsd3; @@ -87981,6 +88605,7 @@ self: { buildDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; + jailbreak = true; homepage = "http://github.com/bgamari/monoidal-containers"; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; @@ -88021,8 +88646,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monomorphic"; - version = "0.0.3.2"; - sha256 = "13zw506wifz2lf7n4a48rkn7ym44jpiqag21zc1py6xxdlkbrhh2"; + version = "0.0.3.3"; + sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln"; buildDepends = [ base ]; homepage = "https://github.com/konn/monomorphic"; description = "Library to convert polymorphic datatypes to/from its monomorphic represetation"; @@ -88178,18 +88803,21 @@ self: { }) { morfeusz = null;}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, deepseq, happy - , lens-family-core, optparse-applicative, pipes, text, transformers + ({ mkDerivation, alex, array, base, binary, containers, deepseq + , happy, http-client, http-client-tls, lens-family-core, managed + , optparse-applicative, pipes, system-fileio, system-filepath, text + , text-format, transformers }: mkDerivation { pname = "morte"; - version = "1.1.2"; - sha256 = "1rz15nmzagwngjd15kd25vnrpz3br23kmjzf558qp61bxlhflybc"; + version = "1.2.0"; + sha256 = "0mr2aaf4r15ysmymqixd592z5w56973qv8ww1d7vkyvj851gfm01"; isLibrary = true; isExecutable = true; buildDepends = [ - array base binary deepseq lens-family-core optparse-applicative - pipes text transformers + array base binary containers deepseq http-client http-client-tls + lens-family-core managed optparse-applicative pipes system-fileio + system-filepath text text-format transformers ]; buildTools = [ alex happy ]; jailbreak = true; @@ -88204,8 +88832,8 @@ self: { }: mkDerivation { pname = "mosaico-lib"; - version = "0.1.0.0"; - sha256 = "0jk1x7jwcx8ackapz91v6apwvwjlhjx36j2pr9ayriyl3s00q0vq"; + version = "0.1.1.0"; + sha256 = "1qcr3l1a422fh5226443dc8p6hvrr9wbhri6mk2pcw7zyfd5xr0b"; buildDepends = [ base base-unicode-symbols colour diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm @@ -88411,7 +89039,6 @@ self: { testDepends = [ base bytestring QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://msgpack.org/"; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; @@ -88720,6 +89347,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "muesli" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, directory + , filepath, hashable, mtl, psqueues, time + }: + mkDerivation { + pname = "muesli"; + version = "0.1.1.0"; + sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w"; + buildDepends = [ + base bytestring cereal containers directory filepath hashable mtl + psqueues time + ]; + homepage = "https://github.com/clnx/muesli"; + description = "A simple document-oriented database"; + license = stdenv.lib.licenses.mit; + }) {}; + "mueval" = callPackage ({ mkDerivation, base, Cabal, containers, directory , extensible-exceptions, filepath, hint, mtl, process, show @@ -89041,6 +89685,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo"; description = "MUtually Recursive Definitions Explicitly Represented"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "murmur-hash" = callPackage @@ -89458,8 +90103,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.0.4"; - sha256 = "0mbbcjcvd05ql76ys5fmsr57aif1bysasz91rvmp795a9wj3i83i"; + version = "1.0.5"; + sha256 = "1lrq0nkxi0ljs6pxf7p4awhrf9ix9dqwvwsydph6fw356ypc39r2"; buildDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -89524,13 +90169,14 @@ self: { }: mkDerivation { pname = "mwc-random-monad"; - version = "0.7.3.0"; - sha256 = "16l42xybkkp99qvv8ilcxqvzzmvhrwx974n38yxj27yy74ds3rk5"; + version = "0.7.3.1"; + sha256 = "0h4ljwwhqg4yy513lqk2ix0m9q2hmk276hgfrc6n3ja6wqbpkwyh"; buildDepends = [ base monad-primitive mwc-random primitive transformers vector ]; description = "Monadic interface for mwc-random"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "myTestlll" = callPackage @@ -89639,7 +90285,6 @@ self: { homepage = "https://github.com/ibotty/mysql-effect"; description = "An extensible mysql effect using extensible-effects and mysql-simple"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple" = callPackage @@ -89677,16 +90322,15 @@ self: { }) {}; "mysql-simple-typed" = callPackage - ({ mkDerivation, base, haskell-src-meta, mysql, mysql-simple - , template-haskell, typedquery, utf8-string + ({ mkDerivation, base, mysql, mysql-simple, template-haskell + , typedquery, utf8-string }: mkDerivation { pname = "mysql-simple-typed"; - version = "0.1.1.1"; - sha256 = "0cizs7c51884j05409nc8ldzlsbjcwpwc1ral1p1g1c98y1mpkcc"; + version = "0.1.1.2"; + sha256 = "19wnvmrb523n8xl5cp9kypcqcrs0xs8pwdk771y1bdin5ds9j095"; buildDepends = [ - base haskell-src-meta mysql mysql-simple template-haskell - typedquery utf8-string + base mysql mysql-simple template-haskell typedquery utf8-string ]; homepage = "https://github.com/tolysz/mysql-simple-typed"; description = "Typed extension to mysql simple"; @@ -89727,8 +90371,8 @@ self: { }: mkDerivation { pname = "nagios-check"; - version = "0.2.1"; - sha256 = "0qnzdljrdwzrsfapm2d6ykz2xzdhq5hzxy51gixsbmlvknglx5bh"; + version = "0.3.1"; + sha256 = "17ww3n2y6cmjc3n05cra43csk60sm5s07q2mn3zq1sjiiq2cw82c"; buildDepends = [ base bifunctors exceptions mtl nagios-perfdata text ]; @@ -89881,18 +90525,18 @@ self: { }) {}; "nanocurses" = callPackage - ({ mkDerivation, base, bytestring, curses, unix }: + ({ mkDerivation, base, bytestring, ncurses, unix }: mkDerivation { pname = "nanocurses"; version = "1.5.2"; sha256 = "04kgf3vvjdx6d1fmfzp0xy5x42zlg0ij59ayi1zhz8hkwsfn5g1m"; buildDepends = [ base bytestring unix ]; - extraLibraries = [ curses ]; + extraLibraries = [ ncurses ]; homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html"; description = "Simple Curses binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { curses = null;}; + }) { inherit (pkgs) ncurses;}; "nanomsg" = callPackage ({ mkDerivation, base, bytestring, nanomsg }: @@ -90104,6 +90748,7 @@ self: { array base bytestring cereal HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text zlib ]; + jailbreak = true; homepage = "https://github.com/acfoltzer/nbt"; description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format"; license = stdenv.lib.licenses.bsd3; @@ -90143,7 +90788,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-ncurses/"; description = "Modernised bindings to GNU ncurses"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) ncurses;}; "neat" = callPackage @@ -90166,8 +90810,8 @@ self: { }: mkDerivation { pname = "neat-interpolation"; - version = "0.2.2"; - sha256 = "0hjv33gpikfiwfhzna35bxiqh62d54776d3ahfb98dxfrjijl20c"; + version = "0.2.2.1"; + sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy"; buildDepends = [ base base-prelude parsec template-haskell ]; testDepends = [ base-prelude HTF ]; jailbreak = true; @@ -90259,7 +90903,6 @@ self: { homepage = "http://github.com/nfjinjing/nemesis"; description = "a task management tool for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nemesis-titan" = callPackage @@ -90354,25 +90997,29 @@ self: { "nested-routes" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , 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 + , clay, composition, constraints, containers, hspec, hspec-wai + , http-media, http-types, lucid, mtl, poly-arity, pred-trie + , regex-compat, semigroups, shakespeare, text, transformers, wai + , wai-extra, wai-util, warp, witherable }: mkDerivation { pname = "nested-routes"; - version = "1.0.0.1"; - sha256 = "04j11mamfpmc0isnxpss6b8qf21mlfs3ndpb8xbdcbcs9hp0xrrq"; + version = "2.2.0"; + sha256 = "01daa0hhwgpp33sq1nlgnbkmn15ca8861qf6d7j5ypb9f48c6jr1"; buildDepends = [ 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 ]; + testDepends = [ + aeson attoparsec base blaze-html bytestring composition constraints + containers hspec hspec-wai http-media http-types lucid mtl + poly-arity pred-trie regex-compat semigroups shakespeare text + transformers wai wai-util warp witherable + ]; description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nested-sets" = callPackage @@ -90443,6 +91090,7 @@ self: { homepage = "http://frenetic-lang.org"; description = "The NetCore compiler and runtime system for OpenFlow networks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netlines" = callPackage @@ -90613,6 +91261,7 @@ self: { jailbreak = true; description = "FRP for controlling networks of OpenFlow switches"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nettle-netkit" = callPackage @@ -90628,6 +91277,7 @@ self: { ]; description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nettle-openflow" = callPackage @@ -90644,6 +91294,7 @@ self: { ]; description = "OpenFlow protocol messages, binary formats, and servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire" = callPackage @@ -90660,6 +91311,7 @@ self: { base containers deepseq parallel profunctors random semigroups time transformers ]; + jailbreak = true; homepage = "http://hub.darcs.net/ertes/netwire"; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; @@ -90700,8 +91352,8 @@ self: { }: mkDerivation { pname = "network"; - version = "2.6.1.0"; - sha256 = "0nx85kvrzjm258qr5blphli44gipc7nvxgvbyq8ifv42ll6w6jdj"; + version = "2.6.2.0"; + sha256 = "0szkzllpc6vs72fz7nykf5y7vc8mvqfv6h4sshfwmdazl2zv03n5"; buildDepends = [ base bytestring unix ]; testDepends = [ base bytestring HUnit test-framework test-framework-hunit @@ -90755,6 +91407,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-anonymous-tor" = callPackage + ({ mkDerivation, attoparsec, base, base32string, bytestring + , exceptions, hexstring, hspec, hspec-attoparsec + , hspec-expectations, network, network-attoparsec, network-simple + , socks, text, transformers + }: + mkDerivation { + pname = "network-anonymous-tor"; + version = "0.9.0"; + sha256 = "02ywcdjrrjivzmzj22nxx81xkcxplhcaxpz21196r3kni8qhi0h0"; + buildDepends = [ + attoparsec base base32string bytestring exceptions hexstring + network network-attoparsec network-simple socks text transformers + ]; + testDepends = [ + attoparsec base base32string bytestring exceptions hspec + hspec-attoparsec hspec-expectations network network-simple socks + text transformers + ]; + homepage = "http://www.leonmergen.com/opensource.html"; + description = "Haskell API for Tor anonymous networking"; + license = stdenv.lib.licenses.mit; + }) {}; + "network-api-support" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, http-client, http-client-tls, http-types, text @@ -90772,7 +91448,6 @@ self: { homepage = "https://github.com/markhibberd/network-api-support"; description = "Toolkit for building http client libraries over Network.Http.Conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-attoparsec" = callPackage @@ -90879,17 +91554,16 @@ self: { "network-conduit-tls" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , connection, cprng-aes, data-default, HUnit, monad-control, mtl - , network, streaming-commons, system-fileio, system-filepath, tls - , transformers + , network, streaming-commons, tls, transformers }: mkDerivation { pname = "network-conduit-tls"; - version = "1.1.2"; - sha256 = "0y3cqvakc676xdzc1hg9afv6aqzvj2pp4pci6cgs4bmm3kc3chfs"; + version = "1.2.0"; + sha256 = "16x334ly9lgrdp9prc9aqjraigqzlgsi9607alaj2pf2qbqa0ipg"; buildDepends = [ base bytestring conduit conduit-extra connection cprng-aes - data-default monad-control network streaming-commons system-fileio - system-filepath tls transformers + data-default monad-control network streaming-commons tls + transformers ]; testDepends = [ base bytestring conduit conduit-extra connection HUnit mtl @@ -90917,15 +91591,14 @@ self: { }) {}; "network-data" = callPackage - ({ mkDerivation, base, bytestring, cereal, pretty, prettyclass }: + ({ mkDerivation, base, bytestring, cereal, pretty }: mkDerivation { pname = "network-data"; - version = "0.5.2"; - sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s"; - buildDepends = [ base bytestring cereal pretty prettyclass ]; + version = "0.5.3"; + sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz"; + buildDepends = [ base bytestring cereal pretty ]; description = "Library for network data structures and their serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-dbus" = callPackage @@ -91006,8 +91679,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-info"; - version = "0.2.0.5"; - sha256 = "0ggxnkjkbspynma0wjrc1wwwb9ygx2dhl0n9lfaq7l8r69z7pqwf"; + version = "0.2.0.6"; + sha256 = "1ymi2cw3914wvinw0wssmq8m2j4g92q1sd5vi9dxfyb7lrj1gga7"; buildDepends = [ base ]; homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; @@ -91154,7 +91827,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-rpca" = callPackage @@ -91432,6 +92104,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-uri-static" = callPackage + ({ mkDerivation, base, doctest, network-uri, template-haskell }: + mkDerivation { + pname = "network-uri-static"; + version = "0.1.0.0"; + sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9"; + buildDepends = [ base network-uri template-haskell ]; + testDepends = [ base doctest ]; + homepage = "http://github.com/snakamura/network-uri-static"; + description = "A small utility to declare type-safe static URIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "network-wai-router" = callPackage ({ mkDerivation, base, wai }: mkDerivation { @@ -91496,8 +92181,8 @@ self: { }: mkDerivation { pname = "newsynth"; - version = "0.2.0.1"; - sha256 = "0xijyxfy62pv7ydfckhai7sdd7rdxlh0vw5wr7ic3z68vc0h6cai"; + version = "0.3.0.1"; + sha256 = "1c65s4nwxzlmix0549chhvm5wj4rvxq92y5kfzd9h11jc4hxl7xs"; isLibrary = true; isExecutable = true; buildDepends = [ base containers fixedprec random superdoc time ]; @@ -91563,11 +92248,10 @@ self: { ({ mkDerivation, base, hspec, HUnit }: mkDerivation { pname = "newtype-generics"; - version = "0.4.0.1"; - sha256 = "1xghpqmpwnjyk944m9nsfzk2jlyqwdvcr5zrmr66d4n650cf1m2b"; + version = "0.4.1"; + sha256 = "1qjzcmx5yj85cvdgglyg9f9ff7k9gvnyrb85n6bjzyh10q9n7vd5"; buildDepends = [ base ]; testDepends = [ base hspec HUnit ]; - jailbreak = true; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91642,7 +92326,6 @@ self: { homepage = "http://github.com/YoEight/ngrams-loader"; description = "Ngrams loader based on http://www.ngrams.info format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nibblestring" = callPackage @@ -91710,7 +92393,6 @@ self: { homepage = "https://github.com/dahlia/nicovideo-translator"; description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nikepub" = callPackage @@ -91879,6 +92561,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nofib-analyze" = callPackage + ({ mkDerivation, array, base, containers, regex-compat }: + mkDerivation { + pname = "nofib-analyze"; + version = "7.10.1"; + sha256 = "04n056gsxv61igdvdysqkxbsz1a5bvkzfnsbrz03ixjgaqg2whfl"; + isLibrary = false; + isExecutable = true; + buildDepends = [ array base containers regex-compat ]; + homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib"; + description = "Parse and compare nofib runs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "noise" = callPackage ({ mkDerivation, base, blaze-markup, blaze-svg, bytestring , containers, cryptohash, HTF, HUnit, network, parsec, QuickCheck @@ -91974,6 +92670,7 @@ self: { version = "0.3.7"; sha256 = "147dbq19n18ixfz6bhx9yi9ppr9j3wnc5dfz8kx5gwihy64b8l1b"; buildDepends = [ base primitive vector ]; + jailbreak = true; description = "Various iterative algorithms for optimization of nonlinear functions"; license = "GPL"; }) {}; @@ -92028,8 +92725,8 @@ self: { }: mkDerivation { pname = "not-gloss"; - version = "0.7.3.0"; - sha256 = "0c5i2c8z15ibdhq9czacazm8wzmngchnbw2hjyypq8vj7y8bhjs2"; + version = "0.7.4.0"; + sha256 = "11ikk8yia52qbaajcnwc7gq1jwwid12j8vzgn2v18j5d272lzwyc"; buildDepends = [ base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw spatial-math time vector vector-binary-instances @@ -92198,6 +92895,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nth-prime" = callPackage + ({ mkDerivation, base, opentheory-prime, opentheory-primitive }: + mkDerivation { + pname = "nth-prime"; + version = "1.2"; + sha256 = "0iq1658jfywni2yhk3aa1d4bnjjp8c9288bqfqxd8ayv87bvpirh"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base opentheory-prime opentheory-primitive ]; + testDepends = [ base opentheory-prime opentheory-primitive ]; + description = "Computing the nth prime"; + license = stdenv.lib.licenses.mit; + }) {}; + "nthable" = callPackage ({ mkDerivation, base, type-level }: mkDerivation { @@ -92553,6 +93264,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo"; description = "Oberon0 Compiler"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "obj" = callPackage @@ -92615,6 +93327,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "observable-sharing" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "observable-sharing"; + version = "0.2.1.0"; + sha256 = "11k6wzk3k39d87zbxminz1ga7nw6r96lf5kki40y673n500i4vdc"; + buildDepends = [ base containers ]; + homepage = "https://github.com/atzeus/observable-sharing"; + description = "Simple observable sharing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -92642,7 +93366,6 @@ self: { homepage = "https://github.com/stackbuilders/octohat"; description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octopus" = callPackage @@ -92820,7 +93543,6 @@ self: { jailbreak = true; description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "omaketex" = callPackage @@ -93021,7 +93743,9 @@ self: { mkDerivation { pname = "opaleye"; version = "0.3.1.2"; + revision = "2"; sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9"; + editedCabalFile = "e428ce92e9fc225610dc60c4248dabb125cdb3dd3bf2cda228672cb01d9c6075"; buildDepends = [ attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -93071,7 +93795,6 @@ self: { homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-union" = callPackage @@ -93160,6 +93883,7 @@ self: { packer vector ]; extraLibraries = [ EGL GLESv2 ]; + jailbreak = true; description = "OpenGL ES 2.0 and 3.0 with EGL 1.4"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -93344,17 +94068,50 @@ self: { }) {}; "opentheory" = callPackage - ({ mkDerivation, base, opentheory-primitive, QuickCheck, random }: + ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { pname = "opentheory"; - version = "1.76"; - sha256 = "011xz72b0sn50pa62h3x9spr1y1prxyyyn3sc8nm1jg0r0rda99c"; - isLibrary = true; - isExecutable = true; - buildDepends = [ base opentheory-primitive QuickCheck random ]; - description = "The Haskell base"; + version = "1.199"; + sha256 = "1il1lyjmv7ij7clnbc57ajpfwlg5a5ld3m619hxylpafyrbr4v5y"; + buildDepends = [ base opentheory-primitive QuickCheck ]; + testDepends = [ base opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=base"; + description = "The standard theory library"; + license = stdenv.lib.licenses.mit; + }) {}; + + "opentheory-bits" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive + , opentheory-probability, QuickCheck + }: + mkDerivation { + pname = "opentheory-bits"; + version = "1.66"; + sha256 = "1qjgrmi05ay4qss6w5ld4pmksb3lsscqpw0x2dcdkja1i5hfpwfj"; + buildDepends = [ + base opentheory opentheory-primitive opentheory-probability + QuickCheck + ]; + homepage = "http://opentheory.gilith.com/?pkg=natural-bits"; + description = "Natural number to bit-list conversions"; + license = stdenv.lib.licenses.mit; + }) {}; + + "opentheory-byte" = callPackage + ({ mkDerivation, base, opentheory, opentheory-bits + , opentheory-primitive, opentheory-probability, QuickCheck + }: + mkDerivation { + pname = "opentheory-byte"; + version = "1.126"; + sha256 = "0zlfik0irikrwk706fdjqb10z5jck3ldlsw269mfwlz6s1d5j2qz"; + buildDepends = [ + base opentheory opentheory-bits opentheory-primitive + opentheory-probability QuickCheck + ]; + homepage = "http://opentheory.gilith.com/?pkg=byte"; + description = "Bytes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory-char" = callPackage @@ -93371,59 +94128,120 @@ self: { base opentheory opentheory-parser opentheory-primitive QuickCheck random ]; + jailbreak = true; description = "Unicode characters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "opentheory-divides" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck + }: + mkDerivation { + pname = "opentheory-divides"; + version = "1.62"; + sha256 = "182c14c1j9m82pnx6crxgrry02yvixziap9ikhavx7krr52vdwbv"; + buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + testDepends = [ base opentheory opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=natural-divides"; + description = "The divides relation on natural numbers"; + license = stdenv.lib.licenses.mit; + }) {}; + "opentheory-parser" = callPackage ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck - , random }: mkDerivation { pname = "opentheory-parser"; - version = "1.117"; - sha256 = "0wrqah4vq0shh9541lqjdciz6v79qrr5s7711zmpcap51gs9d9bl"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - base opentheory opentheory-primitive QuickCheck random - ]; + version = "1.158"; + sha256 = "0325g7m5z64dg8sihmcgi9rmkms6r76hf1d7927v08dl5xh4dlhi"; + buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + testDepends = [ base opentheory opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=parser"; description = "Stream parsers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory-prime" = callPackage - ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck - , random + ({ mkDerivation, base, opentheory, opentheory-divides + , opentheory-primitive, opentheory-stream, QuickCheck }: mkDerivation { pname = "opentheory-prime"; - version = "1.23"; - sha256 = "1mg0bhjcml8camgy7hqci4lpd5raw5yii1rsln160hwsalkaxj1c"; - isLibrary = true; - isExecutable = true; + version = "1.82"; + sha256 = "1x6sir4abr34cghmhbyv5qfd847xbbxg88qaw1vs3sa5lhb5dm8s"; buildDepends = [ - base opentheory opentheory-primitive QuickCheck random + base opentheory opentheory-divides opentheory-primitive + opentheory-stream QuickCheck ]; - description = "Prime numbers"; + testDepends = [ + base opentheory opentheory-divides opentheory-primitive + opentheory-stream QuickCheck + ]; + homepage = "http://opentheory.gilith.com/?pkg=natural-prime"; + description = "Prime natural numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory-primitive" = callPackage ({ mkDerivation, base, QuickCheck, random }: mkDerivation { pname = "opentheory-primitive"; - version = "1.2"; - sha256 = "028z444528v1a35g5iac4fzqgwlxr23ii71sjb264h3v4i4i81d8"; - isLibrary = true; - isExecutable = true; + version = "1.7"; + sha256 = "02lg02w4sds1489bfz4hwgnhd9l6a1l7r9pwjd3s16yj2hbmr6jn"; buildDepends = [ base QuickCheck random ]; + testDepends = [ base QuickCheck random ]; + homepage = "http://www.gilith.com/research/opentheory/"; description = "Haskell primitives used by OpenTheory packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "opentheory-probability" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck + }: + mkDerivation { + pname = "opentheory-probability"; + version = "1.49"; + sha256 = "0dszjszjdabgafpvxiailpgzm7y96f4a8zhjfhin3m36f3lb0dmy"; + buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=probability"; + description = "Probability"; + license = stdenv.lib.licenses.mit; + }) {}; + + "opentheory-stream" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck + }: + mkDerivation { + pname = "opentheory-stream"; + version = "1.45"; + sha256 = "0gl7svhyrvi6bznfmc3jfar6hzlrywni6f7pvaykjzkf80xzljbr"; + buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=stream"; + description = "Infinite stream types"; + license = stdenv.lib.licenses.mit; + }) {}; + + "opentheory-unicode" = callPackage + ({ mkDerivation, base, opentheory, opentheory-bits, opentheory-byte + , opentheory-parser, opentheory-primitive, opentheory-probability + , QuickCheck + }: + mkDerivation { + pname = "opentheory-unicode"; + version = "1.140"; + sha256 = "1w916hc6qn8bf5z95b43aqm25mbivlg7b4q91g5s6gy3q1f4iqna"; + buildDepends = [ + base opentheory opentheory-bits opentheory-byte opentheory-parser + opentheory-primitive opentheory-probability QuickCheck + ]; + testDepends = [ + base opentheory opentheory-bits opentheory-byte opentheory-parser + opentheory-primitive opentheory-probability QuickCheck + ]; + homepage = "http://opentheory.gilith.com/?pkg=char"; + description = "Unicode characters"; + license = stdenv.lib.licenses.mit; }) {}; "operational" = callPackage @@ -93531,6 +94349,7 @@ self: { ad base distributive linear semigroupoids vector ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/bgamari/optimization"; description = "Numerical optimization"; license = stdenv.lib.licenses.bsd3; @@ -93554,6 +94373,7 @@ self: { homepage = "http://optimusprime.posterous.com/"; description = "A supercompiler for f-lite"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optional" = callPackage @@ -93685,7 +94505,6 @@ self: { ]; description = "An API client for http://orchestrate.io/."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orchid" = callPackage @@ -93828,8 +94647,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.1.1.0"; - sha256 = "1hrbfifm9476n28l2gxyr9m00hjibnl78anc5m7inqm8wr1s3cl0"; + version = "0.1.1.1"; + sha256 = "17slf2i7k8bk1d47l165awn38dlpq2rdw6glzvp8if1dir2l2jl7"; buildDepends = [ aeson attoparsec base bytestring containers free hashable old-locale text thyme unordered-containers @@ -93867,8 +94686,8 @@ self: { }: mkDerivation { pname = "os-release"; - version = "0.2.0"; - sha256 = "1y59n0gsp26xbgdfszc6gnwr75h1bmwc8rvsf9p02gwgvcylxhly"; + version = "0.2.1"; + sha256 = "0ij6i1yp2rmbkr9jhr8i969xajw3kbfx0yb44s51gm3mcjb3g4la"; buildDepends = [ base containers parsec transformers ]; testDepends = [ base containers hlint hspec parsec process regex-compat temporary @@ -93964,6 +94783,7 @@ self: { aeson base binary HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "https://github.com/operational-transformation/ot.hs"; description = "Real-time collaborative editing with Operational Transformation"; license = stdenv.lib.licenses.mit; @@ -94099,14 +94919,14 @@ self: { }) {}; "packer" = callPackage - ({ mkDerivation, array, base, bytestring, mtl, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, bytestring, ghc-prim, tasty, tasty-hunit + , tasty-quickcheck, transformers }: mkDerivation { pname = "packer"; - version = "0.1.6"; - sha256 = "02vswdsiinarg405lgzgghlqk4lhw9il8s9v2n1xdhszi510sz1w"; - buildDepends = [ array base bytestring mtl ]; + version = "0.1.8"; + sha256 = "1r7q54a1c6yb0gjd8hvxq1jw2fmgbhf5anfw47nzibs1bywjjgbi"; + buildDepends = [ base bytestring ghc-prim transformers ]; testDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck ]; @@ -94183,7 +95003,26 @@ self: { homepage = "https://github.com/diogob/pagarme_haskell"; description = "Pagarme API wrapper"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pager" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, process, resourcet, safe, terminfo, text, transformers + , unix + }: + mkDerivation { + pname = "pager"; + version = "0.1.1.0"; + sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring conduit conduit-extra directory process resourcet + safe terminfo text transformers unix + ]; + homepage = "https://github.com/pharpend/pager"; + description = "Open up a pager, like 'less' or 'more'"; + license = stdenv.lib.licenses.bsd2; }) {}; "pagerduty" = callPackage @@ -94196,8 +95035,8 @@ self: { }: mkDerivation { pname = "pagerduty"; - version = "0.0.3"; - sha256 = "1jqg7k0vr78fv5cv0rn74v8p5jd4wvv6l5nc5xdwh46b7rjwcpj1"; + version = "0.0.3.1"; + sha256 = "1l68a5s4w3x2n1qqmd2g6q7925rpvyqf1b9gisq8nsxs1dknin2r"; buildDepends = [ aeson base bifunctors bytestring bytestring-conversion conduit data-default-class exceptions generics-sop http-client http-types @@ -94205,6 +95044,7 @@ self: { time-locale-compat transformers transformers-base transformers-compat unordered-containers ]; + jailbreak = true; homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; @@ -94273,29 +95113,31 @@ self: { "pandoc" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , containers, data-default, deepseq-generics, Diff, directory - , executable-path, extensible-exceptions, filepath, haddock-library - , happy, highlighting-kate, hslua, HTTP, http-client - , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network - , network-uri, old-time, pandoc-types, parsec, process, QuickCheck - , random, scientific, SHA, syb, tagsoup, temporary, test-framework - , test-framework-hunit, test-framework-quickcheck2, texmath, text - , time, unordered-containers, vector, xml, yaml, zip-archive, zlib + , cmark, containers, css-text, data-default, deepseq-generics, Diff + , directory, executable-path, extensible-exceptions, filemanip + , filepath, haddock-library, happy, highlighting-kate, hslua, HTTP + , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl + , network, network-uri, old-locale, old-time, pandoc-types, parsec + , process, QuickCheck, random, scientific, SHA, syb, tagsoup + , temporary, test-framework, test-framework-hunit + , test-framework-quickcheck2, texmath, text, time + , unordered-containers, vector, xml, yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "1.13.2.1"; - sha256 = "0pvqi52sh3ldnszrvxlcq1s4v19haqb0wqh5rzn43pmqj2v6xnk6"; + version = "1.14"; + sha256 = "0n4l3jzvd8jzbsi6n4wli2dhijgywbpbss4syjmfnds9pbk6mhz1"; isLibrary = true; isExecutable = true; buildDepends = [ aeson alex array base base64-bytestring binary blaze-html - blaze-markup bytestring containers data-default deepseq-generics - directory extensible-exceptions filepath haddock-library happy - highlighting-kate hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri old-time pandoc-types parsec - process random scientific SHA syb tagsoup temporary texmath text - time unordered-containers vector xml yaml zip-archive zlib + blaze-markup bytestring cmark containers css-text data-default + deepseq-generics directory extensible-exceptions filemanip filepath + haddock-library happy highlighting-kate hslua HTTP http-client + http-client-tls http-types JuicyPixels mtl network network-uri + old-locale old-time pandoc-types parsec process random scientific + SHA syb tagsoup temporary texmath text time unordered-containers + vector xml yaml zip-archive zlib ]; testDepends = [ ansi-terminal base bytestring containers Diff directory @@ -94304,6 +95146,7 @@ self: { test-framework-quickcheck2 text zip-archive ]; configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ]; + jailbreak = true; homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; license = "GPL"; @@ -94318,8 +95161,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.7.0.1"; - sha256 = "09ihb3pxw6rk456a0kmgc51fvykz0f499fjd8idns5q1335l18q4"; + version = "0.7.1.1"; + sha256 = "1n96g7l16cn1qcp9xsbdmp844078lpcjsz3lg1x81drnzax9fpa1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -94332,6 +95175,7 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; + jailbreak = true; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -94342,10 +95186,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.0.2"; - revision = "1"; - sha256 = "0mnksd8wl6y9qh4z5p6nzf64lic2cxws0hm2n1aj8vq8asfy28af"; - editedCabalFile = "c209bec5811d40360ca07a9218404186ab8564ee649b14d6e3ece04b4006204f"; + version = "0.1.2.0"; + sha256 = "0q9ia1nzmzv1q8hplrmxszwk49mlp4v8skbfv4ggsl8s0vxc1c6f"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -94360,6 +95202,22 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "pandoc-csv2table" = callPackage + ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: + mkDerivation { + pname = "pandoc-csv2table"; + version = "1.0.0"; + revision = "1"; + sha256 = "0jr18sa5apvy8jckb5cxvsyr6c2drii6652ipwpd4xkdwrabwp5r"; + editedCabalFile = "49799682e063ffa396f94dd2f91e9b252f0224544d2e7a9d1dc5b41a909efd3d"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base csv pandoc pandoc-types text ]; + homepage = "https://github.com/baig/pandoc-csv2table-filter"; + description = "Convert CSV to Pandoc Table Markdown"; + license = stdenv.lib.licenses.mit; + }) {}; + "pandoc-lens" = callPackage ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { @@ -94367,6 +95225,7 @@ self: { version = "0.3.2"; sha256 = "1n0h3cf2yb5rmlfd0bbxlj3r8bm4h8yffd76fqsbw3s5jm0df4wb"; buildDepends = [ base containers lens pandoc-types ]; + jailbreak = true; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; @@ -94378,14 +95237,14 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.2"; - sha256 = "0j9zzlpwjyy8fqr91fsnzy507ylwrwk7hhl9nkxzk19iva2c42n9"; + version = "1.12.4.3"; + sha256 = "1aj741y28ci039gy9j16jc7v3vfrj0rc11jliahx4202dz6fdyb5"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; + license = "GPL"; }) {}; "pandoc-unlit" = callPackage @@ -94633,8 +95492,8 @@ self: { }: mkDerivation { pname = "parconc-examples"; - version = "0.3.4"; - sha256 = "1i8kkjak3byzypaiqi7iavhswmvs98cvcrakdxpd8cm52gj6xk2d"; + version = "0.3.5"; + sha256 = "05id69rb2cdzs1jf7zgv0gxgvbwm6x83s6ihdh9w1wnnpa7ykpap"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -94870,8 +95729,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsek"; - version = "1.0.1.2"; - sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd"; + version = "1.0.1.3"; + sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7"; buildDepends = [ base ]; description = "Parallel Parsing Processes"; license = stdenv.lib.licenses.gpl3; @@ -94922,6 +95781,7 @@ self: { template-haskell test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; description = "TH parser generator for splitting bytestring into fixed-width fields"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95001,7 +95861,9 @@ self: { mkDerivation { pname = "partial-handler"; version = "1.0.0.0"; + revision = "1"; sha256 = "1fmfiw38v77anh20xh5zzqxm2dcryyyismsagn09sc27jdgnnrzl"; + editedCabalFile = "2e1042c8b036ba686e544bfdd1302fd9f66f377010fa05739e7fc000d97fa597"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; @@ -95167,8 +96029,8 @@ self: { }: mkDerivation { pname = "path"; - version = "0.1.0"; - sha256 = "04yj79cw4l4zkfhmfjc382zjkmimhxm523fgq9ijn4dcj6v5z9yw"; + version = "0.5.0"; + sha256 = "1fk1fpyrmdxym2qnjmlhkgn2kyn5j728hiqw94i8kg47c1xnihkk"; buildDepends = [ base exceptions filepath template-haskell ]; testDepends = [ base hspec HUnit mtl ]; description = "Path"; @@ -95248,7 +96110,6 @@ self: { jailbreak = true; description = "A webpage scraper for Patreon which dumps a list of patrons to a text file"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pattern-arrows" = callPackage @@ -95316,7 +96177,6 @@ self: { 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "paypal-api" = callPackage @@ -95559,7 +96419,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-core" = callPackage @@ -95577,7 +96436,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-document" = callPackage @@ -95597,7 +96455,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-viewer" = callPackage @@ -95619,7 +96476,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf2line" = callPackage @@ -95692,12 +96548,11 @@ self: { }: mkDerivation { pname = "peakachu"; - version = "0.3.0"; - sha256 = "0awj571rgcn69vl907b26j68azy7kyd3kki014lsfsngql9cp1pq"; + version = "0.3.1"; + sha256 = "1wmlainnbrzpwrsr4qhw7m39s4crhc67xg1mxam0rfj9c1cnimxp"; buildDepends = [ base derive GLUT List template-haskell time TypeCompose ]; - jailbreak = true; description = "Experiemental library for composable interactive programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -96041,8 +96896,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.1.3"; - sha256 = "1rw160icdny4jrbymbck2gah3ca21f49yp6zkkjq8sv5mn83dbxy"; + version = "2.1.6"; + sha256 = "17jcj5xvxnck93dk01ac31mbh1b5pk1266x1zqap40glqs247myl"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger lifted-base @@ -96052,8 +96907,9 @@ self: { ]; testDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers hspec monad-control monad-logger old-locale - path-pieces resourcet scientific text time transformers + conduit containers fast-logger hspec lifted-base monad-control + monad-logger mtl old-locale path-pieces resource-pool resourcet + scientific tagged template-haskell text time transformers unordered-containers vector ]; extraLibraries = [ sqlite ]; @@ -96130,8 +96986,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.1.2.1"; - sha256 = "130jd85h1fl5klfr369kg11w29aavl81d22w1is5dg38s0pzn76a"; + version = "2.1.2.2"; + sha256 = "1ppjywipfp48dsahc4mf8p9vx99937yh552kq7dhalnd1yfcbcik"; buildDepends = [ aeson attoparsec base bson bytestring cereal conduit containers monad-control mongoDB network path-pieces persistent resource-pool @@ -96149,8 +97005,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.1.3"; - sha256 = "1k1sjzxz96z6pgk4012v8p4w6scgm4g2j5fs4sjgsj9azp3b7gwh"; + version = "2.1.3.1"; + sha256 = "1q1h3yrrpw9qzc7myfhwjxn5kxky5bxf918fyllpnprdagf98gd1"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -96191,8 +97047,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.5"; - sha256 = "1l12kw2ylxgahy55h302dbbp59mrb3m7xwxvbcvmsnxfi7pcm2si"; + version = "2.1.6"; + sha256 = "1s3dzwxv1rzfg7f5l9qsypzvm7pk2jiqjzdfksiq0ji37f73v7l6"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -96279,8 +97135,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.4.1"; - sha256 = "0lwm1j7zz1zsfw70p7qwcsjlz0kmiliz2fdb2jgksxglw212nh2h"; + version = "2.1.4.2"; + sha256 = "0g0j8yhbr960lvph49x5knwvx86b7kxlihk8n0xvdqbaq04fgiqa"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -96303,8 +97159,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.1.3"; - sha256 = "1b0li6hkir2rnya8ci1wcn77vxmg26i6blmxcvkdgc4jph23ca2p"; + version = "2.1.3.3"; + sha256 = "1p9vndchcd06ajqmqmf3pw5ql9r6jqbs9xl5jxv1x0pjvbq6yjy5"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -96313,6 +97169,7 @@ self: { testDepends = [ aeson base bytestring hspec persistent QuickCheck text transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; @@ -96333,7 +97190,6 @@ self: { homepage = "https://github.com/travitch/persistent-vector"; description = "A persistent sequence based on array mapped tries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-zookeeper" = callPackage @@ -96537,7 +97393,6 @@ self: { ]; description = "simply download a video from webpage and play it"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -96591,6 +97446,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pgstream" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, deepseq, mtl, parallel, postgresql-binary + , postgresql-libpq, resource-pool, resourcet, scientific, stm + , stm-chans, stm-conduit, stringsearch, template-haskell, text + , time, transformers, uuid, vector + }: + mkDerivation { + pname = "pgstream"; + version = "0.1.0.3"; + sha256 = "0zbasvi8392pa7ibd0q5072f1i7h0114v46rwhdfczsk1qzlnscg"; + buildDepends = [ + async attoparsec base blaze-builder bytestring conduit + conduit-extra deepseq mtl parallel postgresql-binary + postgresql-libpq resource-pool resourcet scientific stm stm-chans + stm-conduit stringsearch template-haskell text time transformers + uuid vector + ]; + jailbreak = true; + description = "Elsen Accelerated Computing Engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "phantom-state" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -96751,6 +97630,7 @@ self: { homepage = "http://www.cs.indiana.edu/~rrnewton/projects/phybin/"; description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pi-calculus" = callPackage @@ -96793,6 +97673,7 @@ self: { http-client-tls network-info process random text text-format time xdg-basedir ]; + jailbreak = true; homepage = "https://github.com/enolan/pia-forward"; description = "Set up port forwarding with the Private Internet Access VPN service"; license = stdenv.lib.licenses.gpl3; @@ -96921,7 +97802,20 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipeclip" = callPackage + ({ mkDerivation, base, bytestring, editor-open, Hclip, safe }: + mkDerivation { + pname = "pipeclip"; + version = "0.1.0.1"; + sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base bytestring editor-open Hclip safe ]; + homepage = "https://github.com/pharpend/pipeclip"; + description = "Open your editor, pipe the output to the system clipboard"; + license = stdenv.lib.licenses.bsd2; }) {}; "pipes" = callPackage @@ -96931,7 +97825,9 @@ self: { mkDerivation { pname = "pipes"; version = "4.1.5"; + revision = "1"; sha256 = "1c19am4dr6na9xpx4h7yngvbml0ghc1dbym8988hjhw84gq4lhfx"; + editedCabalFile = "c23c260bff1178965d87e6fc9f7263877b5f2adc4c0e4c1bd59c55971fff9eb4"; buildDepends = [ base mmorph mtl transformers ]; testDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 @@ -96947,8 +97843,8 @@ self: { }: mkDerivation { pname = "pipes-aeson"; - version = "0.4.1.2"; - sha256 = "0wacib0wf40bkm6rp2qcsrahc43g89l3icclbrshk8r54dhbazl7"; + version = "0.4.1.3"; + sha256 = "0c95fm4bj4y0dsar4r7n9irvhrcihylcp8k40khm2bqcad14pjjc"; buildDepends = [ aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers @@ -96965,8 +97861,8 @@ self: { }: mkDerivation { pname = "pipes-attoparsec"; - version = "0.5.1.1"; - sha256 = "1ns8s3p6jh4iya71z3j81cqnrfnr4n92kblwgkjlapb23dykl2qz"; + version = "0.5.1.2"; + sha256 = "1qhhy86c89j6ial5y1j2lhgqx225qr33777jk8sxv021gkabsmlv"; buildDepends = [ attoparsec base bytestring pipes pipes-parse text transformers ]; @@ -96974,7 +97870,6 @@ self: { attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit text transformers ]; - jailbreak = true; homepage = "https://github.com/k0001/pipes-attoparsec"; description = "Attoparsec and Pipes integration"; license = stdenv.lib.licenses.bsd3; @@ -97144,6 +98039,7 @@ self: { base bytestring cassava HUnit pipes pipes-bytestring test-framework test-framework-hunit vector ]; + jailbreak = true; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; }) {}; @@ -97152,9 +98048,10 @@ self: { ({ mkDerivation, base, errors, pipes }: mkDerivation { pname = "pipes-errors"; - version = "0.2.1"; - sha256 = "08i3rzqz7r5vkjfry0bdw3gpxjzhni8xmwwa6p8hdkixznjq7539"; + version = "0.3"; + sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76"; buildDepends = [ base errors pipes ]; + jailbreak = true; homepage = "https://github.com/jdnavarro/pipes-errors"; description = "Integration between pipes and errors"; license = stdenv.lib.licenses.bsd3; @@ -97412,15 +98309,13 @@ self: { }: mkDerivation { pname = "pipes-vector"; - version = "0.6"; - sha256 = "0a3q8cj05b6a6iy2gi8mp2qc6xvmwmiqvcd5i3v0kzvi3rv8fh86"; + version = "0.6.2"; + sha256 = "11nibsshxgnr2jw8lh8q9aygbmpfsq7mf7kdvaqzyggmrdsns2wn"; buildDepends = [ base monad-primitive pipes primitive transformers vector ]; - jailbreak = true; description = "Various proxies for streaming data into vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-wai" = callPackage @@ -97797,14 +98692,22 @@ self: { }) {}; "plugins-multistage" = callPackage - ({ mkDerivation, base, template-haskell, th-desugar }: + ({ mkDerivation, base, directory, ghc, process, QuickCheck, tasty + , tasty-quickcheck, tasty-th, template-haskell, th-desugar + }: mkDerivation { pname = "plugins-multistage"; - version = "0.5.3"; - sha256 = "1k07i4djm5givxwvh1a5h4nlhj8w71n7ajd15av534gnky0njzwc"; - buildDepends = [ base template-haskell th-desugar ]; + version = "0.6.1"; + sha256 = "0kwibjp9r9gwkmi8i79cc217jhnqljcgdkvpsk7hclmaa7ir3caq"; + buildDepends = [ + base directory ghc process template-haskell th-desugar + ]; + testDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th template-haskell + ]; description = "Dynamic linking for embedded DSLs with staged compilation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plumbers" = callPackage @@ -97921,17 +98824,17 @@ self: { "pointed" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class - , kan-extensions, semigroupoids, semigroups, stm, tagged - , transformers, transformers-compat + , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged + , transformers, transformers-compat, unordered-containers }: mkDerivation { pname = "pointed"; - version = "4.2"; - sha256 = "1rwavs2vycb02d04ba8ziywsxbl6k4yqk6pnmzcx5zhnkcfqvmbm"; + version = "4.2.0.2"; + sha256 = "0ynswx6ybl7b6vbrm2bd2zj2sbvsclhdi440lpv1aix5smd8m2jb"; buildDepends = [ - base comonad containers data-default-class kan-extensions + base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers - transformers-compat + transformers-compat unordered-containers ]; homepage = "http://github.com/ekmett/pointed/"; description = "Pointed and copointed data"; @@ -97992,8 +98895,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "pointless-fun"; - version = "1.1.0.5"; - sha256 = "17gzh3w5j05l6ig1sdjqrl7br17zzpy9yh5k2lck0gjl5prcjclw"; + version = "1.1.0.6"; + sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Some common point-free combinators"; @@ -98117,6 +99020,7 @@ self: { version = "0.7.3"; sha256 = "0vv7j1l0wnjwpd3hpxswq0k33izl0ck2njspcga885bkrd45lzdr"; buildDepends = [ base binary containers text text-binary ]; + jailbreak = true; homepage = "https://github.com/kawu/polimorf"; description = "Working with the PoliMorf dictionary"; license = stdenv.lib.licenses.bsd3; @@ -98174,7 +99078,6 @@ self: { homepage = "https://github.com/mokus0/polynomial"; description = "Polynomials"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polynomials-bernstein" = callPackage @@ -98306,8 +99209,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.4.2.0"; - sha256 = "14f20any4pasjwxq81dmcds3l9gyaabdh9rma65yapkpgrs2v56z"; + version = "0.4.2.1"; + sha256 = "14jhxmccj9ywhxz2rkd4vdwhzz6ciq070ml8vl282hz8k3dr1va9"; buildDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -98325,7 +99228,6 @@ self: { tasty-quickcheck tasty-th text tls transformers xml-picklers xml-types ]; - jailbreak = true; homepage = "https://github.com/pontarius/pontarius-xmpp/"; description = "An XMPP client library"; license = stdenv.lib.licenses.bsd3; @@ -98387,10 +99289,13 @@ self: { mkDerivation { pname = "pool-conduit"; version = "0.1.2.3"; + revision = "1"; sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv"; + editedCabalFile = "b894f71054b3824a0a05753e8273efbc7c1dc48efa9c6d56625ba4411a74afa5"; buildDepends = [ base monad-control resource-pool resourcet transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -98622,26 +99527,25 @@ self: { }) {}; "posix-pty" = callPackage - ({ mkDerivation, base, bytestring, unix }: + ({ mkDerivation, base, bytestring, process, unix, util }: mkDerivation { pname = "posix-pty"; - version = "0.1.1"; - sha256 = "0ndr47bfm07b00kfy2p48jm7fjrd76bxbw3l7wm5yc0d0jyi65cd"; - buildDepends = [ base bytestring unix ]; + version = "0.2.0.1"; + sha256 = "1f0jyhfl41fvnjc290lm7x4dik2bhymcfxzf0il1iza5rpcjabxa"; + buildDepends = [ base bytestring process unix ]; + extraLibraries = [ util ]; homepage = "https://bitbucket.org/merijnv/posix-pty"; description = "Pseudo terminal interaction with subprocesses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { util = null;}; "posix-realtime" = callPackage ({ mkDerivation, base, unix }: mkDerivation { pname = "posix-realtime"; - version = "0.0.0.2"; - sha256 = "1i3ag71ymmbcg1v0s6fqkpli8d1wplhj2jkalrv7alz8z666ms3h"; + version = "0.0.0.3"; + sha256 = "0g7mflyvhrypr8a5795vnqb5qlkg3w4nd3j8pnqql9dbmcbqc2aq"; buildDepends = [ base unix ]; - jailbreak = true; description = "POSIX Realtime functionality"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98712,8 +99616,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.5.2"; - sha256 = "1fwh3r0f63wcwnw544jdirzsd0brslkqahn8d2iwr2jvpm5f0pqh"; + version = "0.5.2.1"; + sha256 = "02dzsh9d62pgrqsvjmdxyffr4cryk3sd2dg12jmygg94q5dfkm0m"; buildDepends = [ attoparsec base-prelude bytestring loch-th placeholders scientific text time transformers uuid @@ -98787,6 +99691,7 @@ self: { old-locale postgresql-simple process text time transformers unix unordered-containers vector ]; + jailbreak = true; description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -98881,18 +99786,17 @@ self: { }) {}; "postgresql-simple-typed" = callPackage - ({ mkDerivation, base, haskell-src-meta, postgresql-libpq - , postgresql-simple, template-haskell, typedquery, utf8-string + ({ mkDerivation, base, postgresql-libpq, postgresql-simple + , template-haskell, transformers, typedquery, utf8-string }: mkDerivation { pname = "postgresql-simple-typed"; - version = "0.1.0.0"; - sha256 = "1n9fkg1qcrycb7gvx4pln4xq3hpbczic4p2zv0f9hq7ljb5h3f1a"; + version = "0.1.0.1"; + sha256 = "0rgy0sx4fwcsr8ln14vhrp23hc1b67c07gw0hj5csrsjn40s0c2c"; buildDepends = [ - base haskell-src-meta postgresql-libpq postgresql-simple - template-haskell typedquery utf8-string + base postgresql-libpq postgresql-simple template-haskell + transformers typedquery utf8-string ]; - jailbreak = true; homepage = "https://github.com/tolysz/postgresql-simple-typed"; description = "Typed extension for PostgreSQL simple"; license = stdenv.lib.licenses.bsd3; @@ -98900,19 +99804,19 @@ self: { }) {}; "postgresql-typed" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , cryptohash, haskell-src-meta, network, old-locale, parsec - , postgresql-binary, scientific, template-haskell, text, time - , utf8-string, uuid + ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring + , containers, cryptohash, haskell-src-meta, network, old-locale + , parsec, postgresql-binary, scientific, template-haskell, text + , time, utf8-string, uuid }: mkDerivation { pname = "postgresql-typed"; - version = "0.3.2"; - sha256 = "0q1k5sj6q9c4mssf3z9m69fqyn9z8iz15v2b0rcc7c8x1za1kq2i"; + version = "0.3.3"; + sha256 = "1fj02d0v9bpdgmzp2xqmz72flhl6pyw7v03kqmwyjhkp9afd4dsh"; buildDepends = [ - array base binary bytestring containers cryptohash haskell-src-meta - network old-locale parsec postgresql-binary scientific - template-haskell text time utf8-string uuid + aeson array attoparsec base binary bytestring containers cryptohash + haskell-src-meta network old-locale parsec postgresql-binary + scientific template-haskell text time utf8-string uuid ]; testDepends = [ base network time ]; jailbreak = true; @@ -98924,25 +99828,26 @@ self: { "postgrest" = callPackage ({ mkDerivation, aeson, base, base64-string, bcrypt, blaze-builder - , bytestring, case-insensitive, containers, convertible, hasql - , hasql-backend, hasql-postgres, hlint, hspec, hspec-wai - , hspec-wai-json, HTTP, http-media, http-types, MissingH, mtl - , network, network-uri, optparse-applicative, packdeps, process - , QuickCheck, Ranged-sets, regex-base, regex-tdfa, regex-tdfa-text - , resource-pool, scientific, split, string-conversions - , stringsearch, text, time, transformers, unordered-containers - , vector, wai, wai-cors, wai-extra, wai-middleware-static, warp + , bytestring, case-insensitive, cassava, containers, convertible + , hasql, hasql-backend, hasql-postgres, heredoc, hlint, hspec + , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, jwt + , MissingH, mtl, network, network-uri, optparse-applicative + , packdeps, process, QuickCheck, Ranged-sets, regex-base + , regex-tdfa, regex-tdfa-text, resource-pool, scientific, split + , string-conversions, stringsearch, text, time, transformers + , unordered-containers, vector, wai, wai-cors, wai-extra + , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.2.7.0"; - sha256 = "1mr7wka4kxxmpnhw9p49a4vh68iavrh74shc712z17gmr9yahvcx"; - isLibrary = false; + version = "0.2.9.1"; + sha256 = "0rgvqhhpg6q99q1bdbk3dhnlad8nfrl3xihcg3c0j55dlx3q1860"; + isLibrary = true; isExecutable = true; buildDepends = [ aeson base base64-string bcrypt blaze-builder bytestring - case-insensitive containers convertible hasql hasql-backend - hasql-postgres HTTP http-types MissingH mtl network network-uri + case-insensitive cassava containers convertible hasql hasql-backend + hasql-postgres HTTP http-types jwt MissingH mtl network network-uri optparse-applicative Ranged-sets regex-base regex-tdfa regex-tdfa-text resource-pool scientific split string-conversions stringsearch text time transformers unordered-containers vector wai @@ -98950,13 +99855,14 @@ self: { ]; testDepends = [ aeson base base64-string bcrypt blaze-builder bytestring - case-insensitive containers convertible hasql hasql-backend - hasql-postgres hlint hspec hspec-wai hspec-wai-json HTTP http-media - http-types MissingH mtl network network-uri optparse-applicative - packdeps process QuickCheck Ranged-sets regex-base regex-tdfa - regex-tdfa-text resource-pool scientific split string-conversions - stringsearch text time transformers unordered-containers vector wai - wai-cors wai-extra wai-middleware-static warp + case-insensitive cassava containers convertible hasql hasql-backend + hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP + http-media http-types jwt MissingH mtl network network-uri + optparse-applicative packdeps process QuickCheck Ranged-sets + regex-base regex-tdfa regex-tdfa-text resource-pool scientific + split string-conversions stringsearch text time transformers + unordered-containers vector wai wai-cors wai-extra + wai-middleware-static warp ]; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; @@ -99001,7 +99907,6 @@ self: { homepage = "https://github.com/apiengine/postmark"; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmaster" = callPackage @@ -99083,8 +99988,11 @@ self: { mkDerivation { pname = "pqueue"; version = "1.2.1"; + revision = "1"; sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6"; + editedCabalFile = "ea1de2ab89c2b8b16eb189910b568409e2a5b4af283cf19e179a6fd95fe15fa3"; buildDepends = [ base deepseq ]; + jailbreak = true; description = "Reliable, persistent, fast priority queues"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -99151,8 +100059,8 @@ self: { }: mkDerivation { pname = "pred-trie"; - version = "0.1"; - sha256 = "1dkmpdqxq919555hc8hx5qf070ginynbzb7lnmir1lnidvqi5b8i"; + version = "0.2.0"; + sha256 = "11d0673jhz8vb271wf0qsl8a480hzrghly07iqcmckybalr17ibs"; buildDepends = [ base semigroups ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; description = "Predicative tries"; @@ -99332,8 +100240,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "prelude-safeenum"; - version = "0.1.1.1"; - sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv"; + version = "0.1.1.2"; + sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "A redefinition of the Prelude's Enum class in order to render it safe"; @@ -99378,7 +100286,9 @@ self: { mkDerivation { pname = "presburger"; version = "1.3.1"; + revision = "1"; sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6"; + editedCabalFile = "7c88061e13bab0e63240c05dad36b9518ad50d7ad4ade0f8911efa7826eb4b5d"; buildDepends = [ base containers pretty ]; testDepends = [ base QuickCheck ]; homepage = "http://github.com/yav/presburger"; @@ -99399,7 +100309,6 @@ self: { ]; description = "Make presentations for data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "press" = callPackage @@ -99415,6 +100324,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "presto-hdbc" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, convertible + , either, either-unwrap, errors, HDBC, HTTP, http-streams + , io-streams, lens, mtl, network-uri, safe, scientific, text + , transformers + }: + mkDerivation { + pname = "presto-hdbc"; + version = "0.1.0.3"; + sha256 = "1353nh8pq3ja4pw1fps0a46rfizph47l7k5gqlnkbz8w8b41miap"; + buildDepends = [ + aeson aeson-pretty base bytestring convertible either either-unwrap + errors HDBC HTTP http-streams io-streams lens mtl network-uri safe + scientific text transformers + ]; + jailbreak = true; + description = "An HDBC connector for Presto"; + license = stdenv.lib.licenses.asl20; + }) {}; + "prettify" = callPackage ({ mkDerivation, base, containers, semigroups }: mkDerivation { @@ -99589,21 +100518,6 @@ self: { }) {}; "primitive" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "primitive"; - version = "0.5.4.0"; - revision = "1"; - sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; - editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e"; - buildDepends = [ base ghc-prim ]; - testDepends = [ base ghc-prim ]; - homepage = "https://github.com/haskell/primitive"; - description = "Primitive memory-related operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "primitive_0_6" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -99673,6 +100587,7 @@ self: { ]; description = "A Perl printf like formatter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "printxosd" = callPackage @@ -99879,9 +100794,9 @@ self: { mkDerivation { pname = "process-listlike"; version = "1.0"; - revision = "1"; + revision = "3"; sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r"; - editedCabalFile = "72b239b889868394c365985197588cda0ec8aac03d4796a9e212b4044c966f16"; + editedCabalFile = "75f8f07195965b0a2ca36725792b095896801d4e4133c7c67a72600bdbeb63b1"; buildDepends = [ base bytestring deepseq ListLike process text ]; jailbreak = true; homepage = "https://github.com/ddssff/process-listlike"; @@ -99937,8 +100852,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.7.2.0"; - sha256 = "1wlrinx5v0k26jdkmbb8k313p3nyjrn2r9nag3hryl1wfdkbr1bl"; + version = "0.7.2.1"; + sha256 = "118ig98xi2jdh966483d37wx5wa5mcm7qyfnrb1xszw2nqcivvvx"; buildDepends = [ base bifunctors bytestring conceit containers contravariant foldl free pipes pipes-bytestring pipes-concurrency pipes-parse @@ -100055,11 +100970,12 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.6.1"; - revision = "1"; + revision = "2"; sha256 = "0phwjngndgsggw2f74k6q43cnnw5w4nvfrfrmkwyz6hgah2zv562"; - editedCabalFile = "98cd3c6ac3f78d4097bd1b8c7c1782b85bd05497938ce86d70cb0eb27b09359c"; + editedCabalFile = "ac8ac15500d9a5f4c678489d77c6abea03b24a704ceb235eecf9f49ef08da757"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; @@ -100104,15 +101020,14 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.2.0.0"; - sha256 = "0pgjd7a8xflnk0v2r2smc5qb7j8zsr5qrlxkdk36547plfjfvnv4"; + version = "0.2.0.1"; + sha256 = "17h690m78xsvbcxms2yxq7g9d1w5dx31q1m3a2m3i4gfwby1ndnf"; isLibrary = false; isExecutable = true; buildDepends = [ aeson attoparsec base bytestring filepath text unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; @@ -100132,18 +101047,13 @@ self: { }) {}; "profunctors" = callPackage - ({ mkDerivation, base, comonad, distributive, semigroupoids, tagged - , transformers + ({ mkDerivation, base, comonad, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "4.4.1"; - revision = "1"; - sha256 = "1x5q4bc18cyxajv39xxbxzgpq75xzrhx450n8rc3p8gir92hx645"; - editedCabalFile = "72f05aa59d302bcd53277bdff17e920bc0128e5787b2f8edf584c517cd084db7"; - buildDepends = [ - base comonad distributive semigroupoids tagged transformers - ]; + version = "5.1.1"; + sha256 = "0lw2ipacpnp9yqmi8zsp01pzpn5hwj8af3y0f3079mddrmw48gw7"; + buildDepends = [ base comonad distributive tagged transformers ]; homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; @@ -100230,20 +101140,20 @@ self: { "project-template" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit - , conduit-extra, containers, hspec, mtl, QuickCheck, resourcet - , system-fileio, system-filepath, text, transformers + , conduit-extra, containers, directory, filepath, hspec, mtl + , QuickCheck, resourcet, text, transformers }: mkDerivation { pname = "project-template"; - version = "0.1.4.2"; - sha256 = "10n23s6g7fv0l42hsb804z0qqcyxqw32kwzg1f0w3c6gka844akr"; + version = "0.2.0"; + sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf"; buildDepends = [ base base64-bytestring bytestring conduit conduit-extra containers - mtl resourcet system-fileio system-filepath text transformers + directory filepath mtl resourcet text transformers ]; testDepends = [ base base64-bytestring bytestring conduit containers hspec - QuickCheck resourcet system-filepath text transformers + QuickCheck resourcet text transformers ]; homepage = "https://github.com/fpco/haskell-ide"; description = "Specify Haskell project templates and generate files"; @@ -100299,6 +101209,7 @@ self: { homepage = "https://github.com/Erdwolf/prolog"; description = "A command line tool to visualize query resolution in Prolog"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prolog-graph-lib" = callPackage @@ -100311,6 +101222,7 @@ self: { homepage = "https://github.com/Erdwolf/prolog"; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "promise" = callPackage @@ -100344,20 +101256,20 @@ self: { "propellor" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , directory, filepath, hslogger, IfElse, MissingH - , MonadCatchIO-transformers, mtl, network, process, QuickCheck - , time, unix, unix-compat + , directory, exceptions, filepath, hslogger, IfElse, MissingH, mtl + , network, process, QuickCheck, time, transformers, unix + , unix-compat }: mkDerivation { pname = "propellor"; - version = "2.3.0"; - sha256 = "0k8yi4dh00985gb1k3l8saaf8h9q1jbw2mcr1svn7xdhnd16r1y1"; + version = "2.4.0"; + sha256 = "1l2zhj12jwsavljx0r6qmz44w7k5bwckwg2wcz38qd6km4wy3ppw"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal async base bytestring containers directory filepath - hslogger IfElse MissingH MonadCatchIO-transformers mtl network - process QuickCheck time unix unix-compat + ansi-terminal async base bytestring containers directory exceptions + filepath hslogger IfElse MissingH mtl network process QuickCheck + time transformers unix unix-compat ]; homepage = "https://propellor.branchable.com/"; description = "property-based host configuration management in haskell"; @@ -100420,7 +101332,6 @@ self: { homepage = "http://github.com/deviant-logic/props"; description = "Reusable quickcheck properties"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prosper" = callPackage @@ -100439,7 +101350,6 @@ self: { homepage = "https://api.prosper.com"; description = "Bindings to the Prosper marketplace API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proteaaudio" = callPackage @@ -100462,8 +101372,8 @@ self: { }: mkDerivation { pname = "protobuf"; - version = "0.2.0.4"; - sha256 = "0gg678cb1psgdsjzv9x7mhcjmywj8bgzmp9pd850d3p9zyiw9l2j"; + version = "0.2.1.0"; + sha256 = "0i8hjrj6jycqmq7i1wl0kr9s17g4qfyc0gfwcbhbv70yxwf499di"; buildDepends = [ base bytestring cereal data-binary-ieee754 deepseq mtl text unordered-containers @@ -100575,8 +101485,8 @@ self: { }: mkDerivation { pname = "proton-haskell"; - version = "0.4"; - sha256 = "1drg50ffp9q5hqdn6h46i45y4crmb1d6j6238qdnmrdmbj1pk4zw"; + version = "0.6"; + sha256 = "0g73lspx5rk8d6axn229im7r8ch5d7afn8fb51haazaqmcw906qg"; buildDepends = [ base containers directory filepath ]; testDepends = [ base containers directory filepath HUnit test-framework @@ -100635,6 +101545,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pseudo-boolean" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , containers, deepseq, dlist, hashable, HUnit, parsec, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, tasty-th, temporary + }: + mkDerivation { + pname = "pseudo-boolean"; + version = "0.1.0.1"; + sha256 = "1a46dx6xxnzhf66kym9xbxxcbqkmqbadg7gxhd2clsahbwlm4w4d"; + buildDepends = [ + attoparsec base bytestring bytestring-builder containers deepseq + dlist hashable parsec + ]; + testDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th temporary + ]; + homepage = "https://github.com/msakai/pseudo-boolean"; + description = "Reading/Writing OPB/WBO files used in pseudo boolean competition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pseudo-trie" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -100655,7 +101588,6 @@ self: { buildDepends = [ base template-haskell time ]; description = "cpp-style built-in macros using Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "psqueues" = callPackage @@ -100698,6 +101630,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "publicsuffix" = callPackage + ({ mkDerivation, base, bytestring, filepath, hspec + , template-haskell, text + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20150507"; + sha256 = "1n1wns0n48rqva5zz4kyj84rw0lf7ih612cp0dhsdk9jgc1kapsj"; + buildDepends = [ base bytestring filepath template-haskell text ]; + testDepends = [ base hspec text ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -100899,17 +101846,16 @@ self: { }) {}; "pulse-simple" = callPackage - ({ mkDerivation, base, bytestring, pulseaudio }: + ({ mkDerivation, base, bytestring, libpulseaudio }: mkDerivation { pname = "pulse-simple"; version = "0.1.14"; sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4"; buildDepends = [ base bytestring ]; - extraLibraries = [ pulseaudio ]; + extraLibraries = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) pulseaudio;}; + }) { inherit (pkgs) libpulseaudio;}; "punkt" = callPackage ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text @@ -101481,34 +102427,35 @@ self: { "quandl-api" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring - , http-conduit, http-types, old-locale, syb, text, time + , http-conduit, http-types, syb, text, time, time-locale-compat , unordered-containers }: mkDerivation { pname = "quandl-api"; - version = "0.2.0.0"; - sha256 = "1h6gh9wssb8dw9r5f7caanxq542d0jw9shvp7wx0i1k47f54kb3k"; + version = "0.2.1.0"; + sha256 = "01mjwg7myal3hc98s7v582ycabv7qx2j6lcsyvhxbmhzs1wl8sqf"; buildDepends = [ - aeson base blaze-builder bytestring http-conduit http-types - old-locale syb text time unordered-containers + aeson base blaze-builder bytestring http-conduit http-types syb + text time time-locale-compat unordered-containers ]; homepage = "https://github.com/pvdbrand/quandl-api"; description = "Quandl.com API library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quantfin" = callPackage ({ mkDerivation, base, containers, mersenne-random-pure64, mtl - , random-fu, rvar, transformers, vector + , random, random-fu, random-source, rvar, transformers, vector }: mkDerivation { pname = "quantfin"; - version = "0.1.0.1"; - sha256 = "1rx8jrdhlqnbj28d2yi7vb3x1z7g5qrvzrhfx44zdiqlgw215f05"; + version = "0.1.0.2"; + sha256 = "1m6208c8gxbm95a99kk0chh62bk2zb1fmwrdd7fwl7zpwzr8iany"; + isLibrary = true; + isExecutable = true; buildDepends = [ - base containers mersenne-random-pure64 mtl random-fu rvar - transformers vector + base containers mersenne-random-pure64 mtl random random-fu + random-source rvar transformers vector ]; jailbreak = true; homepage = "https://github.com/boundedvariation/quantfin"; @@ -101874,6 +102821,7 @@ self: { homepage = "http://www.github.com/massysett/quickpull"; description = "Generate Main module with QuickCheck tests"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickset" = callPackage @@ -102092,8 +103040,8 @@ self: { }: mkDerivation { pname = "rainbow"; - version = "0.26.0.2"; - sha256 = "1v94dd9y38ayslii6bjg720dbrjg37wwm13v08g9clbazf122901"; + version = "0.26.0.4"; + sha256 = "1ic6163igf0c815crccss42czdhnrg3y8rfqr05wqy0m4vza0nx4"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; homepage = "https://www.github.com/massysett/rainbow"; @@ -102537,8 +103485,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.2"; - sha256 = "1m8mmvnfvpddbyllrjlv9nxm458ikdxyhf68pr9xf18fxaxsipsb"; + version = "0.2.3"; + sha256 = "1gr050dlvq8pfp77g21ywc6cknbgmkw8bcc4d8klw8jpf0ppar45"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102641,11 +103589,10 @@ self: { }: mkDerivation { pname = "razom-text-util"; - version = "0.1.0.0"; - sha256 = "08f7cvipcdcn6s2rgf0n65g67fhkx36841dihzzsfalglfr9gn6m"; + version = "0.1.1.0"; + sha256 = "1zmqfjbhvszf2ky6556q1311x23y1h0v90yqaa1mynn8lqhplgkv"; buildDepends = [ base regex-applicative smaoin text-position ]; testDepends = [ base QuickCheck regex-applicative smaoin ]; - jailbreak = true; homepage = "http://rel4tion.org/projects/razom-text-util/"; description = "Common text/parsing tools for Razom language packages"; license = stdenv.lib.licenses.publicDomain; @@ -102731,10 +103678,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "rdtsc"; - version = "1.3.0.0"; - sha256 = "1j421cfyz35mkh78idw89b0gl7c810n04pfh0lvdprghlfk90adk"; + version = "1.3.0.1"; + sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal"; buildDepends = [ base ]; - homepage = "http://code.haskell.org/rdtsc"; + homepage = "https://github.com/mgrabmueller/rdtsc"; description = "Binding for the rdtsc machine instruction"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -102871,7 +103818,6 @@ self: { homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Library for functional reactive programming (FRP)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-sdl" = callPackage @@ -102921,7 +103867,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-fieldtrip" = callPackage @@ -103018,10 +103963,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "read-bounded"; - version = "0.1.0.0"; - sha256 = "1nvfkxjxn38rpplvg48sgx671fmfxj80dy2a77pjvm3c31q0hhqm"; + version = "0.1.1.0"; + sha256 = "19ynv5vxa5dnphv9kby0nfvq3wn6qpk7n5qv1x22ipkfxnxdw47k"; buildDepends = [ base ]; jailbreak = true; + homepage = "https://github.com/thomaseding/read-bounded"; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103135,13 +104081,12 @@ self: { }: mkDerivation { pname = "record"; - version = "0.3.1.1"; - sha256 = "08rmxy2hy19jz614ml5qfwhmdnhfs0qllgk65p0p7bb4v65cg5s9"; + version = "0.3.1.2"; + sha256 = "02kpi21l2kwysk8qgxgl10ngqnmc0mx50qxf9jq0fmi8rv3fm9xp"; buildDepends = [ attoparsec base base-prelude template-haskell text transformers ]; testDepends = [ base base-prelude directory doctest filepath ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/record"; description = "First class records implemented with quasi-quotation"; license = stdenv.lib.licenses.mit; @@ -103157,6 +104102,7 @@ self: { sha256 = "023g63y478k7mq8kk5xcxa3civs3hdhlvdb0qh3amvvybpj3g4av"; buildDepends = [ aeson base base-prelude record template-haskell ]; testDepends = [ aeson base-prelude hspec record ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/record-aeson"; description = "Instances of \"aeson\" classes for the \"record\" types"; license = stdenv.lib.licenses.mit; @@ -103273,8 +104219,8 @@ self: { }: mkDerivation { pname = "redis"; - version = "0.14"; - sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094"; + version = "0.14.1"; + sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b"; buildDepends = [ base bytestring concurrent-extra containers exceptions mtl network old-time utf8-string @@ -103384,6 +104330,7 @@ self: { pointed semigroupoids semigroups text transformers unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/reducers/"; description = "Semigroups, specialized containers and a general map/reduce framework"; license = stdenv.lib.licenses.bsd3; @@ -103476,6 +104423,7 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th unordered-containers ]; + jailbreak = true; homepage = "https://github.com/RobotGymnast/refcount"; description = "Container with element counts"; license = stdenv.lib.licenses.mit; @@ -103548,8 +104496,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "reflection"; - version = "1.5.1.2"; - sha256 = "09fs42gmhdgfag7k4gm19l63sz5b1sxw6s3hgszpcnnsbv1g9ad4"; + version = "1.5.2.1"; + sha256 = "1pynmkhdxq5vxbjs7rxiv3mg8avidxg4cnghanp75846s4s6ggg5"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; @@ -103618,6 +104566,7 @@ self: { semigroups text these time transformers webkitgtk3 webkitgtk3-javascriptcore ]; + jailbreak = true; description = "Glitch-free Functional Reactive Web Apps"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103626,8 +104575,8 @@ self: { ({ mkDerivation, base, containers, mtl, text }: mkDerivation { pname = "reform"; - version = "0.2.6"; - sha256 = "02izf5hhhwc27lza0w93n3n5sdg1f0h6njgz3vw4bv71114wfcj7"; + version = "0.2.7"; + sha256 = "0jjbcc88ffv6nqj0jbgb54bin0k5hh4w1i44xh3vdv00s7aj3abm"; buildDepends = [ base containers mtl text ]; homepage = "http://www.happstack.com/"; description = "reform is an HTML form generation and validation library"; @@ -103638,8 +104587,8 @@ self: { ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }: mkDerivation { pname = "reform-blaze"; - version = "0.2.3"; - sha256 = "1bbmmvrprbig4ic1vq8jjhb4nxxkn0a4dxxaa62i02ms3wb1vsf5"; + version = "0.2.4"; + sha256 = "124hvgjhb2x6769qnwwjw30qmramh54pmggpqmj0dc8m473psfjy"; buildDepends = [ base blaze-html blaze-markup reform text ]; homepage = "http://www.happstack.com/"; description = "Add support for using blaze-html with Reform"; @@ -103653,6 +104602,7 @@ self: { version = "0.0.4"; sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg"; buildDepends = [ base blaze-markup reform shakespeare text ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using Hamlet with Reform"; license = stdenv.lib.licenses.bsd3; @@ -103664,28 +104614,26 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.4"; - sha256 = "0igyvf8a0dd8376khzsssr6bjp3m224rrynm1ws4slxq9h3dklqn"; + version = "0.2.5"; + sha256 = "12asmp1bklk33rpbhwhpbvmnkssjll92l47qxywibnpdf0zc6xsc"; buildDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack support for reform"; license = stdenv.lib.licenses.bsd3; }) {}; "reform-hsp" = callPackage - ({ mkDerivation, base, hsp, reform, text }: + ({ mkDerivation, base, hsp, hsx2hs, reform, text }: mkDerivation { pname = "reform-hsp"; - version = "0.2.5"; - sha256 = "0fq4g2v22nsqby72sasr15hs02rl97n8j85v9lgirw1jk2mbsqar"; - buildDepends = [ base hsp reform text ]; + version = "0.2.6"; + sha256 = "0aigsrax7s5ys0w2kd52jqi3453q81f4yp6c1s84a383yqndyq1j"; + buildDepends = [ base hsp hsx2hs reform text ]; homepage = "http://www.happstack.com/"; description = "Add support for using HSP with Reform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -104353,8 +105301,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.4.0.1"; - sha256 = "00ysy5lg0mpv5b1vcjlfi6nx72df3iqz5nmrfsrr0k7i65xp1fzi"; + version = "0.5.0.0"; + sha256 = "00q0z4bnic5phhm7xxv059380q23d0fhd8vh32aggjlggzlq01sx"; buildDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -104597,7 +105545,6 @@ self: { buildDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "High performance, regular, shape polymorphic parallel arrays"; license = stdenv.lib.licenses.bsd3; @@ -104632,6 +105579,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Bulk array representations and operators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-bytestring" = callPackage @@ -104649,15 +105597,18 @@ self: { }) {}; "repa-convert" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, base, bytestring, double-conversion, primitive + , repa-scalar, vector + }: mkDerivation { pname = "repa-convert"; - version = "4.1.0.1"; - sha256 = "197lqlyvljbngnckw742kij7frsx1rwakfa13xwaij6gxmyz9zx6"; - buildDepends = [ base primitive vector ]; - jailbreak = true; + version = "4.2.0.1"; + sha256 = "0y7xjcbrm2g3rgppb9lqbj4m1l7bvir12gjg11a18fkl1mzdh89l"; + buildDepends = [ + base bytestring double-conversion primitive repa-scalar vector + ]; homepage = "http://repa.ouroborus.net"; - description = "Packing and unpacking binary data"; + description = "Packing and unpacking flat tables"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -104702,7 +105653,6 @@ self: { template-haskell vector ]; extraLibraries = [ llvm ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; license = stdenv.lib.licenses.bsd3; @@ -104720,7 +105670,6 @@ self: { testDepends = [ base repa tasty tasty-hunit tasty-quickcheck ]; description = "Perform fft with repa via FFTW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-flow" = callPackage @@ -104774,6 +105723,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "repa-scalar" = callPackage + ({ mkDerivation, base, bytestring, double-conversion, primitive + , vector + }: + mkDerivation { + pname = "repa-scalar"; + version = "4.2.0.1"; + sha256 = "1mby4xa0i2jrzhiyvayif6bwxsmfz1ibvigxw8kwxjd5hqc0y6f6"; + buildDepends = [ + base bytestring double-conversion primitive vector + ]; + homepage = "http://repa.ouroborus.net"; + description = "Scalar data types and conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-series" = callPackage ({ mkDerivation, base, ghc, ghc-prim, vector }: mkDerivation { @@ -104854,18 +105819,18 @@ self: { "repl-toolkit" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory - , exceptions, functor-monadic, ListLike, listsafe, monad-loops, mtl - , numericpeano, parsec, semigroupoids, system-filepath, text + , exceptions, filepath, functor-monadic, ListLike, listsafe + , monad-loops, mtl, numericpeano, parsec, semigroupoids, text , transformers }: mkDerivation { pname = "repl-toolkit"; - version = "0.4.0.0"; - sha256 = "1r4gyj3jjm9sv597zlksckg5cl9r2k633hz5avzczf92b0j4ikr3"; + version = "0.5.0.0"; + sha256 = "0m0jh734zfmxc2bfilb1ka12y3nhsm94hxcg0q6wwf6bxkl564vq"; buildDepends = [ - aeson base bytestring data-default directory exceptions + aeson base bytestring data-default directory exceptions filepath functor-monadic ListLike listsafe monad-loops mtl numericpeano - parsec semigroupoids system-filepath text transformers + parsec semigroupoids text transformers ]; homepage = "https://github.com/ombocomp/repl-toolkit"; description = "Toolkit for quickly whipping up config files and command-line interfaces"; @@ -105090,7 +106055,6 @@ self: { homepage = "https://github.com/wowus/resource-effect/"; description = "A port of the package 'resourcet' for extensible effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resource-embed" = callPackage @@ -105167,10 +106131,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.1.4.1"; - revision = "1"; - sha256 = "1qw9bjr22g8a1fr84cmwjqpqs7cfc8iagix4s618snrg1r1gp6p2"; - editedCabalFile = "28106769e7204b32cfdfb46603990697cfef6f1a9e720d47ec76873edfb06ad7"; + version = "1.1.5"; + sha256 = "063v7xfhwqgf1yvdiidg4anx38nfvgcwb0sqim5rcbqhz0fmkypy"; buildDepends = [ base containers exceptions lifted-base mmorph monad-control mtl transformers transformers-base transformers-compat @@ -105206,6 +106168,7 @@ self: { homepage = "https://github.com/raptros/respond"; description = "process and route HTTP requests and generate responses on top of WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-client" = callPackage @@ -105217,8 +106180,8 @@ self: { }: mkDerivation { pname = "rest-client"; - version = "0.5.0.2"; - sha256 = "1sykmz3mms714sypkpbjhk6dapb0saqsvwjjxnr3cklxdhxhyvz6"; + version = "0.5.0.3"; + sha256 = "02lgdjn4800301w8cki2wyl65jzc4yp4gxrhz5lwv9jcy69gbkkb"; buildDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-conduit http-types hxt hxt-pickle-utils @@ -105231,23 +106194,22 @@ self: { "rest-core" = callPackage ({ mkDerivation, aeson, aeson-utils, base, bytestring - , case-insensitive, either, errors, fclabels, HUnit, hxt - , hxt-pickle-utils, json-schema, mtl, mtl-compat, multipart, random - , rest-stringmap, rest-types, safe, semigroups, split - , test-framework, test-framework-hunit, text, transformers - , transformers-compat, unordered-containers, uri-encode - , utf8-string, uuid + , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils + , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap + , rest-types, safe, split, test-framework, test-framework-hunit + , text, transformers, transformers-compat, unordered-containers + , uri-encode, utf8-string, uuid }: mkDerivation { pname = "rest-core"; - version = "0.35.1"; - sha256 = "16mzvbkv69i0kabjj214166rmsqqc0ga5ad1i7yhm6202s11fx4n"; + version = "0.36.0.4"; + sha256 = "07ypxsf15ghcnlb706cnl3jw275jlwa158dxb0gkr6ab8sq5f2zk"; buildDepends = [ - aeson aeson-utils base bytestring case-insensitive either errors - fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart - random rest-stringmap rest-types safe semigroups split text - transformers transformers-compat unordered-containers uri-encode - utf8-string uuid + aeson aeson-utils base bytestring case-insensitive errors fclabels + hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random + rest-stringmap rest-types safe split text transformers + transformers-compat unordered-containers uri-encode utf8-string + uuid ]; testDepends = [ base bytestring HUnit mtl test-framework test-framework-hunit @@ -105259,22 +106221,22 @@ self: { "rest-example" = callPackage ({ mkDerivation, aeson, base, containers, filepath, generic-aeson - , hxt, json-schema, mtl, regular, regular-xmlpickler, rest-core - , rest-gen, safe, stm, text, time, transformers, transformers-base + , generic-xmlpickler, hxt, json-schema, mtl, rest-core, rest-gen + , safe, stm, text, time, transformers, transformers-base , transformers-compat, unordered-containers }: mkDerivation { pname = "rest-example"; - version = "0.2.0.1"; - sha256 = "0pc8q6ky8flh0rz4s3fl7fyharg1p026v689s8h709mcf5q6kvkf"; + version = "0.2.0.2"; + sha256 = "13mq7zhjwp57rials06kkj8aq400wapldl5mc35h1xynm396xmpi"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base containers filepath generic-aeson hxt json-schema mtl - regular regular-xmlpickler rest-core rest-gen safe stm text time - transformers transformers-base transformers-compat - unordered-containers + aeson base containers filepath generic-aeson generic-xmlpickler hxt + json-schema mtl rest-core rest-gen safe stm text time transformers + transformers-base transformers-compat unordered-containers ]; + jailbreak = true; homepage = "http://www.github.com/silkapp/rest"; description = "Example project for rest"; license = stdenv.lib.licenses.bsd3; @@ -105284,19 +106246,19 @@ self: { ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder , directory, fclabels, filepath, hashable, haskell-src-exts , HStringTemplate, HUnit, hxt, json-schema, pretty, process - , rest-core, safe, scientific, semigroups, split, tagged - , test-framework, test-framework-hunit, text, uniplate - , unordered-containers, vector + , rest-core, safe, scientific, semigroups, split, test-framework + , test-framework-hunit, text, uniplate, unordered-containers + , vector }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.3"; - sha256 = "0hydifrpyzgd2kyrxxwzh7z5iiz0x3584nlgx8gzikyqab8gbk04"; + version = "0.17.0.5"; + sha256 = "1pwn1ws6dcwa00y8dblaj7wnr51mv9hjrc05fiv7mzvl0j0v0iz7"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema - pretty process rest-core safe scientific semigroups split tagged - text uniplate unordered-containers vector + pretty process rest-core safe scientific semigroups split text + uniplate unordered-containers vector ]; testDepends = [ base fclabels haskell-src-exts HUnit rest-core test-framework @@ -105312,8 +106274,8 @@ self: { }: mkDerivation { pname = "rest-happstack"; - version = "0.2.10.7"; - sha256 = "17fqfax3whslip0knwr21f2h674nz5ayqk6947dryhglvwhsyn5v"; + version = "0.2.10.8"; + sha256 = "0n1rc1b9vdq83ilm2s9ac96jln89g0g0img1pwg991dbm30k3v7y"; buildDepends = [ base containers happstack-server mtl rest-core rest-gen utf8-string ]; @@ -105327,8 +106289,8 @@ self: { }: mkDerivation { pname = "rest-snap"; - version = "0.1.17.17"; - sha256 = "1q2w9p9g66fv4mq566895l15l8ywz7nl4bf0zlyf1ng64fmi9far"; + version = "0.1.17.18"; + sha256 = "0g8srn4b7nxyi98vn28q27li4mk7ypdgg9l66ba7z5h0bg8w2766"; buildDepends = [ base bytestring case-insensitive rest-core safe snap-core unordered-containers uri-encode utf8-string @@ -105339,14 +106301,14 @@ self: { "rest-stringmap" = callPackage ({ mkDerivation, aeson, base, containers, hashable, hxt - , json-schema, tagged, text, tostring, unordered-containers + , json-schema, tostring, unordered-containers }: mkDerivation { pname = "rest-stringmap"; - version = "0.2.0.4"; - sha256 = "0r9wmy5myysnw83000qlw547ny9lpshm09fi8hmfr14kd3mr9fb1"; + version = "0.2.0.6"; + sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6"; buildDepends = [ - aeson base containers hashable hxt json-schema tagged text tostring + aeson base containers hashable hxt json-schema tostring unordered-containers ]; description = "Maps with stringy keys that can be transcoded to JSON and XML"; @@ -105354,18 +106316,16 @@ self: { }) {}; "rest-types" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, generic-aeson, hxt - , json-schema, mtl, regular, regular-xmlpickler, rest-stringmap - , text, transformers, transformers-compat, uuid + ({ mkDerivation, aeson, base, case-insensitive, generic-aeson + , generic-xmlpickler, hxt, json-schema, rest-stringmap, text, uuid }: mkDerivation { pname = "rest-types"; - version = "1.13.1"; - sha256 = "09lyx0a4w1mp1ivcky3wnlhisp2a8sd3f37zcr5ckxi8sjmcvsli"; + version = "1.14.0.1"; + sha256 = "0chb91gb3xvfp7k4sbsp07ri2m5x26qj4q2bq0ldkxpk06jicmb4"; buildDepends = [ - aeson base case-insensitive generic-aeson hxt json-schema mtl - regular regular-xmlpickler rest-stringmap text transformers - transformers-compat uuid + aeson base case-insensitive generic-aeson generic-xmlpickler hxt + json-schema rest-stringmap text uuid ]; description = "Silk Rest Framework Types"; license = stdenv.lib.licenses.bsd3; @@ -105378,10 +106338,8 @@ self: { }: mkDerivation { pname = "rest-wai"; - version = "0.1.0.7"; - revision = "1"; - sha256 = "0agvs26x26cgzls66jx7pj2qdn01snjr11rv7sd3x3h4g3ww375v"; - editedCabalFile = "1b15b246eb06e388c3ac37b6a7eb5697109f04f085a46ced92d9e4e809841981"; + version = "0.1.0.8"; + sha256 = "0r11y2rl0h2axnlqcqhdy7w0b3c207qbyhg60rr0rnm9vsqj5l5d"; buildDepends = [ base bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai @@ -105444,6 +106402,7 @@ self: { jailbreak = true; description = "Convert between camel case and separated words style"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resumable-exceptions" = callPackage @@ -105559,6 +106518,7 @@ self: { base data-default-class exceptions hspec HUnit QuickCheck time transformers ]; + jailbreak = true; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; @@ -105630,7 +106590,6 @@ self: { homepage = "https://github.com/jcristovao/reverse-geocoding"; description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reversi" = callPackage @@ -105931,6 +106890,63 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rivet" = callPackage + ({ mkDerivation, base, rivet-core, rivet-simple-deploy }: + mkDerivation { + pname = "rivet"; + version = "0.1.0.0"; + sha256 = "1hiwgn0xyl42y9cmmc25464y42w7grf68xv8cvjznwzv0v1v63cg"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base rivet-core rivet-simple-deploy ]; + homepage = "https://github.com/dbp/rivet"; + description = "A project management tool for Haskell applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rivet-core" = callPackage + ({ mkDerivation, base, configurator, directory, directory-tree + , filepath, postgresql-simple, process, shake, template-haskell + , text, time, unordered-containers + }: + mkDerivation { + pname = "rivet-core"; + version = "0.1.0.1"; + sha256 = "102zgb1ryfl341h8r9hxm9zbmg8jq67bkn57hxhnfsjxv7952x21"; + buildDepends = [ + base configurator directory directory-tree filepath + postgresql-simple process shake template-haskell text time + unordered-containers + ]; + homepage = "https://github.com/dbp/rivet"; + description = "Core library for project management tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rivet-migration" = callPackage + ({ mkDerivation, base, postgresql-simple, text }: + mkDerivation { + pname = "rivet-migration"; + version = "0.1.0.1"; + sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd"; + buildDepends = [ base postgresql-simple text ]; + homepage = "https://github.com/dbp/rivet"; + description = "Postgresql migration support for project management tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rivet-simple-deploy" = callPackage + ({ mkDerivation, base, configurator, mtl, rivet-core, text }: + mkDerivation { + pname = "rivet-simple-deploy"; + version = "0.1.0.0"; + sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf"; + buildDepends = [ base configurator mtl rivet-core text ]; + homepage = "https://github.com/dbp/rivet"; + description = "Basic deployment support for project management tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rmonad" = callPackage ({ mkDerivation, base, containers, HUnit, suitable, test-framework , test-framework-hunit, transformers @@ -105964,6 +106980,7 @@ self: { testDepends = [ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; + jailbreak = true; description = "Haskell implementation of the RNCryptor file format"; license = stdenv.lib.licenses.mit; }) {}; @@ -105998,8 +107015,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.2"; - sha256 = "0lqws8c8qjw7gakyp5ridp1khjhvv0na44rakbh6nhycykvnnfkv"; + version = "0.4.1.3"; + sha256 = "051ibkbhqlpimajj8gl0m468rs6qhlgs15f5bcrhlngfs20jbfkq"; buildDepends = [ attoparsec base bytestring old-locale time ]; testDepends = [ attoparsec base bytestring directory heredoc hspec QuickCheck @@ -106026,7 +107043,6 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -106588,10 +107604,9 @@ self: { }: mkDerivation { pname = "rss"; - version = "3000.2.0.4"; - sha256 = "1kq7bk3kl48699n2ri15im5ds8cd2pmcjglh06br1knxkli80kbq"; + version = "3000.2.0.5"; + sha256 = "0ydr6wqmac6bk3bn69fgay66rc2xap99jgz1gg5z09mhhv3bjmb1"; buildDepends = [ base HaXml network network-uri old-locale time ]; - jailbreak = true; homepage = "https://github.com/basvandijk/rss"; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; @@ -106646,7 +107661,6 @@ self: { homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) rtl-sdr;}; "rtorrent-rpc" = callPackage @@ -106751,7 +107765,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/ruler"; description = "Ruler tool for UHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruler-core" = callPackage @@ -107126,7 +108139,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"; @@ -107138,12 +108151,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;}; + }) { sodium = null;}; "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels @@ -107648,8 +108661,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.2.0"; - sha256 = "0bqnjnyjvhhj2lh8jr6cris5l4crwyql95rfzrvc95wvkb75jwzv"; + version = "0.2.1"; + sha256 = "0lva7pi78ksbxcjd19dycn4ayxcma28wrjmx3x31hn01nvhsnqg0"; buildDepends = [ base bytestring curl regex-base regex-tdfa tagsoup text ]; @@ -107791,6 +108804,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "schedule-planner" = callPackage + ({ mkDerivation, base, containers, happstack-lite, json, mtl + , options, transformers + }: + mkDerivation { + pname = "schedule-planner"; + version = "0.1.0.2"; + sha256 = "0xpn5jgdbzkwysnjlzmvnrvk55wsffx9zbxd6hi1av4nbqz2269r"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers happstack-lite json mtl options transformers + ]; + description = "Find the ideal lesson layout"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -107869,6 +108899,7 @@ self: { aeson base bytestring directory filepath process scholdoc scholdoc-types temporary text yaml ]; + jailbreak = true; homepage = "http://scholdoc.scholarlymarkdown.com"; description = "Scholdoc fork of pandoc-citeproc"; license = stdenv.lib.licenses.bsd3; @@ -107909,6 +108940,7 @@ self: { buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; + jailbreak = true; homepage = "http://scholdoc.scholarlymarkdown.com"; description = "Scholdoc fork of pandoc-types"; license = "GPL"; @@ -108116,9 +109148,9 @@ self: { mkDerivation { pname = "scotty"; version = "0.9.1"; - revision = "1"; + revision = "2"; sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm"; - editedCabalFile = "5a0fefbeb7107a096658d4f0743084bd26e9b0c84853fd560715b0aa46c5802a"; + editedCabalFile = "e37bd4bbb4da4e6d20bd8a29a5c3ca13476643e796a3463a20cbcbd2437bfde7"; buildDepends = [ aeson base blaze-builder bytestring case-insensitive data-default http-types monad-control mtl regex-compat text transformers @@ -108132,6 +109164,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scotty_0_10_0" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, data-default-class, directory, hspec, hspec-wai + , http-types, lifted-base, monad-control, mtl, network + , regex-compat, text, transformers, transformers-base + , transformers-compat, wai, wai-extra, warp + }: + mkDerivation { + pname = "scotty"; + version = "0.10.0"; + sha256 = "0r1k96cf5nykgg987hfqfayyix23rjfn73njqqsfxjiai1dgrnzn"; + buildDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class http-types monad-control mtl network + regex-compat text transformers transformers-base + transformers-compat wai wai-extra warp + ]; + testDepends = [ + async base data-default-class directory hspec hspec-wai http-types + lifted-base network text wai + ]; + homepage = "https://github.com/scotty-web/scotty"; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scotty-binding-play" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl , scotty, template-haskell, text, transformers @@ -108239,7 +109297,6 @@ self: { homepage = "https://github.com/agrafix/scotty-session"; description = "Adding session functionality to scotty"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-tls" = callPackage @@ -108443,8 +109500,8 @@ self: { ({ mkDerivation, base, SDL2, transformers }: mkDerivation { pname = "sdl2"; - version = "1.3.0"; - sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa"; + version = "1.3.1"; + sha256 = "17d3nmiz32hccbbxx55wa2zca8xn7mq3f02rcarzynqczvi5hlyv"; buildDepends = [ base transformers ]; extraLibraries = [ SDL2 ]; pkgconfigDepends = [ SDL2 ]; @@ -108478,7 +109535,6 @@ self: { extraLibraries = [ SDL2 SDL2_ttf ]; description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -108569,6 +109625,7 @@ self: { base ghc-prim profunctors semigroupoids tagged transformers ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/search/"; description = "Infinite search in finite time with Hilbert's epsilon"; license = stdenv.lib.licenses.bsd3; @@ -108616,24 +109673,23 @@ self: { }) {}; "second-transfer" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , conduit, containers, cpphs, exceptions, hashable, hashtables - , hslogger, http2, HUnit, lens, network, network-uri, openssl, text - , transformers + ({ mkDerivation, attoparsec, base, base16-bytestring, binary + , bytestring, conduit, containers, cpphs, exceptions, hashable + , hashtables, hslogger, http2, HUnit, lens, network, network-uri + , openssl, text, time, transformers }: mkDerivation { pname = "second-transfer"; - version = "0.4.0.0"; - sha256 = "1xmlfdvcic11pi8ik9pasljq4h61nsnxpykcw2c9i9pgkl6bkwj9"; + version = "0.5.2.2"; + sha256 = "0zch87psqszg42rxwjd3px80j867xjqz06lgvndrd01sqzadw18g"; buildDepends = [ - base base16-bytestring binary bytestring conduit containers - exceptions hashable hashtables hslogger http2 lens network - network-uri text transformers + attoparsec base base16-bytestring binary bytestring conduit + containers exceptions hashable hashtables hslogger http2 lens + network network-uri text time transformers ]; testDepends = [ base bytestring conduit http2 HUnit lens ]; buildTools = [ cpphs ]; extraLibraries = [ openssl ]; - jailbreak = true; homepage = "https://www.httptwo.com/second-transfer/"; description = "Second Transfer HTTP/2 web server"; license = stdenv.lib.licenses.bsd3; @@ -108714,12 +109770,12 @@ self: { }) {}; "securemem" = callPackage - ({ mkDerivation, base, byteable, bytestring, ghc-prim }: + ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: mkDerivation { pname = "securemem"; - version = "0.1.7"; - sha256 = "14mmis2y9xf3jzmf6s6g7g8ixgbrx99x0b422zv4ix3vpx2lj57r"; - buildDepends = [ base byteable bytestring ghc-prim ]; + version = "0.1.8"; + sha256 = "14q5p464vks942k4q5dl4gyi9asg3d8rl8kd84qgbrvvr3ymhxb2"; + buildDepends = [ base byteable bytestring ghc-prim memory ]; homepage = "http://github.com/vincenthz/hs-securemem"; description = "abstraction to an auto scrubbing and const time eq, memory chunk"; license = stdenv.lib.licenses.bsd3; @@ -108856,37 +109912,37 @@ self: { ]; description = "Weakened partial isomorphisms, reversible computations"; license = stdenv.lib.licenses.mit; - }) {}; - - "semigroupoid-extras" = callPackage - ({ mkDerivation, base, semigroupoids }: - mkDerivation { - pname = "semigroupoid-extras"; - version = "4.0"; - sha256 = "07aa7z4nywcrp9msq83b1pcmryl25yxha89sn5vwlgq40cibcm3g"; - buildDepends = [ base semigroupoids ]; - homepage = "http://github.com/ekmett/semigroupoid-extras"; - description = "This package has been absorbed into semigroupoids 4.0"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semigroupoid-extras" = callPackage + ({ mkDerivation, base, profunctors, semigroupoids }: + mkDerivation { + pname = "semigroupoid-extras"; + version = "5"; + sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh"; + buildDepends = [ base profunctors semigroupoids ]; + homepage = "http://github.com/ekmett/semigroupoid-extras"; + description = "Semigroupoids that depend on PolyKinds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "semigroupoids" = callPackage - ({ mkDerivation, base, comonad, containers, contravariant - , distributive, doctest, Glob, semigroups, transformers - , transformers-compat + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, directory, distributive, doctest + , filepath, semigroups, tagged, transformers, transformers-compat }: mkDerivation { pname = "semigroupoids"; - version = "4.3"; + version = "5.0.0.1"; revision = "1"; - sha256 = "1qn0rffc1zskk6f34pxrp96iarxgp36l2404rs6sz9khl1hh58sf"; - editedCabalFile = "564644e3fb93fa01f5c45772256a980baa07275a763f1015859816942ab210b3"; + sha256 = "0njand5df3ri7pr0jd12z7dfvcfw6xdm7z5ap0b4xcpy47ndcw8l"; + editedCabalFile = "30bb2d94a228945d3d719a7004d79c218479dbdf31f1e92f730378af57fd6575"; buildDepends = [ - base comonad containers contravariant distributive semigroups - transformers transformers-compat + base base-orphans bifunctors comonad containers contravariant + distributive semigroups tagged transformers transformers-compat ]; - testDepends = [ base doctest Glob ]; + testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; @@ -109218,8 +110274,8 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "sequence"; - version = "0.9.6"; - sha256 = "0qn224369bwmdcq3z1j8rpcw4mcvgyh1sp427dx0yncp9d0srqcs"; + version = "0.9.8"; + sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh"; buildDepends = [ base containers transformers ]; homepage = "https://github.com/atzeus/sequence"; description = "A type class for sequences and various sequence data structures"; @@ -109274,18 +110330,17 @@ self: { }) {}; "serf" = callPackage - ({ mkDerivation, attoparsec, attoparsec-conduit, base, conduit, mtl + ({ mkDerivation, attoparsec, base, conduit, conduit-extra, mtl , operational, process, resourcet, text }: mkDerivation { pname = "serf"; - version = "0.1.0.0"; - sha256 = "18ddr4pkr1zld49x6k3lcbrv9916s9r1mxfsi9nfrv7lbvrjmj3v"; + version = "0.1.1.0"; + sha256 = "0ry0shqmazxcsjxsh6amvz2fky2fy3wwlck7d331j8csz7fwdjfn"; buildDepends = [ - attoparsec attoparsec-conduit base conduit mtl operational process + attoparsec base conduit conduit-extra mtl operational process resourcet text ]; - jailbreak = true; homepage = "http://github.com/sanetracker/serf"; description = "Interact with Serf via Haskell"; license = stdenv.lib.licenses.mit; @@ -109296,10 +110351,9 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "serial"; - version = "0.2.6"; - sha256 = "17z0pkc0nz3hf9s68spbb6ijcx6b2dw4y50cavf5110aav59kik1"; + version = "0.2.7"; + sha256 = "1h52h8i28bhamp57q57ih1w9h26ih9g1l25gg9rhiwv5ykhy2vfq"; buildDepends = [ base unix ]; - jailbreak = true; description = "POSIX serial port wrapper"; license = "LGPL"; }) {}; @@ -109336,24 +110390,24 @@ self: { "servant" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring - , bytestring-conversion, case-insensitive, doctest, filemanip - , hspec, http-media, http-types, network-uri, parsec, QuickCheck - , quickcheck-instances, string-conversions, text, url + , bytestring-conversion, case-insensitive, directory, doctest + , filemanip, filepath, hspec, http-media, http-types, network-uri + , parsec, QuickCheck, quickcheck-instances, string-conversions + , text, url }: mkDerivation { pname = "servant"; - version = "0.4.0"; - revision = "1"; - sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5"; - editedCabalFile = "b9f6399d21ba876a4e30cb8e48cb040a972fe82dbac93c62691dc6eae530c25b"; + version = "0.4.1"; + sha256 = "0rbbijy1y40msy0ficssfg0krylrma55z500anymjkmpyp3ymnls"; buildDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri string-conversions text ]; testDepends = [ - aeson attoparsec base bytestring doctest filemanip hspec parsec - QuickCheck quickcheck-instances string-conversions text url + aeson attoparsec base bytestring directory doctest filemanip + filepath hspec parsec QuickCheck quickcheck-instances + string-conversions text url ]; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; @@ -109364,8 +110418,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.0.0"; - sha256 = "17l0fm296zg5nwfc6srnjl82qckabyac5yxm1dhqxwxq45kj42an"; + version = "0.4.1"; + sha256 = "0an5lb3p61i8iahs5rgfy97s3ivqa3q0034iz8zxa4rvhy7k56hp"; buildDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -109381,10 +110435,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.0"; - revision = "1"; - sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm"; - editedCabalFile = "9a7ca5856ef66a4345f4732e7ca5680f55502b899bbe1e2f1397b0e55d33ad37"; + version = "0.4.1"; + sha256 = "1h0w9dkngrz9pimz66bc2ij9ik316x0sliyyqf16mmkpn66wcl6r"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -109407,8 +110459,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.0"; - sha256 = "0fbbs4w0yz0kj3gvms0xbikzfqjdqbbi19z26z3zdmc06crkhn4m"; + version = "0.4.1"; + sha256 = "0xhj75nbsnlbzp3sf6qkfwh0x6a64lfzzq9m07wfg02nqzn22y92"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109422,6 +110474,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ede" = callPackage + ({ mkDerivation, aeson, base, bytestring, ede, either, filepath + , http-media, http-types, semigroups, servant, servant-server, text + , transformers, unordered-containers, wai, warp + }: + mkDerivation { + pname = "servant-ede"; + version = "0.4"; + sha256 = "0h1kvgp0hzn5zmvc5gys3n3w20gmjmsgdw4lmpk7qwg16x2kriwd"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring ede either filepath http-media http-types + semigroups servant servant-server text transformers + unordered-containers wai warp + ]; + homepage = "http://github.com/alpmestan/servant-ede"; + description = "Combinators for rendering EDE templates in servant web applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant @@ -109429,8 +110502,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.0"; - sha256 = "1p8pdrqyj1pyrwghv3k26s4y4aprlkasbzcba9j5n528xvfg0zw5"; + version = "0.4.1"; + sha256 = "10w4fll46355w21l2jq3kd9lfsncdajc8s40j181s29kw6bq6r6n"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109449,8 +110522,8 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.0.0"; - sha256 = "05jadyh3msl2jlrq1d8bmazxb356qdv0gzwpj9gkvrsp4i6ldgcl"; + version = "0.4.1"; + sha256 = "02bggqwmpqznfnprfyfq6ia04byi23zgwvzigymaw1bykfi7z6h0"; buildDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -109458,19 +110531,21 @@ self: { }) {}; "servant-pandoc" = callPackage - ({ mkDerivation, base, bytestring, pandoc-types, servant-docs, text - , unordered-containers + ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types + , semigroupoids, servant-docs, text, unordered-containers }: mkDerivation { pname = "servant-pandoc"; - version = "0.1.0.2"; - sha256 = "0k7fb1ijnvicsrdddibcw1kzjfaq5s776znf6mrpwjgazidq6wfl"; + version = "0.4.0"; + sha256 = "07cyw1d12hg5amjrbsmk2m2ch52yav16k8c3sh83xf42f2j05avs"; buildDepends = [ - base bytestring pandoc-types servant-docs text unordered-containers + base bytestring http-media lens pandoc-types semigroupoids + servant-docs text unordered-containers ]; jailbreak = true; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pool" = callPackage @@ -109537,28 +110612,26 @@ self: { "servant-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, directory, doctest, either, exceptions - , filemanip, hspec, hspec-wai, http-types, mmorph, mtl, network - , network-uri, parsec, QuickCheck, safe, servant, split + , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl + , network, network-uri, parsec, QuickCheck, safe, servant, split , string-conversions, system-filepath, temporary, text , transformers, wai, wai-app-static, wai-extra, warp }: mkDerivation { pname = "servant-server"; - version = "0.4.0"; - revision = "1"; - sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx"; - editedCabalFile = "2e024f79e857aa5ad15cf171c1883b99eb45e901ec888eb68d9c6099c88bbbe8"; + version = "0.4.1"; + sha256 = "0bc82pn82ymv5wy1plmcgxb0ljkqj48rn9x8gdjdki06yvph63ga"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec base bytestring either http-types mmorph mtl - network-uri safe servant split string-conversions system-filepath - text transformers wai wai-app-static warp + aeson attoparsec base bytestring either filepath http-types mmorph + mtl network-uri safe servant split string-conversions + system-filepath text transformers wai wai-app-static warp ]; testDepends = [ aeson base bytestring bytestring-conversion directory doctest - either exceptions filemanip hspec hspec-wai http-types mtl network - parsec QuickCheck servant string-conversions temporary text + either exceptions filemanip filepath hspec hspec-wai http-types mtl + network parsec QuickCheck servant string-conversions temporary text transformers wai wai-extra warp ]; jailbreak = true; @@ -110001,8 +111074,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.15.1"; - sha256 = "0bdx2pclcnqbkdwv8jw6v7w21hn29dp9xbvsbfrnqjvb9f6p1my9"; + version = "0.15.2"; + sha256 = "1vjvfmscmja4f60ag619bca9xdpqlaj3ra2yacrmh1wdi5fzcrdf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110069,7 +111142,6 @@ self: { homepage = "https://github.com/samplecount/shake-language-c"; description = "Utilities for cross-compiling with Shake"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-minify" = callPackage @@ -110124,22 +111196,21 @@ self: { "shakespeare" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, system-fileio, system-filepath, template-haskell, text - , time, transformers + , process, template-haskell, text, time, transformers }: mkDerivation { pname = "shakespeare"; - version = "2.0.4.1"; - sha256 = "0z3aw13kjknrb0r15jffvc4b2aj89r1zl83ighs2cv318dd89qzi"; + version = "2.0.5"; + sha256 = "0jdmmrglzqzpj4cfiyab3kfr0vlz1rfc893nrq94b1rg4vwh1zzh"; buildDepends = [ aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process system-fileio system-filepath - template-haskell text time transformers + exceptions ghc-prim parsec process template-haskell text time + transformers ]; testDepends = [ aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process system-fileio - system-filepath template-haskell text time transformers + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers ]; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; @@ -110255,6 +111326,7 @@ self: { base bytestring hsc2hs QuickCheck test-framework test-framework-quickcheck2 unix ]; + jailbreak = true; description = "A circular buffer built on shared memory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -111151,8 +112223,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.18"; - sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49"; + version = "0.2.20"; + sha256 = "0fzxlj3nmlj9nyzl4ygn6q2rgwvcgjpkypp6cpka64bhqfrgqyb3"; buildDepends = [ base bytestring network unix ]; testDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -111506,7 +112578,6 @@ self: { homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; description = "A framework for generating singleton types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sink" = callPackage @@ -111588,15 +112659,17 @@ self: { }) {}; "sized-types" = callPackage - ({ mkDerivation, array, base, containers, singletons }: + ({ mkDerivation, array, base, base-compat, containers, QuickCheck + , singletons + }: mkDerivation { pname = "sized-types"; - version = "0.5.0"; - sha256 = "1cvgw2plzgpddg2p74hylx499dv4hn2nc8s085mnayp5n9jkn8md"; + version = "0.5.1"; + sha256 = "1nwr92gy8031f18w367ys0l27q4qvpkrkikbj03m93q2i7y74ry7"; isLibrary = true; isExecutable = true; - buildDepends = [ array base containers singletons ]; - jailbreak = true; + buildDepends = [ array base base-compat containers singletons ]; + testDepends = [ base QuickCheck ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools"; description = "Sized types in Haskell using the GHC Nat kind"; license = stdenv.lib.licenses.bsd3; @@ -111752,7 +112825,6 @@ self: { testDepends = [ base ]; description = "Bindings to the Slack RTM API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slack-notify-haskell" = callPackage @@ -111790,6 +112862,7 @@ self: { testDepends = [ base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/slave-thread"; description = "A principal solution to ghost threads and silent exceptions"; license = stdenv.lib.licenses.mit; @@ -111855,7 +112928,6 @@ self: { homepage = "http://github.com/akc/sloane"; description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slot-lambda" = callPackage @@ -111935,17 +113007,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck-lens" = callPackage + ({ mkDerivation, base, lens, smallcheck, smallcheck-series, tasty + , tasty-smallcheck, transformers + }: + mkDerivation { + pname = "smallcheck-lens"; + version = "0.1"; + sha256 = "19awz3gphvkmb54j3mqqmqjzdjywdrrvsb9lp46gbhjazn94sxdl"; + buildDepends = [ + base lens smallcheck smallcheck-series tasty tasty-smallcheck + transformers + ]; + testDepends = [ base lens smallcheck tasty tasty-smallcheck ]; + homepage = "https://github.com/jdnavarro/smallcheck-lens"; + description = "SmallCheck lens laws"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smallcheck-series" = callPackage - ({ mkDerivation, base, bytestring, doctest, Glob, smallcheck, text + ({ mkDerivation, base, bytestring, containers, doctest, Glob + , logict, smallcheck, text, transformers }: mkDerivation { pname = "smallcheck-series"; - version = "0.2"; - sha256 = "1666pf3ki46w3zi01c3lzih7jh0jgqx9jyc1ykrjs056mlnbxp3v"; - buildDepends = [ base bytestring smallcheck text ]; + version = "0.3"; + sha256 = "1vdwafwdv38n1bvjf1rybfhh42a0q0g0g4wmw0v4fgxh73qndfdv"; + buildDepends = [ + base bytestring containers logict smallcheck text transformers + ]; testDepends = [ base doctest Glob ]; homepage = "https://github.com/jdnavarro/smallcheck-series"; - description = "Extra SmallCheck series"; + description = "Extra SmallCheck series and utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -112026,6 +113119,7 @@ self: { homepage = "https://github.com/leepike/SmartCheck"; description = "A smarter QuickCheck"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smartconstructor" = callPackage @@ -112220,10 +113314,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.14.0.2"; - revision = "2"; - sha256 = "1yv1snkibsqd7cdxyqi7c8gvnv1hzzhw5jlk19kps526n5xvay7r"; - editedCabalFile = "27e804d1f6070f0899ad3770dfded3db1b6ce44309b28c33f11701edcfe6428a"; + version = "0.14.0.4"; + sha256 = "0z0w6dig658cbl6adwq738dr9z56a3sj8lfhh5zfnmmy7x1794xs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112334,7 +113426,9 @@ self: { mkDerivation { pname = "snap-core"; version = "0.9.7.0"; + revision = "1"; sha256 = "0ambk7q35v76ww62m4y6j45ga63c141zi3wxkgazybbazk5i36nw"; + editedCabalFile = "052dd91058bbdf948c75693679c257ae4511bcf8c46428f975d8d31e78e860a4"; buildDepends = [ attoparsec attoparsec-enumerator base blaze-builder blaze-builder-enumerator bytestring bytestring-mmap @@ -112342,7 +113436,6 @@ self: { hashable HUnit MonadCatchIO-transformers mtl random regex-posix text time unix unix-compat unordered-containers vector zlib-enum ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; @@ -112414,7 +113507,9 @@ self: { mkDerivation { pname = "snap-extras"; version = "0.11"; + revision = "1"; sha256 = "1s6qdl149x22six61kgm7xnqfyys8z7zh0waajmzip1q4ivxqnij"; + editedCabalFile = "b0332fedd9b65e483e28c08dc1e76473dc4ab7cee457c69195069aca91d24c46"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112502,7 +113597,9 @@ self: { mkDerivation { pname = "snap-server"; version = "0.9.5.1"; + revision = "1"; sha256 = "18ryin6f315picrs2159sn2668266l3xchs7jb8isw0gp52273xg"; + editedCabalFile = "7909ad539e7d3f23f3c799d736d1a54d0a9098dd55fd6be75c13b57794bfaa5c"; buildDepends = [ attoparsec attoparsec-enumerator base blaze-builder blaze-builder-enumerator bytestring case-insensitive containers @@ -112510,7 +113607,6 @@ self: { old-locale snap-core text time unix unix-compat ]; configureFlags = [ "-fopenssl" ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -112716,17 +113812,17 @@ self: { mkDerivation { pname = "snaplet-fay"; version = "0.3.3.11"; - revision = "1"; + revision = "2"; sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr"; - editedCabalFile = "754ad06e1c8e6fd26f362bdc3f83f0863e7f2e941ffcf8b753310aee2c1aad26"; + editedCabalFile = "6b536ac4ad158ceed55ca18802caf4e970caabce93af33d95579ac431a003e9d"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers ]; + jailbreak = true; homepage = "https://github.com/faylang/snaplet-fay"; description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-hasql" = callPackage @@ -112872,7 +113968,6 @@ self: { homepage = "https://github.com/ixmatus/snaplet-mandrill"; description = "Snap framework snaplet for the Mandrill API library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-mongoDB" = callPackage @@ -112993,13 +114088,14 @@ self: { mkDerivation { pname = "snaplet-postgresql-simple"; version = "0.6.0.2"; + revision = "2"; sha256 = "0xx69x9mkv6xyd7arnip12zzyq7hdcqbypgypalgsj6vcjb8i4mp"; + editedCabalFile = "cfc56ee20478bf05a650bdcb457b606a640daa71b84a3a2a3bdb8930dcbbeb7b"; buildDepends = [ base bytestring clientsession configurator errors lens MonadCatchIO-transformers mtl postgresql-simple resource-pool-catchio snap text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -113020,7 +114116,6 @@ self: { homepage = "https://github.com/LukeHoersten/snaplet-postmark"; description = "Postmark snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-purescript" = callPackage @@ -113277,6 +114372,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snaplet-wordpress" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder + , bytestring, configurator, containers, data-default, either, hedis + , heist, hspec, hspec-core, hspec-snap, lens, map-syntax, mtl, snap + , snap-core, snaplet-redis, text, time, unordered-containers + , vector, wreq, xmlhtml + }: + mkDerivation { + pname = "snaplet-wordpress"; + version = "0.1.1.2"; + sha256 = "1vmkywrd0vfyd028d0pvfglywgbv1m26j1shwy9wmnr581vx9pab"; + buildDepends = [ + aeson async attoparsec base blaze-builder bytestring configurator + containers data-default either hedis heist hspec hspec-snap lens + map-syntax mtl snap snap-core snaplet-redis text time + unordered-containers vector wreq xmlhtml + ]; + testDepends = [ + aeson base blaze-builder containers data-default either hedis heist + hspec hspec-core hspec-snap lens mtl snap snaplet-redis text + unordered-containers xmlhtml + ]; + homepage = "https://github.com/dbp/snaplet-wordpress"; + description = "A snaplet that communicates with wordpress over its api"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snappy" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, snappy , test-framework, test-framework-quickcheck2 @@ -113562,6 +114685,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "socket" = callPackage + ({ mkDerivation, async, base, bytestring }: + mkDerivation { + pname = "socket"; + version = "0.2.0.0"; + sha256 = "0z9hcbvsalmn7zmmks18v8pq3gnvf868kw44a9s6kp5h6npp05dw"; + buildDepends = [ base bytestring ]; + testDepends = [ async base bytestring ]; + homepage = "https://github.com/lpeterse/haskell-socket"; + description = "A binding to the POSIX sockets interface"; + license = stdenv.lib.licenses.mit; + }) {}; + "socket-activation" = callPackage ({ mkDerivation, base, network, transformers, unix }: mkDerivation { @@ -113580,13 +114716,12 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.1"; - sha256 = "0ylb05lcgprvfdvhc71dqhh9azsp12vwx8zihdvcim0ax0ylrb20"; + version = "1.3.2"; + sha256 = "0bqrglnp54hd777lq92ia7z9vwmj1dq24m7lbiqhzvvb63p9mv4i"; buildDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -113663,8 +114798,8 @@ self: { }: mkDerivation { pname = "som"; - version = "8.0.4"; - sha256 = "0jax009wbqlkkdhli5g0d01cgl7lvc8j2a86lp6p1msdk8rb6nls"; + version = "8.0.5"; + sha256 = "1cprlv1mbs722ap3cicgi0haph9xlz2xvcm374857d11ly31wav0"; buildDepends = [ base containers grid MonadRandom ]; testDepends = [ base containers grid MonadRandom QuickCheck random test-framework @@ -113673,7 +114808,6 @@ self: { homepage = "https://github.com/mhwombat/som"; description = "Self-Organising Maps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -113726,7 +114860,6 @@ self: { homepage = "https://github.com/nfjinjing/sort-by-pinyin"; description = "Sort simplified Chinese by PinYin"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sorted" = callPackage @@ -113967,6 +115100,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spaceprobe" = callPackage + ({ mkDerivation, base, clock, containers, erf, mtl, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "spaceprobe"; + version = "0.3.0"; + sha256 = "09vpnq5mfdzr132cqm5i4xkxmpg2035pbs64a56lgq0asdzlhfmy"; + buildDepends = [ base clock containers erf mtl ]; + testDepends = [ + base clock containers erf mtl QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/SeanRBurton/spaceprobe"; + description = "Optimization over arbitrary search spaces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sparse" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , deepseq, directory, doctest, filepath, hlint, hybrid-vectors @@ -114175,7 +115326,6 @@ self: { ]; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculation" = callPackage @@ -114219,7 +115369,6 @@ self: { homepage = "https://github.com/gregwebs/haskell-spell-suggest"; description = "Spelling suggestion tool with library and command-line interfaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sphero" = callPackage @@ -115049,6 +116198,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stable-heap" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "stable-heap"; + version = "0.1.0.0"; + sha256 = "14wx42lmk2vd6v356q5cbd78y9xdnmkwcn6ddpnkyzq331hk23s1"; + buildDepends = [ base ]; + homepage = "http://hub.darcs.net/jmcarthur/stable-heap"; + description = "Purely functional stable heaps (fair priority queues)"; + license = stdenv.lib.licenses.mit; + }) {}; + "stable-maps" = callPackage ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { @@ -115099,6 +116260,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stack" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "stack"; + version = "0.0.0"; + sha256 = "0829d2yb32gfnn22idhwzpyc2gy3d7lyj19kh20fbq73fp7k9kmb"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base ]; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "stack-prism" = callPackage ({ mkDerivation, base, profunctors, tagged, template-haskell , transformers @@ -115111,6 +116285,7 @@ self: { base profunctors tagged template-haskell transformers ]; testDepends = [ base template-haskell ]; + jailbreak = true; homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; @@ -115243,8 +116418,8 @@ self: { }: mkDerivation { pname = "stackage-install"; - version = "0.1.0.3"; - sha256 = "1m9y6xvh1gzivvx9n69m1qdawmbshb05xm7dw3d5wpbrrc9axg4m"; + version = "0.1.1.1"; + sha256 = "0xdqd1q1xy0qax4c2dn1qa0qphvq01xy3wzdp7rr2xnd23ikmbs6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -115257,21 +116432,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stackage-metadata" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal + , conduit, containers, cryptohash, directory, filepath, http-client + , http-client-tls, pretty, resourcet, stackage-install + , stackage-update, tar, text, transformers, yaml, zlib + }: + mkDerivation { + pname = "stackage-metadata"; + version = "0.3.0.0"; + sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base base16-bytestring bytestring Cabal conduit containers + cryptohash directory filepath http-client http-client-tls pretty + resourcet stackage-install stackage-update tar text transformers + yaml zlib + ]; + homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool"; + description = "Grab current metadata for all packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "stackage-sandbox" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit-combinators - , conduit-extra, filepath, optparse-applicative, process - , stackage-cli, system-fileio, system-filepath, text + , conduit-extra, directory, filepath, optparse-applicative, process + , stackage-cli, text }: mkDerivation { pname = "stackage-sandbox"; - version = "0.1.1"; - sha256 = "1xdf1izk8a610g5jzmq3fhx5myld1lfmzd9hfjlqyvwjc76w36g5"; + version = "0.1.4"; + sha256 = "0y6m2ph1pgzlncirngbid7igdwkiv7yxcj27cgm0xpq8ii4lsq4x"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base bytestring conduit-combinators conduit-extra - filepath optparse-applicative process stackage-cli system-fileio - system-filepath text + directory filepath optparse-applicative process stackage-cli text ]; homepage = "https://www.stackage.org/package/stackage-sandbox"; description = "Work with shared stackage sandboxes"; @@ -115280,22 +116477,21 @@ self: { "stackage-setup" = callPackage ({ mkDerivation, aeson, base, bytestring, classy-prelude-conduit - , cryptohash, cryptohash-conduit, filepath, http-client-tls - , http-conduit, http-types, optparse-applicative, process - , stackage-cli, system-fileio, system-filepath, text - , unordered-containers, yaml + , cryptohash, cryptohash-conduit, directory, filepath + , http-client-tls, http-conduit, http-types, optparse-applicative + , process, stackage-cli, text, unordered-containers, yaml }: mkDerivation { pname = "stackage-setup"; - version = "0.0.1"; - sha256 = "1db527g3wk154rr1vsi6fv2lvh4cyfgab02ghvmmshgrjj3iypkw"; + version = "0.0.2"; + sha256 = "1101sb822v42zjjgabn4s80qyvn6nvzkfagaxpzjm6dp5svl3biv"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring classy-prelude-conduit cryptohash - cryptohash-conduit filepath http-client-tls http-conduit http-types - optparse-applicative process stackage-cli system-fileio - system-filepath text unordered-containers yaml + cryptohash-conduit directory filepath http-client-tls http-conduit + http-types optparse-applicative process stackage-cli text + unordered-containers yaml ]; homepage = "https://www.stackage.org/package/stackage-setup"; description = "An executable for downloading a Haskell setup"; @@ -115304,15 +116500,16 @@ self: { "stackage-types" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, exceptions - , hashable, semigroups, text, time, unordered-containers, vector + , hashable, safe, semigroups, text, time, unordered-containers + , vector }: mkDerivation { pname = "stackage-types"; - version = "1.0.1"; - sha256 = "0dgxkpx97ndmc9m46ql5chsg42f3ibzzqj0brh89xc5dvd5gdhhd"; + version = "1.0.1.1"; + sha256 = "0zffk8rc611nm5zl53fynz8ly4mzrqx9cjyfwrw07j9mdwi21dsz"; buildDepends = [ - aeson base Cabal containers exceptions hashable semigroups text - time unordered-containers vector + aeson base Cabal containers exceptions hashable safe semigroups + text time unordered-containers vector ]; homepage = "https://github.com/fpco/stackage-types"; description = "Shared data types between various Stackage packages"; @@ -115323,8 +116520,8 @@ self: { ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "stackage-update"; - version = "0.1.1.3"; - sha256 = "01f9809scpkix54w0yfw4yjf1aak4y612bq7mjn1j573s10xa2iy"; + version = "0.1.2"; + sha256 = "1lw30fvscnb3n29lavw16am41adrvby1v2vbh7yykbr80pkb3hvj"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath process ]; @@ -115340,8 +116537,8 @@ self: { }: mkDerivation { pname = "stackage-upload"; - version = "0.1.0.4"; - sha256 = "12233xn9gjd7a7d75rpzf58r2fw86vcvhv0snkkj97y83mm4r3ga"; + version = "0.1.0.5"; + sha256 = "0fxkscyzpl6ph28100b0l663rjny9vp2jrhcca19dc0jzj0kfdgi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -115447,6 +116644,7 @@ self: { sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1"; buildDepends = [ base mtl ]; testDepends = [ base checkers mtl QuickCheck ]; + jailbreak = true; description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -115561,6 +116759,7 @@ self: { version = "0.2.0.1"; sha256 = "14zglnvlra4p85zc4vkgwrpfjf7mrz9dw4ppi369vsfwnw2sgwkq"; buildDepends = [ base double-conversion free mtl text ]; + jailbreak = true; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; @@ -115935,8 +117134,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-chans"; - version = "3.0.0.3"; - sha256 = "058miz12xm21lghc4bi06grsddd8hf2x9x5qdh0dva6lk0h9y7mk"; + version = "3.0.0.4"; + sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13"; buildDepends = [ base stm ]; homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; @@ -115967,8 +117166,8 @@ self: { }: mkDerivation { pname = "stm-conduit"; - version = "2.6.0"; - sha256 = "0lhqhsvisyn4wgj5qk0slzbgy7lbmzgcryi4vlw1d058nsjnpxwj"; + version = "2.6.1"; + sha256 = "0cd99aj9azlr6d9bayjyrbigbzll9yfny7qan1wnrh413i1z1x0p"; buildDepends = [ async base cereal cereal-conduit conduit conduit-combinators conduit-extra directory ghc-prim lifted-async lifted-base @@ -116001,6 +117200,7 @@ self: { base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude placeholders primitive QuickCheck transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/stm-containers"; description = "Containers for STM"; license = stdenv.lib.licenses.mit; @@ -116056,9 +117256,10 @@ self: { mkDerivation { pname = "stm-lifted"; version = "0.1.0.0"; + revision = "1"; sha256 = "1x3yxxyik0vyh3p530msxh2a1aylmh8zab05qpq7nfl5m9v6v090"; + editedCabalFile = "d313721a31d8e7ccc725c3a1542f4ac3f8c84fbcad10094cd1067c133edc6c54"; buildDepends = [ base stm transformers ]; - jailbreak = true; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -116456,8 +117657,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.1.12"; - sha256 = "1scqajmi3zp1088kc8nfzmzm8831idc4m0d5sck5mhav9xcmx7sy"; + version = "0.1.12.1"; + sha256 = "1msg18bvz1cxfh745m3jgxf65x7jncqwwpfi538x24qsn788vgfm"; buildDepends = [ array base blaze-builder bytestring directory network process random stm text transformers unix zlib @@ -116509,6 +117710,7 @@ self: { buildDepends = [ adjunctions base comonad distributive semigroupoids semigroups ]; + jailbreak = true; homepage = "http://github.com/ekmett/streams/issues"; description = "Various Haskell 2010 stream comonads"; license = stdenv.lib.licenses.bsd3; @@ -116877,6 +118079,7 @@ self: { http-types template-haskell text time transformers ]; testDepends = [ base bytestring hlint markdown-unlit time ]; + jailbreak = true; homepage = "http://taylor.fausak.me/strive/"; description = "A Haskell client for the Strava V3 API"; license = stdenv.lib.licenses.mit; @@ -116908,7 +118111,6 @@ self: { base geniplate language-haskell-extract mtl pretty QuickCheck safe testing-feat ]; - jailbreak = true; homepage = "http://www.github.com/danr/structural-induction"; description = "Instantiate structural induction schemas for algebraic data types"; license = stdenv.lib.licenses.gpl3; @@ -117052,6 +118254,7 @@ self: { haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; + jailbreak = true; homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; @@ -117369,8 +118572,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.3"; - sha256 = "0r83c5422bk50k0s5sbcbzw808r9am1zy35dlny4y28hvljm1pad"; + version = "0.3.1"; + sha256 = "1fnj7d2nw4p9m46wp64gz99ssggxd0rz4737732hpk9vr5xq78lc"; buildDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -117506,7 +118709,6 @@ self: { testDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "Implementation of swagger data model"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -117659,12 +118861,13 @@ self: { }: mkDerivation { pname = "syb-with-class"; - version = "0.6.1.5"; - sha256 = "1gn4p92jabgvbk7bg1nzjimyfzznl800bi9hw4ssvc7jqqnyw5zn"; + version = "0.6.1.6"; + revision = "1"; + sha256 = "1c61hig293lxyr2kdri3rp6wkns921fiwwmml9zhrhrrryfr0p2n"; + editedCabalFile = "e894d322dfc9c36c33058bfcbecbe6d36e620556a9713108b008120f7981cd7c"; buildDepends = [ array base bytestring containers template-haskell ]; - jailbreak = true; description = "Scrap Your Boilerplate With Class"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -117773,19 +118976,19 @@ self: { "syncthing-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, containers , data-default, derive, either, exceptions, http-client - , http-client-tls, http-types, lens, old-locale - , quickcheck-instances, regex-posix, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , vector, wreq + , http-client-tls, http-types, lens, quickcheck-instances + , regex-posix, scientific, tasty, tasty-hunit, tasty-quickcheck + , text, time, time-locale-compat, transformers + , unordered-containers, vector, wreq }: mkDerivation { pname = "syncthing-hs"; - version = "0.2.0.0"; - sha256 = "172jyv2lxq1ys7r2hcrria91s6k5fks2bqnd7whppln79g1nd7vi"; + version = "0.3.0.0"; + sha256 = "0mancdrf3miicjcsrszxgv5bnka9nvbcsynyw4ljn19c2mk2628r"; buildDepends = [ aeson base bytestring connection containers either exceptions - http-client http-client-tls lens old-locale regex-posix text time - transformers unordered-containers vector wreq + http-client http-client-tls lens regex-posix text time + time-locale-compat transformers unordered-containers vector wreq ]; testDepends = [ aeson base bytestring containers data-default derive either @@ -117841,7 +119044,6 @@ self: { homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntactical" = callPackage @@ -117870,6 +119072,7 @@ self: { ]; description = "Reversible parsing and pretty-printing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-attoparsec" = callPackage @@ -117885,6 +119088,7 @@ self: { ]; description = "Syntax instances for Attoparsec"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-example" = callPackage @@ -117903,6 +119107,7 @@ self: { ]; description = "Example application using syntax, a library for abstract syntax descriptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-example-json" = callPackage @@ -117921,6 +119126,7 @@ self: { ]; description = "Example JSON parser/pretty-printer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-pretty" = callPackage @@ -117933,6 +119139,7 @@ self: { buildDepends = [ base pretty scientific semi-iso syntax text ]; description = "Syntax instance for pretty, the pretty printing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-printer" = callPackage @@ -117950,6 +119157,7 @@ self: { jailbreak = true; description = "Text and ByteString printers for 'syntax'"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-trees" = callPackage @@ -118201,6 +119409,7 @@ self: { homepage = "https://github.com/d12frosted/CanonicalPath"; description = "Abstract data type for canonical paths with some utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-command" = callPackage @@ -118224,15 +119433,15 @@ self: { }: mkDerivation { pname = "system-fileio"; - version = "0.3.16.2"; - sha256 = "17mk1crlgrh9c9lfng6a2fdk49m2mbkkdlq5iysl1rzwkn12mmkd"; + version = "0.3.16.3"; + sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i"; buildDepends = [ base bytestring system-filepath text time unix ]; testDepends = [ base bytestring chell system-filepath temporary text time transformers unix ]; homepage = "https://github.com/fpco/haskell-filesystem"; - description = "Consistent filesystem interaction across GHC versions"; + description = "Consistent filesystem interaction across GHC versions (deprecated)"; license = stdenv.lib.licenses.mit; }) {}; @@ -118242,14 +119451,14 @@ self: { }: mkDerivation { pname = "system-filepath"; - version = "0.4.13.3"; - sha256 = "1j6fk1d3qrc2dn4kzwar9z3malrhx2mc6jjvlq9wiqyyx5gs3yyj"; + version = "0.4.13.4"; + sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l"; buildDepends = [ base bytestring deepseq text ]; testDepends = [ base bytestring chell chell-quickcheck QuickCheck text ]; homepage = "https://github.com/fpco/haskell-filesystem"; - description = "High-level, byte-based file and directory path manipulations"; + description = "High-level, byte-based file and directory path manipulations (deprecated)"; license = stdenv.lib.licenses.mit; }) {}; @@ -118514,6 +119723,7 @@ self: { base containers directory doctest filepath lens transformers unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/tables/"; description = "In-memory storage with multiple keys using lenses and traversals"; license = stdenv.lib.licenses.bsd3; @@ -118658,16 +119868,12 @@ self: { }) {}; "tagged-binary" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default, pureMD5 - , spoon - }: + ({ mkDerivation, base, binary, bytestring, pureMD5 }: mkDerivation { pname = "tagged-binary"; - version = "0.1.2.0"; - sha256 = "1ci2dgqix1r9x4k77igv367r3z1qphd906cg1mxfw92mq61m7f0w"; - buildDepends = [ - base binary bytestring data-default pureMD5 spoon - ]; + version = "0.2.0.0"; + sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm"; + buildDepends = [ base binary bytestring pureMD5 ]; description = "Provides tools for serializing data tagged with type information"; license = stdenv.lib.licenses.mit; }) {}; @@ -118736,6 +119942,7 @@ self: { base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged ]; + jailbreak = true; homepage = "http://github.com/ekmett/tagged-transformer"; description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; @@ -118835,6 +120042,7 @@ self: { version = "0.3.0"; sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf"; buildDepends = [ base binary containers parsec text text-binary ]; + jailbreak = true; homepage = "https://github.com/kawu/tagset-positional"; description = "Positional tags and tagsets"; license = stdenv.lib.licenses.bsd3; @@ -119091,28 +120299,29 @@ self: { ({ mkDerivation, array, base, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, ghc-prim, liquid-fixpoint , liquidhaskell, mtl, pretty, process, syb, tagged, tasty - , tasty-hunit, template-haskell, text, text-format, transformers - , unordered-containers, vector + , tasty-hunit, template-haskell, text, text-format, th-lift + , transformers, unordered-containers, vector, z3 }: mkDerivation { pname = "target"; - version = "0.1.1.0"; - sha256 = "1b6kbiqpx57ghi98ki4gbqclyl91rs113ayd51bx8wmwwbaag21v"; + version = "0.1.3.0"; + sha256 = "0przmavzzcbyxkqj1wffiissxz9fdlrx2q8lpxgmsamadd46xq66"; buildDepends = [ base containers directory exceptions filepath ghc ghc-paths liquid-fixpoint liquidhaskell mtl pretty process syb tagged - template-haskell text text-format transformers unordered-containers - vector + template-haskell text text-format th-lift transformers + unordered-containers vector ]; testDepends = [ array base containers deepseq ghc ghc-prim liquid-fixpoint liquidhaskell mtl tagged tasty tasty-hunit template-haskell unordered-containers ]; + buildTools = [ z3 ]; description = "Generate test-suites from refinement types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) z3;}; "task" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers @@ -119318,10 +120527,9 @@ self: { }: mkDerivation { pname = "tasty-program"; - version = "1.0.2"; - sha256 = "0ii7jcmvmbw03r1ghm2bq9bmbs7w0jqgfc7qx34n45ymjy7ipc55"; + version = "1.0.3"; + sha256 = "18q6b8z5hh1jybr9i72ark95hwz8kg6zbh40ghgwsf6n3ijyfn8n"; buildDepends = [ base deepseq directory filepath process tasty ]; - jailbreak = true; homepage = "https://github.com/jstolarek/tasty-program"; description = "Use tasty framework to test whether a program executes correctly"; license = stdenv.lib.licenses.bsd3; @@ -119367,8 +120575,8 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.1.5"; - sha256 = "09mgk5pklmwxhr6r3lfmcdd09fzwn00x1vbyy93gh7wbpcpfa8dv"; + version = "3.1.7"; + sha256 = "1mplisyhps9n3kw2w3fjanc14cr6vbyr4xdydq76za9dmx07kd3l"; buildDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -119379,7 +120587,7 @@ self: { transformers ]; homepage = "https://github.com/phile314/tasty-silver"; - description = "Golden tests support for tasty. Fork of tasty-golden."; + description = "A fancy test runner, including support for golden tests"; license = stdenv.lib.licenses.mit; }) {}; @@ -119566,6 +120774,7 @@ self: { buildDepends = [ base containers fgl graphviz ]; description = "Graphical modeling tools for sequential teams"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teeth" = callPackage @@ -119584,19 +120793,21 @@ self: { }) {}; "tellbot" = callPackage - ({ mkDerivation, base, bifunctors, containers, errors, http-conduit - , mtl, network, regex-posix, split, time, transformers + ({ mkDerivation, base, bifunctors, bytestring, containers, errors + , http-conduit, mtl, network, regex-posix, split, tagsoup, text + , time, transformers }: mkDerivation { pname = "tellbot"; - version = "0.5.1.2"; - sha256 = "1w5byb09gv61qagqb2l16y93zlwvv1wfjlvc4xm6mi91xviyihkc"; + version = "0.5.1.4"; + sha256 = "0mm7yyyxs3dvqsrs1xd4mq7byfn55rwri26k9xq3l4k9v7sxbgx8"; isLibrary = false; isExecutable = true; buildDepends = [ - base bifunctors containers errors http-conduit mtl network - regex-posix split time transformers + base bifunctors bytestring containers errors http-conduit mtl + network regex-posix split tagsoup text time transformers ]; + jailbreak = true; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -119891,8 +121102,8 @@ self: { }: mkDerivation { pname = "term-rewriting"; - version = "0.1.2.2"; - sha256 = "0j69a4vvsv5lbh8zx3908bpk76lmg871glm6hqv0nq4xzircp184"; + version = "0.2"; + sha256 = "07axcgr8llrj8icaysi1awq29p8vgpakvv56shvjrcgjf9ar0m11"; buildDepends = [ ansi-wl-pprint array base containers mtl multiset parsec union-find-array @@ -119942,8 +121153,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "terminal-size"; - version = "0.3.0"; - sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw"; + version = "0.3.2"; + sha256 = "0vm6xrm5j60h01lgn7srhsx2698aq6k5jkbc84bi5zh5w63fsdyp"; buildDepends = [ base ]; description = "Get terminal window height and width"; license = stdenv.lib.licenses.bsd3; @@ -120224,22 +121435,21 @@ self: { }: mkDerivation { pname = "test-framework-th-prime"; - version = "0.0.7"; - sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p"; + version = "0.0.8"; + sha256 = "0gb7bpdxzsd8fnh4ck4p1ks7nxrk7fsw97x90d4zjds5hnw3hchr"; buildDepends = [ base cpphs haskell-src-exts template-haskell test-framework ]; description = "Template Haskell for test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-invariant" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { pname = "test-invariant"; - version = "0.4.4.0"; - sha256 = "12b3m9ryfkc4gvlsw7jchy3rnqjs5j0gcknn1b3rhm2gzn66ac04"; + version = "0.4.5.0"; + sha256 = "0ck3kk7pmj1679ddmrysx5j3y27619ar1b2pny45mskz3g6vyvrh"; buildDepends = [ base QuickCheck ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "https://github.com/knupfer/test-invariant"; @@ -120269,8 +121479,8 @@ self: { }: mkDerivation { pname = "test-sandbox"; - version = "0.1.4"; - sha256 = "1x7vsi1brrdj71gwszc75qz159y8i4xln9dpcnxf70xjlswjmiqj"; + version = "0.1.5"; + sha256 = "1cknqblzf2wqq46casmfq00lx4zh3y9g07bqsbchxbq4xmd000js"; buildDepends = [ base bytestring cereal containers data-default directory filepath lifted-base monad-control monad-loops mtl network process random @@ -120364,6 +121574,7 @@ self: { sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka"; buildDepends = [ base mtl QuickCheck state-plus template-haskell ]; testDepends = [ base executable-path mtl process QuickCheck ]; + jailbreak = true; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -120424,6 +121635,7 @@ self: { version = "2.1.3.0"; sha256 = "1rq5d64d7j3gpgbfxmfr4xmzizjy0ricw5ghrakv8gzvxmi2bn4p"; buildDepends = [ base containers HUnit mtl QuickCheck random ]; + jailbreak = true; homepage = "https://github.com/jgoerzen/testpack"; description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)"; license = "LGPL"; @@ -120533,21 +121745,21 @@ self: { }) {}; "text" = callPackage - ({ mkDerivation, array, base, bytestring, deepseq, directory - , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode - , random, test-framework, test-framework-hunit + ({ mkDerivation, array, base, binary, bytestring, deepseq + , directory, ghc-prim, HUnit, integer-gmp, QuickCheck + , quickcheck-unicode, random, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "text"; - version = "1.2.0.4"; - sha256 = "004p1c74crs8wmjafwsmw3mmycspq1j8fpm1lvfpq6acha7bnpc6"; + version = "1.2.1.1"; + sha256 = "0l4lrpa216dblm1qk0qpykmx56a28h0hjgccq18sn1mr7n3wyhl8"; buildDepends = [ - array base bytestring deepseq ghc-prim integer-gmp + array base binary bytestring deepseq ghc-prim integer-gmp ]; testDepends = [ - array base bytestring deepseq directory ghc-prim HUnit integer-gmp - QuickCheck quickcheck-unicode random test-framework + array base binary bytestring deepseq directory ghc-prim HUnit + integer-gmp QuickCheck quickcheck-unicode random test-framework test-framework-hunit test-framework-quickcheck2 ]; homepage = "https://github.com/bos/text"; @@ -120576,8 +121788,8 @@ self: { ({ mkDerivation, base, binary, text }: mkDerivation { pname = "text-binary"; - version = "0.1.0"; - sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z"; + version = "0.2.0"; + sha256 = "09njl6afnj2yjqn3mg3ry4qsd5jjjh51malk6kn2zzihldb9z5b2"; buildDepends = [ base binary text ]; homepage = "https://github.com/kawu/text-binary"; description = "Binary instances for text types"; @@ -120812,21 +122024,24 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp - , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text + ({ mkDerivation, array, base, base-compat, base-orphans, bytestring + , bytestring-builder, ghc-prim, hspec, integer-gmp, nats + , QuickCheck, quickcheck-instances, semigroups, tagged + , template-haskell, text, transformers, transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "0.7.0.1"; - sha256 = "1qmvnni69dkxdjay387qxnvy1j4cffnw5igdgqbaqvrm0cgkkg4a"; + version = "0.8.1.1"; + sha256 = "130nqg0fgvnzi5zl0c0cwxjm2jppjmxm9z04g0rv498cl783ag45"; buildDepends = [ - array base bytestring ghc-prim integer-gmp semigroups - template-haskell text + array base base-compat bytestring bytestring-builder ghc-prim + integer-gmp nats semigroups tagged template-haskell text + transformers void ]; testDepends = [ - array base bytestring ghc-prim QuickCheck quickcheck-instances - tasty tasty-hunit tasty-quickcheck text + array base base-compat base-orphans bytestring bytestring-builder + ghc-prim hspec nats QuickCheck quickcheck-instances tagged text + transformers transformers-compat void ]; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; @@ -120834,35 +122049,34 @@ self: { }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , haskeline, hoopl, hpc, old-locale, old-time, pretty - , quickcheck-instances, random, semigroups, tagged, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, terminfo, text - , text-show, time, transformers, transformers-compat, unix - , unordered-containers, utf8-string, vector, xhtml + ({ mkDerivation, base, base-compat, binary, bytestring, containers + , directory, haskeline, hoopl, hpc, hspec, old-locale, old-time + , pretty, QuickCheck, quickcheck-instances, random, semigroups + , tagged, template-haskell, terminfo, text, text-show, time + , transformers, transformers-compat, unix, unordered-containers + , utf8-string, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "0.3.0.1"; - sha256 = "1a6ybgx5jivacy7b0bja5f7an1xq9mjmr2x348knaf84v2wqws9p"; + version = "0.4"; + sha256 = "1zk3q11dsr8n15r6r9dhqwyh6irqv6s2q7mkgzlgzw1narvllil2"; buildDepends = [ - base binary bytestring containers directory haskeline hoopl hpc - old-locale old-time pretty random semigroups tagged + base base-compat binary bytestring containers directory haskeline + hoopl hpc old-locale old-time pretty random semigroups tagged template-haskell terminfo text text-show time transformers transformers-compat unix unordered-containers utf8-string vector xhtml ]; testDepends = [ - base binary bytestring containers directory haskeline hoopl hpc - old-locale old-time pretty quickcheck-instances random semigroups - tagged tasty tasty-hunit tasty-quickcheck template-haskell terminfo - text-show time transformers transformers-compat unix + base base-compat binary bytestring containers directory haskeline + hoopl hpc hspec old-locale old-time pretty QuickCheck + quickcheck-instances random semigroups tagged template-haskell + terminfo text-show time transformers transformers-compat unix unordered-containers utf8-string vector xhtml ]; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -120956,6 +122170,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "textocat-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, http-conduit + , http-types, resourcet, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "textocat-api"; + version = "0.1.0.0"; + sha256 = "0cljy3s13xqdvxffpp74iwamfvkmq7s49vpc8vpxnq2fvh6bmkx9"; + buildDepends = [ + aeson base bytestring conduit http-conduit http-types resourcet + text transformers + ]; + testDepends = [ + aeson base bytestring conduit http-conduit http-types resourcet + tasty tasty-hunit text transformers + ]; + jailbreak = true; + homepage = "https://github.com/gltronred/textocat-api-haskell"; + description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com"; + license = stdenv.lib.licenses.asl20; + }) {}; + "texts" = callPackage ({ mkDerivation }: mkDerivation { @@ -121180,10 +122416,10 @@ self: { base containers HTF list-extras loch-th placeholders template-haskell th-expand-syns ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/th-instance-reification"; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-instances" = callPackage @@ -121251,10 +122487,10 @@ self: { base bytestring containers directory doctest filepath QuickCheck template-haskell text vector ]; + jailbreak = true; homepage = "http://github.com/bennofs/th-lift-instances/"; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-orphans" = callPackage @@ -121273,6 +122509,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_12_0" = callPackage + ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift + , th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.12.0"; + sha256 = "0dgbk8w81k8d5a9y4nq7h2rz6rvz3vhc0bs0vff7c0iiaglgajvp"; + buildDepends = [ + base mtl nats template-haskell th-lift th-reify-many + ]; + testDepends = [ base hspec template-haskell ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-printf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit , QuickCheck, template-haskell, text, transformers @@ -121330,16 +122582,16 @@ self: { }: mkDerivation { pname = "th-typegraph"; - version = "0.14"; - sha256 = "1f2wgr429hkv687mk9qgaqnr1n9nznl90cy7w74w4jzp6fd6rskp"; + version = "0.17.1"; + sha256 = "06hyyb1rjm8rvkllvjsgh56fwly99hv33brb4xycc1sc4452cslm"; 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 + array base bytestring containers data-default 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"; @@ -121348,25 +122600,21 @@ self: { "themoviedb" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, either - , http-client, http-client-tls, http-types, mtl, network - , network-uri, old-locale, tasty, tasty-hunit, text, text-binary - , time, transformers, unix + , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit + , text, text-binary, time, time-locale-compat, transformers }: mkDerivation { pname = "themoviedb"; - version = "1.0.0.0"; - sha256 = "1gwvhbxmhzc5sbcfvyln84x7j8jpglknxx15q82dyr8bhccs4x0w"; + version = "1.1.0.0"; + sha256 = "0yvpijr2dk01g1ks65nalyz547l9aq97a9v1bx3lp47allihrp8k"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base binary bytestring either http-client http-client-tls - http-types mtl network network-uri old-locale text text-binary time - transformers unix - ]; - testDepends = [ - aeson base bytestring network old-locale tasty tasty-hunit text - time transformers unix + http-types mtl text text-binary time time-locale-compat + transformers ]; + testDepends = [ base bytestring tasty tasty-hunit text time ]; jailbreak = true; homepage = "http://github.com/pjones/themoviedb"; description = "Haskell API bindings for http://themoviedb.org"; @@ -121644,26 +122892,24 @@ self: { }) {}; "threepenny-gui" = callPackage - ({ mkDerivation, aeson, async, attoparsec-enumerator, base - , bytestring, containers, data-default, deepseq, filepath, hashable - , MonadCatchIO-transformers, network-uri, safe, snap-core - , snap-server, stm, template-haskell, text, time, transformers - , unordered-containers, utf8-string, vault, vector, websockets - , websockets-snap + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, filepath, hashable, network-uri, safe + , snap-core, snap-server, stm, template-haskell, text, transformers + , unordered-containers, vault, vector, websockets, websockets-snap }: mkDerivation { pname = "threepenny-gui"; - version = "0.6.0.1"; - sha256 = "1pivjwz9i3phi6ja4b47mwbh3gscql4z14vxw5s6imhy3pzbr99r"; + version = "0.6.0.2"; + sha256 = "0ghcf6p7i39ss63snmk6hn20cw4hyi3agr05rdh7n60fyf9afs4c"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson async attoparsec-enumerator base bytestring containers - data-default deepseq filepath hashable MonadCatchIO-transformers - network-uri safe snap-core snap-server stm template-haskell text - time transformers unordered-containers utf8-string vault vector - websockets websockets-snap + aeson async base bytestring containers data-default deepseq + filepath hashable network-uri safe snap-core snap-server stm + template-haskell text transformers unordered-containers vault + vector websockets websockets-snap ]; + jailbreak = true; homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; @@ -121852,8 +123098,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.4.30"; - sha256 = "1awc2xgq4vn8nnfij3cnklcayh9d4khwpldm75jbghqi75921jni"; + version = "0.4.32"; + sha256 = "1vb3ziin58gxf8jpjgv1c04bqa0vhkmib4h3v2s1k66gdkj1sxk2"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers @@ -121950,7 +123196,6 @@ self: { jailbreak = true; description = "Nice API for a Slackbot"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tighttp" = callPackage @@ -122144,6 +123389,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "time-qq" = callPackage + ({ mkDerivation, base, hspec, old-locale, template-haskell, time }: + mkDerivation { + pname = "time-qq"; + version = "0.0.0.1"; + sha256 = "11ib2i7693jvszbgzd2673953pklxphd0mhwkf67q47d6b5spdpq"; + buildDepends = [ base old-locale template-haskell time ]; + testDepends = [ base hspec ]; + homepage = "https://github.com/christian-marie/time-qq"; + description = "Quasi-quoter for UTCTime times"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "time-recurrence" = callPackage ({ mkDerivation, base, data-ordlist, HUnit, mtl, old-locale , test-framework, test-framework-hunit, time @@ -122220,6 +123478,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "timeconsole" = callPackage + ({ mkDerivation, base, process, time }: + mkDerivation { + pname = "timeconsole"; + version = "0.1.0.0"; + sha256 = "0zmrysri8hxxvr4dffmawv5cb8lyz92w8ixfj5kah8ya2p422yc0"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base process time ]; + jailbreak = true; + description = "Time commands by lines of STDOUT"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "timeit" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -122335,7 +123607,6 @@ self: { ]; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers" = callPackage @@ -122792,7 +124063,18 @@ self: { homepage = "https://github.com/hvr/token-bucket"; description = "Rate limiter using lazy bucket algorithm"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tokenify" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "tokenify"; + version = "0.1.2.0"; + sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch"; + buildDepends = [ base containers text ]; + homepage = "https://github.com/AKST/tokenify"; + description = "A regex lexer"; + license = stdenv.lib.licenses.mit; }) {}; "tokenize" = callPackage @@ -122805,7 +124087,6 @@ self: { homepage = "https://bitbucket.org/gchrupala/lingo/overview"; description = "Simple tokenizer for English text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "toktok" = callPackage @@ -122903,17 +124184,17 @@ self: { }) {}; "topkata" = callPackage - ({ mkDerivation, ALUT, array, base, filepath, GLUT, OpenAL, OpenGL - , random + ({ mkDerivation, ALUT, array, base, filepath, GLFW-b, OpenAL + , OpenGL, parseargs, random }: mkDerivation { pname = "topkata"; - version = "0.2.3"; - sha256 = "19lm9i65ywh3a8hsrqnihq8gkfxmz81zznyqlqgcf1914w826i3a"; + version = "0.2.4"; + sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi"; isLibrary = false; isExecutable = true; buildDepends = [ - ALUT array base filepath GLUT OpenAL OpenGL random + ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random ]; homepage = "http://home.arcor.de/chr_bauer/topkata.html"; description = "OpenGL Arcade Game"; @@ -123729,8 +125010,10 @@ self: { }: mkDerivation { pname = "ttrie"; - version = "0.1.1"; - sha256 = "1di4h0vqj0hyxy0zgxkr1zwfy901hfglh9da21kv7li88c2d51sp"; + version = "0.1.2"; + revision = "1"; + sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0"; + editedCabalFile = "60673b32699d1b010c285811c892a1aa7b8890733083c82148ecd033b4db1222"; buildDepends = [ atomic-primops base hashable primitive stm ]; testDepends = [ base containers hashable QuickCheck stm test-framework @@ -123745,19 +125028,19 @@ self: { "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline - , JuicyPixels, mtl, parsec, process, process-extras, random - , template-haskell, time, vector, yaml + , JuicyPixels, mtl, parsec, process, random, template-haskell, time + , vector, yaml }: mkDerivation { pname = "tttool"; - version = "1.4.0.1"; - sha256 = "1adk3ngh88bm2mwycvpw3fsvzcrprkd34wyam6pan8yvw1jaz0lg"; + version = "1.4.0.2"; + sha256 = "0avn7011868nqibmdz07s27d8g46v9hwps5h04dg57vk9305j70g"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base binary bytestring containers directory executable-path - filepath hashable haskeline JuicyPixels mtl parsec process - process-extras random template-haskell time vector yaml + filepath hashable haskeline JuicyPixels mtl parsec process random + template-haskell time vector yaml ]; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; @@ -123854,6 +125137,7 @@ self: { buildDepends = [ base HList template-haskell ]; description = "Morph between tuples, or convert them from and to HLists"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tuple-th" = callPackage @@ -123978,15 +125262,14 @@ self: { jailbreak = true; description = "Used as Lab Assignments Environment at the University of Twente"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-eventloop-trees" = callPackage ({ mkDerivation, base, eventloop }: mkDerivation { pname = "twentefp-eventloop-trees"; - version = "0.1.0.1"; - sha256 = "1zbpxmi5n9ckmpxk8k3xlgjk0p9gw4ffa5yzd50x7ns1l8af8s5m"; + version = "0.1.1.0"; + sha256 = "1zn3bz2119jcyangs7mi2s9wcjkqgk54vwg6rfcbfg37m1v1ixy4"; buildDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; @@ -124001,7 +125284,6 @@ self: { buildDepends = [ base twentefp-eventloop-graphics ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-number" = callPackage @@ -124040,7 +125322,6 @@ self: { buildDepends = [ base twentefp-eventloop-graphics ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-websockets" = callPackage @@ -124060,7 +125341,6 @@ self: { jailbreak = true; description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twhs" = callPackage @@ -124145,6 +125425,7 @@ self: { aeson base bytestring Cabal http-client http-client-tls network-uri text transformers ]; + jailbreak = true; homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -124336,6 +125617,7 @@ self: { testDepends = [ base containers HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; @@ -125276,7 +126558,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uhc-util" = callPackage @@ -125466,7 +126747,6 @@ 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 @@ -125748,8 +127028,8 @@ self: { ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { pname = "unification-fd"; - version = "0.10.0"; - sha256 = "1jin4w4csy6vhjrqk4lwn6aa6ic3xqnk86fsasznp2x9jv3rzw2b"; + version = "0.10.0.1"; + sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v"; buildDepends = [ base containers logict mtl ]; homepage = "http://code.haskell.org/~wren/"; description = "Simple generic unification algorithms"; @@ -126079,8 +127359,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "unix-bytestring"; - version = "0.3.7.2"; - sha256 = "0n1i7pcdwhs0wz6spf3pndr8i74qn0cdzr3p46w4r4mvvwr76i2s"; + version = "0.3.7.3"; + sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53"; buildDepends = [ base bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "Unix/Posix-specific functions for ByteStrings"; @@ -126099,6 +127379,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-fcntl" = callPackage + ({ mkDerivation, base, foreign-var, unix }: + mkDerivation { + pname = "unix-fcntl"; + version = "0.0.0"; + sha256 = "18rjz14x1mbwdppf18gv3x4jwvz68bb2n1b11ygck60yl4pqbhb9"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base foreign-var unix ]; + homepage = "https://github.com/maoe/unix-fcntl"; + description = "Comprehensive bindings to fcntl(2)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unix-handle" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -126190,14 +127484,11 @@ self: { ({ mkDerivation, array, base, mtl, unix }: mkDerivation { pname = "unlambda"; - version = "0.1.3"; - revision = "1"; - sha256 = "0clcpkhg23a7ma72rjjpl2w8jpg2mdn4rgm3vf0vqr7lbyma1h89"; - editedCabalFile = "fa5648fb982ec7670fcd4ace6fa9f01d26b0c81641f4e3d1e31edbd49dd6bbe4"; + version = "0.1.4.1"; + sha256 = "01v0cl540gwc8j3x6q9gc7bvdcm9f843qbbk15llw9ik2dfm5987"; isLibrary = true; isExecutable = true; buildDepends = [ array base mtl unix ]; - jailbreak = true; description = "Unlambda interpreter"; license = "GPL"; }) {}; @@ -126379,22 +127670,23 @@ self: { }) {}; "up" = callPackage - ({ mkDerivation, base, directory, filepath, mtl, parsec, split - , transformers + ({ mkDerivation, base, directory, filepath, lambda-options, mtl + , split }: mkDerivation { pname = "up"; - version = "1.0.0.2"; - sha256 = "10dd90walys2q30b80c6z76v4lixp6cjbxq7gc43mqb67p0qnk67"; + version = "1.0.0.3"; + sha256 = "1w37jmnmx2vrdwbdcnhb29bvy4857pzcx4gdavmcp598lsfj34vy"; isLibrary = false; isExecutable = true; buildDepends = [ - base directory filepath mtl parsec split transformers + base directory filepath lambda-options mtl split ]; jailbreak = true; homepage = "https://github.com/thomaseding/up"; description = "Command line tool to generate pathnames to facilitate moving upward in a file system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "up-grade" = callPackage @@ -126502,15 +127794,15 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit, lens - , QuickCheck, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , derive, HUnit, lens, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "uri-bytestring"; - version = "0.1"; - sha256 = "16fvijiaqnrlw8hhv96cnp0qh5sq3bhixihw0k73i6j7wp1wp9i1"; - buildDepends = [ attoparsec base bytestring ]; + version = "0.1.2"; + sha256 = "1rd166dsc5cl6bwvd43z08d6j6djnmskg1ddnv1js0z4xxpbs2qf"; + buildDepends = [ attoparsec base blaze-builder bytestring ]; testDepends = [ attoparsec base bytestring derive HUnit lens QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck @@ -126714,16 +128006,19 @@ self: { }) {}; "urlpath" = callPackage - ({ mkDerivation, base, hspec, mtl, QuickCheck, quickcheck-instances - , text, transformers + ({ mkDerivation, base, hspec, monoid-subclasses, mtl, QuickCheck + , quickcheck-instances, text, transformers }: mkDerivation { pname = "urlpath"; - version = "0.2"; - sha256 = "0rbw76m9d1gr0zc7wppzdad5nnwdrg2g5v54lc7hxk5wk53pran1"; - buildDepends = [ base mtl transformers ]; + version = "2.1.0"; + revision = "1"; + sha256 = "1q8zj228ln9xmr3r0ggv6pi074l8ixchn81mw8664jikf2pjcqq9"; + editedCabalFile = "a342b25d9ea3984cf20025d421f59629d7abdf4bd2b42a4e9ef53ba5729f13e1"; + buildDepends = [ base monoid-subclasses mtl transformers ]; testDepends = [ - base hspec mtl QuickCheck quickcheck-instances text transformers + base hspec monoid-subclasses mtl QuickCheck quickcheck-instances + text transformers ]; description = "Painfully simple URL writing combinators"; license = stdenv.lib.licenses.mit; @@ -126881,6 +128176,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "users-persistent" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, monad-logger, mtl + , persistent, persistent-sqlite, persistent-template, temporary + , text, time, users, users-test, uuid + }: + mkDerivation { + pname = "users-persistent"; + version = "0.3.0.0"; + sha256 = "0hdvsnjciw3a6gsz5lv5q6m5fs3hd60gmgfbzgx5n7md2ya5jimr"; + buildDepends = [ + aeson base bytestring mtl persistent persistent-template text time + users uuid + ]; + testDepends = [ + base hspec monad-logger persistent-sqlite temporary text users-test + ]; + homepage = "https://github.com/agrafix/users"; + description = "A persistent backend for the users package"; + license = stdenv.lib.licenses.mit; + }) {}; + "users-postgresql-simple" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, mtl , postgresql-simple, text, time, users, users-test, uuid @@ -126959,25 +128275,12 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; + jailbreak = true; description = "Variants of Prelude and System.IO with UTF8 text I/O operations"; license = stdenv.lib.licenses.bsd3; }) {}; "utf8-string" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "utf8-string"; - version = "0.3.8"; - revision = "2"; - sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0"; - editedCabalFile = "0555d720026fff65342bdc500391ffd300858b6f2c6db441d4dd1eafbcb599ff"; - buildDepends = [ base bytestring ]; - homepage = "http://github.com/glguy/utf8-string/"; - description = "Support for reading and writing UTF8 Strings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "utf8-string_1" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "utf8-string"; @@ -127069,12 +128372,8 @@ self: { }: mkDerivation { pname = "uu-options"; - version = "0.1.0.2"; - revision = "1"; - sha256 = "0cbf0ckq8z7lqziip7znfwa4vmqfsgmg7phrc3r68z2hpinw73zy"; - editedCabalFile = "25f112bb1de34b05c01588e982a1ce61225ede0e18d569c5dea91518589e0149"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.0"; + sha256 = "11gixk6lxsakcdxir9jla5nk71phmlzd9hxp8wq23n550xw91ij6"; buildDepends = [ base lenses mtl template-haskell transformers uu-interleaved uu-parsinglib @@ -127082,7 +128381,6 @@ self: { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; description = "Parse command line options using uu-interleave and uu-parsinglib"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uu-parsinglib" = callPackage @@ -127403,6 +128701,7 @@ self: { jailbreak = true; description = "A library for transforming vacuum graphs into GraphViz output"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vacuum-opengl" = callPackage @@ -127444,15 +128743,14 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.4"; - sha256 = "0ndhknsqrb0vg5gba2q6dala16m7vbc8x4dga28q3ys0f14h1m6m"; + version = "0.0.5"; + sha256 = "07bqcp58hqyh5zvi6zpwwpppfzj30j60ryf6k0wqzckklibffqkj"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base directory filepath process text ]; testDepends = [ attoparsec base directory filepath process QuickCheck text ]; - jailbreak = true; homepage = "https://github.com/hamishmack/vado"; description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; @@ -127540,7 +128838,6 @@ self: { homepage = "https://github.com/mavenraven/validations"; description = "A nice way to define field validations in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "value-supply" = callPackage @@ -127572,6 +128869,7 @@ self: { homepage = "https://github.com/benzrf/vampire"; description = "Analyze and visualize expression trees"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "var" = callPackage @@ -127821,7 +129119,6 @@ self: { homepage = "http://github.com/cpdurham/vect-floating-accelerate"; description = "Accelerate instances for vect-floating types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vect-opengl" = callPackage @@ -127863,6 +129160,7 @@ self: { base QuickCheck random template-haskell test-framework test-framework-quickcheck2 transformers ]; + jailbreak = true; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; @@ -128325,7 +129623,6 @@ self: { extraLibraries = [ ncurses ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -128478,6 +129775,7 @@ self: { homepage = "http://github.com/zsol/visual-graphrewrite/"; description = "Visualize the graph-rewrite steps of a Haskell program"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "visual-prof" = callPackage @@ -128717,6 +130015,7 @@ self: { array base bytestring containers data-default directory filepath mtl QuickCheck random regex-base stm text time unix vector vty ]; + jailbreak = true; homepage = "http://jtdaugherty.github.com/vty-ui/"; description = "An interactive terminal user interface library for Vty"; license = stdenv.lib.licenses.bsd3; @@ -128735,6 +130034,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "waddle" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, directory, JuicyPixels + }: + mkDerivation { + pname = "waddle"; + version = "0.1.0.5"; + sha256 = "0v4qhr01bqz7hb5q8hf2rdk8fxrbbmvsighi5wv2gv5b3cwh28cv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring case-insensitive containers directory + JuicyPixels + ]; + jailbreak = true; + homepage = "https://github.com/mgrabmueller/waddle"; + description = "DOOM WAD file utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, hspec, http-types , network, text, vault @@ -128787,23 +130106,22 @@ self: { , blaze-markup, byteable, bytestring, containers, cryptohash , cryptohash-conduit, directory, file-embed, filepath, hspec , http-date, http-types, mime-types, network, old-locale - , optparse-applicative, system-fileio, system-filepath - , template-haskell, text, time, transformers, unix-compat - , unordered-containers, wai, wai-extra, warp, zlib + , optparse-applicative, template-haskell, text, time, transformers + , unix-compat, unordered-containers, wai, wai-extra, warp, zlib }: mkDerivation { pname = "wai-app-static"; - version = "3.0.1.1"; - sha256 = "1zji4zisclycpyg28shwk96zmhmlvwiwz057dd4wf3w35sdklx7y"; + version = "3.1.0"; + sha256 = "0zajsav11v5r6c5k2ls1cfc6bz1zalasxpl03hvh5fww5f1vn9iq"; isLibrary = true; isExecutable = true; buildDepends = [ base base64-bytestring blaze-builder blaze-html blaze-markup byteable bytestring containers cryptohash cryptohash-conduit directory file-embed filepath http-date http-types mime-types - old-locale optparse-applicative system-fileio system-filepath - template-haskell text time transformers unix-compat - unordered-containers wai wai-extra warp zlib + old-locale optparse-applicative template-haskell text time + transformers unix-compat unordered-containers wai wai-extra warp + zlib ]; testDepends = [ base bytestring hspec http-date http-types mime-types network @@ -128863,7 +130181,6 @@ self: { homepage = "https://github.com/singpolyma/wai-digestive-functors"; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -129245,23 +130562,22 @@ self: { , blaze-builder, bytestring, case-insensitive, clientsession , containers, cookie, gitrev, http-client, http-client-tls , http-reverse-proxy, http-types, optparse-applicative, resourcet - , template-haskell, text, time, transformers, unix-compat, wai - , wai-app-static, warp + , template-haskell, text, time, transformers, unix-compat, vault + , wai, wai-app-static, warp }: mkDerivation { pname = "wai-middleware-crowd"; - version = "0.1.0.0"; - sha256 = "15wgnbsw47jqncz2zl9clsa6nbaya019sapmgj3d9yl1rqdzkaqy"; + version = "0.1.1.1"; + sha256 = "1lkdjfp7aq61hzh9y13bqk9qgfr6s3m7n13ar73gjv5k2g97fizj"; isLibrary = true; isExecutable = true; buildDepends = [ authenticate base base64-bytestring binary blaze-builder bytestring case-insensitive clientsession containers cookie gitrev http-client http-client-tls http-reverse-proxy http-types optparse-applicative - resourcet template-haskell text time transformers unix-compat wai - wai-app-static warp + resourcet template-haskell text time transformers unix-compat vault + wai wai-app-static warp ]; - jailbreak = true; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; }) {}; @@ -129428,25 +130744,24 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, containers, haddock, hlint - , hspec, http-types, HUnit, network, process, regex-compat, stm - , token-bucket, transformers, wai, wai-extra + ({ mkDerivation, base, bytestring, containers, hlint, hspec + , http-types, HUnit, network, stm, token-bucket, transformers, wai + , wai-extra }: mkDerivation { pname = "wai-middleware-throttle"; - version = "0.2.0.0"; - sha256 = "1dnpx3byb1q8g41kj55qgw6vrjm4rv4sa6qbd12pafwabcgx4l74"; + version = "0.2.0.1"; + sha256 = "08qxdcbn1lg9rd2rcp10iri1maamn5cily9mbg1r65h8ivdmrdan"; buildDepends = [ base containers http-types network stm token-bucket transformers wai ]; testDepends = [ - base bytestring haddock hlint hspec http-types HUnit process - regex-compat stm transformers wai wai-extra + base bytestring hlint hspec http-types HUnit stm transformers wai + wai-extra ]; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-predicates" = callPackage @@ -129479,8 +130794,8 @@ self: { }: mkDerivation { pname = "wai-request-spec"; - version = "0.8.5.2"; - sha256 = "1r51ib85krin61ggqgrir0igma80qryblqqrf38j01af1qnvvlxv"; + version = "0.10.0.0"; + sha256 = "1sjlajp79j9mj0xaz9srzvai86il95vzq7668ydzj9hllllf04bk"; buildDepends = [ base bytestring case-insensitive containers http-types text wai ]; @@ -129535,16 +130850,16 @@ self: { }) {}; "wai-routes" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, http-types - , mtl, template-haskell, text, wai, yesod-routes + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , http-types, mtl, path-pieces, random, template-haskell, text, wai }: mkDerivation { pname = "wai-routes"; - version = "0.5.1"; - sha256 = "0xd4abccgnj793vbrf1a0m1ddcq8i4p8f7sxk6mz4d1lzb4y0sf0"; + version = "0.6.1"; + sha256 = "15j37h3a56fsgmznmw8b1ksp0pkrrqz3kyrwj69hba2bnjcq5n7q"; buildDepends = [ - aeson base blaze-builder bytestring http-types mtl template-haskell - text wai yesod-routes + aeson base blaze-builder bytestring containers http-types mtl + path-pieces random template-haskell text wai ]; jailbreak = true; homepage = "https://github.com/ajnsit/wai-routes"; @@ -129649,6 +130964,7 @@ self: { ]; description = "A simple cache for serving static files in a WAI middleware"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-static-pages" = callPackage @@ -129784,24 +131100,23 @@ self: { , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec , HTTP, http-date, http-types, HUnit, iproute, lifted-base, network , old-locale, QuickCheck, simple-sendfile, streaming-commons, text - , time, transformers, unix, unix-compat, vault, void, wai + , time, transformers, unix, unix-compat, vault, wai }: mkDerivation { pname = "warp"; - version = "3.0.13"; - sha256 = "0ggjbkgxzrvi7smjvrprr07c49n6d3s21jqnjc9l4ss3f3nd7699"; + version = "3.0.13.1"; + sha256 = "17vik5xf2amyi4pwq7wfia2a6f1pksa4ll155hbhkndhbwszvrkc"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network - simple-sendfile streaming-commons text unix unix-compat vault void - wai + simple-sendfile streaming-commons text unix unix-compat vault wai ]; testDepends = [ array async auto-update base blaze-builder bytestring case-insensitive doctest ghc-prim hashable hspec HTTP http-date http-types HUnit iproute lifted-base network old-locale QuickCheck simple-sendfile streaming-commons text time transformers unix - unix-compat vault void wai + unix-compat vault wai ]; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; @@ -129850,8 +131165,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.0.3"; - sha256 = "1ngprhmf58i80fkw2z750pxavyv05g3sr8j7hd24h47msmghq9mm"; + version = "3.0.4"; + sha256 = "03k8iynz586cdjjh4nyrlbs8c864d305swrf4xkf55r9l3klsbg4"; buildDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -129910,6 +131225,7 @@ self: { jailbreak = true; description = "Opinionated filesystem watcher"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "watchit" = callPackage @@ -130122,7 +131438,6 @@ self: { homepage = "http://hub.darcs.net/ertes/web-page"; description = "Monoidally construct web pages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-plugins" = callPackage @@ -130139,18 +131454,18 @@ self: { }) {}; "web-routes" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, ghc-prim - , http-types, HUnit, mtl, parsec, QuickCheck, split, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, blaze-builder, bytestring, exceptions + , ghc-prim, http-types, HUnit, mtl, parsec, QuickCheck, split + , test-framework, test-framework-hunit, test-framework-quickcheck2 , test-framework-th, text, utf8-string }: mkDerivation { pname = "web-routes"; - version = "0.27.8"; - sha256 = "1nz7nny333miap44yrdzn711g4xgr2c9nd0ivm0q02692684craq"; + version = "0.27.9"; + sha256 = "1azccgcnksz4c4pm1nayvjiq3m192zz21cnc0fm89hdixvqck346"; buildDepends = [ - base blaze-builder bytestring ghc-prim http-types mtl parsec split - text utf8-string + base blaze-builder bytestring exceptions ghc-prim http-types mtl + parsec split text utf8-string ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -130164,8 +131479,8 @@ self: { ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { pname = "web-routes-boomerang"; - version = "0.28.3"; - sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn"; + version = "0.28.4"; + sha256 = "0ailw4s0c1f054q58dwylq1g1f043vw4ywk0spg5d3sk9asy8bxh"; buildDepends = [ base boomerang mtl parsec text web-routes ]; description = "Library for maintaining correctness and composability of URLs within an application"; license = stdenv.lib.licenses.bsd3; @@ -130190,8 +131505,8 @@ self: { ({ mkDerivation, base, hsp, text, web-routes }: mkDerivation { pname = "web-routes-hsp"; - version = "0.24.5"; - sha256 = "1vnsdsipm764maqn43774vw5hn64vvaaih8gg9130fkvp6jj39nk"; + version = "0.24.6"; + sha256 = "048dxx5cjdm7v0340p9x3s73a6y7fldykzkwkpb12bb926bir3fl"; buildDepends = [ base hsp text web-routes ]; description = "Adds XMLGenerator instance for RouteT monad"; license = stdenv.lib.licenses.bsd3; @@ -130242,8 +131557,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.2"; - sha256 = "1dk768m0bb4y3i1q9sxj2fbn6farlyyy52fxmk0ipbnbdq7if71f"; + version = "0.22.3"; + sha256 = "0ccv1mzisd0fnhbl776i0fhavjazm0l3b4ycnbdzgs1kh4w8gzfp"; buildDepends = [ base parsec split template-haskell text web-routes ]; @@ -130307,8 +131622,8 @@ self: { }: mkDerivation { pname = "webcrank"; - version = "0.2.0.1"; - sha256 = "0l6mc3gyflb0lqmcs5x0nc3r5szyf4ig6y268f7crp74h05mvnlr"; + version = "0.2.1"; + sha256 = "0px4dy4crivkga0h2ca9j6fxlzwyl8qm8xzd2xyllqm2gzvcc3l7"; buildDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -130323,7 +131638,6 @@ self: { homepage = "https://github.com/webcrank/webcrank.hs"; description = "Webmachine inspired toolkit for building http applications and services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webcrank-dispatch" = callPackage @@ -130358,7 +131672,6 @@ self: { homepage = "https://github.com/webcrank/webcrank-wai"; description = "Build a WAI Application from Webcrank Resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver" = callPackage @@ -130487,8 +131800,8 @@ self: { }: mkDerivation { pname = "webkit"; - version = "0.13.1.2"; - sha256 = "090gp3700dafb30jdf1bw1vcn7rj7cs4h0glbi5rqp2ssg5f78kc"; + version = "0.13.1.3"; + sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306"; buildDepends = [ base bytestring cairo glib gtk mtl pango text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; @@ -130517,8 +131830,8 @@ self: { }: mkDerivation { pname = "webkitgtk3"; - version = "0.13.1.2"; - sha256 = "11b9n7q5xljjfnpfbh91kzs568y7nqdys5rm518cr4an20mbi47l"; + version = "0.13.1.3"; + sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk"; buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; @@ -130549,7 +131862,9 @@ self: { mkDerivation { pname = "webpage"; version = "0.0.3.1"; + revision = "1"; sha256 = "1s9q44wvkc60g1117c3c4klf9pc92x7rpgvb7pwyhbbkvshmnirj"; + editedCabalFile = "1829b0f7db8745498bee16ed1d70917aa781fd14ab8f8032b51472cfc3cd6787"; buildDepends = [ base blaze-html data-default hastache lucid text ]; @@ -130955,15 +132270,16 @@ self: { }) {}; "witherable" = callPackage - ({ mkDerivation, base, containers, hashable, transformers - , unordered-containers, vector + ({ mkDerivation, base, base-orphans, containers, hashable + , transformers, unordered-containers, vector }: mkDerivation { pname = "witherable"; - version = "0.1.2.3"; - sha256 = "1281npwsmj9vzw3l5bb8pzywgm5dk4y723zsq5dk0b0ri58m3hcz"; + version = "0.1.3"; + sha256 = "0n0l169xh23925blgzy2i90gz8lsa0176dp49bl6cncq362bqcn8"; buildDepends = [ - base containers hashable transformers unordered-containers vector + base base-orphans containers hashable transformers + unordered-containers vector ]; homepage = "https://github.com/fumieval/witherable"; description = "Generalization of filter and catMaybes"; @@ -131018,6 +132334,7 @@ self: { version = "0.2.5"; sha256 = "02r453wx1kv50lw0hx4nvzzv5wjfsy16gyjqphc25aq45rl5hr8g"; buildDepends = [ base lens linear parsec parsec-numbers ]; + jailbreak = true; homepage = "http://github.com/bgamari/wkt"; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; @@ -131064,6 +132381,7 @@ self: { base containers nats semigroupoids semigroups text utf8-string ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://github.com/ekmett/wl-pprint-extras/"; description = "A free monad based on the Wadler/Leijen pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -131084,7 +132402,6 @@ self: { homepage = "http://github.com/ekmett/wl-pprint-terminfo/"; description = "A color pretty printer with terminfo support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-text" = callPackage @@ -131399,7 +132716,6 @@ self: { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wreq-sb" = callPackage @@ -131474,7 +132790,6 @@ self: { jailbreak = true; description = "A small tool to list, add and remove webseeds from a torrent file"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wtk" = callPackage @@ -131614,7 +132929,6 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxAsteroids" = callPackage @@ -131832,8 +133146,8 @@ self: { }: mkDerivation { pname = "x509"; - version = "1.5.0.1"; - sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba"; + version = "1.5.1"; + sha256 = "1mxg3bill1zqxdn6x0ayf8dja7y3xqikjaj9dhwf22y24vsj6v2n"; buildDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers crypto-pubkey-types cryptohash directory filepath hourglass mtl pem @@ -132038,12 +133352,11 @@ self: { }: mkDerivation { pname = "xdot"; - version = "0.2.4.6"; - sha256 = "123vygzkqlycc298zh3321y7w85xnynbavzqms6cb8zgzya42wrs"; + version = "0.2.4.7"; + sha256 = "1izf892748g7f1h4m49d52zkbzfv164r4zyqss5lsbh3brh15v3g"; isLibrary = true; isExecutable = true; buildDepends = [ base cairo graphviz gtk mtl polyparse text ]; - jailbreak = true; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -132342,6 +133655,7 @@ self: { base containers HUnit old-time smallcheck tasty tasty-hunit tasty-smallcheck time ]; + jailbreak = true; homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; @@ -132419,16 +133733,16 @@ self: { ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet - , system-filepath, text, transformers, xml-types + , text, transformers, xml-types }: mkDerivation { pname = "xml-conduit"; - version = "1.2.6"; - sha256 = "1ybl0maakz4arqbblipafwggh0m2n8ljyp91iiihb4674kynrciz"; + version = "1.3.0"; + sha256 = "0kcwfr02gnldal4dq2am9kc36j76cjx0japi5r5wms2c1az95r1l"; buildDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control - resourcet system-filepath text transformers xml-types + resourcet text transformers xml-types ]; testDepends = [ base blaze-markup bytestring conduit containers hspec HUnit @@ -132520,8 +133834,8 @@ self: { }: mkDerivation { pname = "xml-hamlet"; - version = "0.4.0.10"; - sha256 = "0bvgd3xbc25d2zdmpzq1rxhr7rkglf0zpc8wy75j2yqv6ymylb6v"; + version = "0.4.0.11"; + sha256 = "128ypil2c86zpkivrla031hn4rmhbpisy4zj0xmff473hz9qln9x"; buildDepends = [ base containers parsec shakespeare template-haskell text xml-conduit @@ -132554,15 +133868,16 @@ self: { mkDerivation { pname = "xml-html-conduit-lens"; version = "0.3.2.1"; - revision = "1"; + revision = "2"; sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12"; - editedCabalFile = "b525d68eb964e306dc6fab3f9ba89e2325d91af53469ad32ec1d49e5f9a80647"; + editedCabalFile = "6c3305bb07c0fd40c933640ebe9e6114a798115cfb2f3cb976e40f1ece955132"; buildDepends = [ base bytestring containers html-conduit lens text xml-conduit ]; testDepends = [ base doctest hspec hspec-expectations-lens lens xml-conduit ]; + jailbreak = true; homepage = "https://github.com/supki/xml-html-conduit-lens#readme"; description = "Optics for xml-conduit and html-conduit"; license = stdenv.lib.licenses.bsd3; @@ -132575,7 +133890,9 @@ self: { mkDerivation { pname = "xml-lens"; version = "0.1.6.3"; + revision = "1"; sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd"; + editedCabalFile = "1a0768a259fb0aeaaecc092c6a9777c4d498d2695b0385a0e620e47f362773b9"; buildDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -132911,6 +134228,7 @@ self: { base containers directory extensible-exceptions filepath mtl process unix utf8-string X11 ]; + jailbreak = true; postInstall = '' shopt -s globstar mkdir -p $out/share/man/man1 @@ -133307,7 +134625,6 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xtest" = callPackage @@ -133427,7 +134744,6 @@ self: { homepage = "http://github.com/snoyberg/yackage"; description = "Personal Hackage replacement for testing new packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-finance-conduit" = callPackage @@ -133444,7 +134760,6 @@ self: { jailbreak = true; description = "Streaming aproach to the yahoo finance api"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-web-search" = callPackage @@ -133580,8 +134895,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.1.9"; - sha256 = "0gxwa792g2nbgm2j6gl478qq5vgr06z6zzbbxranvh5fq7pq6al5"; + version = "0.3.1.10"; + sha256 = "1hpjzml8bw5n4lv82x3j6h8dzkz53mbhhsc7dhp79hwn75nq3aiz"; buildDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -133923,8 +135238,8 @@ self: { }: mkDerivation { pname = "yesod-angular-ui"; - version = "0.1.0.1"; - sha256 = "1kj2lbg57sp4bsl4ri3p73gr5a2k17lx7gf01ay7x0960gj5ql92"; + version = "0.1.1.0"; + sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k"; buildDepends = [ base blaze-html containers directory hjsmin mtl resourcet shakespeare template-haskell text transformers yesod yesod-core @@ -134135,7 +135450,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "OAuth Authentication for Yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-oauth2" = callPackage @@ -134152,6 +135466,7 @@ self: { lifted-base network-uri random text transformers yesod-auth yesod-core yesod-form ]; + jailbreak = true; homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; @@ -134214,31 +135529,30 @@ self: { "yesod-bin" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, directory, file-embed, filepath - , fsnotify, ghc, ghc-paths, http-client, http-conduit + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit , http-reverse-proxy, http-types, lifted-base, network , optparse-applicative, parsec, process, project-template - , resourcet, shakespeare, split, streaming-commons, system-fileio - , system-filepath, tar, template-haskell, text, time, transformers - , transformers-compat, unix-compat, unordered-containers, wai - , wai-extra, warp, warp-tls, yaml, zlib + , resourcet, shakespeare, split, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls + , yaml, zlib }: mkDerivation { pname = "yesod-bin"; - version = "1.4.7.2"; - sha256 = "15l69vxfzhjql83ikvb6ca980ikj17346bq9b4888cv87yxnizgh"; + version = "1.4.9.2"; + sha256 = "0bbr9bjgj75jh8q9jzv9h1ivz87svz3j02hwphq32487f3682gd0"; isLibrary = false; isExecutable = true; buildDepends = [ async attoparsec base base64-bytestring blaze-builder bytestring - Cabal conduit conduit-extra containers data-default-class directory - file-embed filepath fsnotify ghc ghc-paths http-client http-conduit - http-reverse-proxy http-types lifted-base network + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify ghc ghc-paths http-client + http-conduit http-reverse-proxy http-types lifted-base network optparse-applicative parsec process project-template resourcet - shakespeare split streaming-commons system-fileio system-filepath - tar template-haskell text time transformers transformers-compat - unix-compat unordered-containers wai wai-extra warp warp-tls yaml - zlib + shakespeare split streaming-commons tar template-haskell text time + transformers transformers-compat unix-compat unordered-containers + wai wai-extra warp warp-tls yaml zlib ]; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; @@ -134338,6 +135652,7 @@ self: { base classy-prelude containers monad-control persistent random stm uuid yesod-core yesod-form yesod-persistent ]; + jailbreak = true; homepage = "https://github.com/league/yesod-crud"; description = "Generic administrative CRUD operations as a Yesod subsite"; license = stdenv.lib.licenses.bsd3; @@ -134451,24 +135766,22 @@ self: { "yesod-fay" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory - , fay, fay-dom, monad-loops, process, pureMD5, shakespeare - , system-fileio, system-filepath, template-haskell, text - , transformers, utf8-string, yesod-core, yesod-form, yesod-static + , fay, fay-dom, filepath, monad-loops, process, pureMD5 + , shakespeare, template-haskell, text, transformers, utf8-string + , yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "yesod-fay"; - version = "0.7.1"; - sha256 = "0g17n7aqr1zhlh21dkl13rhac34nq8f77mj85kll6vgcs8nfidhl"; + version = "0.8.0"; + sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf"; buildDepends = [ - aeson base bytestring data-default directory fay fay-dom - monad-loops process pureMD5 shakespeare system-fileio - system-filepath template-haskell text transformers utf8-string - yesod-core yesod-form yesod-static + aeson base bytestring data-default directory fay fay-dom filepath + monad-loops process pureMD5 shakespeare template-haskell text + transformers utf8-string yesod-core yesod-form yesod-static ]; homepage = "https://github.com/fpco/yesod-fay"; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-fb" = callPackage @@ -134530,16 +135843,15 @@ self: { "yesod-gitrepo" = callPackage ({ mkDerivation, base, directory, enclosed-exceptions, http-types - , lifted-base, process, system-filepath, temporary, text, wai - , yesod-core + , lifted-base, process, temporary, text, wai, yesod-core }: mkDerivation { pname = "yesod-gitrepo"; - version = "0.1.1.0"; - sha256 = "1bf4rhf6i4cciyllkh6zil29i7yi5ph0nkpcqmhbihk4i7xm05zj"; + version = "0.2.1.0"; + sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf"; buildDepends = [ base directory enclosed-exceptions http-types lifted-base process - system-filepath temporary text wai yesod-core + temporary text wai yesod-core ]; homepage = "https://github.com/snoyberg/yesod-gitrepo"; description = "Host content provided by a Git repo"; @@ -134629,6 +135941,7 @@ self: { wai-logger warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent yesod-static ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; @@ -134648,6 +135961,7 @@ self: { base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form ]; + jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; @@ -134866,6 +136180,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-raml" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , network-uri, optparse-applicative, regex-posix, template-haskell + , text, unordered-containers, yaml, yesod-core + }: + mkDerivation { + pname = "yesod-raml"; + version = "0.1.0"; + sha256 = "1vcllxsyqvr26a27l9vfi76kpdzld3ws1i0q6g9jnwhkr16bmc3f"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring containers network-uri optparse-applicative + regex-posix template-haskell text unordered-containers yaml + yesod-core + ]; + testDepends = [ + aeson base bytestring containers hspec network-uri regex-posix + template-haskell text unordered-containers yaml yesod-core + ]; + description = "RAML style route definitions for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-recaptcha" = callPackage ({ mkDerivation, base, bytestring, data-default, http-conduit , http-types, lifted-base, network, network-info, resourcet, text @@ -134923,6 +136262,7 @@ self: { homepage = "https://github.com/docmunch/yesod-routes-typescript"; description = "generate TypeScript routes for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-rst" = callPackage @@ -135004,30 +136344,31 @@ self: { , containers, cryptohash, cryptohash-conduit, css-text , data-default, directory, file-embed, filepath, hashable, hjsmin , hspec, http-types, HUnit, mime-types, old-time, process - , resourcet, system-fileio, system-filepath, template-haskell, text - , transformers, unix-compat, unordered-containers, wai - , wai-app-static, wai-extra, yesod-core, yesod-test + , resourcet, template-haskell, text, transformers, unix-compat + , unordered-containers, wai, wai-app-static, wai-extra, yesod-core + , yesod-test }: mkDerivation { pname = "yesod-static"; - version = "1.4.0.4"; - sha256 = "1z01m3rvar6djxqcc2hyi53yfcpqwpi45wffpjnfp8hsr1x0zaqk"; + version = "1.5.0"; + revision = "1"; + sha256 = "1i95c43hlks1wclhwal9yr1pasmz78ddi7wzjhg9k5w21hrkcp92"; + editedCabalFile = "d01c0a6fcb4ae005dea0c4898fd1ad452cde5e1989c90e62309c481cd0ff36c3"; buildDepends = [ async attoparsec base base64-bytestring blaze-builder byteable bytestring conduit conduit-extra containers cryptohash cryptohash-conduit css-text data-default directory file-embed filepath hashable hjsmin http-types mime-types old-time process - resourcet system-fileio system-filepath template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - yesod-core + resourcet template-haskell text transformers unix-compat + unordered-containers wai wai-app-static yesod-core ]; testDepends = [ async base base64-bytestring byteable bytestring conduit conduit-extra containers cryptohash cryptohash-conduit data-default directory file-embed filepath hjsmin hspec http-types HUnit - mime-types old-time process resourcet system-fileio system-filepath - template-haskell text transformers unix-compat unordered-containers - wai wai-app-static wai-extra yesod-core yesod-test + mime-types old-time process resourcet template-haskell text + transformers unix-compat unordered-containers wai wai-app-static + wai-extra yesod-core yesod-test ]; homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; @@ -135057,6 +136398,7 @@ self: { base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test ]; + jailbreak = true; homepage = "https://bitbucket.org/wuzzeb/yesod-static-generators"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; @@ -135133,6 +136475,7 @@ self: { aeson base markdown persistent shakespeare text yesod-core yesod-form yesod-persistent ]; + jailbreak = true; description = "Yesod support for Text.Markdown."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -135294,41 +136637,37 @@ self: { }) {}; "yi" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal - , cautious-file, containers, data-default, directory, dlist - , dynamic-state, dyre, exceptions, filepath, glib, gtk, hashable - , hint, HUnit, lens, mtl, old-locale, oo-prototypes, pango, parsec - , pointedlist, process, QuickCheck, random, regex-base, regex-tdfa - , safe, semigroups, split, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers-base, unix - , unix-compat, unordered-containers, utf8-string, vty, word-trie - , xdg-basedir, yi-language, yi-rope + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , data-default, directory, dlist, dynamic-state, dyre, exceptions + , filepath, glib, gtk, hashable, HUnit, lens, mtl, old-locale + , oo-prototypes, pango, parsec, pointedlist, process, QuickCheck + , regex-base, regex-tdfa, safe, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , transformers-base, unix, unix-compat, unordered-containers, vty + , word-trie, xdg-basedir, yi-language, yi-rope }: mkDerivation { pname = "yi"; - version = "0.11.2"; - sha256 = "0kqrdbfpihyds8mdai6j4dzzd8wbcchji0gdgpfb4w5kwhhh9dvz"; + version = "0.12.0"; + sha256 = "167x1zmkhrh7s4wjvvpp0pydgif1yl05by8j6wimi79wwvnkiyi7"; isLibrary = true; isExecutable = true; buildDepends = [ - array base binary bytestring Cabal cautious-file containers - data-default directory dlist dynamic-state dyre exceptions filepath - glib gtk hashable hint lens mtl old-locale oo-prototypes pango - parsec pointedlist process QuickCheck random regex-base regex-tdfa - safe semigroups split template-haskell text time transformers-base - unix unix-compat unordered-containers utf8-string vty word-trie - xdg-basedir yi-language yi-rope + array base binary bytestring Cabal containers data-default + directory dlist dynamic-state dyre exceptions filepath glib gtk + hashable lens mtl old-locale oo-prototypes pango parsec pointedlist + process regex-base regex-tdfa safe semigroups split + template-haskell text time transformers-base unix unix-compat + unordered-containers vty word-trie xdg-basedir yi-language yi-rope ]; testDepends = [ base directory filepath HUnit lens QuickCheck semigroups tasty tasty-hunit tasty-quickcheck text yi-language yi-rope ]; configureFlags = [ "-fpango" "-fvty" ]; - jailbreak = true; - homepage = "http://haskell.org/haskellwiki/Yi"; + homepage = "https://yi-editor.github.io"; description = "The Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -135431,7 +136770,6 @@ self: { homepage = "https://github.com/Fuuzetsu/yi-monokai"; description = "Monokai colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-rope" = callPackage @@ -135462,7 +136800,6 @@ self: { homepage = "https://github.com/yi-editor/yi-snippet"; description = "Snippet support for Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-spolsky" = callPackage @@ -135476,7 +136813,6 @@ self: { homepage = "https://github.com/melrief/yi-spolsky"; description = "Spolsky colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-vty" = callPackage @@ -135695,6 +137031,7 @@ self: { HStringTemplate lucid old-locale old-time pandoc parsec scientific split text time unordered-containers yaml ]; + jailbreak = true; homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; @@ -136090,6 +137427,7 @@ self: { sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls"; buildDepends = [ base lens profunctors semigroupoids ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/zippers/"; description = "Traversal based zippers"; license = stdenv.lib.licenses.bsd3; @@ -136107,7 +137445,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "zlib" = callPackage + "zlib_0_5_4_2" = callPackage ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "zlib"; @@ -136119,16 +137457,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) zlib;}; - "zlib_0_6_1_0" = callPackage + "zlib" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, zlib }: mkDerivation { pname = "zlib"; - version = "0.6.1.0"; - revision = "1"; - sha256 = "1yc4zfysbj28px064bfwz9n3b3i57c1dsfvkzgfxxmgj1mq65q7n"; - editedCabalFile = "4efd1cd219decf6e6a97795a52344922c36aace77dc4b6834502c218d48b9f13"; + version = "0.6.1.1"; + sha256 = "0dd79dxf56d8f6ad9if3j87s9gg7yd17ckypjxwplrbkahlb9xf5"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -136186,9 +137522,10 @@ self: { ({ mkDerivation, base, bytestring, profunctors, zlib }: mkDerivation { pname = "zlib-lens"; - version = "0.1.1.2"; - sha256 = "13zfh0639881nfxibl501f1b3ci9pjvhvdid2l5sf2na8kmpzr61"; + version = "0.1.2"; + sha256 = "1vm12sm9ypik5qnnizmwx56fmpjghldzb06kn020hwlabz8c4j8n"; buildDepends = [ base bytestring profunctors zlib ]; + jailbreak = true; homepage = "http://lens.github.io/"; description = "Lenses for zlib"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch new file mode 100644 index 00000000000..a7c35647a29 --- /dev/null +++ b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch @@ -0,0 +1,41 @@ +Running command 'diff -urN old-iconv new-iconv' +Fri May 29 00:42:30 CEST 2015 Robert Helgesson + * Add Functor and Applicative instances for IConv + + This makes iconv successfully build under GHC 7.10. +diff -urN old-iconv/Codec/Text/IConv/Internal.hs new-iconv/Codec/Text/IConv/Internal.hs +--- old-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200 ++++ new-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200 +@@ -49,6 +49,7 @@ + import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO) + import System.IO (hPutStrLn, stderr) + import Control.Exception (assert) ++import Control.Monad (ap, liftM) + + import Prelude hiding (length) + +@@ -192,8 +193,8 @@ + -} + + +----------------------------- +--- IConv monad ++---------------------------------------- ++-- IConv functor, applicative, and monad + -- + + newtype IConv a = I { +@@ -202,6 +203,13 @@ + -> IO (Buffers, a) + } + ++instance Functor IConv where ++ fmap = liftM ++ ++instance Applicative IConv where ++ pure = return ++ (<*>) = ap ++ + instance Monad IConv where + (>>=) = bindI + -- m >>= f = (m `bindI` \a -> consistencyCheck `thenI` returnI a) `bindI` f diff --git a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch b/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch deleted file mode 100644 index 51c453557aa..00000000000 --- a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru3 unlambda-0.1.3-old/Language/Unlambda.hs unlambda-0.1.3/Language/Unlambda.hs ---- unlambda-0.1.3-old/Language/Unlambda.hs 2015-04-17 21:16:32.415751612 +0300 -+++ unlambda-0.1.3/Language/Unlambda.hs 2015-04-17 21:25:38.210123501 +0300 -@@ -29,6 +29,7 @@ - import Prelude hiding(catch) - #endif - import Control.Exception (catch, IOException) -+import Control.Monad (liftM, ap) - - ------------------------------------------------------------------------ - -- Abstract syntax -@@ -85,6 +86,16 @@ - - type Cont a = (Maybe Char, Int) -> a -> IO Exp - -+instance Functor Eval where -+ -+ fmap = liftM -+ -+instance Applicative Eval where -+ -+ pure = return -+ -+ (<*>) = ap -+ - instance Monad Eval where - - (Eval cp1) >>= f = Eval $ \dat1 cont2 -> diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 1166c7075c8..9d12d42cee8 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { if [ $b == "mix" ]; then continue; fi wrapProgram $f \ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" done ''; diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix new file mode 100644 index 00000000000..b1c3df28d1f --- /dev/null +++ b/pkgs/development/interpreters/hugs/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, bison }: + +stdenv.mkDerivation { + + name = "hugs98-200609"; + + src = fetchurl { + url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; + sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6"; + }; + + buildInputs = [ bison ]; + + postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +"; + + configureFlags = [ + "--enable-char-encoding=utf8" # require that the UTF-8 encoding is always used + "--disable-path-canonicalization" + "--disable-timer" # evaluation timing (for benchmarking Hugs) + "--disable-profiling" # heap profiler + "--disable-stack-dumps" # stack dump on stack overflow + "--enable-large-banner" # multiline startup banner + "--disable-internal-prims" # experimental primitives to access Hugs's innards + "--disable-debug" # include C debugging information (for debugging Hugs) + "--disable-tag" # runtime tag checking (for debugging Hugs) + "--disable-lint" # "lint" flags (for debugging Hugs) + "--disable-only98" # build Hugs to understand Haskell 98 only + "--enable-ffi" + "--enable-pthreads" # build Hugs using POSIX threads C library + ]; + + meta = { + homepage = http://www.haskell.org/hugs; + description = "Haskell interpreter"; + license = "as-is"; # gentoo labels it this way + platforms = stdenv.lib.platforms.unix; # arbitrary choice + }; +} diff --git a/pkgs/development/interpreters/lua-5/5.2.darwin.patch b/pkgs/development/interpreters/lua-5/5.2.darwin.patch index ffc3ff34be7..b314bd2abac 100644 --- a/pkgs/development/interpreters/lua-5/5.2.darwin.patch +++ b/pkgs/development/interpreters/lua-5/5.2.darwin.patch @@ -1,27 +1,27 @@ diff --git a/Makefile b/Makefile -index 209a132..9387b09 100644 +index d2c7db4..dc107b3 100644 --- a/Makefile +++ b/Makefile -@@ -43,5 +43,5 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris +@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris # What to install. TO_BIN= lua luac TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a +TO_LIB= liblua.${version}.dylib TO_MAN= lua.1 luac.1 - + # Lua version and release. -@@ -64,3 +64,5 @@ install: dummy +@@ -63,6 +63,8 @@ install: dummy cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${majorVersion}.dylib + ln -s -f liblua.${majorVersion}.dylib $(INSTALL_LIB)/liblua.dylib - - ranlib: - cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) + + uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) diff --git a/src/Makefile b/src/Makefile -index fea895b..d9146d0 100644 +index 7b4b2b7..25001e5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -28,7 +28,7 @@ MYOBJS= diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index f0d9d03991b..8e148f1189c 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "luajit-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"; + sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 6e7ffa656a0..92df954e5e0 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "4.0.0"; + version = "4.1.0"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "0qw25v8pzx08mirhy46dmqj93nwnxfvgw2jsn8rvxh2d7x4nc8jv"; + sha256 = "16hssxv6fwi5a6bz7dlvhjjr3ymiqrvq0xfd38gwhn9qhvynv2ak"; }; buildInputs = [ pkgconfig nix git ]; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index a0906a09a78..9ad8c2790da 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - version = "3.8.2"; + version = "4.0.0"; name = "octave-${version}"; src = fetchurl { - url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae"; + url = "mirror://gnu/octave/${name}.tar.xz"; + sha256 = "0x64b2lna4vrlm4wwx6h1qdlmki6s2b9q90yjxldlvvrqvxf4syg"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 diff --git a/pkgs/development/interpreters/perl/sys-perl/default.nix b/pkgs/development/interpreters/perl/sys-perl/default.nix deleted file mode 100644 index e30ce92c61e..00000000000 --- a/pkgs/development/interpreters/perl/sys-perl/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv }: - -stdenv.mkDerivation rec { - name = "perl"; - - unpackPhase = "true"; - - installPhase = - '' - mkdir -p $out/bin - ln -s /usr/bin/perl $out/bin - ''; - - setupHook = ./setup-hook.sh; - - libPrefix = "lib/perl5/site_perl/5.10/i686-cygwin"; - - passthru.libPrefix = libPrefix; -} diff --git a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh deleted file mode 100644 index 7b03c15ec5a..00000000000 --- a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/@libPrefix@ -} - -envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 7133b1e0824..c10425631b3 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.4.40"; - sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628"; + phpVersion = "5.4.41"; + sha = "0wl27f5z6vymajm2bzfp440zsp1jdxqn71avryiq1zw029db9i2v"; apacheHttpd = apacheHttpd; } diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index fdc1ab79c76..0d66e64693a 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.5.21"; - sha = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2"; + phpVersion = "5.5.25"; + sha = "0qrc4qll07hfs5a3l4ajrj7969w10d0n146zq1smdl6x4pkkgpv8"; apacheHttpd = apacheHttpd; } diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 5f69e46189f..425f51ce5c6 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.6.6"; - sha = "0k5vml94p5809bk2d5a8lhzf3h7f1xgs75b9qy6ikj70cndmqqh9"; + phpVersion = "5.6.9"; + sha = "1fdwk8g509gxd5ad3y1s3j49hfkjdg8mgmzn9ki3pflbgdxvilqr"; apacheHttpd = apacheHttpd; } diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 8cad6dc369d..c9ec01703bf 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/zsaleeba/picoc; downloadPage = https://code.google.com/p/picoc/downloads/list; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 4e322faf66f..29e3ecd20b1 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -169,7 +169,7 @@ let crypt = buildInternalPythonModule { moduleName = "crypt"; internalName = "crypt"; - deps = [ ]; + deps = optional (stdenv ? glibc) stdenv.glibc; }; curses = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch b/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch new file mode 100644 index 00000000000..22bc0f7ced0 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch @@ -0,0 +1,34 @@ +--- origsrc/Lib/ctypes/util.py 2007-09-14 15:05:26.000000000 -0500 ++++ src/Lib/ctypes/util.py 2008-11-25 17:54:47.319296200 -0600 +@@ -41,6 +41,20 @@ + continue + return None + ++elif sys.platform == "cygwin": ++ def find_library(name): ++ for libdir in ['/usr/lib', '/usr/local/lib']: ++ for libext in ['lib%s.dll.a' % name, 'lib%s.a' % name]: ++ implib = os.path.join(libdir, libext) ++ if not os.path.exists(implib): ++ continue ++ cmd = "dlltool -I " + implib + " 2>/dev/null" ++ res = os.popen(cmd).read().replace("\n","") ++ if not res: ++ continue ++ return res ++ return None ++ + elif os.name == "posix": + # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump + import re, tempfile, errno +@@ -157,6 +173,10 @@ + print cdll.LoadLibrary("libcrypto.dylib") + print cdll.LoadLibrary("libSystem.dylib") + print cdll.LoadLibrary("System.framework/System") ++ elif sys.platform == "cygwin": ++ print cdll.LoadLibrary("cygbz2-1.dll") ++ print find_library("crypt") ++ print cdll.LoadLibrary("cygcrypt-0.dll") + else: + print cdll.LoadLibrary("libm.so") + print cdll.LoadLibrary("libcrypt.so") diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch b/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch new file mode 100644 index 00000000000..28b6dafc3f1 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch @@ -0,0 +1,27 @@ +--- origsrc/setup.py 2008-02-04 17:41:02.000000000 -0600 ++++ src/setup.py 2008-07-02 02:11:28.671875000 -0500 +@@ -1277,12 +1279,6 @@ + include_dirs.append('/usr/X11/include') + added_lib_dirs.append('/usr/X11/lib') + +- # If Cygwin, then verify that X is installed before proceeding +- if host_platform == 'cygwin': +- x11_inc = find_file('X11/Xlib.h', [], include_dirs) +- if x11_inc is None: +- return +- + # Check for BLT extension + if self.compiler.find_library_file(lib_dirs + added_lib_dirs, + 'BLT8.0'): +@@ -1300,9 +1296,8 @@ + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') ++ # Finally, link with the X11 libraries ++ libs.append('X11') + + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, diff --git a/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch b/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch new file mode 100644 index 00000000000..bef137efda7 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch @@ -0,0 +1,13 @@ +--- origsrc/Modules/_ssl.c 2009-01-26 10:55:41.000000000 -0600 ++++ src/Modules/_ssl.c 2009-08-20 00:04:59.346816700 -0500 +@@ -15,6 +15,10 @@ + + #include "Python.h" + ++#ifdef __CYGWIN__ ++#undef WITH_THREAD ++#endif ++ + #ifdef WITH_THREAD + #include "pythread.h" + #define PySSL_BEGIN_ALLOW_THREADS { \ diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch b/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch new file mode 100644 index 00000000000..d1dae8c47dc --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch @@ -0,0 +1,41 @@ +--- Python-2.6.5.orig/Modules/selectmodule.c 2012-02-02 22:35:21.835125000 -0500 ++++ Python-2.6.5/Modules/selectmodule.c 2012-02-02 22:41:41.210125000 -0500 +@@ -6,6 +6,21 @@ + >= 0. + */ + ++/* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined. ++ 64 is too small (too many people have bumped into that limit). ++ Here we boost it. ++ ++ Cygwin also defines FD_SETSIZE to 64, so also increase the limit on ++ Cygwin. We must do this before sys/types.h is included, which otherwise ++ sets FD_SETSIZE to the default. ++ ++ Users who want even more than the boosted limit should #define ++ FD_SETSIZE higher before this; e.g., via compiler /D switch. ++*/ ++#if (defined(MS_WINDOWS) || defined(__CYGWIN__)) && !defined(FD_SETSIZE) ++#define FD_SETSIZE 512 ++#endif ++ + #include "Python.h" + #include + +@@ -16,16 +31,6 @@ + #undef HAVE_BROKEN_POLL + #endif + +-/* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined. +- 64 is too small (too many people have bumped into that limit). +- Here we boost it. +- Users who want even more than the boosted limit should #define +- FD_SETSIZE higher before this; e.g., via compiler /D switch. +-*/ +-#if defined(MS_WINDOWS) && !defined(FD_SETSIZE) +-#define FD_SETSIZE 512 +-#endif +- + #if defined(HAVE_POLL_H) + #include + #elif defined(HAVE_SYS_POLL_H) diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch b/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch new file mode 100644 index 00000000000..ea696978236 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch @@ -0,0 +1,11 @@ +--- origsrc/Include/pyerrors.h 2008-06-08 23:58:54.000000000 -0500 ++++ src/Include/pyerrors.h 2010-05-12 04:19:31.535297200 -0500 +@@ -232,7 +232,7 @@ PyAPI_FUNC(int) PyErr_CheckSignals(void) + PyAPI_FUNC(void) PyErr_SetInterrupt(void); + + /* In signalmodule.c */ +-int PySignal_SetWakeupFd(int fd); ++PyAPI_FUNC(int) PySignal_SetWakeupFd(int fd); + + /* Support for adding program text to SyntaxErrors */ + PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int); diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch b/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch new file mode 100644 index 00000000000..e1cf5ad4bbf --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch @@ -0,0 +1,16 @@ +--- origsrc/Include/py_curses.h 2009-09-06 16:23:05.000000000 -0500 ++++ src/Include/py_curses.h 2010-04-14 15:21:23.008971400 -0500 +@@ -17,6 +17,13 @@ + #define NCURSES_OPAQUE 0 + #endif /* __APPLE__ */ + ++#ifdef __CYGWIN__ ++/* the following define is necessary for Cygwin; without it, the ++ Cygwin-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python ++ can't get at the WINDOW flags field. */ ++#define NCURSES_INTERNALS ++#endif /* __CYGWIN__ */ ++ + #ifdef __FreeBSD__ + /* + ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch b/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch new file mode 100644 index 00000000000..bfaeb37c287 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch @@ -0,0 +1,27 @@ +--- origsrc/setup.py.orig 2012-11-27 10:20:47.442395900 -0500 ++++ src/setup.py 2012-11-27 10:53:15.583020900 -0500 +@@ -1141,7 +1141,7 @@ + + dbm_order = ['gdbm'] + # The standard Unix dbm module: +- if host_platform not in ['cygwin']: ++ if host_platform not in ['win32']: + config_args = [arg.strip("'") + for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] + dbm_args = [arg for arg in config_args +@@ -1192,6 +1192,15 @@ + ], + libraries = gdbm_libs) + break ++ if find_file("ndbm.h", inc_dirs, []) is not None: ++ print("building dbm using gdbm") ++ dbmext = Extension( ++ 'dbm', ['dbmmodule.c'], ++ define_macros=[ ++ ('HAVE_NDBM_H', None), ++ ], ++ libraries = gdbm_libs) ++ break + elif cand == "bdb": + if db_incs is not None: + print "building dbm using bdb" diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch b/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch new file mode 100644 index 00000000000..6e1fc8b53e8 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch @@ -0,0 +1,10 @@ +--- origsrc/Lib/distutils/unixccompiler.py.orig 2012-11-27 07:44:15.409993500 -0500 ++++ src/Lib/distutils/unixccompiler.py 2012-11-27 08:09:57.801770900 -0500 +@@ -141,6 +141,7 @@ + static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s" + if sys.platform == "cygwin": + exe_extension = ".exe" ++ dylib_lib_extension = ".dll.a" + + def preprocess(self, source, + output_file=None, macros=None, include_dirs=None, diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch b/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch new file mode 100644 index 00000000000..68f6921ba6a --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch @@ -0,0 +1,31 @@ +--- origsrc/Modules/getpath.c.orig 2012-11-27 12:07:56.098645900 -0500 ++++ src/Modules/getpath.c 2012-11-27 12:10:11.254895900 -0500 +@@ -436,6 +436,28 @@ + if (isxfile(progpath)) + break; + ++#ifdef __CYGWIN__ ++ /* ++ * Cygwin automatically removes the ".exe" extension from argv[0] ++ * to make programs feel like they are in a more Unix-like ++ * environment. Unfortunately, this can make it problemmatic for ++ * Cygwin to distinguish between a directory and an executable with ++ * the same name excluding the ".exe" extension. For example, the ++ * Cygwin Python build directory has a "Python" directory and a ++ * "python.exe" executable. This causes isxfile() to erroneously ++ * return false. If isdir() returns true and there is enough space ++ * to append the ".exe" extension, then we try again with the ++ * extension appended. ++ */ ++#define EXE ".exe" ++ if (isdir(progpath) && strlen(progpath) + strlen(EXE) <= MAXPATHLEN) ++ { ++ strcat(progpath, EXE); ++ if (isxfile(progpath)) ++ break; ++ } ++#endif /* __CYGWIN__ */ ++ + if (!delim) { + progpath[0] = '\0'; + break; diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch b/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch new file mode 100644 index 00000000000..55281db6768 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch @@ -0,0 +1,11 @@ +--- origsrc/setup.py.orig 2012-11-27 09:28:34.051770900 -0500 ++++ src/setup.py 2012-11-27 09:28:47.239270900 -0500 +@@ -470,7 +470,7 @@ + + # Check for MacOS X, which doesn't need libm.a at all + math_libs = ['m'] +- if host_platform in ['darwin', 'beos']: ++ if host_platform in ['darwin', 'beos', 'cygwin']: + math_libs = [] + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index ac9b9d63709..e67c2682998 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -7,6 +7,7 @@ , tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true , zlib ? null, zlibSupport ? true +, expat, libffi }: assert zlibSupport -> zlib != null; @@ -19,11 +20,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.9"; + version = "${majorVersion}.10"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "05j9in7yygfgl6nml0rixfvj1bbip982w3l54q05f0vyx8a7xllh"; + sha256 = "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw"; }; patches = @@ -39,6 +40,17 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch + ] ++ optionals stdenv.isCygwin [ + ./2.5.2-ctypes-util-find_library.patch + ./2.5.2-tkinter-x11.patch + ./2.6.2-ssl-threads.patch + ./2.6.5-export-PySignal_SetWakeupFd.patch + ./2.6.5-FD_SETSIZE.patch + ./2.6.5-ncurses-abi6.patch + ./2.7.3-dbm.patch + ./2.7.3-dylib.patch + ./2.7.3-getpath-exe-extension.patch + ./2.7.3-no-libm.patch ]; preConfigure = '' @@ -50,19 +62,26 @@ let for i in Lib/plat-*/regen; do substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done - '' + optionalString stdenv.isCygwin '' - # On Cygwin, `make install' tries to read this Makefile. - mkdir -p $out/lib/python${majorVersion}/config - touch $out/lib/python${majorVersion}/config/Makefile - mkdir -p $out/include/python${majorVersion} - touch $out/include/python${majorVersion}/pyconfig.h ''; - configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; + configureFlags = [ + "--enable-shared" + "--with-threads" + "--enable-unicode=ucs4" + ] ++ optionals stdenv.isCygwin [ + "--with-system-ffi" + "--with-system-expat" + "ac_cv_func_bind_textdomain_codeset=yes" + ]; + + postConfigure = if stdenv.isCygwin then '' + sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' + '' else null; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl ] + ++ optionals stdenv.isCygwin [ expat libffi ] ++ optionals includeModules ( [ db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk x11 libX11 ] @@ -150,14 +169,17 @@ let if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches preConfigure configureFlags; + inherit src patches preConfigure postConfigure configureFlags; buildInputs = [ python ] ++ deps; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - buildPhase = '' + # non-python gdbm has a libintl dependency on i686-cygwin, not on x86_64-cygwin + buildPhase = (if (stdenv.system == "i686-cygwin" && moduleName == "gdbm") then '' + sed -i setup.py -e "s:libraries = \['gdbm'\]:libraries = ['gdbm', 'intl']:" + '' else '''') + '' substituteInPlace setup.py --replace 'self.extensions = extensions' \ 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' @@ -196,7 +218,7 @@ let crypt = buildInternalPythonModule { moduleName = "crypt"; internalName = "crypt"; - deps = [ ]; + deps = optional (stdenv ? glibc) stdenv.glibc; }; gdbm = buildInternalPythonModule { @@ -212,10 +234,10 @@ let } // optionalAttrs x11Support { - tkinter = buildInternalPythonModule { + tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 libX11 ]; - }; + }); } // { diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix index 88e0af2a21b..336d4054422 100644 --- a/pkgs/development/interpreters/ruby/bundler.nix +++ b/pkgs/development/interpreters/ruby/bundler.nix @@ -1,7 +1,8 @@ -{ buildRubyGem, coreutils }: +{ buildRubyGem, makeWrapper, ruby, coreutils }: buildRubyGem { name = "bundler-1.9.2"; + namePrefix = ""; sha256 = "0ck9bnqg7miimggj1d6qlabrsa5h9yaw241fqn15cvqh915209zk"; dontPatchShebangs = true; postInstall = '' @@ -9,5 +10,8 @@ buildRubyGem { substituteInPlace $f \ --replace "/usr/bin/env" "${coreutils}/bin/env" done + + wrapProgram $out/bin/bundler \ + --prefix PATH ":" ${ruby}/bin ''; } diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix index 3c2ea71ecf2..0ae1d1261ee 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-shared" "--enable-pthread" ] + # Without this fails due to not finding X11/Xlib.h + # Not sure why this isn't required on Linux + ++ ops stdenv.isDarwin [ "--without-tcl" "--without-tk" ] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"; installFlags = stdenv.lib.optionalString docSupport "install-doc"; diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix index db807ebbd8b..c53a012d753 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix @@ -101,12 +101,12 @@ stdenv.mkDerivation rec { sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig ''; - meta = { - license = "Ruby"; + meta = with stdenv.lib; { + license = licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; }; passthru = rec { diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index f23955228f7..3e00b21ad43 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -2,7 +2,7 @@ , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, x11 ? null, libXrandr ? null -, pulseaudioSupport ? true, pulseaudio ? null +, pulseaudioSupport ? true, libpulseaudio ? null }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -12,7 +12,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> pulseaudio != null; +assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "1.2.15"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { propagatedNativeBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ stdenv.lib.optional alsaSupport alsaLib ++ - stdenv.lib.optional pulseaudioSupport pulseaudio; + stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = let notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt"; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index ade6bc620e4..bfd5ff65563 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -2,7 +2,7 @@ , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, x11 ? null, libXrandr ? null -, pulseaudioSupport ? true, pulseaudio ? null +, pulseaudioSupport ? true, libpulseaudio ? null }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -12,7 +12,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> pulseaudio != null; +assert pulseaudioSupport -> libpulseaudio != null; let configureFlagsFun = attrs: '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ - stdenv.lib.optional pulseaudioSupport pulseaudio; + stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ pkgconfig audiofile ] ++ stdenv.lib.optional openglSupport [ mesa ] ++ diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 9194339b3a4..824a2949492 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: +{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: +let version = "1.13"; in stdenv.mkDerivation rec { - name = "accounts-qt-1.11"; - src = fetchurl { - url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2"; - sha256 = "07drh4s7zaz4bzg2xhwm50ig1g8vlphfv02nrzz1yi085az1fmch"; + name = "accounts-qt-${version}"; + + src = fetchFromGitLab { + sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl"; + rev = version; + repo = "libaccounts-qt"; + owner = "accounts-sso"; + }; + + meta = with stdenv.lib; { + description = "Qt library for accessing the online accounts database"; + homepage = "http://code.google.com/p/accounts-sso/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ nckx ]; }; buildInputs = [ glib libaccounts-glib qt5.base ]; nativeBuildInputs = [ doxygen pkgconfig ]; configurePhase = '' - qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/AccountsQt5 - ''; - - postInstall = '' - mv $out/lib/cmake/AccountsQt5/AccountsQtConfig.cmake \ - $out/lib/cmake/AccountsQt5/AccountsQt5Config.cmake - mv $out/lib/cmake/AccountsQt5/AccountsQtConfigVersion.cmake \ - $out/lib/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake + qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake ''; } diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index 2c76c2f4350..cda2cd9bb05 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -22,5 +22,7 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + + broken = true; }; }) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 8f3d298306b..2a75b1fb700 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -6,8 +6,8 @@ agda.mkDerivation (self: rec { src = fetchgit { url = "git://github.com/agda/agda-stdlib"; - rev = "451446c5d849b8c5d6d34363e3551169eb126cfb"; - sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701"; + rev = "9c9b3cb28f9a7d39a256890a1469c1a3f7fc4faf"; + sha256 = "521899b820e70abbae7cb30008b87a2f8676bc6265b78865e42982fc2e5c972f"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 226f792c45a..9d4761c3da8 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - name = "aqbanking-5.4.0beta"; + name = "aqbanking-5.5.1"; src = fetchurl { - url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=112&file=01&dummy=aqbanking-5.4.0beta.tar.gz"; + url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "0yd588sw9grc2c0bfyx8h39mr30pa1zxrcbv31p6pz6szilk2agh"; + sha256 = "1pxd5xv2xls1hyizr1vbknzgb66babhlp72777rcxq46gp91g3r3"; }; buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ]; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 8d87e2ee50d..75dd10d8caa 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { installTargets = "install install-lib install-dev"; - meta = { + meta = with stdenv.lib; { homepage = http://savannah.nongnu.org/projects/attr/; description = "Library and tools for manipulating extended attributes"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix new file mode 100644 index 00000000000..8c7e82557ab --- /dev/null +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "zita-resampler-${version}"; + version = "1.3.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq"; + }; + + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=" + ]; + + patchPhase = '' + cd libs + sed -e "s@ldconfig@@" -i Makefile + ''; + + fixupPhase = '' + ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1 + ''; + + meta = { + description = "resample library by Fons Adriaensen"; + version = "${version}"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index d89a2763834..abd8a284e62 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit version; description = "Brokken's Own Base Classes And Templates"; downloadPage = http://sourceforge.net/projects/bobcat/files/; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/boehm-gc/cygwin.patch b/pkgs/development/libraries/boehm-gc/cygwin.patch new file mode 100644 index 00000000000..25c6b9f06f3 --- /dev/null +++ b/pkgs/development/libraries/boehm-gc/cygwin.patch @@ -0,0 +1,108 @@ +--- gc-7.2/include/gc.h 2014-06-01 19:00:48.000000000 +0200 ++++ gc-7.2/include/gc.h 2015-05-27 12:55:42.248984200 +0200 +@@ -1386,7 +1386,14 @@ + /* THREAD_LOCAL_ALLOC defined and the initial allocation call is not */ + /* to GC_malloc() or GC_malloc_atomic(). */ + +-#ifdef __CYGWIN32__ ++#ifdef __CYGWIN__ ++#ifdef __x86_64__ ++ extern int __data_start__[], __data_end__[], __bss_start__[], __bss_end__[]; ++#define GC_DATASTART (__data_start__ < __bss_start__ ?\ ++ (void *)__data_start__ : (void *)__bss_start__) ++#define GC_DATAEND (__data_end__ < __bss_end__ ?\ ++ (void *)__data_end__ : (void *)__bss_end__) ++#else + /* Similarly gnu-win32 DLLs need explicit initialization from the */ + /* main program, as does AIX. */ + extern int _data_start__[], _data_end__[], _bss_start__[], _bss_end__[]; +@@ -1394,6 +1401,7 @@ + (void *)_data_start__ : (void *)_bss_start__) + # define GC_DATAEND (_data_end__ > _bss_end__ ? \ + (void *)_data_end__ : (void *)_bss_end__) ++#endif + # define GC_INIT_CONF_ROOTS GC_add_roots(GC_DATASTART, GC_DATAEND); \ + GC_gcollect() /* For blacklisting. */ + /* Required at least if GC is in a DLL. And doesn't hurt. */ +--- gc-7.2/include/private/gcconfig.h 2014-06-01 19:00:48.000000000 +0200 ++++ gc-7.2/include/private/gcconfig.h 2015-05-27 12:46:01.864338700 +0200 +@@ -441,10 +441,20 @@ + # endif + # define mach_type_known + # endif +-# if defined(__CYGWIN32__) || defined(__CYGWIN__) ++# if defined(__CYGWIN32__) + # define I386 + # define CYGWIN32 + # define mach_type_known ++#if defined(__CYGWIN__) ++# if defined(__LP64__) ++# define X86_64 ++# define mach_type_known ++# else ++# define I386 ++# endif ++# define CYGWIN32 ++# define mach_type_known ++#endif + # endif + # if defined(__MINGW32__) && !defined(mach_type_known) + # define I386 +@@ -511,6 +521,16 @@ + # define mach_type_known + # endif + ++#if defined(__CYGWIN__) ++# if defined(__LP64__) ++# define X86_64 ++# define mach_type_known ++# else ++# define I386 ++# endif ++# define CYGWIN32 ++# define mach_type_known ++#endif + /* Feel free to add more clauses here */ + + /* Or manually define the machine type here. A machine type is */ +@@ -2279,6 +2299,20 @@ + # define GWW_VDB + # define DATAEND /* not needed */ + # endif ++ ++# ifdef CYGWIN32 ++# define OS_TYPE "CYGWIN32" ++# define DATASTART ((ptr_t)GC_DATASTART) /* From gc.h */ ++# define DATAEND ((ptr_t)GC_DATAEND) ++# define ALIGNMENT 8 ++# undef STACK_GRAN ++# define STACK_GRAN 0x10000 ++# ifdef USE_MMAP ++# define NEED_FIND_LIMIT ++# define USE_MMAP_ANON ++# endif ++# endif ++ + # endif /* X86_64 */ + + # ifdef HEXAGON +--- gc-7.2/os_dep.c 2015-05-27 12:25:29.097698800 +0200 ++++ gc-7.2/os_dep.c 2015-05-27 12:48:23.714600800 +0200 +@@ -764,10 +764,16 @@ + /* gcc version of boehm-gc). */ + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) + { ++# ifdef __x86_64__ ++ PNT_TIB pTib = NtCurrentTeb(); ++ void * _tlsbase = pTib->StackBase; ++ /*void * _tlsbase = NtCurrentTeb()->pTib.StackBase;*/ ++ /*extern void * _tlsbase __asm__ ("%gs:8");*/ ++# else + void * _tlsbase; +- + __asm__ ("movl %%fs:4, %0" + : "=r" (_tlsbase)); ++# endif + sb -> mem_base = _tlsbase; + return GC_SUCCESS; + } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index d71440a61d8..158f4b227dd 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; }; + patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; + configureFlags = [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 59d25a76732..92e02c6ca08 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.highscore.de/boost/process0.5/"; description = "Library to manage system processes"; - license = "boost-license"; + license = licenses.boost; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index c843a00b836..5880ae772ce 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ python bzip2 zlib gmp openssl boost ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags} + python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 89c791fae02..47a2c63d328 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { '' + glib.flattenInclude ); - meta = { + meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; - license = [ "LGPLv2+" "MPLv1" ]; + license = with licenses; [ lgpl2Plus mpl10 ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 990d44dfef8..b8e9fd7966b 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; - meta = { + meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; - license = [ "LGPLv2+" "MPLv1" ]; + license = with licenses; [ lgpl2Plus mpl10 ]; }; } diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index c6bd7e4f4d4..8a67206d5b4 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capnproto-${version}"; - version = "0.5.0"; + version = "0.5.1.2"; src = fetchurl { url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "01fsf60zlyc6rlhnrh8gd9jj5gs52ancb50ml3w7gwq55zgx2rf7"; + sha256 = "0a89v6sigsyj9vii0d5kqs2fdv73r71f8czzhdvqdvk3p0mlcgx2"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix new file mode 100644 index 00000000000..49376b74c17 --- /dev/null +++ b/pkgs/development/libraries/catch/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + + name = "catch-${version}"; + version = "1.1-3"; + + src = fetchFromGitHub { + owner = "philsquared"; + repo = "Catch"; + rev = "c51e86819dc993d590e5d0adaf1952f4b53e5355"; + sha256 = "0kgi7wxxysgjbpisqfj4dj0k19cyyai92f001zi8gzkybd4fkgv5"; + }; + + buildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + + buildPhase = '' + cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release + cd Build + make + cd .. + ''; + + installPhase = '' + mkdir -p $out + mv include $out/. + ''; + + meta = with stdenv.lib; { + description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; + homepage = "http://catch-lib.net"; + license = licenses.boost; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 5105bd29876..5574e18ffa0 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; + broken = true; # fails to compile with libgcrypt >= 1.6 }; } diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix deleted file mode 100644 index 7a9d114ce8e..00000000000 --- a/pkgs/development/libraries/clutter/1.18.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.18"; - ver_min = "2"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix deleted file mode 100644 index f6927770d86..00000000000 --- a/pkgs/development/libraries/cogl/1.18.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection -, gstreamerSupport ? true, gst_all_1 }: - -let - ver_maj = "1.18"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "0phg76jpkn0j948axavzr15gyrqipzmzzr66nlp3dfksgszixnd4"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-introspection" - "--enable-gles1" - "--enable-gles2" - "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; - - propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage - ] - ++ libintlOrEmpty - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer - gst_all_1.gst-plugins-base ]; - - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; - - COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - #doCheck = true; # all tests fail (no idea why) - - meta = with stdenv.lib; { - description = "A small open source library for using 3D graphics hardware for rendering"; - maintainers = with maintainers; [ lovek323 ]; - - longDescription = '' - Cogl is a small open source library for using 3D graphics hardware for - rendering. The API departs from the flat state machine style of OpenGL - and is designed to make it easy to write orthogonal components that can - render without stepping on each other's toes. - ''; - - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index fc2d04e649b..510af3df824 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/zeromq/cppzmq; license = licenses.bsd2; description = "C++ binding for 0MQ"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 013a7fd35b9..077bd4e03a3 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") + "--enable-dbm" ]; preConfigure = '' diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix index 172a823cfdc..2cb241b0427 100644 --- a/pkgs/development/libraries/despotify/default.nix +++ b/pkgs/development/libraries/despotify/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao, + stdenv, fetchsvn, openssl, zlib, libvorbis, libpulseaudio, gstreamer, libao, libtool, ncurses, glibc }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc + openssl zlib libvorbis libpulseaudio gstreamer libao libtool ncurses glibc ]; configurePhase = "cd src"; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 07f11d9fa39..7de7cb4d102 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "2.0.1"; + version = "1.1.5"; name = "double-conversion-${version}"; src = fetchFromGitHub { - owner = "floitsch"; + owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b"; + sha256 = "1a264wpnvxmnq5pdlnp417ld1ybrng83lnbg38bv4ahz7a29ap4z"; }; nativeBuildInputs = [ cmake ]; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; - homepage = https://github.com/floitsch/double-conversion; + homepage = https://github.com/google/double-conversion; license = licenses.bsd3; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index a1b0d87cdfd..4798c50225d 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/anholt/libepoxy; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix new file mode 100644 index 00000000000..5f7d61f3601 --- /dev/null +++ b/pkgs/development/libraries/fcppt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, cmake, boost }: + +stdenv.mkDerivation rec { + name = "fcppt-1.3.0"; + + src = fetchgit { + url = https://github.com/freundlich/fcppt.git; + rev = "7787733afc7a6278c0de8c0435b3d312e0c0c851"; + sha256 = "1vy6nhk6nymbp4yihvw75qn67q9fgmfc518f8dn3h2pq2gfjqrpy"; + }; + + buildInputs = [ cmake boost ]; + + cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ]; + + enableParallelBuilding = true; + + meta = { + description = "Freundlich's C++ toolkit"; + longDescription = '' + Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on improving general C++ code by providing better types, a strong focus on C++11 (non-conforming compilers are mostly not supported) and functional programming (which is both efficient and syntactically affordable in C++11). + ''; + homepage = http://fcppt.org; + license = stdenv.lib.licenses.boost; + maintainers = with stdenv.lib.maintainers; [ pmiddend ]; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index e674ef0b97b..aee67f5cd77 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -108,7 +108,7 @@ #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null -, pulseaudio ? null # Pulseaudio input support +, libpulseaudio ? null # Pulseaudio input support , rtmpdump ? null # RTMP[E] support #, libquvi ? null # Quvi input support , samba ? null # Samba protocol @@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { name = "ffmpeg-${version}"; - version = "2.6.1"; + version = "2.6.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4"; + sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr"; }; patchPhase = ''patchShebangs .''; @@ -361,7 +361,7 @@ stdenv.mkDerivation rec { #(enableFeature (openh264 != null) "openh264") (enableFeature (openjpeg_1 != null) "libopenjpeg") (enableFeature (opensslExtlib && gplLicensing) "openssl") - (enableFeature (pulseaudio != null) "libpulse") + (enableFeature (libpulseaudio != null) "libpulse") #(enableFeature quvi "libquvi") (enableFeature (rtmpdump != null) "librtmp") #(enableFeature (schroedinger != null) "libschroedinger") @@ -399,7 +399,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXext libXfixes libXv lzma openal openjpeg_1 pulseaudio rtmpdump + libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib mesa ++ optionals x11grabExtlib [ libXext libXfixes ] diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index bad142f6f96..b008151d6cb 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.15"; + version = "${branch}.16"; branch = "0.10"; - sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb"; + sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; }) diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix index e382fe7154d..fbbb75cb832 100644 --- a/pkgs/development/libraries/ffmpeg/2.2.nix +++ b/pkgs/development/libraries/ffmpeg/2.2.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.13"; + version = "${branch}.15"; branch = "2.2"; - sha256 = "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0"; + sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4"; }) diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix index 9e097ddfebb..60fc32e030e 100644 --- a/pkgs/development/libraries/ffmpeg/2.6.nix +++ b/pkgs/development/libraries/ffmpeg/2.6.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.1"; + version = "${branch}.3"; branch = "2.6"; - sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4"; + sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr"; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1f127d948af..99d8fe679ab 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm -, alsaLib, bzip2, fontconfig, freetype, libiconv, lame, libass, libogg, libtheora -, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr, x264 -, xvidcore, zlib +, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg +, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, libpulseaudio, SDL, soxr +, x264, xvidcore, zlib , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { else "--disable-pthreads --disable-w32threads") (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2 + "--enable-network" (ifMinVer "2.4" "--enable-pixelutils") # Executables "--enable-ffmpeg" @@ -105,6 +106,7 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" "--disable-doc") # External Libraries "--enable-bzlib" + "--enable-gnutls" (ifMinVer "1.0" "--enable-fontconfig") (ifMinVer "0.7" "--enable-libfreetype") "--enable-libmp3lame" @@ -129,15 +131,15 @@ stdenv.mkDerivation rec { "--disable-stripping" # Disable mmx support for 0.6.90 (verFix null "0.6.90" "--disable-mmx") - ] ++ optional (stdenv.cc.cc.isClang or false) "--cc=clang"; + ] ++ optional stdenv.cc.isClang "--cc=clang"; nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - bzip2 fontconfig freetype libiconv lame libass libogg libtheora libvdpau - libvorbis lzma SDL soxr x264 xvidcore zlib + bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora + libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib ] ++ optional openglSupport mesa - ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin + ++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin ++ optional (isLinux || isFreeBSD) libva ++ optional isLinux alsaLib; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 104b7229bb1..2bcc1cd69a7 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 ++ optional stdenv.isx86_64 "--enable-sse2" - ++ optional (stdenv.cc.cc.isGNU or false) "--enable-openmp"; + ++ optional stdenv.cc.isGNU "--enable-openmp"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index 8fb4d40b1db..a5b65f09e61 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -1,20 +1,26 @@ { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng - +, cfg ? {} , automake, autoconf, libtool }: let inherit (composableDerivation) edf; in -let version = "1.3.2"; in +let version = "1.3.3"; in composableDerivation.composableDerivation {} { name = "fltk-${version}"; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "1974brlk723095vf8z72kazq1cbqr9a51kq6b0xda6zkjkgl8q0p"; + sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq"; }; + # http://www.fltk.org/str.php?L3156 + postPatch = '' + substituteInPlace FL/x.H \ + --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' + ''; + propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; enableParallelBilding = true; @@ -48,7 +54,7 @@ composableDerivation.composableDerivation {} { localpngSupport = false; sharedSupport = true; threadsSupport = true; - }; + } // cfg; meta = { description = "A C++ cross-platform light-weight GUI library binding"; @@ -56,9 +62,5 @@ composableDerivation.composableDerivation {} { }; patches = [ - # https://bugs.archlinux.org/task/36186 - (fetchurl { - url = "https://bugs.archlinux.org/task/36186?getfile=10750"; - sha256 = "1hpb1i87nc3zw6mgpgf3bfv557ci930bsn6rwlhaif51nlqd2wbj"; - }) ]; + ]; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 180de724d95..79584a99f63 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,14 +2,14 @@ , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "0.32.0"; + version = "0.38.0"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0yviih6b220bv6d1rg4lx1hqprqapnzfv4rv64cwjxbmz49ckmzh"; + sha256 = "0b273iwizy08r8lap367q79lai4l4aib2bvd827lkkdax5jpqf6b"; }; buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 3980c5b61b3..11d10e73cdd 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -3,12 +3,12 @@ assert odbcSupport -> unixODBC != null; -stdenv.mkDerivation { - name = "freetds-0.91"; +stdenv.mkDerivation rec { + name = "freetds-0.91.112"; src = fetchurl { - url = ftp://ftp.astron.com/pub/freetds/stable/freetds-stable.tgz; - sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; + url = "ftp://ftp.astron.com/pub/freetds/stable/${name}.tar.gz"; + sha256 = "be4f04ee57328c32e7e7cd7e2e1483e535071cec6101e46b9dd15b857c5078ed"; }; buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 0b22aa501e6..e6b1875a9e0 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) - ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./returnval.patch; + ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index da6a3ad1dff..1fa57b5adb5 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.31"; - ver_min = "3"; + ver_min = "4"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc"; + sha256 = "05bslhk33qpssg66n2wys9khyzwkr4am0b23dym8n67qjds9gng5"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 6b53e07acdb..464d2f66e45 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "getdata-0.8.6"; + name = "getdata-0.8.8"; src = fetchurl { url = "mirror://sourceforge/getdata/${name}.tar.bz2"; - sha256 = "1cxmyqg6m7346q37wrr05zmyip1qcgi4vpy3xki20nxwkaw37lz8"; + sha256 = "1p5sncbr0bjrx1ki57di0j9rl5ksv0hbfy7bkcb4vaz9z9mrn8xj"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 8f6277ca2e9..15f11f8a133 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation (rec { configureFlags = [ "--disable-csharp" "--with-xz" ] ++ (stdenv.lib.optionals stdenv.isCygwin - [ # We have a static libiconv, so we can only build the static lib. - "--disable-shared" "--enable-static" - + [ "--disable-java" + "--disable-native-java" # Share the cache among the various `configure' runs. "--config-cache" + "--with-included-gettext" + "--with-included-glib" + "--with-included-libcroco" ]); # On cross building, gettext supposes that the wchar.h from libc @@ -28,6 +30,8 @@ stdenv.mkDerivation (rec { echo gl_cv_func_wcwidth_works=yes > cachefile configureFlags="$configureFlags --cache-file=`pwd`/cachefile" fi + '' + stdenv.lib.optionalString stdenv.isCygwin '' + sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in ''; buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 7ddbc408ca6..823f09b8bce 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "the Git linkable library"; homepage = http://libgit2.github.com/; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index ab7e312762f..087be3bb6de 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 }: +{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 +, libXinerama, libXcursor +}: stdenv.mkDerivation rec { - name = "glfw-3.0.4"; + name = "glfw-3.1.1"; src = fetchurl { url = "mirror://sourceforge/glfw/${name}.tar.bz2"; - sha256 = "1h7g16ncgkl38w19x4dvnn17k9j0kqfvbb9whw9qc71lkq5xf2ag"; + sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa"; }; enableParallelBuilding = true; - buildInputs = [ cmake mesa libXrandr libXi libXxf86vm libXfixes x11 ]; + buildInputs = [ + cmake mesa libXrandr libXi libXxf86vm libXfixes x11 + libXinerama libXcursor + ]; + + cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 6f0394823a6..79c8ac03183 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy -, gsettings_desktop_schemas }: +, gsettings_desktop_schemas, cacert }: let ver_maj = "2.44"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"; }; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; preBuild = '' sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 91832ac650e..8dc96dbbe7a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -assert !stdenv.isDarwin -> stdenv.cc.cc.isGNU or false; +assert !stdenv.isDarwin -> stdenv.cc.isGNU; # TODO: # * Add gio-module-fam @@ -40,7 +40,7 @@ let ''; ver_maj = "2.44"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "1fgmjv3yzxgbks31h42201x2izpw0sd84h8dfw0si3x00sqn5lzj"; + sha256 = "01yabrfp64i11mrks3p1gcks99lw0zm7f5vhkc53sl4amyndw4c8"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; @@ -63,8 +63,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pcre zlib libffi libiconv ] ++ libintlOrEmpty; - configureFlags = - optional stdenv.isDarwin "--disable-compile-warnings" + # Static is necessary for qemu-nix to support static userspace translators + configureFlags = [ "--enable-static" ] + ++ optional stdenv.isDarwin "--disable-compile-warnings" ++ optional stdenv.isSunOS "--disable-modular-tests"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" @@ -75,6 +76,8 @@ stdenv.mkDerivation rec { export MACOSX_DEPLOYMENT_TARGET= ''; + dontDisableStatic = true; + enableParallelBuilding = true; DETERMINISTIC_BUILD = 1; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index ccf6d2c0686..08eaf555e02 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -8,7 +8,7 @@ , withGd ? false, gd ? null, libpng ? null }: -assert stdenv.cc.cc.isGNU or false; +assert stdenv.cc.isGNU; let build = import ./common.nix; diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch index 88c8adef922..eeaf21901a3 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch @@ -6,7 +6,7 @@ diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive. +static int -+open_locale_archive () ++open_locale_archive (void) +{ + int fd = -1; + char *path = getenv ("LOCALE_ARCHIVE_2_11"); diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index a78d9890729..43479a8f66d 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pciutils }: stdenv.mkDerivation rec { - name = "gnu-efi_${version}"; - version = "3.0u"; + name = "gnu-efi-${version}"; + version = "3.0.2"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/${name}.orig.tar.gz"; - sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w"; + url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; + sha256 = "1mxl6xarwickhssn0nc5hyvayyf2cjh5p10l37jd1ymirl75hjqr"; }; - arch = with stdenv.lib; head (splitString "-" stdenv.system); + buildInputs = [ pciutils ]; makeFlags = [ + "PREFIX=\${out}" "CC=gcc" "AS=as" "LD=ld" @@ -20,18 +21,6 @@ stdenv.mkDerivation rec { "OBJCOPY=objcopy" ]; - buildPhase = '' - make $makeFlags - make $makeFlags -C apps clean all - ''; - - installPhase = '' - mkdir -pv $out/include/efi/{protocol,$arch} - make PREFIX="$out" $makeFlags install - mkdir -pv $out/share/gnu-efi - install -D -m644 apps/*.efi $out/share/gnu-efi - ''; - meta = with stdenv.lib; { description = "GNU EFI development toolchain"; homepage = http://sourceforge.net/projects/gnu-efi/; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 930713f5987..6f2361f1658 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { # for the actual fix. enableParallelBuilding = !guileBindings; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp trousers unbound ] + buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ] + ++ stdenv.lib.optional stdenv.isLinux trousers + ++ [ unbound ] ++ stdenv.lib.optional guileBindings guile; nativeBuildInputs = [ perl pkgconfig autoreconfHook ]; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); # Fixup broken libtool and pkgconfig files - preFixup = '' + preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \ -e 's,-lz,-L${zlib}/lib -lz,' \ -e 's,-lgmp,-L${gmp}/lib -lgmp,' \ diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 706bd769219..fb9ff8eb0fb 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeFlags = [ "SHELL=${stdenv.shell}" "INSTALL_ROOT=$(out)" - ] ++ optional (stdenv.cc.cc.isClang or false) "CC=clang"; + ] ++ optional stdenv.cc.isClang "CC=clang"; preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}"; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 71652e3cae3..a748d958269 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "gss-1.0.2"; + name = "gss-1.0.3"; src = fetchurl { url = "mirror://gnu/gss/${name}.tar.gz"; - sha256 = "1qa8lbkzi6ilfggx7mchfzjnchvhwi68rck3jf9j4425ncz7zsd9"; + sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"; }; buildInputs = [ shishi ]; diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 4796ce078df..6ec5e5d9e0a 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -18,4 +18,6 @@ rec { gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; gst-editing-services = callPackage ./ges { inherit gnonlin; }; + + gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; }; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 51ad836b644..c999c65229e 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -3,7 +3,7 @@ , libv4l, libdv, libavc1394, libiec61883 , libvpx, speex, flac, taglib , cairo, gdk_pixbuf, aalib, libcaca -, libsoup, pulseaudio, libintlOrEmpty +, libsoup, libpulseaudio, libintlOrEmpty }: let @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libsoup ] ++ libintlOrEmpty - ++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ]; + ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; LDFLAGS = optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 1db7e4dbd55..deca854008a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx -, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc +, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2, libsoup, libintlOrEmpty , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gstreamer gst_plugins_base ] - ++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ] + ++ stdenv.lib.optional stdenv.isLinux [ libpulseaudio ] ++ libintlOrEmpty ++ stdenv.lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index ea1c31ccab8..ce6ae931836 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "C++ bindings for the GStreamer streaming multimedia library"; homepage = http://www.gtkmm.org/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = "Philip Lykke Carlsen "; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ plcplc ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix new file mode 100644 index 00000000000..a1f936e20af --- /dev/null +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva +, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm +, libvpx +}: + +stdenv.mkDerivation rec { + name = "gst-vaapi-${version}"; + version = "0.5.10"; + + src = fetchurl { + url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2"; + sha256 = "179wnz4c4gnw9ibfgjrad9b44icygadaknsgjfw24lr2pz3kdlhd"; + }; + + nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; + + buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev + xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr mesa nasm libvpx ]; + + preConfigure = " + export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0 + mkdir -p $GST_PLUGIN_PATH_1_0 + "; + configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; + + meta = { + homepage = "http://www.freedesktop.org"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + }; +} diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 774193cc06c..fec9d16cf95 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.27"; + name = "gtk+-2.24.28"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0"; + sha256 = "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix deleted file mode 100644 index 84bea07602f..00000000000 --- a/pkgs/development/libraries/gtk+/3.16.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux, cups ? null -}: - -assert xineramaSupport -> xlibs.libXinerama != null; -assert cupsSupport -> cups != null; - -let - ver_maj = "3.16"; - ver_min = "2"; - version = "${ver_maj}.${ver_min}"; -in -stdenv.mkDerivation rec { - name = "gtk+3-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0"; - }; - - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - - buildInputs = [ libxkbcommon epoxy ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] - ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] - ++ optional stdenv.isDarwin x11 - ++ optional xineramaSupport libXinerama - ++ optional cupsSupport cups; - - # demos fail to install, no idea where's the problem - preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; - - enableParallelBuilding = true; - - postInstall = "rm -rf $out/share/gtk-doc"; - - passthru = { - gtkExeEnvPostBuild = '' - rm $out/lib/gtk-3.0/3.0.0/immodules.cache - $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache - ''; # workaround for bug of nix-mode for Emacs */ ''; - }; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 35b40a507a8..4bc31b99e82 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon +, xlibs, x11, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: @@ -9,8 +9,8 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; let - ver_maj = "3.12"; - ver_min = "2"; + ver_maj = "3.16"; + ver_min = "3"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -18,21 +18,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1"; + sha256 = "195ykv53sl2gsc847wcnd79zilm1yzcc2cfjxnrakhh2dd5gshr9"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - buildInputs = [ libxkbcommon ]; + buildInputs = [ libxkbcommon epoxy ]; propagatedBuildInputs = with xlibs; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isLinux [ wayland ] - ++ optional stdenv.isDarwin x11 ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + # demos fail to install, no idea where's the problem preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat]; + maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix deleted file mode 100644 index bc327468855..00000000000 --- a/pkgs/development/libraries/gtkmm/3.16.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: - -let - ver_maj = "3.16"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "gtkmm-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = { - description = "C++ interface to the GTK+ graphical user interface library"; - - longDescription = '' - gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a - comprehensive set of widgets that are easily extensible via - inheritance. You can create user interfaces either in code or - with the Glade User Interface designer, using libglademm. - There's extensive documentation, including API reference and a - tutorial. - ''; - - homepage = http://gtkmm.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index e158c64f73a..bc327468855 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: let - ver_maj = "3.12"; + ver_maj = "3.16"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1"; + sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix index b8ad3442729..b6cd2e54768 100644 --- a/pkgs/development/libraries/gwenhywfar/default.nix +++ b/pkgs/development/libraries/gwenhywfar/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, qt4 }: stdenv.mkDerivation rec { - name = "gwenhywfar-4.10.0beta"; + name = "gwenhywfar-4.11.1"; src = fetchurl { - url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-4.10.0beta.tar.gz"; + url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "1ihg2s263g540hl42y6g9wqcc4am70kv01yivsqfrpa9fnhbxm7f"; + sha256 = "0ay79vc03jsw762nax204g112yg5sak340g31bm4hm93q69aiv2b"; }; propagatedBuildInputs = [ gnutls libgcrypt ]; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 9d5b11501fc..e7247332059 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: let - version = "2.3"; + version = "2.5.0"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "1qnm466wp8zncr8na4xj2wndfzzfiahafhsaigj8cv35nx56pziv"; + sha256 = "108lh05pl4i5w7hmkw07k9wklk5pbh705pw1qyz5zvp6yicbmd73"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index f5a3857ec28..c357d808cac 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # . doCheck = !stdenv.isCygwin; - meta = { + meta = with stdenv.lib; { description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { ''; # http://www.open-mpi.org/projects/hwloc/license.php - license = "revised-BSD"; + license = licenses.bsd3; homepage = http://www.open-mpi.org/projects/hwloc/; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix new file mode 100644 index 00000000000..25c8d7e561b --- /dev/null +++ b/pkgs/development/libraries/idnkit/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libiconv }: + +stdenv.mkDerivation rec { + name = "idnkit-1.0"; + + src = fetchurl { + url = "http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${name}-src.tar.gz"; + sha256 = "1z4i6fmyv67sflmjg763ymcxrcv84rbj1kv15im0s655h775zk8n"; + }; + + buildInputs = [ libiconv ]; + + meta = with stdenv.lib; { + homepage = https://www.nic.ad.jp/ja/idn/idnkit; + description = "provides functionalities about i18n domain name processing"; + license = "idnkit-2 license"; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index 5350630dac4..fbba11c10c9 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, autoreconfHook }: -let version = "9.15"; +let version = "9.16"; in stdenv.mkDerivation { name = "ijs-${version}"; src = fetchurl { url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2"; - sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6"; + sha256 = "0vdqbjkickb0109lk6397bb2zjmg1s46dac5p5j4gfxa4pwl8b9y"; }; prePatch = "cd ijs"; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index f71c273f6d0..8d6e0b91ca0 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl }: +let + inherit (stdenv.lib) optional; + isClang = (stdenv.cc.cc.isClang or false); +in stdenv.mkDerivation rec{ name = "iniparser-3.1"; @@ -10,12 +14,12 @@ stdenv.mkDerivation rec{ patches = ./no-usr.patch; - buildFlags = "libiniparser.so"; + # TODO: Build dylib on Darwin + buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) + ++ optional isClang "CC=clang"; installPhase = '' mkdir -p $out/lib - cp libiniparser.so.0 $out/lib - ln -s libiniparser.so.0 $out/lib/libiniparser.so mkdir -p $out/include cp src/*.h $out/include @@ -25,7 +29,13 @@ stdenv.mkDerivation rec{ bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; done; cp -r html $out/share/doc/${name} - ''; + + '' + (if stdenv.isDarwin then '' + cp libiniparser.a $out/lib + '' else '' + cp libiniparser.so.0 $out/lib + ln -s libiniparser.so.0 $out/lib/libiniparser.so + ''); meta = { homepage = http://ndevilla.free.fr/iniparser; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index a682b3a6b82..8acd872fcb3 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -2,21 +2,16 @@ stdenv.mkDerivation rec { - # Version 3843 is required for supertuxkart - name = "irrlicht-1.8-svn-3843"; + name = "irrlicht-${version}-svn-${revision}"; + version = "1.8"; + revision = "5104"; # newest revision as of 05-16-15 src = fetchsvn { - url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk; - rev = 3843; - sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; + url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev) + rev = "${revision}"; + sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq"; }; - patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ]; - - postPatch = '' - sed -i /stdcall-alias/d source/Irrlicht/Makefile - ''; - preConfigure = '' cd source/Irrlicht ''; @@ -30,11 +25,6 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - postInstall = '' - ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8 - ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so - ''; - buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; meta = { diff --git a/pkgs/development/libraries/irrlicht/irrlicht3843.nix b/pkgs/development/libraries/irrlicht/irrlicht3843.nix new file mode 100644 index 00000000000..a682b3a6b82 --- /dev/null +++ b/pkgs/development/libraries/irrlicht/irrlicht3843.nix @@ -0,0 +1,45 @@ +{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }: + + +stdenv.mkDerivation rec { + # Version 3843 is required for supertuxkart + name = "irrlicht-1.8-svn-3843"; + + src = fetchsvn { + url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk; + rev = 3843; + sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; + }; + + patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ]; + + postPatch = '' + sed -i /stdcall-alias/d source/Irrlicht/Makefile + ''; + + preConfigure = '' + cd source/Irrlicht + ''; + + buildPhase = '' + make sharedlib NDEBUG=1 + ''; + + preInstall = '' + sed -i s,/usr/local/lib,$out/lib, Makefile + mkdir -p $out/lib + ''; + + postInstall = '' + ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8 + ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so + ''; + + buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; + + meta = { + homepage = http://irrlicht.sourceforge.net/; + license = stdenv.lib.licenses.zlib; + description = "Open source high performance realtime 3D engine written in C++"; + }; +} diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 34aaded7cb4..74aa8c9ba16 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { cp -v *.jar "$out/share/java" ''; - meta = { + meta = with stdenv.lib; { description = "An implementation of JavaScript written in Java"; longDescription = @@ -52,6 +52,6 @@ stdenv.mkDerivation { homepage = http://www.mozilla.org/rhino/; - license = [ "MPLv1.1" /* or */ "GPLv2+" ]; + license = with licenses; [ mpl11 /* or */ gpl2Plus ]; }; } diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 2e0c75c1452..7dba9e02519 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile - '' + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + '' + stdenv.lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \ --replace "CC = gcc" "CC = clang" ''; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 357ba257c24..9e5ac769616 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/open-source-parsers/jsoncpp; description = "A simple API to manipulate JSON data in C++"; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - license = with stdenv.lib.licenses; [ mit ]; + license = stdenv.lib.licenses.mit; branch = "1.6"; }; } diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 13b50286380..6e2c085f3ba 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { # gcc 4.8 optimisations break judy. # http://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) '' + preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU '' configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.9/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix similarity index 99% rename from pkgs/development/libraries/kde-frameworks-5.9/default.nix rename to pkgs/development/libraries/kde-frameworks-5.10/default.nix index 397eec61a78..4423f9c157d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.9/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -113,7 +113,7 @@ let meta = let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in { - license = with stdenv.lib.licenses; [ bsd2 ]; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; diff --git a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix similarity index 97% rename from pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix rename to pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix index 71dbc50a806..8e0b434d5bd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix @@ -18,7 +18,7 @@ }; frameworkintegration = { - buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ]; + buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ]; propagatedNativeBuildInputs = [ ]; @@ -322,9 +322,9 @@ }; knewstuff = { - buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; + buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Attica" "KF5XmlGui" "Qt5Widgets" ]; + propagatedBuildInputs = [ "KF5Attica" "KF5Service" "KF5XmlGui" "Qt5Widgets" ]; propagatedNativeBuildInputs = [ ]; propagatedUserEnvPkgs = [ ]; }; @@ -338,7 +338,7 @@ }; knotifyconfig = { - buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ]; + buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Widgets" ]; propagatedNativeBuildInputs = [ ]; @@ -482,7 +482,7 @@ }; networkmanager-qt = { - buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ]; + buildInputs = [ "ECM" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Core" ]; propagatedNativeBuildInputs = [ ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh rename to pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch rename to pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch rename to pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix new file mode 100644 index 00000000000..83d10f9def6 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix @@ -0,0 +1,1174 @@ +# This file is generated automatically. DO NOT EDIT! +{ stdenv, fetchurl, mirror }: +[ + { + name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz"; + sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh"; + name = "kemoticons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar"; + store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz"; + sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4"; + name = "kpeople-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar"; + store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz"; + sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr"; + name = "kconfigwidgets-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar"; + store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz"; + sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc"; + name = "ki18n-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar"; + store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz"; + sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy"; + name = "kplotting-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar"; + store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz"; + sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9"; + name = "kservice-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar"; + store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz"; + sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06"; + name = "kbookmarks-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar"; + store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz"; + sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp"; + name = "kded-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar"; + store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz"; + sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0"; + name = "knewstuff-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar"; + store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz"; + sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7"; + name = "knotifyconfig-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar"; + store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz"; + sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq"; + name = "threadweaver-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar"; + store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz"; + sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m"; + name = "kcmutils-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar"; + store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz"; + sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z"; + name = "kwindowsystem-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar"; + store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz"; + sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9"; + name = "extra-cmake-modules-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar"; + store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz"; + sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld"; + name = "kwallet-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz"; + sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10"; + name = "kguiaddons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar"; + store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz"; + sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x"; + name = "plasma-framework-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz"; + sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib"; + name = "kcodecs-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar"; + store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz"; + sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv"; + name = "kxmlgui-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar"; + store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz"; + sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr"; + name = "ktextwidgets-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar"; + store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz"; + sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav"; + name = "kinit-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz"; + sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh"; + name = "kdbusaddons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar"; + store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz"; + sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9"; + name = "frameworkintegration-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar"; + store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz"; + sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n"; + name = "kjobwidgets-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar"; + store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz"; + sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4"; + name = "networkmanager-qt-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar"; + store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz"; + sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli"; + name = "kpty-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar"; + store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz"; + sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k"; + name = "kcompletion-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar"; + store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz"; + sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4"; + name = "kio-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar"; + store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz"; + sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l"; + name = "kparts-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz"; + sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm"; + name = "kiconthemes-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar"; + store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz"; + sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx"; + name = "kglobalaccel-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar"; + store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz"; + sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm"; + name = "kapidox-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar"; + store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz"; + sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz"; + name = "kauth-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz"; + sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf"; + name = "kpackage-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar"; + store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz"; + sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa"; + name = "knotifications-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar"; + store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz"; + sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r"; + name = "kdesu-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar"; + store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz"; + sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7"; + name = "kcrash-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar"; + store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz"; + sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2"; + name = "kdnssd-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar"; + store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz"; + sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif"; + name = "kunitconversion-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar"; + store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz"; + sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5"; + name = "kidletime-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar"; + store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz"; + sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix"; + name = "kjsembed-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar"; + store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz"; + sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d"; + name = "kdelibs4support-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz"; + sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl"; + name = "krunner-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz"; + sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj"; + name = "kross-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar"; + store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz"; + sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv"; + name = "khtml-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar"; + store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz"; + sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl"; + name = "kjs-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar"; + store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz"; + sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z"; + name = "kmediaplayer-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar"; + store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz"; + sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365"; + name = "kitemmodels-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar"; + store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz"; + sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3"; + name = "modemmanager-qt-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar"; + store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz"; + sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk"; + name = "kdoctools-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz"; + sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi"; + name = "kcoreaddons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar"; + store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz"; + sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy"; + name = "kdewebkit-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar"; + store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz"; + sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg"; + name = "kimageformats-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar"; + store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz"; + sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z"; + name = "karchive-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar"; + store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz"; + sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4"; + name = "kdeclarative-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar"; + store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz"; + sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s"; + name = "kitemviews-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar"; + store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz"; + sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28"; + name = "sonnet-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar"; + store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz"; + sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik"; + name = "kdesignerplugin-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar"; + store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz"; + sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1"; + name = "kconfig-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar"; + store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz"; + sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam"; + name = "kactivities-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar"; + store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz"; + sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn"; + name = "solid-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar"; + store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz"; + sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg"; + name = "kxmlrpcclient-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar"; + store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz"; + sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b"; + name = "ktexteditor-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar"; + store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz"; + sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj"; + name = "attica-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz"; + sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1"; + name = "kwidgetsaddons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kunitconversion-5.10.0.tar.xz" ".tar"; + store = "/nix/store/zfya6451kbd13sqbvn37as2pbvwzblb2-kunitconversion-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz"; + sha256 = "0dxawvihm2bnc9l9vx90bq50sbcgrnkfvlsixkwhirw2cvvz0v5p"; + name = "kunitconversion-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kauth-5.10.0.tar.xz" ".tar"; + store = "/nix/store/4895lldwv2v8vmravprlvy18qrbj83ha-kauth-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kauth-5.10.0.tar.xz"; + sha256 = "074xr0qzknh9d0f6lisbyf612p4drlqscs7lqkasmd8f0r14ixlq"; + name = "kauth-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kio-5.10.0.tar.xz" ".tar"; + store = "/nix/store/360wiiib4wjpc6anq8yk3xsl52bmfi5p-kio-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kio-5.10.0.tar.xz"; + sha256 = "1lbbxn5s6p8fsgyr4nwwyawgcw4ywldwy7mbvn8pk5xrzai3c04r"; + name = "kio-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "threadweaver-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ha4rcc73g899c7qsngjyjqww5wn8d24y-threadweaver-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/threadweaver-5.10.0.tar.xz"; + sha256 = "1lfdxin8rjvjpqky3g416magsg9ivf5kjmh9r37rz4v0mxsv5knd"; + name = "threadweaver-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcrash-5.10.0.tar.xz" ".tar"; + store = "/nix/store/jakl1nm1lvnyscpx35d21l4whc8p6h8n-kcrash-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcrash-5.10.0.tar.xz"; + sha256 = "1imgn8a8ns15f2alp5xljy6llmqy0dv7yiqqjb1n8klvyp5mynlx"; + name = "kcrash-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "karchive-5.10.0.tar.xz" ".tar"; + store = "/nix/store/9lh3nmzwia4akk6zi426admgq1sd1ybx-karchive-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/karchive-5.10.0.tar.xz"; + sha256 = "19lzv1fi7vw95l9mx0qx10nfn5q7wzkqahsg2jswp31vgf977wfw"; + name = "karchive-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "networkmanager-qt-5.10.0.tar.xz" ".tar"; + store = "/nix/store/mx64rg2lj5vmx2ggijrwv8iqp5lrm2ac-networkmanager-qt-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz"; + sha256 = "0a9yg40rmvl7mxscyx6ndq4fwqxfy6rfy6a6cb8b6wm2im29njc4"; + name = "networkmanager-qt-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kguiaddons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/wd7s3v68xjshl9jjy974pidv0bar6j9f-kguiaddons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz"; + sha256 = "033z4difclwbmy4bi0c819i08x8pb5znr0kd27c3l9xaf2z3kaxr"; + name = "kguiaddons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kparts-5.10.0.tar.xz" ".tar"; + store = "/nix/store/q4xmlj9k2lc0ansqm982xcczna33d0y4-kparts-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kparts-5.10.0.tar.xz"; + sha256 = "0k1zkr2qvl65cgk0j3ybvmxs8wwjl0641yrgl36ngbk23lyi35rv"; + name = "kparts-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kemoticons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/8vyxpyy2ym3zza3rgh97ny034prss6f0-kemoticons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kemoticons-5.10.0.tar.xz"; + sha256 = "0i3hj04k0dh2rx77sig9qdpjh2rik0n2snpr61ckiw9ixh8fggkr"; + name = "kemoticons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwindowsystem-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ay11avkmb2sslf4r4ibi00sj7sndfvw0-kwindowsystem-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz"; + sha256 = "0grxbydcc9k88nnlav7vcn3lajzswcsim5cpjcsysx9irx8rbiqf"; + name = "kwindowsystem-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfigwidgets-5.10.0.tar.xz" ".tar"; + store = "/nix/store/2lpy9ar6qh2i3bn3vn3n9kckj5inryc4-kconfigwidgets-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz"; + sha256 = "19p073fzpvm6hn85qk959s6dlnizywwcipw4rfm92b3y3jqg77i0"; + name = "kconfigwidgets-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjobwidgets-5.10.0.tar.xz" ".tar"; + store = "/nix/store/vh5k90s0ni97ffz23fgfngqxay542xb4-kjobwidgets-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz"; + sha256 = "0b2n0wn2l4k8xsjgycv7123xvlbq06g0pmbn5q6akywr0lrnyd16"; + name = "kjobwidgets-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwidgetsaddons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/2i00n76b27gj6cpzqsqyahjdpiqncvxa-kwidgetsaddons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz"; + sha256 = "0c9gzwsacm4zjjqc25akzf88fgrp9nraqid3c4na6asyn1pxzkmh"; + name = "kwidgetsaddons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwallet-5.10.0.tar.xz" ".tar"; + store = "/nix/store/xdgfmrz0zga3ffrmhh6svc0xwk9j8hz4-kwallet-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kwallet-5.10.0.tar.xz"; + sha256 = "0nrb67shmdfaw2naa87gp29f2y3nnscj6ipw854j7shxz4fl2nr4"; + name = "kwallet-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kded-5.10.0.tar.xz" ".tar"; + store = "/nix/store/aw04kz9cvgl089fi7dria4bjj6lsx0gy-kded-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kded-5.10.0.tar.xz"; + sha256 = "0n2nd96j09igbxwq4697gyl45sfij22hs5mkys1gnaw5j8byaj4a"; + name = "kded-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcompletion-5.10.0.tar.xz" ".tar"; + store = "/nix/store/9x8g7xf6da032y48bjwb0qgn256nxjid-kcompletion-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcompletion-5.10.0.tar.xz"; + sha256 = "1cb8b7qij67bghg35xcbs2lpkh5jzl7illln7h6h9jyygzv6vq7m"; + name = "kcompletion-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "attica-5.10.0.tar.xz" ".tar"; + store = "/nix/store/78shcdc7hazqjpb9zw9fi48i783dcnx9-attica-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/attica-5.10.0.tar.xz"; + sha256 = "1immb10bvpkscdawyv1n0y52jjnfy0y3hnjxxzfwci9fj24da625"; + name = "attica-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemviews-5.10.0.tar.xz" ".tar"; + store = "/nix/store/3z0i50s73z4ah1wxw0gv9r5ayllm2ws3-kitemviews-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kitemviews-5.10.0.tar.xz"; + sha256 = "0dihi79j7iqy2x3qivjalsj9qa2b17g7jl7j705fjjfnw64xj8bi"; + name = "kitemviews-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdbusaddons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/fnjbqxb8pb2z48c7a3i7ngma7lalmvsq-kdbusaddons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz"; + sha256 = "0lk7h424lc015asqpnldck18zcjki4672fkswy3qdvmkkpzdgx3m"; + name = "kdbusaddons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcoreaddons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/71ql005nih2qjlybsal2rdg4h1fgj3rf-kcoreaddons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz"; + sha256 = "0y1j50axd6i0givknp9xfk81jdcdzz5p7m761qvbbjflqrnznvc1"; + name = "kcoreaddons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifications-5.10.0.tar.xz" ".tar"; + store = "/nix/store/8raimajcs7nc091fa75wbli2d1rz74my-knotifications-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/knotifications-5.10.0.tar.xz"; + sha256 = "16qh492wwcyxanwmaqp1979wh3mrzmjkhvgnig5fxfvqzh9hxp0p"; + name = "knotifications-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kglobalaccel-5.10.0.tar.xz" ".tar"; + store = "/nix/store/s9fnk5qs8qjsnf1yqdh09xf3ad7p4k6s-kglobalaccel-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz"; + sha256 = "02nr4f991zi03spq4m9rlj11m5kvhmqghkfl2ijqnwv8m4dq2afy"; + name = "kglobalaccel-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebkit-5.10.0.tar.xz" ".tar"; + store = "/nix/store/36lvpr42574d8cia2ldszawfbm88jiha-kdewebkit-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz"; + sha256 = "08bw2ximj3z6rs06przf6kah1mczlv2nri99cgiihin99jx8f98h"; + name = "kdewebkit-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfig-5.10.0.tar.xz" ".tar"; + store = "/nix/store/7hk4bl92kfr9a3qs4wz52a8w7ij8336a-kconfig-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kconfig-5.10.0.tar.xz"; + sha256 = "1r7r4yihlnld09l9qmq2q8h9xk7clmgbry8vnggzih1bamid79dq"; + name = "kconfig-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ki18n-5.10.0.tar.xz" ".tar"; + store = "/nix/store/cnhv0jch823qnim7z0zdvbyjd5vrcg3y-ki18n-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/ki18n-5.10.0.tar.xz"; + sha256 = "0xa27c42bnvhks6mdz593hxwl3idagyz6mbmp8p5dj6xsfdabrcs"; + name = "ki18n-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kimageformats-5.10.0.tar.xz" ".tar"; + store = "/nix/store/0hc6flqibi46fbrc3cdfynyvhpq458z0-kimageformats-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kimageformats-5.10.0.tar.xz"; + sha256 = "140s1lydikb87rpaxqmv6ccp139ch9vsi62r6fmyvwx6l0ffh2ay"; + name = "kimageformats-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbookmarks-5.10.0.tar.xz" ".tar"; + store = "/nix/store/4w5fasxqv1s6rx9ri3jg1dppikm2hpci-kbookmarks-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz"; + sha256 = "040n5xv8n357smmhsq24hgv43dcsbpc0wfyjhfznz41azcibbydw"; + name = "kbookmarks-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kactivities-5.10.0.tar.xz" ".tar"; + store = "/nix/store/5aq6q69jylvagidgawig2laf1lqlks8l-kactivities-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kactivities-5.10.0.tar.xz"; + sha256 = "0d2cyjv9hb4zd99sp598miwq4k1nzv4ssbgak7jmifqcimjpjjsk"; + name = "kactivities-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktextwidgets-5.10.0.tar.xz" ".tar"; + store = "/nix/store/8w02lcpf5pr1y6nhr7jx33xf266napd4-ktextwidgets-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz"; + sha256 = "0mpsikpy1i3j1dx352a5c77xx5m6iv4lfnff58yi5z0m31002mv6"; + name = "ktextwidgets-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "extra-cmake-modules-5.10.0.tar.xz" ".tar"; + store = "/nix/store/m4lgg75y8c1fcw2gsskyk14x011ydbvk-extra-cmake-modules-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz"; + sha256 = "00h62mmxl8jwslssczv14dmydgmg3rr12dd8b5471xbmx8kvqb86"; + name = "extra-cmake-modules-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-framework-5.10.0.tar.xz" ".tar"; + store = "/nix/store/yy7r7d0m4l75v0l7dr9krjcgbkpq2nrw-plasma-framework-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz"; + sha256 = "0a2lkxbpry8p8sar7ai2fcnjciiik4ir9y9snkmxci26vgql8j8a"; + name = "plasma-framework-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kidletime-5.10.0.tar.xz" ".tar"; + store = "/nix/store/0n2i32wrhvwpq63xvqxf2ibgil9fmljy-kidletime-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kidletime-5.10.0.tar.xz"; + sha256 = "0rvw4b22x9jgkqx64wisc0qnl6kx2b97sz2hxcpqh2lkj1cql4r0"; + name = "kidletime-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kservice-5.10.0.tar.xz" ".tar"; + store = "/nix/store/gzc1wc32ggqrmvvzg36p6n7g5zlvxl48-kservice-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kservice-5.10.0.tar.xz"; + sha256 = "15dmfd8ddjaac5mdb041ddhpkr3bh6gcgy0wfg404xiy1sx12dr6"; + name = "kservice-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdnssd-5.10.0.tar.xz" ".tar"; + store = "/nix/store/q2pbpwp8al275xk7sd4smwzyi9yahfsh-kdnssd-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdnssd-5.10.0.tar.xz"; + sha256 = "0frar6j0n6m43l7hdc14n0vbvs63fjg2gv5q59zwsx856rrqfszi"; + name = "kdnssd-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcmutils-5.10.0.tar.xz" ".tar"; + store = "/nix/store/nx5s67hxxldmws5292cqgwr8xjxr2dli-kcmutils-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcmutils-5.10.0.tar.xz"; + sha256 = "1995jbnnkwmkyiq8jav4r3x3mi3w5kv0am10c0d6g1pxjsig1xrx"; + name = "kcmutils-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapidox-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ymkxbdnjg74454a4k4s5i1y29cfxf6zc-kapidox-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kapidox-5.10.0.tar.xz"; + sha256 = "1zjjj951vfnwc8833lh6schdcva0dhiws56kmhclg7m9mpnvbav4"; + name = "kapidox-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeclarative-5.10.0.tar.xz" ".tar"; + store = "/nix/store/k58nmr9k6qib3kbp6yxwkbw90fxxydhv-kdeclarative-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz"; + sha256 = "1kfsqg43inn2is991nzcgcicd7aa7yg6bzsxac3c3136p32ii9yg"; + name = "kdeclarative-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdoctools-5.10.0.tar.xz" ".tar"; + store = "/nix/store/jzw1pnsjcl6xv8gfqdi02gcnr5x1301s-kdoctools-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdoctools-5.10.0.tar.xz"; + sha256 = "0v00pjm0jsqkxq52ndpds7qn5vbsxkgzvvy379id1ag692s55jkp"; + name = "kdoctools-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krunner-5.10.0.tar.xz" ".tar"; + store = "/nix/store/dac20ijml2z02bbslxpzxlmpzsbfp4r1-krunner-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz"; + sha256 = "15adxzsh27s6h37mfa8pwwdf47gp8whfsshj5chl7h3zdj5aa04i"; + name = "krunner-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjs-5.10.0.tar.xz" ".tar"; + store = "/nix/store/qm70n66sxh6zgxc02sh2k0ii1xw2g8yk-kjs-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz"; + sha256 = "0l3pn9g7mv5wklihgd7v3c83563ly9swwayivqlyz4rj35m7lvq1"; + name = "kjs-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmediaplayer-5.10.0.tar.xz" ".tar"; + store = "/nix/store/h0k2i2vx7r57by15bx23paay9q4fah3x-kmediaplayer-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz"; + sha256 = "0q17lgajv3844d2nccnfyzg6g55wx79fxij2iw42m25wyxg7b4df"; + name = "kmediaplayer-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjsembed-5.10.0.tar.xz" ".tar"; + store = "/nix/store/3z1phizh6lphvihqgg63ajlfqj3hbn54-kjsembed-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz"; + sha256 = "1922bvs3p2ffax5h8kmg4llw65h00m22qfs8n3qhcc952zgv1wxl"; + name = "kjsembed-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kross-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ifg2nrl5zk707f510nkv8cnzjwdrrc2h-kross-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz"; + sha256 = "02mz7w920vka5wwgbnf0m774s56r4qkwplakdyal92ip3zc3m6jq"; + name = "kross-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khtml-5.10.0.tar.xz" ".tar"; + store = "/nix/store/h9zaw11asgbhgxwqbsnvcdg0h97rcqfd-khtml-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz"; + sha256 = "0wzzcysgvjkibs8j277z75b0s5dvjwby7c6lnyyzmnm5vmsw2dj2"; + name = "khtml-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs4support-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ii9a8qxf2xh1ijx4m5zfssjrvgfsf1wf-kdelibs4support-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz"; + sha256 = "0j7ah078ckz8zcdb417j7dmzpcbs9vvbr42r6c49fk7rp7vy4ly2"; + name = "kdelibs4support-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "frameworkintegration-5.10.0.tar.xz" ".tar"; + store = "/nix/store/7rbwib0mgkm5pl8ai6q6fjdq87zyk99d-frameworkintegration-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz"; + sha256 = "00plajvkp19njdyq37qmf0q5xvwvl3vgx0vmls4hf2mk179yqm63"; + name = "frameworkintegration-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knewstuff-5.10.0.tar.xz" ".tar"; + store = "/nix/store/k4zm5y96427bwdjfjinnj8p2knkgn12h-knewstuff-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/knewstuff-5.10.0.tar.xz"; + sha256 = "1z24h7rk7vyavw3949gj06y924x1sbyy8jh3krr1ngpddlrsk5l7"; + name = "knewstuff-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpackage-5.10.0.tar.xz" ".tar"; + store = "/nix/store/j9p1kdz7wknxjk33b92aicqx2f021i10-kpackage-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kpackage-5.10.0.tar.xz"; + sha256 = "0c5xnks7k85lj6pkbylnlcmlhxns95zs6km9hfvdi7zh0i26y8qb"; + name = "kpackage-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "modemmanager-qt-5.10.0.tar.xz" ".tar"; + store = "/nix/store/lqd4bh2da4v002ckm5cz5clzmddkvyil-modemmanager-qt-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz"; + sha256 = "1whhc8clibiwzda4zbk8asry65c7nlnlgq10sbmh7gq008l0z9l1"; + name = "modemmanager-qt-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktexteditor-5.10.0.tar.xz" ".tar"; + store = "/nix/store/x83fw1z7h9s2h03m4slydvpafzxvi1lq-ktexteditor-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz"; + sha256 = "1axs21vklg392hxcm8j6y01qk3wphsfldh0caqnv6ifhamvcvkhh"; + name = "ktexteditor-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifyconfig-5.10.0.tar.xz" ".tar"; + store = "/nix/store/chvplwyglb6zwhjhxyrb91f0rg4k2g1a-knotifyconfig-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz"; + sha256 = "1zhddbynsk4b27sldmbd8q8mk8kbjyfv5k27vrqahlbq7ysrhflm"; + name = "knotifyconfig-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcodecs-5.10.0.tar.xz" ".tar"; + store = "/nix/store/184rzn1mjkmv6dvqs8rmjhwxzsbp04yb-kcodecs-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcodecs-5.10.0.tar.xz"; + sha256 = "1izw6rpvpxhwnl6aqrfqh2m3v3ia5gynpsxd8syi1cxnzmajgwic"; + name = "kcodecs-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpeople-5.10.0.tar.xz" ".tar"; + store = "/nix/store/1vqn907gx0b0h238zwys8v3ryxf8yqlh-kpeople-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kpeople-5.10.0.tar.xz"; + sha256 = "0b56c3pha1rgz9h8ia0vd4k5nvmxh64wgk5vgfnxa0znij47wcka"; + name = "kpeople-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kinit-5.10.0.tar.xz" ".tar"; + store = "/nix/store/rmrvk7308bi4kzximn9pzzgij9mihnll-kinit-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kinit-5.10.0.tar.xz"; + sha256 = "02da17n19xx9cqiyzh7qlbqyy0mpy4gr3pdja1xlqaapc52k99sz"; + name = "kinit-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlrpcclient-5.10.0.tar.xz" ".tar"; + store = "/nix/store/bijjk36yvjjcmnckvm3ccw9zs40ckjcx-kxmlrpcclient-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz"; + sha256 = "1cjwqxpwwx9gxxb43dncyfcn3rjfx28af6dbh4zx7l0yqw4z4cxi"; + name = "kxmlrpcclient-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlgui-5.10.0.tar.xz" ".tar"; + store = "/nix/store/fafv3gxzbrvrjvxvng6is8k9a3869g1s-kxmlgui-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz"; + sha256 = "1m22ld9pd2z287j8nj9alk1pychq04r0w1g1vqhgr0shlxzx91pf"; + name = "kxmlgui-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "solid-5.10.0.tar.xz" ".tar"; + store = "/nix/store/6shp9pnj9p4lpb2kzzdfqz2pf6ivy2gc-solid-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/solid-5.10.0.tar.xz"; + sha256 = "1qy3bic39jffc2pl1wh36qm8sizjld6gd2qx6y4j9xzkv723r864"; + name = "solid-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiconthemes-5.10.0.tar.xz" ".tar"; + store = "/nix/store/h5i2pk6zy3k4h23q1jfdbarc8fm1614b-kiconthemes-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz"; + sha256 = "19vvg63ld4388jd47245zqzbj5bs8qj69524bvwqbv77201qg7j1"; + name = "kiconthemes-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesignerplugin-5.10.0.tar.xz" ".tar"; + store = "/nix/store/jdyk0kl1ccbnnb83mzda670bg93z3w0w-kdesignerplugin-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz"; + sha256 = "1z82kxn5hpbmhsrh4ic7mcmsz115p39gph7ysjz9fh6ylfdgcrpm"; + name = "kdesignerplugin-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kplotting-5.10.0.tar.xz" ".tar"; + store = "/nix/store/b5h0i3mcfb9g7krd7pc5c0f1c2q0jma5-kplotting-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kplotting-5.10.0.tar.xz"; + sha256 = "0g7riml9nbs762s1pld9d3y743z52kxdaiaklg3ai5cljp5v5skh"; + name = "kplotting-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sonnet-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ivjvsiqv1gjb0cq5lkxa7a3kb9pjcvrw-sonnet-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/sonnet-5.10.0.tar.xz"; + sha256 = "1ad205mldwk234vwjkbalx6pnib02mz68drajg07ii5ycsczgk93"; + name = "sonnet-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesu-5.10.0.tar.xz" ".tar"; + store = "/nix/store/h3vphpz0fdw7v339bcf0krqm2rgwqzsl-kdesu-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdesu-5.10.0.tar.xz"; + sha256 = "002ryv2svl1hmapflg0cvl7xd7qa4sh2msxnma9ijsad1ypv9nrw"; + name = "kdesu-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpty-5.10.0.tar.xz" ".tar"; + store = "/nix/store/1k73m5m6vkl6p9gcn8ik4cvh0k5chlxa-kpty-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kpty-5.10.0.tar.xz"; + sha256 = "1ys8wv1hirv6jk6jdzjnvkhw2lx3rxj8xp4sgvxfbfs833vdnqx6"; + name = "kpty-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemmodels-5.10.0.tar.xz" ".tar"; + store = "/nix/store/v1lmfs7h4q0d6wmp7xz21ad5sm50bxx2-kitemmodels-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz"; + sha256 = "1c63wsy9iy842ljv2vmnjcn6p3ahnv6pm73p1kayjdqq6wy0lmq6"; + name = "kitemmodels-5.10.0.tar.xz"; + }; + } +] diff --git a/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh similarity index 57% rename from pkgs/development/libraries/kde-frameworks-5.9/manifest.sh rename to pkgs/development/libraries/kde-frameworks-5.10/manifest.sh index 0075819664a..28870e48964 100755 --- a/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh +++ b/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh @@ -1,12 +1,15 @@ #!/bin/sh +# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS +KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" + if [ $# -eq 0 ]; then # The extra slash at the end of the URL is necessary to stop wget # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../../.. -A autonix.manifest) \ - http://download.kde.org/stable/frameworks/5.9/ \ - -A '*.tar.xz' + "${KDE_MIRROR}/stable/frameworks/5.10/" \ + $MANIFEST_EXTRA_ARGS -A '*.tar.xz' else diff --git a/pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch rename to pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/renames.nix b/pkgs/development/libraries/kde-frameworks-5.10/renames.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/renames.nix rename to pkgs/development/libraries/kde-frameworks-5.10/renames.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh rename to pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix deleted file mode 100644 index c61618b6e45..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix +++ /dev/null @@ -1,589 +0,0 @@ -# This file is generated automatically. DO NOT EDIT! -{ stdenv, fetchurl, mirror }: -[ - { - name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz"; - sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh"; - name = "kemoticons-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar"; - store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz"; - sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4"; - name = "kpeople-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar"; - store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz"; - sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr"; - name = "kconfigwidgets-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar"; - store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz"; - sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc"; - name = "ki18n-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar"; - store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz"; - sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy"; - name = "kplotting-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar"; - store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz"; - sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9"; - name = "kservice-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar"; - store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz"; - sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06"; - name = "kbookmarks-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar"; - store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz"; - sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp"; - name = "kded-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar"; - store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz"; - sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0"; - name = "knewstuff-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar"; - store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz"; - sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7"; - name = "knotifyconfig-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar"; - store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz"; - sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq"; - name = "threadweaver-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar"; - store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz"; - sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m"; - name = "kcmutils-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar"; - store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz"; - sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z"; - name = "kwindowsystem-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar"; - store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz"; - sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9"; - name = "extra-cmake-modules-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar"; - store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz"; - sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld"; - name = "kwallet-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz"; - sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10"; - name = "kguiaddons-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar"; - store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz"; - sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x"; - name = "plasma-framework-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz"; - sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib"; - name = "kcodecs-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar"; - store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz"; - sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv"; - name = "kxmlgui-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar"; - store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz"; - sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr"; - name = "ktextwidgets-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar"; - store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz"; - sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav"; - name = "kinit-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz"; - sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh"; - name = "kdbusaddons-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar"; - store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz"; - sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9"; - name = "frameworkintegration-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar"; - store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz"; - sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n"; - name = "kjobwidgets-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar"; - store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz"; - sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4"; - name = "networkmanager-qt-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar"; - store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz"; - sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli"; - name = "kpty-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar"; - store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz"; - sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k"; - name = "kcompletion-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar"; - store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz"; - sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4"; - name = "kio-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar"; - store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz"; - sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l"; - name = "kparts-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz"; - sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm"; - name = "kiconthemes-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar"; - store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz"; - sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx"; - name = "kglobalaccel-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar"; - store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz"; - sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm"; - name = "kapidox-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar"; - store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz"; - sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz"; - name = "kauth-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz"; - sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf"; - name = "kpackage-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar"; - store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz"; - sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa"; - name = "knotifications-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar"; - store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz"; - sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r"; - name = "kdesu-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar"; - store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz"; - sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7"; - name = "kcrash-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar"; - store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz"; - sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2"; - name = "kdnssd-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar"; - store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz"; - sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif"; - name = "kunitconversion-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar"; - store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz"; - sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5"; - name = "kidletime-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar"; - store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz"; - sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix"; - name = "kjsembed-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar"; - store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz"; - sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d"; - name = "kdelibs4support-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz"; - sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl"; - name = "krunner-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz"; - sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj"; - name = "kross-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar"; - store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz"; - sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv"; - name = "khtml-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar"; - store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz"; - sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl"; - name = "kjs-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar"; - store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz"; - sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z"; - name = "kmediaplayer-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar"; - store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz"; - sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365"; - name = "kitemmodels-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar"; - store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz"; - sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3"; - name = "modemmanager-qt-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar"; - store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz"; - sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk"; - name = "kdoctools-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz"; - sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi"; - name = "kcoreaddons-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar"; - store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz"; - sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy"; - name = "kdewebkit-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar"; - store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz"; - sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg"; - name = "kimageformats-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar"; - store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz"; - sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z"; - name = "karchive-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar"; - store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz"; - sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4"; - name = "kdeclarative-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar"; - store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz"; - sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s"; - name = "kitemviews-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar"; - store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz"; - sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28"; - name = "sonnet-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar"; - store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz"; - sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik"; - name = "kdesignerplugin-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar"; - store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz"; - sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1"; - name = "kconfig-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar"; - store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz"; - sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam"; - name = "kactivities-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar"; - store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz"; - sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn"; - name = "solid-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar"; - store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz"; - sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg"; - name = "kxmlrpcclient-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar"; - store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz"; - sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b"; - name = "ktexteditor-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar"; - store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz"; - sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj"; - name = "attica-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz"; - sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1"; - name = "kwidgetsaddons-5.9.0.tar.xz"; - }; - } -] diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index b0de8c15146..dd1f7afdf23 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,103 +1,127 @@ -{ stdenv, fetchurl, pkgconfig, flex, yacc +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python, perl, yacc, flex +, texinfo ? null, perlPackages # Optional Dependencies , openldap ? null, libcap_ng ? null, sqlite ? null, openssl ? null, db ? null , readline ? null, libedit ? null, pam ? null -#, readline, openldap, libcap_ng -#, sqlite, db, ncurses, openssl, cyrus_sasl +# Extra Args +, prefix ? "" }: +with stdenv; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; + libOnly = prefix == "lib"; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - optOpenldap = shouldUsePkg openldap; + optTexinfo = if libOnly then null else shouldUsePkg texinfo; + optOpenldap = if libOnly then null else shouldUsePkg openldap; optLibcap_ng = shouldUsePkg libcap_ng; optSqlite = shouldUsePkg sqlite; optOpenssl = shouldUsePkg openssl; optDb = shouldUsePkg db; optReadline = shouldUsePkg readline; optLibedit = shouldUsePkg libedit; - optPam = shouldUsePkg pam; -in -stdenv.mkDerivation rec { - name = "heimdal-1.5.3"; + optPam = if libOnly then null else shouldUsePkg pam; - src = fetchurl { - urls = [ - "http://www.h5l.org/dist/src/${name}.tar.gz" - "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" - ]; - sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma"; + lineParserStr = if optLibedit != null then "libedit" + else if optReadline != null then "readline" + else "no"; + + lineParserInputs = { + "libedit" = [ optLibedit ]; + "readline" = [ optReadline ]; + "no" = [ ]; + }.${lineParserStr}; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "${prefix}heimdal-${version}"; + version = "2015-05-26"; + + src = fetchFromGitHub { + owner = "heimdal"; + repo = "heimdal"; + rev = "50e2a5ce95f42d4963d359c27a832e61991a12b1"; + sha256 = "10104vm192r1i7ccs1fan16h9n31saaswsmywmrb0cxc7jv3rj8x"; }; - nativeBuildInputs = [ pkgconfig flex yacc ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex optTexinfo ] + ++ (with perlPackages; [ JSON ]); buildInputs = [ - optOpenldap optLibcap_ng optSqlite optOpenssl optDb optReadline optLibedit - optPam - ]; + optOpenldap optLibcap_ng optSqlite optOpenssl optDb optPam + ] ++ lineParserInputs; configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkWith (optOpenldap != null) "openldap" optOpenldap) - (mkEnable (optOpenldap != null) "hdb-openldap-module" null) - (mkEnable true "pk-init" null) - (mkEnable true "digest" null) - (mkEnable true "kx509" null) - (mkWith (optLibcap_ng != null) "capng" null) - (mkWith (optSqlite != null) "sqlite3" sqlite) - (mkEnable (optSqlite != null) "sqlite-cache" null) - (mkWith false "libintl" null) # TODO libintl fix - (mkWith true "hdbdir" "/var/lib/heimdal") - (mkWith (optOpenssl != null) "openssl" optOpenssl) - (mkEnable true "pthread-support" null) - (mkEnable false "dce" null) # TODO: Add support - (mkEnable true "afs-support" null) - (mkWith (optDb != null) "berkeley-db" optDb) - (mkEnable false "nmdb" null) - (mkEnable false "developer" null) - (mkWith true "ipv6" null) - (mkEnable false "socket-wrapper" null) - (mkEnable true "otp" null) - (mkEnable false "osfc2" null) - (mkEnable true "mmap" null) - (mkEnable true "afs-string-to-key" null) - (mkWith (optReadline != null) "readline" optReadline) - (mkWith (optLibedit != null) "libedit" optLibedit) - (mkWith false "x" null) - (mkEnable true "kcm" null) - (mkEnable true "heimdal-documentation" null) + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkWith (optOpenldap != null) "openldap" optOpenldap) + (mkEnable (optOpenldap != null) "hdb-openldap-module" null) + (mkEnable true "pk-init" null) + (mkEnable true "digest" null) + (mkEnable true "kx509" null) + (mkWith (optLibcap_ng != null) "capng" null) + (mkWith (optSqlite != null) "sqlite3" sqlite) + (mkEnable (optSqlite != null) "sqlite-cache" null) + (mkWith false "libintl" null) # TODO libintl fix + (mkWith true "hdbdir" "/var/lib/heimdal") + (mkEnable false "dce" null) # TODO: Add support + (mkEnable (!libOnly) "afs-support" null) + (mkEnable true "mmap" null) + (mkEnable (!libOnly) "afs-string-to-key" null) + (mkWith (lineParserStr == "readline") "readline" optReadline) + (mkWith (lineParserStr == "libedit") "libedit" optLibedit) + (mkWith false "hesiod" null) + (mkEnable (!libOnly) "kcm" null) + (mkEnable (optTexinfo != null) "heimdal-documentation" null) + (mkWith true "ipv6" null) + (mkEnable true "pthread-support" null) + (mkEnable false "osfc2" null) + (mkEnable false "socket-wrapper" null) + (mkEnable (!libOnly) "otp" null) + (mkEnable false "developer" null) + (mkWith (optDb != null) "berkeley-db" optDb) + (mkEnable true "ndbm-db" null) + (mkEnable false "mdb-db" null) + (mkWith (optOpenssl != null) "openssl" optOpenssl) ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread" + buildPhase = optionalString libOnly '' + (cd include; make -j $NIX_BUILD_CORES) + (cd lib; make -j $NIX_BUILD_CORES) + (cd tools; make -j $NIX_BUILD_CORES) + (cd include/hcrypto; make -j $NIX_BUILD_CORES) + (cd lib/hcrypto; make -j $NIX_BUILD_CORES) + ''; + + installPhase = optionalString libOnly '' + (cd include; make -j $NIX_BUILD_CORES install) + (cd lib; make -j $NIX_BUILD_CORES install) + (cd tools; make -j $NIX_BUILD_CORES install) + (cd include/hcrypto; make -j $NIX_BUILD_CORES install) + (cd lib/hcrypto; make -j $NIX_BUILD_CORES install) + rm -rf $out/{libexec,sbin,share} + find $out/bin -type f | grep -v 'krb5-config' | xargs rm ''; # We need to build hcrypt for applications like samba postBuild = '' - (cd lib/hcrypto; make) - (cd include/hcrypto; make) + (cd include/hcrypto; make -j $NIX_BUILD_CORES) + (cd lib/hcrypto; make -j $NIX_BUILD_CORES) ''; postInstall = '' # Install hcrypto - (cd lib/hcrypto; make install) - (cd include/hcrypto; make install) + (cd include/hcrypto; make -j $NIX_BUILD_CORES install) + (cd lib/hcrypto; make -j $NIX_BUILD_CORES install) # Doesn't succeed with --libexec=$out/sbin, so mv "$out/libexec/"* $out/sbin/ rmdir $out/libexec ''; - meta = with stdenv.lib; { + enableParallelBuilding = true; + + meta = { description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 41c570ee554..c4974c51e81 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,41 +1,129 @@ -{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }: +{ stdenv, fetchurl, pkgconfig, perl +, yacc, bootstrap_cmds +# Optional Dependencies +, libedit ? null, readline ? null, ncurses ? null, libverto ? null +, openldap ? null + +# Crypto Dependencies +, openssl ? null, nss ? null, nspr ? null + +# Extra Arguments +, prefix ? "" +}: + +with stdenv; let - pname = "krb5"; - version = "1.13.1"; - name = "${pname}-${version}"; - webpage = http://web.mit.edu/kerberos/; -in + libOnly = prefix == "lib"; -stdenv.mkDerivation (rec { - inherit name; + optOpenssl = shouldUsePkg openssl; + optNss = shouldUsePkg nss; + optNspr = shouldUsePkg nspr; + optLibedit = if libOnly then null else shouldUsePkg libedit; + optReadline = if libOnly then null else shouldUsePkg readline; + optNcurses = if libOnly then null else shouldUsePkg ncurses; + optLibverto = shouldUsePkg libverto; + optOpenldap = if libOnly then null else shouldUsePkg openldap; + + # Prefer the openssl implementation + cryptoStr = if optOpenssl != null then "openssl" + else if optNss != null && optNspr != null then "nss" + else "builtin"; + + cryptoInputs = { + "openssl" = [ optOpenssl ]; + "nss" = [ optNss optNspr ]; + "builtin" = [ ]; + }.${cryptoStr}; + + tlsStr = if optOpenssl != null then "openssl" + else "no"; + + tlsInputs = { + "openssl" = [ optOpenssl ]; + "no" = [ ]; + }.${tlsStr}; + + # Libedit is less buggy in krb5, readline breaks tests + lineParserStr = if optLibedit != null then "libedit" + else if optReadline != null && optNcurses != null then "readline" + else "no"; + + lineParserInputs = { + "libedit" = [ optLibedit ]; + "readline" = [ optReadline optNcurses ]; + "no" = [ ]; + }.${lineParserStr}; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "${prefix}krb5-${version}"; + version = "1.13.2"; src = fetchurl { - url = "${webpage}dist/krb5/1.13/${name}-signed.tar"; - sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd"; + url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar"; + sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75"; }; - buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ] + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ yacc optOpenssl optLibverto optOpenldap ] + ++ cryptoInputs ++ tlsInputs ++ lineParserInputs # Provides the mig command used by the build scripts - ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ; + ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds; unpackPhase = '' tar -xf $src - tar -xzf ${name}.tar.gz - cd ${name}/src + tar -xzf krb5-${version}.tar.gz + cd krb5-${version}/src ''; - configureFlags = [ "--with-tcl=no" ]; + configureFlags = [ + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable false "athena" null) + (mkWith false "vague-errors" null) + (mkWith true "crypto-impl" cryptoStr) + (mkWith true "pkinit-crypto-impl" cryptoStr) + (mkWith true "tls-impl" tlsStr) + (mkEnable true "aesni" null) + (mkEnable true "kdc-lookaside-cache" null) + (mkEnable (optOpenssl != null) "pkinit" null) + (mkWith (lineParserStr == "libedit") "libedit" null) + (mkWith (lineParserStr == "readline") "readline" null) + (mkWith (optLibverto != null) "system-verto" null) + (mkWith (optOpenldap != null) "ldap" null) + (mkWith false "tcl" null) + (mkWith false "system-db" null) # Requires db v1.85 + ]; + + buildPhase = optionalString libOnly '' + (cd util; make -j $NIX_BUILD_CORES) + (cd include; make -j $NIX_BUILD_CORES) + (cd lib; make -j $NIX_BUILD_CORES) + (cd build-tools; make -j $NIX_BUILD_CORES) + ''; + + installPhase = optionalString libOnly '' + mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} + + (cd util; make -j $NIX_BUILD_CORES install) + (cd include; make -j $NIX_BUILD_CORES install) + (cd lib; make -j $NIX_BUILD_CORES install) + (cd build-tools; make -j $NIX_BUILD_CORES install) + + rm -rf $out/{sbin,share} + find $out/bin -type f | grep -v 'krb5-config' | xargs rm + ''; enableParallelBuilding = true; meta = with stdenv.lib; { + homepage = http://web.mit.edu/kerberos/; description = "MIT Kerberos 5"; - homepage = webpage; license = "MPL"; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; passthru.implementation = "krb5"; -}) +} diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 562e292791a..4a61d188ef6 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -17,7 +17,7 @@ assert sndfileFileIOSupport -> (libsndfile != null); #assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null)); let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; + sndfileFileIO = if sndfileFileIOSupport then "sndfile" else "lame"; in with stdenv.lib; @@ -39,17 +39,18 @@ stdenv.mkDerivation rec { ++ optional sndfileFileIOSupport libsndfile; configureFlags = [ - (mkFlag nasmSupport "nasm") - (mkFlag cpmlSupport "cpml") - #(mkFlag efenceSupport "efence") - (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (mkFlag analyzerHooksSupport "analyzer-hooks") - (mkFlag decoderSupport "decoder") - (mkFlag frontendSupport "frontend") - (mkFlag frontendSupport "dynamic-frontends") - #(mkFlag mp3xSupport "mp3x") - (mkFlag mp3rtpSupport "mp3rtp") - (if debugSupport then "--enable-debug=alot" else "") + (mkEnable nasmSupport "nasm" null) + (mkEnable cpmlSupport "cpml" null) + #(mkEnable efenceSupport "efence" null) + (mkWith true "fileio" sndfileFileIO) + (mkEnable analyzerHooksSupport "analyzer-hooks" null) + (mkEnable decoderSupport "decoder" null) + (mkEnable frontendSupport "frontend" null) + (mkEnable frontendSupport "dynamic-frontends" null) + #(mkEnable mp3xSupport "mp3x" null) + (mkEnable mp3rtpSupport "mp3rtp" null) + ] ++ optional debugSupport [ + (mkEnable true "debug" "alot") ]; meta = { diff --git a/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch b/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch deleted file mode 100644 index 620d702f0f0..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- lesstif2-0.94.4.orig/include/Motif-2.1/XmI/XpmI.h -+++ lesstif2-0.94.4/include/Motif-2.1/XmI/XpmI.h -@@ -217,8 +217,8 @@ - FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s)); - FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data)); - --#define HashAtomData(i) ((void *)i) --#define HashColorIndex(slot) ((unsigned int)((*slot)->data)) -+#define HashAtomData(i) ((void *)(uintptr_t)i) -+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data)) - #define USE_HASHTABLE (cpp > 2 && ncolors > 4) - - /* I/O utility */ diff --git a/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch b/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch deleted file mode 100644 index 1699dbe1908..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lesstif2-0.95.0.orig/lib/Xm-2.1/RenderTable.c -+++ lesstif2-0.95.0/lib/Xm-2.1/RenderTable.c -@@ -465,7 +465,7 @@ - DEBUGOUT(_LtDebug(__FILE__, w, "_XmRenderTableFinaliseTag(%s)\n", tag)); - #if 1 - /* Experimental start */ -- if (r->dpy == 0) -+ if (r->dpy == 0 && w) - r->dpy = XtDisplay(w); - /* Experimental end */ - #endif diff --git a/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch b/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch deleted file mode 100644 index 10bdf8d0b97..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c lesstif2-0.94.4/lib/Xm-2.1/XmIm.c ---- lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c 2004-10-20 21:32:11.000000000 +0200 -+++ lesstif2-0.94.4/lib/Xm-2.1/XmIm.c 2007-03-28 14:39:27.000000000 +0200 -@@ -133,7 +133,10 @@ - p->next = q->next; - } - -- XtFree((char *)stuff); -+ /* if count!=0 then someone uses the stuff as orig_xim -+ so unlink it but not free it */ -+ if (!stuff->count) -+ XtFree((char *)stuff); - } - - /* -@@ -1060,6 +1063,8 @@ - XCloseIM(stuff->xim); - DEBUGOUT(_LtDebug(__FILE__, w, "XCloseIM(%p)\n", stuff->xim)); - stuff->orig_xim->xim = NULL; -+ /* stuff->orig_xim is now useless */ -+ XtFree(stuff->orig_xim); - } else { - DEBUGOUT(_LtDebug(__FILE__, w, "XmImCloseXIM(%p), count -> %d\n", - stuff->xim, stuff->orig_xim->count)); diff --git a/pkgs/development/libraries/lesstif-0.93/default.nix b/pkgs/development/libraries/lesstif-0.93/default.nix deleted file mode 100644 index e8ec3d5e659..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, x11, libXp, libXau }: - -stdenv.mkDerivation { - name = "lesstif-0.93.94"; - - src = fetchurl { - url = http://prdownloads.sourceforge.net/lesstif/lesstif-0.93.94.tar.bz2; - sha256 = "0v4l46ill6dhhswsw1hk6rqyng98d85nsr214vhd2k0mfajpig1y"; - }; - - buildInputs = [x11]; - - propagatedBuildInputs = [libXp libXau]; - - # This is an older release of lesstif which works with arb. - patches = - [ ./c-bad_integer_cast.patch - ./c-xim_chained_list_crash.patch - ./c-render_table_crash.patch - ./stdint.patch - ]; - - meta = { - priority = "5"; - }; -} diff --git a/pkgs/development/libraries/lesstif-0.93/stdint.patch b/pkgs/development/libraries/lesstif-0.93/stdint.patch deleted file mode 100644 index 8b202704abd..00000000000 --- a/pkgs/development/libraries/lesstif-0.93/stdint.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r 97ac365bfcd6 lesstif-0.93.94/lib/Xm-2.1/Xpm.c ---- lesstif-0.93.94/lib/Xm-2.1/Xpm.c Mon Oct 06 15:52:50 2008 +0200 -+++ lesstif-0.93.94/lib/Xm-2.1/Xpm.c Mon Oct 06 15:53:16 2008 +0200 -@@ -54,6 +54,7 @@ - #include - #endif - -+#include - #include /* Avoid re-definition of Pixel-type */ - - #include diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 717dae8fb25..631c7c778ae 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, yacc, flex }: +{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: # library that allows libbluray to play AACS protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -7,7 +7,6 @@ # http://vlc-bluray.whoknowsmy.name/ # https://wiki.archlinux.org/index.php/BluRay - let baseName = "libaacs"; version = "0.8.0"; in @@ -20,13 +19,13 @@ stdenv.mkDerivation { sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y"; }; - buildInputs = [ libgcrypt ]; + buildInputs = [ libgcrypt libgpgerror ]; nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { homepage = http://www.videolan.org/developers/libbluray.html; - description = "Library to access Blu-Ray disks for video playback"; + description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index b3217e66275..aa029ede953 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,15 +1,25 @@ -{ stdenv, fetchurl, glib, libxml2, libxslt, pkgconfig, sqlite }: +{ stdenv, fetchFromGitLab, autoconf, automake, glib +, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: +let version = "1.18"; in stdenv.mkDerivation rec { - name = "libaccounts-glib-1.16"; - src = fetchurl { - url = "https://accounts-sso.googlecode.com/files/${name}.tar.gz"; - sha256 = "0hgvk9rdfvk47c54rvcp3hq74yy7v6w1ql71q2mik8lmsx22354a"; + name = "libaccounts-glib-${version}"; + + src = fetchFromGitLab { + sha256 = "02p23vrqhw2l2w6nrwlk4bqxf7z9kplkc2d43716x9xakxr291km"; + rev = version; + repo = "libaccounts-glib"; + owner = "accounts-sso"; }; buildInputs = [ glib libxml2 libxslt sqlite ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ]; - configurePhase = ''HAVE_GCOV_FALSE='#' ./configure $configureFlags --prefix=$out''; + postPatch = '' + NOCONFIGURE=1 ./autogen.sh + ''; + configurePhase = '' + HAVE_GCOV_FALSE="#" ./configure $configureFlags --prefix=$out + ''; } diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 72b364bb364..ee92da283a6 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib, libcap +{ lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap , usePulseAudio }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libcap ] ++ - lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]); + lib.optional stdenv.isLinux (if usePulseAudio then [ libpulseaudio ] else [ alsaLib ]); meta = { longDescription = '' diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index f0c3c0632a9..076d2240277 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; + preBuild = if stdenv.isCygwin then '' + echo "#include " >> config.h + '' else null; + meta = { description = "Multi-format archive and compression library"; longDescription = '' diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 2a9af50fcde..502f95dca9a 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, yasm -, freetype ? null -, fribidi ? null +, freetype, fribidi , encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support , harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support @@ -8,31 +7,26 @@ , largeTilesSupport ? false # Use larger tiles in the rasterizer }: -assert ((freetype != null) && (fribidi != null)); -assert encaSupport -> (enca != null); -assert fontconfigSupport -> (fontconfig != null); -assert harfbuzzSupport -> (harfbuzz != null); - -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in +assert encaSupport -> enca != null; +assert fontconfigSupport -> fontconfig != null; +assert harfbuzzSupport -> harfbuzz != null; with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; - sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7"; + sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37"; }; configureFlags = [ - (mkFlag encaSupport "enca") - (mkFlag fontconfigSupport "fontconfig") - (mkFlag harfbuzzSupport "harfbuzz") - (mkFlag rasterizerSupport "rasterizer") - (mkFlag largeTilesSupport "large-tiles") + (mkEnable encaSupport "enca" null) + (mkEnable fontconfigSupport "fontconfig" null) + (mkEnable harfbuzzSupport "harfbuzz" null) + (mkEnable rasterizerSupport "rasterizer" null) + (mkEnable largeTilesSupport "large-tiles" null) ]; nativeBuildInputs = [ pkgconfig yasm ]; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 35ffe6d5fa5..cf74ed3b5f6 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, autoconf, automake, libtool }: let s = # Generated upstream information rec { @@ -9,15 +9,22 @@ let url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz"; sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4"; }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { + + buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + +in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; + src = fetchurl { inherit (s) url sha256; }; + + preConfigure = if stdenv.isCygwin then '' + sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am + ./autogen.sh + '' else null; + meta = { inherit (s) version; description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix new file mode 100644 index 00000000000..8cc2e806932 --- /dev/null +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: + +# library that allows libbluray to play BDplus protected bluray disks +# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. + +# Info on how to use / obtain aacs keys: +# http://vlc-bluray.whoknowsmy.name/ +# https://wiki.archlinux.org/index.php/BluRay + + +let baseName = "libbdplus"; + version = "0.1.2"; +in + +stdenv.mkDerivation { + name = "${baseName}-${version}"; + + src = fetchurl { + url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; + }; + + buildInputs = [ libgcrypt libgpgerror ]; + + nativeBuildInputs = [ ]; + + meta = with stdenv.lib; { + homepage = http://www.videolan.org/developers/libbdplus.html; + description = "Library to access BD+ protected Blu-Ray disks"; + license = licenses.lgpl21; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index 8443ddaa606..44b8d47b5e3 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -3,11 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libbluedevil"; - version = "1.9.3"; + # bluedevil must have the same major version (x.y) as libbluedevil! + # do not update this package without checking bluedevil + version = "2.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0fdq083145mb3ynw14pc471ahp7is48wqpmswrvfz3hkyayriss3"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c"; }; buildInputs = [ cmake qt4 ]; diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch index 64f0e74084f..2680b1c6de5 100644 --- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch @@ -1,8 +1,7 @@ -diff --git a/configure.ac b/configure.ac -index 3609d88..48c6bc6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -227,6 +227,7 @@ if [[ $use_bdjava = "yes" ]]; then +diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac +--- libbluray-0.8.0/configure.ac 2015-04-10 09:48:23.000000000 +0300 ++++ libbluray-0.8.0-new/configure.ac 2015-05-18 14:22:01.002075482 +0300 +@@ -231,6 +231,7 @@ AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"]) AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) @@ -10,16 +9,14 @@ index 3609d88..48c6bc6 100644 fi AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ]) -diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c -index c622801..f4aab9b 100644 ---- a/src/libbluray/bdj/bdj.c -+++ b/src/libbluray/bdj/bdj.c -@@ -210,7 +210,7 @@ static const char *_find_libbluray_jar(void) +diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c +--- libbluray-0.8.0/src/libbluray/bdj/bdj.c 2015-04-06 19:25:09.000000000 +0300 ++++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c 2015-05-18 14:22:59.241312808 +0300 +@@ -228,6 +228,7 @@ #ifdef _WIN32 "" BDJ_JARFILE, #else -- "/usr/share/java/" BDJ_JARFILE, + JARDIR "/" BDJ_JARFILE, + "/usr/share/java/" BDJ_JARFILE, + "/usr/share/libbluray/lib/" BDJ_JARFILE, #endif - }; - diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 170c4e46188..de0fa1a56d3 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig -, withAACS ? false, libaacs ? null, jdk ? null, ant ? null +{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook +, withJava ? true, jdk ? null, ant ? null +, withAACS ? false, libaacs ? null +, withBDplus ? false, libbdplus ? null , withMetadata ? true, libxml2 ? null , withFonts ? true, freetype ? null -# Need to run autoreconf hook after BDJ jarfile patch -, autoreconfHook ? null }: -assert withAACS -> jdk != null && ant != null && libaacs != null && autoreconfHook != null; +with stdenv.lib; + +assert withJava -> jdk != null && ant != null; +assert withAACS -> libaacs != null; +assert withBDplus -> libbdplus != null; assert withMetadata -> libxml2 != null; assert withFonts -> freetype != null; @@ -15,41 +19,40 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.7.0"; + version = "0.8.0"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp"; + sha256 = "027xbdbsjyp1spfiva2331pzixrzw6vm97xlvgz16hzm5a5j103v"; }; - nativeBuildInputs = with stdenv.lib; - [pkgconfig] - ++ optional withAACS ant + nativeBuildInputs = [ pkgconfig autoreconfHook ] + ++ optionals withJava [ ant ] ; - buildInputs = with stdenv.lib; - [fontconfig] - ++ optionals withAACS [ jdk autoreconfHook ] - ++ optional withMetadata libxml2 - ++ optional withFonts freetype - ; + buildInputs = [ fontconfig ] + ++ optional withJava jdk + ++ optional withMetadata libxml2 + ++ optional withFonts freetype + ; propagatedBuildInputs = stdenv.lib.optional withAACS libaacs; - preConfigure = stdenv.lib.optionalString withAACS '' - export JDK_HOME=${jdk.home} - export LIBS="$LIBS -L${libaacs} -laacs" + preConfigure = '' + ${optionalString withJava ''export JDK_HOME="${jdk.home}"''} + ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''} + ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''} ''; configureFlags = with stdenv.lib; - optional withAACS "--enable-bdjava" + optional (! withJava) "--disable-bdjava" ++ optional (! withMetadata) "--without-libxml2" ++ optional (! withFonts) "--without-freetype" ; # Fix search path for BDJ jarfile - patches = stdenv.lib.optional withAACS ./BDJ-JARFILE-path.patch; + patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch; meta = with stdenv.lib; { homepage = http://www.videolan.org/developers/libbluray.html; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 0d9474e585e..2510e3b8621 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap -, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }: +, alsaLib, libpulseaudio, gstreamer, gst_plugins_base, libvorbis }: stdenv.mkDerivation rec { name = "libcanberra-0.30"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libtool alsaLib pulseaudio libvorbis gtk libcap + pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap /*gstreamer gst_plugins_base*/ # ToDo: gstreamer not found (why?), add (g)udev? ]; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 21666ed3034..90318e3e991 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - configureFlags = if (stdenv.cc.cc.isClang or false) + configureFlags = if stdenv.cc.isClang then [ "--disable-werror" ] else null; CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index dd0de49a4bd..bbeb75d0b8d 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = http://sites.dparrish.com/libcli; - license = with licenses; lgpl21Plus; + license = licenses.lgpl21Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 5d5a9e49381..ea27046279c 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -1,26 +1,42 @@ -{ stdenv, fetchurl, }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libclthreads-${version}"; version = "2.4.0"; + src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6"; }; - configurePhase = '' - sed -e "s@/usr/local@$out@" -i Makefile - sed -e "s@/usr/bin/install@install@" -i Makefile - sed -e "s@/sbin/ldconfig@ldconfig@" -i Makefile - sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile + patchPhase = '' + # Fix hardcoded paths to executables + sed -e "s@/usr/bin/install@install@" -i ./Makefile + sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile + + # Remove useless symlink: /lib64 -> /lib + sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile ''; - meta = { - description = "zita thread library"; - version = "${version}"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=''" + ]; + + preInstall = '' + # The Makefile does not create the include directory + mkdir -p $out/include + ''; + + postInstall = '' + ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so + ''; + + meta = with stdenv.lib; { + description = "Zita thread library"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + license = licenses.lgpl21; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 7d0e4596dd0..4dc103515ac 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,38 +1,41 @@ -{ stdenv, fetchurl, libclthreads, libXft, libX11, xlibs }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }: stdenv.mkDerivation rec { name = "libclxclient-${version}"; version = "3.9.0"; + src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; - buildInputs = [ - libclthreads libXft libX11 xlibs.xproto - ]; + buildInputs = [ libclthreads libX11 libXft xlibs.xproto ]; - configurePhase = '' - cpp -v - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xlibs.xproto}/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXft}/include" - echo $NIX_CFLAGS_COMPILE - sed -e "s@/usr/local@$out@" -i Makefile - sed -e "s@#include @#include <${libclthreads}/include>@" -i clxclient.h + NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include"; + + patchPhase = '' sed -e "s@ldconfig@@" -i Makefile - sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile ''; - fixupPhase = '' + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=''" + ]; + + preInstall = '' + # The Makefile does not create the include directory + mkdir -p $out/include + ''; + + postInstall = '' ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3 ''; - meta = { - description = "zita X11 library"; - version = "${version}"; + meta = with stdenv.lib; { + description = "Zita X11 library"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 5ffdd9303e0..b223bd962e7 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.60"; + name = "libdrm-2.4.61"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "12cqnmssi6mbr93n29mm84k8wix5nx6zs82k7wcmj7z3r335ymwr"; + sha256 = "8b549092c8961a393a7e1d9a1bccddcea8e2af67c0d7d7c67babb9fc3b47699c"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 6af8e7a415e..f8b9e9ecef9 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = http://www.videolan.org/developers/libdvbpsi.html ; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix new file mode 100644 index 00000000000..9b4e912772b --- /dev/null +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, pkgconfig, libdvdread}: + +stdenv.mkDerivation { + name = "libdvdnav-4.2.1"; + + src = fetchurl { + url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; + sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libdvdread]; + + configureScript = "./configure2"; # wtf? + + preConfigure = '' + mkdir -p $out + ''; + + # From Handbrake + patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ]; + + meta = { + homepage = http://dvdnav.mplayerhq.hu/; + description = "A library that implements DVD navigation features such as DVD menus"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.wmertens ]; + }; + + passthru = { inherit libdvdread; }; +} diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 9b4e912772b..fe625aa69e1 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,25 +1,17 @@ {stdenv, fetchurl, pkgconfig, libdvdread}: -stdenv.mkDerivation { - name = "libdvdnav-4.2.1"; - +stdenv.mkDerivation rec { + name = "libdvdnav-${version}"; + version = "5.0.3"; + src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; - sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; + url = "http://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"; + sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [libdvdread]; - configureScript = "./configure2"; # wtf? - - preConfigure = '' - mkdir -p $out - ''; - - # From Handbrake - patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ]; - meta = { homepage = http://dvdnav.mplayerhq.hu/; description = "A library that implements DVD navigation features such as DVD menus"; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix new file mode 100644 index 00000000000..eb5a48a99f1 --- /dev/null +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, libdvdcss}: + +stdenv.mkDerivation { + name = "libdvdread-4.9.9"; + + src = fetchurl { + url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; + sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; + }; + + buildInputs = [libdvdcss]; + + NIX_LDFLAGS = "-ldvdcss"; + + postInstall = '' + ln -s dvdread $out/include/libdvdread + ''; + + meta = { + homepage = http://dvdnav.mplayerhq.hu/; + description = "A library for reading DVDs"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.wmertens ]; + }; +} diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index eb5a48a99f1..311bc6dc405 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, libdvdcss}: -stdenv.mkDerivation { - name = "libdvdread-4.9.9"; - +stdenv.mkDerivation rec { + name = "libdvdread-${version}"; + version = "5.0.2"; + src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; - sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; + url = "http://download.videolan.org/pub/videolan/libdvdread/${version}/libdvdread-${version}.tar.bz2"; + sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf"; }; buildInputs = [libdvdcss]; diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 90cab2cc687..ce7d7b9e275 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -7,6 +7,11 @@ stdenv.mkDerivation rec { url = "http://dist.schmorp.de/libev/${name}.tar.gz"; sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48"; }; + + # Version 4.19 is not valid C11 (which Clang default to) + # Check if this is still necessary on upgrade + NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null; + meta = { description = "A high-performance event loop/event model with lots of features"; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch new file mode 100644 index 00000000000..f3b38dbd1c1 --- /dev/null +++ b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch @@ -0,0 +1,10 @@ +--- libffi-3.2.1/src/closures.c 2014-11-08 13:47:24.000000000 +0100 ++++ libffi-3.2.1/src/closures.c 2015-05-19 10:15:50.059325900 +0200 +@@ -212,6 +212,7 @@ + #include + + /* Cygwin is Linux-like, but not quite that Linux-like. */ ++#define is_emutramp_enabled() 0 + #define is_selinux_enabled() 0 + + #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */ diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index bc15e88ba2f..668ac138be8 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"; }; + patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null; + buildInputs = stdenv.lib.optional doCheck dejagnu; configureFlags = [ diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 2540d22b8d4..9616461177e 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; # This dead code causes a duplicate symbol error in Clang so just remove it - postPatch = if (stdenv.cc.cc.isClang or false) then '' + postPatch = if stdenv.cc.isClang then '' substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" '' else null; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 7d327a499bc..702d54392a6 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -5,16 +5,9 @@ , libcap ? null, pth ? null }: +with stdenv; +with stdenv.lib; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optLibcap = shouldUsePkg libcap; #optPth = shouldUsePkg pth; optPth = null; # Broken as of 1.6.3 @@ -38,13 +31,13 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' sed -i 's,#include ,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) '' + '' + optionalString (!stdenv.isDarwin && optLibcap != null) '' sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; - meta = with stdenv.lib; { + meta = { homepage = https://www.gnu.org/software/libgcrypt/; description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 0479343a8f5..d08e4c231f5 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,24 +1,26 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, gdk_pixbuf, libiconv, libintlOrEmpty }: +, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }: with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { - name = "libgsf-1.14.30"; + name = "libgsf-1.14.32"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "0w2v1a9sxsymd1mcy4mwsz4r6za9iwq69rj86nb939p41d4c6j6b"; + sha256 = "13bf38b848c01e20eb89a48150b6f864434ee4dfbb6301ddf6f4080a36cd99e9"; }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gettext bzip2 zlib python ]; + buildInputs = [ gettext bzip2 zlib python ] + ++ stdenv.lib.optional doCheck perl; propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] ++ libintlOrEmpty; doCheck = true; + preCheck = "patchShebangs ./tests/"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 70d6b24cbfc..eddc4eed55c 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://gcc.gnu.org/; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 9e65e63ffdb..70b0574a7b4 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -10,11 +10,16 @@ stdenv.mkDerivation rec { sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"; }; + patches = if stdenv.isCygwin then [ + ./libiconv-1.14-reloc.patch + ./libiconv-1.14-wchar.patch + ] else null; + # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL # (Windows' linker would need to be used somehow to produce an actual # DLL.) Thus, build the static library too, and this is what Gettext # will actually use. - configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ]; + configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null; crossAttrs = { # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW). diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch new file mode 100644 index 00000000000..005e3379d16 --- /dev/null +++ b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch @@ -0,0 +1,269 @@ +--- libiconv-1.14/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 ++++ libiconv-1.14/lib/relocatable.c 2011-10-15 03:14:13.195133600 -0400 +@@ -2,20 +2,18 @@ + Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + +- This program is free software; you can redistribute it and/or modify it +- under the terms of the GNU Library General Public License as published +- by the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as published by ++ the Free Software Foundation; either version 2.1 of the License, or ++ (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU Library General Public +- License along with this program; if not, write to the Free Software +- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +- USA. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + + /* Tell glibc's to provide a prototype for getline(). +@@ -87,6 +85,19 @@ + # define FILE_SYSTEM_PREFIX_LEN(P) 0 + #endif + ++/* Whether to enable the more costly support for relocatable libraries. ++ It allows libraries to be have been installed with a different original ++ prefix than the program. But it is quite costly, especially on Cygwin ++ platforms, see below. Therefore we enable it by default only on native ++ Win32 platforms. */ ++#ifndef ENABLE_COSTLY_RELOCATABLE ++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ ++# define ENABLE_COSTLY_RELOCATABLE 1 ++# else ++# define ENABLE_COSTLY_RELOCATABLE 0 ++# endif ++#endif ++ + /* Original installation prefix. */ + static char *orig_prefix; + static size_t orig_prefix_len; +@@ -156,7 +167,7 @@ + #endif + } + +-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) ++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) + + /* Convenience function: + Computes the current installation prefix, based on the original +@@ -286,7 +297,7 @@ + + #endif /* !IN_LIBRARY || PIC */ + +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + + /* Full pathname of shared library, or NULL. */ + static char *shared_library_fullname; +@@ -332,7 +343,9 @@ + #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ + /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() + function. +- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ ++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. ++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on ++ Cygwin 1.7. */ + FILE *fp; + + /* Open the current process' maps file. It describes one VMA per line. */ +@@ -405,7 +418,7 @@ + const char * + relocate (const char *pathname) + { +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + static int initialized; + + /* Initialization code for a shared library. */ +--- libiconv-1.14/libcharset/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 ++++ libiconv-1.14/libcharset/lib/relocatable.c 2011-10-15 03:14:27.878133600 -0400 +@@ -2,20 +2,18 @@ + Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + +- This program is free software; you can redistribute it and/or modify it +- under the terms of the GNU Library General Public License as published +- by the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as published by ++ the Free Software Foundation; either version 2.1 of the License, or ++ (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU Library General Public +- License along with this program; if not, write to the Free Software +- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +- USA. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + + /* Tell glibc's to provide a prototype for getline(). +@@ -87,6 +85,19 @@ + # define FILE_SYSTEM_PREFIX_LEN(P) 0 + #endif + ++/* Whether to enable the more costly support for relocatable libraries. ++ It allows libraries to be have been installed with a different original ++ prefix than the program. But it is quite costly, especially on Cygwin ++ platforms, see below. Therefore we enable it by default only on native ++ Win32 platforms. */ ++#ifndef ENABLE_COSTLY_RELOCATABLE ++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ ++# define ENABLE_COSTLY_RELOCATABLE 1 ++# else ++# define ENABLE_COSTLY_RELOCATABLE 0 ++# endif ++#endif ++ + /* Original installation prefix. */ + static char *orig_prefix; + static size_t orig_prefix_len; +@@ -156,7 +167,7 @@ + #endif + } + +-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) ++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) + + /* Convenience function: + Computes the current installation prefix, based on the original +@@ -286,7 +297,7 @@ + + #endif /* !IN_LIBRARY || PIC */ + +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + + /* Full pathname of shared library, or NULL. */ + static char *shared_library_fullname; +@@ -332,7 +343,9 @@ + #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ + /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() + function. +- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ ++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. ++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on ++ Cygwin 1.7. */ + FILE *fp; + + /* Open the current process' maps file. It describes one VMA per line. */ +@@ -405,7 +418,7 @@ + const char * + relocate (const char *pathname) + { +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + static int initialized; + + /* Initialization code for a shared library. */ +--- libiconv-1.14/srclib/relocatable.c 2011-08-07 09:42:06.000000000 -0400 ++++ libiconv-1.14/srclib/relocatable.c 2011-10-15 03:14:37.739133600 -0400 +@@ -3,16 +3,16 @@ + Written by Bruno Haible , 2003. + + This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or ++ it under the terms of the GNU Lesser General Public License as published by ++ the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ + + +@@ -85,6 +85,19 @@ + # define FILE_SYSTEM_PREFIX_LEN(P) 0 + #endif + ++/* Whether to enable the more costly support for relocatable libraries. ++ It allows libraries to be have been installed with a different original ++ prefix than the program. But it is quite costly, especially on Cygwin ++ platforms, see below. Therefore we enable it by default only on native ++ Win32 platforms. */ ++#ifndef ENABLE_COSTLY_RELOCATABLE ++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ ++# define ENABLE_COSTLY_RELOCATABLE 1 ++# else ++# define ENABLE_COSTLY_RELOCATABLE 0 ++# endif ++#endif ++ + /* Original installation prefix. */ + static char *orig_prefix; + static size_t orig_prefix_len; +@@ -154,7 +167,7 @@ + #endif + } + +-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) ++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) + + /* Convenience function: + Computes the current installation prefix, based on the original +@@ -284,7 +297,7 @@ + + #endif /* !IN_LIBRARY || PIC */ + +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + + /* Full pathname of shared library, or NULL. */ + static char *shared_library_fullname; +@@ -330,7 +343,9 @@ + #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ + /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() + function. +- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ ++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. ++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on ++ Cygwin 1.7. */ + FILE *fp; + + /* Open the current process' maps file. It describes one VMA per line. */ +@@ -403,7 +418,7 @@ + const char * + relocate (const char *pathname) + { +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + static int initialized; + + /* Initialization code for a shared library. */ +--- libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-07 09:42:12.000000000 -0400 ++++ libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-30 02:40:45.597317000 -0400 +@@ -164,6 +164,7 @@ gl_UNISTD_MODULE_INDICATOR([readlink]) + gl_RELOCATABLE([$gl_source_base]) + if test $RELOCATABLE = yes; then + AC_LIBOBJ([progreloc]) ++ AC_LIBOBJ([relocatable]) + fi + gl_FUNC_READLINK_SEPARATE + gl_CANONICALIZE_LGPL_SEPARATE diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch new file mode 100644 index 00000000000..0e4ddd931bb --- /dev/null +++ b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch @@ -0,0 +1,102 @@ +--- libiconv-1.14/libcharset/lib/localcharset.c 2011-02-28 17:43:35.000000000 -0500 ++++ libiconv-1.14/libcharset/lib/localcharset.c 2011-08-28 00:16:57.238000000 -0400 +@@ -54,10 +54,6 @@ + # include + # endif + # endif +-# ifdef __CYGWIN__ +-# define WIN32_LEAN_AND_MEAN +-# include +-# endif + #elif defined WIN32_NATIVE + # define WIN32_LEAN_AND_MEAN + # include +@@ -124,7 +120,7 @@ + cp = charset_aliases; + if (cp == NULL) + { +-#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) ++#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE) + const char *dir; + const char *base = "charset.alias"; + char *file_name; +@@ -309,7 +305,7 @@ + "DECKOREAN" "\0" "EUC-KR" "\0"; + # endif + +-# if defined WIN32_NATIVE || defined __CYGWIN__ ++# if defined WIN32_NATIVE + /* To avoid the troubles of installing a separate file in the same + directory as the DLL and of retrieving the DLL's directory at + runtime, simply inline the aliases here. */ +@@ -365,64 +361,12 @@ + + # if HAVE_LANGINFO_CODESET + +- /* Most systems support nl_langinfo (CODESET) nowadays. */ +- codeset = nl_langinfo (CODESET); +- +-# ifdef __CYGWIN__ +- /* Cygwin < 1.7 does not have locales. nl_langinfo (CODESET) always +- returns "US-ASCII". Return the suffix of the locale name from the +- environment variables (if present) or the codepage as a number. */ +- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) +- { +- const char *locale; +- static char buf[2 + 10 + 1]; +- +- locale = getenv ("LC_ALL"); +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_CTYPE"); +- if (locale == NULL || locale[0] == '\0') +- locale = getenv ("LANG"); +- } +- if (locale != NULL && locale[0] != '\0') +- { +- /* If the locale name contains an encoding after the dot, return +- it. */ +- const char *dot = strchr (locale, '.'); +- +- if (dot != NULL) +- { +- const char *modifier; +- +- dot++; +- /* Look for the possible @... trailer and remove it, if any. */ +- modifier = strchr (dot, '@'); +- if (modifier == NULL) +- return dot; +- if (modifier - dot < sizeof (buf)) +- { +- memcpy (buf, dot, modifier - dot); +- buf [modifier - dot] = '\0'; +- return buf; +- } +- } +- } +- +- /* Woe32 has a function returning the locale's codepage as a number: +- GetACP(). This encoding is used by Cygwin, unless the user has set +- the environment variable CYGWIN=codepage:oem (which very few people +- do). +- Output directed to console windows needs to be converted (to +- GetOEMCP() if the console is using a raster font, or to +- GetConsoleOutputCP() if it is using a TrueType font). Cygwin does +- this conversion transparently (see winsup/cygwin/fhandler_console.cc), +- converting to GetConsoleOutputCP(). This leads to correct results, +- except when SetConsoleOutputCP has been called and a raster font is +- in use. */ +- sprintf (buf, "CP%u", GetACP ()); +- codeset = buf; +- } +-# endif ++ /* Most systems support nl_langinfo (CODESET) nowadays. ++ POSIX allows that the returned pointer may point to a static area that ++ may be overwritten by subsequent calls to setlocale or nl_langinfo. */ ++ static char codeset_buf[64]; ++ codeset_buf[0] = '\0'; ++ codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf)); + + # else + diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 87d8154e5aa..3b8b7565e77 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -9,10 +9,6 @@ assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-0.15.0"; @@ -23,9 +19,9 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") - (mkFlag testsSupport "tests") + (mkEnable documentationSupport "documentation" null) + (mkEnable eventGUISupport "event-gui" null) + (mkEnable testsSupport "tests" null) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 6a650de8564..c9de127c905 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses - platforms = platforms.all; maintainers = [ maintainers.vcunat ]; + # upstream supports darwin (and others), but it doesn't build currently + platforms = platforms.all; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 40efafdea3d..6ab80d55a45 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Musical key detection for digital audio (C++ library)"; homepage = http://www.ibrahimshaath.co.uk/keyfinder/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix index a56f5784b4d..2a346abed74 100644 --- a/pkgs/development/libraries/libkvkontakte/default.nix +++ b/pkgs/development/libraries/libkvkontakte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qjson, kdelibs }: +{ stdenv, fetchgit, pkgconfig, qjson, kdelibs }: stdenv.mkDerivation { name = "libkvkonatkte-1.0-pre20120103"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61"; }; - buildInputs = [ qjson kdelibs ]; + buildInputs = [ pkgconfig qjson kdelibs ]; meta = { homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 7739c3627ec..37823af12e9 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad # It is included here in order to fix a build failure in Clang # But it may be useful to fix other, currently unknown problems as well - ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) [ ./optimize.diff ]; + ++ stdenv.lib.optional stdenv.cc.isClang [ ./optimize.diff ]; nativeBuildInputs = [ autoconf ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 54862e0482b..947cee94bd9 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.73"; + version = "0.7.74"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2"; - sha256 = "1c7yc9m4fdrfdlb80g6157sa8s0wlv892pixrfdzfljsqayxnl6k"; + sha256 = "1dn7zwqkl08vafc979i1mx63r2jlr95gfazg4d2cc9v3pav28zpk"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 9eca6bd84b9..d88b75440bc 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -5,16 +5,8 @@ , openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null }: +with stdenv; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optOpenssl = shouldUsePkg openssl; optZlib = shouldUsePkg zlib; hasSpdy = optOpenssl != null && optZlib != null; @@ -25,11 +17,11 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.41"; + name = "libmicrohttpd-0.9.42"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p"; + sha256 = "0nvxmm6z6wcq1vl6l92rids0i0va184y86bkc10dl0vh6rrj0d80"; }; nativeBuildInputs = [ pkgconfig ]; @@ -41,6 +33,7 @@ stdenv.mkDerivation rec { (mkWith true "threads" "posix") (mkEnable true "doc" null) (mkEnable false "examples" null) + (mkEnable true "poll" "auto") (mkEnable true "epoll" "auto") (mkEnable doCheck "curl" null) (mkEnable hasSpdy "spdy" null) diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 2146562c5cb..0f3ea26eb04 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, alsaLib, pulseaudio }: +{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio }: stdenv.mkDerivation rec { name = "libmikmod-3.3.7"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ stdenv.lib.optional stdenv.isLinux [ alsaLib pulseaudio ]; + ++ stdenv.lib.optional stdenv.isLinux [ alsaLib libpulseaudio ]; propagatedBuildInputs = - stdenv.lib.optional stdenv.isLinux pulseaudio; + stdenv.lib.optional stdenv.isLinux libpulseaudio; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound"; diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index f6908cd514c..a1a343de0e2 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - meta = { + meta = with stdenv.lib; { description = "Userspace library providing an API to the in-kernel connection tracking state table"; longDescription = '' libnetfilter_conntrack is a userspace library providing a programming interface (API) to the @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { by conntrack-tools among many other applications ''; homepage = http://netfilter.org/projects/libnetfilter_conntrack/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = stdenv.lib.maintainers.nckx; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 7f6335f6496..119f4111666 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; description = "OSSP uuid ISO-C and C++ shared library"; longDescription = @@ -35,6 +35,7 @@ stdenv.mkDerivation { short lifetime and to reliably identifying very persistent objects across a network. ''; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; + platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index cbb314a7bb7..c08ff265194 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; - meta = { + meta = with stdenv.lib; { description = "Helper library to program the performance monitoring events"; longDescription = '' This package provides a library, called libpfm4 which is used to @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { events such as those provided by the Performance Monitoring Unit (PMU) of modern processors. ''; - licence = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.pierron ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = [ maintainers.pierron ]; + platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix new file mode 100644 index 00000000000..5b02cfec7e3 --- /dev/null +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, postgresql, python }: + +stdenv.mkDerivation rec { + name = "libpqxx-4.0.1"; + + src = fetchurl { + url = "http://pqxx.org/download/software/libpqxx/${name}.tar.gz"; + sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09"; + }; + + buildInputs = [ postgresql python ]; + + preConfigure = '' + patchShebangs . + ''; + + configureFlags = "--enable-shared"; + + meta = { + description = "A C++ library to access PostgreSQL databases"; + homepage = http://pqxx.org/development/libpqxx/; + license = lib.licenses.postgresql; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 29a8c459c34..8d1288f98ce 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [pkgconfig glib ncurses]; + buildInputs = [ pkgconfig glib ncurses ]; - meta = { + meta = with stdenv.lib; { homepage = http://libpseudo.sourceforge.net/; description = "Simple, thread-safe messaging between threads"; - license="GPLv2+"; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index f1c54d5cf5f..4a2d7be7b8b 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { the domain in a user interface or sorting domain lists by site. ''; homepage = http://rockdaboot.github.io/libpsl/; - license = with licenses; mit; - platforms = with platforms; linux; + license = licenses.mit; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 56e7084292c..0b9b79f0c60 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/re.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 165e16a8823..817e1c79bc7 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/rem.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index e8d4f98028f..831292bf1d9 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -2,14 +2,14 @@ let patch = fetchurl { - url = http://ftp.debian.org/debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz; + url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz; sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx"; }; in stdenv.mkDerivation { name = "libresample-0.1.3"; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz; + url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz; sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0"; }; patches = [ patch ]; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index ff7886d0513..b3543236158 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { # Clang generates warnings in Boost's header files # -Werror causes these warnings to be interpreted as errors # Simplest solution: disable -Werror - configureFlags = if (stdenv.cc.cc.isClang or false) + configureFlags = if stdenv.cc.isClang then [ "--disable-werror" ] else null; meta = { diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 3d8699918e1..62970b71904 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://github.com/bji/libs3; - description = "a library for interfacing with amazon s3"; - licenses = licenses.gpl3; + description = "A library for interfacing with amazon s3"; + license = licenses.gpl3; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 00655b51afc..61f22701111 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "seccomp"; repo = "libseccomp"; rev = "v${version}"; - sha256 = "0vfd6hx92cp1jaqxxaj30r92bfm6fmamxi2yqxrl82mqism1lk84"; + sha256 = "153k3jflcgij19nxghmwlvqlngl84vkld514d31490c6sfkr5fy2"; }; buildInputs = [ autoreconfHook getopt ]; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index f824ab864a1..0b0656df4f6 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb"; }; - NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp"; doCheck = true; diff --git a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch new file mode 100644 index 00000000000..030983d5c55 --- /dev/null +++ b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch @@ -0,0 +1,28 @@ +From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001 +From: Mike DePaulo +Date: Fri, 15 May 2015 22:22:13 -0400 +Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194) + +--- + src/channels.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/channels.c b/src/channels.c +index 7a4e71f..db5f83a 100644 +--- a/src/channels.c ++++ b/src/channels.c +@@ -2206,6 +2206,11 @@ error: + } + + /* DEPRECATED */ ++int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) { ++ return ssh_channel_listen_forward(session, address, port, bound_port); ++} ++ ++/* DEPRECATED */ + ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) { + return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL); + } +-- +2.1.4 + diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 88af054654b..a9117556a7f 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,22 +1,75 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt, openssl }: +{ stdenv, fetchurl, pkgconfig, cmake + +# Optional Dependencies +, libheimdal ? null, zlib ? null, libsodium ? null + +# Crypto Dependencies +, openssl ? null, libgcrypt ? null +}: + +with stdenv; +let + # Prefer openssl + cryptoStr = if shouldUsePkg openssl != null then "openssl" + else if shouldUsePkg libgcrypt != null then "libgcrypt" + else "none"; + crypto = { + openssl = openssl; + libgcrypt = libgcrypt; + none = null; + }.${cryptoStr}; + + optLibheimdal = shouldUsePkg libheimdal; + optZlib = shouldUsePkg zlib; + optLibsodium = shouldUsePkg libsodium; +in + +assert crypto != null; stdenv.mkDerivation rec { - name = "libssh-0.6.4"; + name = "libssh-0.7.0"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/107/${name}.tar.gz"; - sha256 = "0lkb45sc7w0wd67p46yh8rsprglssnkqar1sp0impwsvx7i0acky"; + url = "https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.0.tar.gz"; + sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0"; }; - # option we don't provide (yet): use libgcrypt instead of openssl - buildInputs = [ zlib /*libgcrypt*/ openssl ]; + patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + postPatch = '' + # Fix headers to use libsodium instead of NaCl + sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c + ''; + + cmakeFlags = [ + "-DWITH_GSSAPI=${if optLibheimdal != null then "ON" else "OFF"}" + "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}" + "-DWITH_SSH1=OFF" + "-DWITH_SFTP=ON" + "-DWITH_SERVER=ON" + "-DWITH_STATIC_LIB=OFF" + "-DWITH_DEBUG_CRYPTO=OFF" + "-DWITH_DEBUG_CALLTRACE=OFF" + "-DWITH_GCRYPT=${if cryptoStr == "libgcrypt" then "ON" else "OFF"}" + "-DWITH_PCAP=ON" + "-DWITH_INTERNAL_DOC=OFF" + "-DWITH_TESTING=OFF" + "-DWITH_CLIENT_TESTING=OFF" + "-DWITH_BENCHMARKS=OFF" + "-DWITH_EXAMPLES=OFF" + "-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}" + ] ++ stdenv.lib.optionals (optLibsodium != null) [ + "-DNACL_LIBRARY=${optLibsodium}/lib/libsodium.so" + "-DNACL_INCLUDE_DIR=${optLibsodium}/include" + ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ optLibheimdal optZlib optLibsodium crypto ]; meta = with stdenv.lib; { description = "SSH client library"; license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + maintainers = with maintainers; [ sander urkud wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 3434fde1a62..a8e8777f06c 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -7,16 +7,8 @@ , openssl ? null, libgcrypt ? null }: +with stdenv; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - # Prefer openssl cryptoStr = if shouldUsePkg openssl != null then "openssl" else if shouldUsePkg libgcrypt != null then "libgcrypt" diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 4316b2dda6b..e5965a10f67 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal keypress reading library"; - license = with licenses; [ mit ]; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index ef7a8ab09a8..da590adae06 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: -stdenv.mkDerivation ({ +stdenv.mkDerivation rec { name = "libtheora-1.1.1"; + src = fetchurl { - url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.gz; + url = "http://downloads.xiph.org/releases/theora/${name}.tar.gz"; sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; - buildInputs = [pkgconfig]; - - propagatedBuildInputs = [libogg libvorbis]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ libogg libvorbis ]; # GCC's -fforce-addr flag is not supported by clang # It's just an optimization, so it's safe to simply remove it @@ -17,23 +17,11 @@ stdenv.mkDerivation ({ substituteInPlace configure --replace "-fforce-addr" "" ''; - crossAttrs = { - propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv]; - configureFlags = "--disable-examples"; - }; - meta = with stdenv.lib; { homepage = http://www.theora.org/; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; - maintainers = [ maintainers.spwhitt ]; + maintainers = with maintainers; [ spwhitt wkennington ]; platforms = platforms.unix; }; } - -# It has an old config.guess that doesn't know the mips64el. -// stdenv.lib.optionalAttrs (stdenv.system == "mips64el-linux") -{ - propagatedBuildInputs = [libogg libvorbis autoconf automake libtool]; - preConfigure = "rm config.guess; sh autogen.sh"; -}) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index b08c169993e..91895114ea0 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib" touch "$out/lib/libunwind-generic.so" ''; + + postInstall = '' + find $out -name \*.la | while read file; do + sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file + done + ''; meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index f85c2bef185..37f09d4adf0 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -105,5 +105,5 @@ in // mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) { v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx"; - v1_4_2 = "03ffyjyz92ipi2im05hvlx7jypv9c8fyp90zqyr91w7vszskxnxw"; + v1_5_0 = "1j0871mxw97680ghlqy0dpyfmr26kqa0lk26a2bgcqf4ghqap24x"; } diff --git a/pkgs/development/libraries/libverto/default.nix b/pkgs/development/libraries/libverto/default.nix new file mode 100644 index 00000000000..e4097aa57d6 --- /dev/null +++ b/pkgs/development/libraries/libverto/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig + +# Optional Dependencies +, glib ? null, libev ? null, libevent ? null, tevent ? null, talloc ? null +}: +with stdenv; +let + optGlib = shouldUsePkg glib; + optLibev = shouldUsePkg libev; + optLibevent = shouldUsePkg libevent; + optTevent = shouldUsePkg tevent; + optTalloc = shouldUsePkg talloc; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "libverto-0.2.6"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/l/i/libverto/${name}.tar.gz"; + sha256 = "17hwr55ga0rkm5cnyfiipyrk9n372x892ph9wzi88j2zhnisdv0p"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ optGlib optLibev optLibevent ] + ++ optionals (optTevent != null && optTalloc != null) [ + optTevent optTalloc + ]; + + postInstall = '' + # In v0.2.6 the shipped pkg-config files have an out of order + # declaration of exec_prefix breaking them. This fixes that issue + sed -i 's,''${exec_prefix},''${prefix},g' $out/lib/pkgconfig/*.pc + ''; + + meta = { + homepage = https://fedorahosted.org/libverto/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index f82581b1097..c0880ee896f 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig glib ncurses gpm]; - meta = { + meta = with stdenv.lib; { homepage = http://libviper.sourceforge.net/; description = "Simple window creation and management facilities for the console"; - license="GPLv2+"; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 20433ab1458..e58d964a625 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses}: +{ stdenv, fetchurl, pkgconfig, glib, ncurses }: + stdenv.mkDerivation rec { name = "libvterm-0.99.7"; @@ -16,11 +17,12 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [pkgconfig glib ncurses]; + buildInputs = [ pkgconfig glib ncurses ]; - meta = { + meta = with stdenv.lib; { homepage = http://libvterm.sourceforge.net/; description = "Terminal emulator library to mimic both vt100 and rxvt"; - license="GPLv2+"; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 6da1b00ee81..871dff0aa8a 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -20,10 +20,6 @@ assert jpegSupport -> (libjpeg != null); assert tiffSupport -> (libtiff != null); assert gifSupport -> (giflib != null); -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; @@ -35,19 +31,19 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag threadingSupport "threading") - (mkFlag openglSupport "gl") - (mkFlag pngSupport "png") - (mkFlag jpegSupport "jpeg") - (mkFlag tiffSupport "tiff") - (mkFlag gifSupport "gif") - #(mkFlag (wicSupport && stdenv.isCygwin) "wic") - (mkFlag alignedSupport "aligned") - (mkFlag swap16bitcspSupport "swap-16bit-csp") - (mkFlag experimentalSupport "experimental") - (mkFlag libwebpmuxSupport "libwebpmux") - (mkFlag libwebpdemuxSupport "libwebpdemux") - (mkFlag libwebpdecoderSupport "libwebpdecoder") + (mkEnable threadingSupport "threading" null) + (mkEnable openglSupport "gl" null) + (mkEnable pngSupport "png" null) + (mkEnable jpegSupport "jpeg" null) + (mkEnable tiffSupport "tiff" null) + (mkEnable gifSupport "gif" null) + #(mkEnable (wicSupport && stdenv.isCygwin) "wic" null) + (mkEnable alignedSupport "aligned" null) + (mkEnable swap16bitcspSupport "swap-16bit-csp" null) + (mkEnable experimentalSupport "experimental" null) + (mkEnable libwebpmuxSupport "libwebpmux" null) + (mkEnable libwebpdemuxSupport "libwebpdemux" null) + (mkEnable libwebpdecoderSupport "libwebpdecoder" null) ]; buildInputs = [ ] diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index c900cfbc684..84dbb0c156f 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "NX compression library"; homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 87b4d82efc6..0d711514444 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/libxls/; license = licenses.bsd2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 0d70a6502fe..77050a1d3b3 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -6,16 +6,8 @@ #TODO: share most stuff between python and non-python builds, perhaps via multiple-output +with stdenv; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optIcu = shouldUsePkg icu; optPython = shouldUsePkg python; optReadline = shouldUsePkg readline; @@ -25,6 +17,7 @@ let sitePackages = if optPython == null then null else "\${out}/lib/${python.libPrefix}/site-packages"; in +with stdenv.lib; stdenv.mkDerivation rec { name = "libxml2-${version}"; version = "2.9.2"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 586a10bd1a8..19e71fd66c1 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, pulseaudio, speex, gsm +{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, vim }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ - alsaLib pulseaudio speex gsm libopus + alsaLib libpulseaudio speex gsm libopus ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp ortp libv4l libpcap srtp vim diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d5838308b39..c5e0e87341e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,7 +23,7 @@ else */ let - version = "10.5.4"; + version = "10.5.6"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang; @@ -38,7 +38,7 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" ]; - sha256 = "00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm"; + sha256 = "66017853bde5f7a6647db3eede30512a091a3491daa1708e0ad8027c328ba595"; }; prePatch = "patchShebangs ."; @@ -167,11 +167,11 @@ stdenv.mkDerivation { passthru = { inherit libdrm version driverLink; }; - meta = { + meta = with stdenv.lib; { description = "An open source implementation of OpenGL"; homepage = http://www.mesa3d.org/; license = "bsd"; - platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ]; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ eduarrrd simons vcunat ]; }; } diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 88f18003977..df084f0cc20 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "http://movit.sesse.net/${name}.tar.gz"; - sha256 = "0jka9l3cx7q09rpz5x6rv6ii8kbgm2vc419gx2rb9rc8sl81hzj1"; + sha256 = "0q33h3gfw16gd9k6s3isd7ili2mifw7j1723xpdlc516gggsazw9"; }; GTEST_DIR = "${gtest}"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index fd545e53625..f0519fa981d 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -8,23 +8,11 @@ , unicode ? true }: +with stdenv.lib; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg_: let - pkg = (builtins.tryEval pkg_).value; - in if stdenv.lib.any (x: x == stdenv.system) (pkg.meta.platforms or []) - then pkg - else null; - buildShared = !stdenv.isDarwin; - optGpm = shouldUsePkg gpm; + optGpm = stdenv.shouldUsePkg gpm; in stdenv.mkDerivation rec { name = "ncurses-5.9"; @@ -61,6 +49,15 @@ stdenv.mkDerivation rec { (mkEnable unicode "widec" null) (mkEnable true "ext-colors" null) (mkEnable true "ext-mouse" null) + ] ++ stdenv.lib.optionals stdenv.isCygwin [ + "--enable-sp-funcs" + "--enable-term-driver" + "--enable-const" + "--enable-ext-colors" + "--enable-ext-mouse" + "--enable-reentrant" + "--enable-colorfgbg" + "--enable-tcap-names" ]; # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this @@ -72,6 +69,8 @@ stdenv.mkDerivation rec { preConfigure = '' export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" + '' + stdenv.lib.optionalString stdenv.isCygwin '' + sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure ''; selfNativeBuildInput = true; @@ -83,7 +82,7 @@ stdenv.mkDerivation rec { # When building a wide-character (Unicode) build, create backward # compatibility links from the the "normal" libraries to the # wide-character libraries (e.g. libncurses.so to libncursesw.so). - postInstall = if unicode then '' + postInstall = if unicode then ('' # Create a non-abi versioned config cfg=$(basename $out/bin/ncurses*-config) ln -svf $cfg $out/bin/ncursesw-config @@ -97,17 +96,23 @@ stdenv.mkDerivation rec { libs="$(find $out/lib -name \*w.a | sed 's,.*lib\(.*\)w.a.*,\1,g')" for lib in $libs; do if [ -e "$out/lib/lib''${lib}w.so" ]; then - echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so + ln -svf lib''${lib}w.so $out/lib/lib$lib.so + ln -svf lib''${lib}w.so.${abiVersion} $out/lib/lib$lib.so.${abiVersion} fi ln -svf lib''${lib}w.a $out/lib/lib$lib.a ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc done # Create curses compatability - echo "INPUT(-lncursesw)" > $out/lib/libcursesw.so - echo "INPUT(-lncursesw)" > $out/lib/libcurses.so - ln -svf libncurses - '' else '' + ln -svf libncursesw.so $out/lib/libcursesw.so + ln -svf libncursesw.so $out/lib/libcurses.so + '' + stdenv.lib.optionalString stdenv.isCygwin '' + for lib in $libs; do + if test -e $out/lib/lib''${lib}w.dll.a; then + ln -svf lib''${lib}w.dll.a $out/lib/lib$lib.dll.a + fi + done + '') else '' # Create a non-abi versioned config cfg=$(basename $out/bin/ncurses*-config) ln -svf $cfg $out/bin/ncurses-config @@ -116,10 +121,10 @@ stdenv.mkDerivation rec { ln -svf . $out/include/ncurses # Create curses compatability - echo "INPUT(-lncurses)" > $out/lib/libcurses.so + ln -svf libncurses.so $out/lib/libcurses.so ''; - meta = with stdenv.lib; { + meta = { description = "Free software emulation of curses in SVR4 and more"; longDescription = '' diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 505c9b5c0d9..9659ae5273d 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, - zlib, hdf5, + zlib, hdf5, m4, curl # for DAP }: stdenv.mkDerivation rec { - name = "netcdf-4.3.2"; + name = "netcdf-4.3.3.1"; src = fetchurl { url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; - sha256 = "57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e"; + sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx"; }; buildInputs = [ - zlib hdf5 curl + zlib hdf5 m4 curl ]; configureFlags = [ diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index b72abb57e8f..d8fd36ecba6 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -8,16 +8,9 @@ , prefix ? "" }: +with stdenv; +with stdenv.lib; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - isLib = prefix == "lib"; optOpenssl = if isLib then null else shouldUsePkg openssl; @@ -34,17 +27,23 @@ let in stdenv.mkDerivation rec { name = "${prefix}nghttp2-${version}"; - version = "0.7.13"; + version = "0.7.14"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { - url = "http://pub.wak.io/nixos/tarballs/nghttp2-0.7.13.tar.xz"; - sha256 = "1nz14hmfhsxljmf7f3763q9kpn9prfdivrvdr7c74x72s75bzwli"; + url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2"; + sha256 = "000d50yzyysbr9ldhvnbpzn35vplqm08dnmh55wc5zk273gy383f"; }; + # Configure script searches for a symbol which does not exist in jemalloc on Darwin + # Reported upstream in https://github.com/tatsuhiro-t/nghttp2/issues/233 + postPatch = if (stdenv.isDarwin && optJemalloc != null) then '' + substituteInPlace configure --replace "malloc_stats_print" "je_malloc_stats_print" + '' else null; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ] - ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ]; + ++ optionals hasApp [ optOpenssl optLibev optZlib ]; configureFlags = [ (mkEnable false "werror" null) @@ -62,7 +61,7 @@ stdenv.mkDerivation rec { (mkWith false "cython" null) ]; - meta = with stdenv.lib; { + meta = { homepage = http://nghttp2.org/; description = "an implementation of HTTP/2 in C"; license = licenses.mit; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 1494092fc47..dd508d68748 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5b167558486..037ab3c03c0 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.19"; + version = "3.19.1"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/${name}.tar.gz"; - sha256 = "989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_1_RTM/src/${name}.tar.gz"; + sha256 = "b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff"; }; buildInputs = [ nspr perl zlib sqlite ]; @@ -79,8 +79,9 @@ in stdenv.mkDerivation rec { find $out/bin -type f \( -name nss-config -o -delete \) ''; - meta = { + meta = with stdenv.lib; { homepage = https://developer.mozilla.org/en-US/docs/NSS; description = "A set of libraries for development of security-enabled client and server applications"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index eedc9e9ff93..89dc32b61f2 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake , alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, pulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null }: with stdenv.lib; assert alsaSupport -> alsaLib != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "1.16.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ optional alsaSupport alsaLib - ++ optional pulseSupport pulseaudio; + ++ optional pulseSupport libpulseaudio; NIX_LDFLAGS = [] ++ optional alsaSupport "-lasound" diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 5a935691ca5..ac39ef2e84c 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, alsaLib, cmake }: -let version = "1.7.411"; in +let version = "1.16.0"; in stdenv.mkDerivation rec { name = "openal-${version}"; src = fetchurl { - url = "http://connect.creativelabs.com/openal/Downloads/openal-soft-${version}.bz2"; - sha256 = "1nbqvg08hy5p2cxy2i2mmh2szmbpsg2dcvhr61iplyisw04rwc8i"; - name = "openal-soft-${version}.tar.bz2"; + url = "http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2"; + sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g"; }; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { is done from the perspective of the Listener. ''; - homepage = http://www.openal.org/; - license = stdenv.lib.licenses.gpl2Plus; + homepage = http://kcat.strangesoft.net/openal.html; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index b0ef9e83242..4228c285dfd 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # -fpermissive helps building opencascade, although gcc detects a flaw in the code # and reports an error otherwise. Further versions may fix that. NIX_CFLAGS_COMPILE = "-fpermissive" + # https://bugzilla.redhat.com/show_bug.cgi?id=902561 + + " -DUSE_INTERP_RESULT" # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + " -DGLX_GLXEXT_LEGACY"; diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix index 14886f02142..2147bab0a6a 100644 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ b/pkgs/development/libraries/openjpeg/1.x.nix @@ -1,10 +1,7 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // rec { version = "${branch}.2"; branch = "1.5"; - src = fetchurl { - url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz"; - sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"; - }; + sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"; }) diff --git a/pkgs/development/libraries/openjpeg/2.0.1.nix b/pkgs/development/libraries/openjpeg/2.0.1.nix deleted file mode 100644 index 25575450b47..00000000000 --- a/pkgs/development/libraries/openjpeg/2.0.1.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.0.1"; - branch = "2"; - src = fetchurl { - url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz"; - sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"; - }; -}) diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix new file mode 100644 index 00000000000..034942b25dd --- /dev/null +++ b/pkgs/development/libraries/openjpeg/2.0.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.0.1"; + branch = "2"; + sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"; +}) diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix index 7e48b656ae2..f6b3ce3a9cd 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -1,10 +1,7 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // rec { version = "${branch}.0"; branch = "2.1"; - src = fetchurl { - url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz"; - sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"; - }; + sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"; }) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 3fae65d9bd2..717e5a4de2c 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -1,85 +1,70 @@ -{ stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ -, sharedLibsSupport ? true # Build shared libraries -, codecSupport ? true # Codec executables +{ stdenv, fetchurl, cmake, pkgconfig +, libpng, libtiff, lcms2 , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables -, jpipLibSupport ? true # JPIP library & executables +, jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl ? null, fcgi ? null # JPIP Server #, opjViewerSupport ? false, wxGTK ? null # OPJViewer executable -, openjpegJarSupport ? false, jdk ? null # Openjpeg jar (Java) +, openjpegJarSupport ? false # Openjpeg jar (Java) , jp3dSupport ? true # # JP3D comp , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build , testsSupport ? false +, jdk ? null # Inherit generics -, branch, src, version, ... +, branch, sha256, version, ... }: -assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null)); +assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; #assert opjViewerSupport -> (wxGTK != null); -assert openjpegJarSupport -> (jdk != null); -assert testsSupport -> codecSupport; +assert (openjpegJarSupport || jpipLibSupport) -> jdk != null; let - mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; + inherit (stdenv.lib) optional optionals; + mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -with stdenv.lib; stdenv.mkDerivation rec { name = "openjpeg-${version}"; - inherit branch; - inherit version; - inherit src; + + src = fetchurl { + url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz"; + inherit sha256; + }; cmakeFlags = [ - (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS") - (mkFlag codecSupport "BUILD_CODEC") + "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_CODEC=ON" (mkFlag mj2Support "BUILD_MJ2") (mkFlag jpwlLibSupport "BUILD_JPWL") (mkFlag jpipLibSupport "BUILD_JPIP") (mkFlag jpipServerSupport "BUILD_JPIP_SERVER") #(mkFlag opjViewerSupport "BUILD_VIEWER") + "-DBUILD_VIEWER=OFF" (mkFlag openjpegJarSupport "BUILD_JAVA") (mkFlag jp3dSupport "BUILD_JP3D") (mkFlag thirdPartySupport "BUILD_THIRDPARTY") (mkFlag testsSupport "BUILD_TESTING") - ] ++ stdenv.lib.optionals stdenv.isDarwin - [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" ]; - nativebuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ cmake ] + buildInputs = [ ] ++ optionals jpipServerSupport [ curl fcgi ] #++ optional opjViewerSupport wxGTK - ++ optional openjpegJarSupport jdk; + ++ optional (openjpegJarSupport || jpipLibSupport) jdk; propagatedBuildInputs = [ libpng libtiff lcms2 ]; - postInstall = glib.flattenInclude + '' - mkdir -p "$out/lib/pkgconfig" - cat > "$out/lib/pkgconfig/libopenjp2.pc" < /dev/null; then \ + ( case $$i in \ + *crypto*) i=libeay32.dll;; \ +@@ -643,9 +644,9 @@ install_docs: + @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ + here="`pwd`"; \ + filecase=; \ +- if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \ ++ case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \ + filecase=-i; \ +- fi; \ ++ esac; \ + set -e; for i in doc/apps/*.pod; do \ + fn=`basename $$i .pod`; \ + sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ +--- openssl-1.0.1e/engines/ccgost/Makefile 2013-02-11 09:26:04.000000000 -0600 ++++ openssl-1.0.1e/engines/ccgost/Makefile 2013-02-17 17:05:47.759290200 -0600 +@@ -45,7 +45,11 @@ install: + set -e; \ + echo installing $(LIBNAME); \ + pfx=lib; \ +- if [ "$(PLATFORM)" != "Cygwin" ]; then \ ++ case "$(PLATFORM)" in Cygwin*) \ ++ sfx=".so"; \ ++ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ ++ ;; \ ++ *) \ + case "$(CFLAGS)" in \ + *DSO_BEOS*) sfx=".so";; \ + *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ +@@ -54,10 +58,7 @@ install: + *) sfx=".bad";; \ + esac; \ + cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ +- else \ +- sfx=".so"; \ +- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ +- fi; \ ++ esac; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ + fi +--- openssl-1.0.1i/engines/Makefile 2014-10-23 16:08:19.360200000 +0200 ++++ openssl-1.0.1i/engines/Makefile 2014-10-23 16:10:54.205800000 +0200 +@@ -111,7 +111,11 @@ + for l in $(LIBNAMES); do \ + ( echo installing $$l; \ + pfx=lib; \ +- if [ "$(PLATFORM)" != "Cygwin" ]; then \ ++ case "$(PLATFORM)" in Cygwin*) \ ++ sfx=".so"; \ ++ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ ++ ;; \ ++ *) \ + case "$(CFLAGS)" in \ + *DSO_BEOS*) sfx=".so";; \ + *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ +@@ -120,10 +124,7 @@ + *) sfx=".bad";; \ + esac; \ + cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ +- else \ +- sfx=".so"; \ +- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ +- fi; \ ++ esac; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ + done; \ diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix new file mode 100644 index 00000000000..a1645189161 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.0.2.x.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, perl +, withCryptodev ? false, cryptodevHeaders }: + +let + name = "openssl-1.0.2a"; + + opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] + (throw "openssl needs its platform name cross building" null) + stdenv.cross; + + patchesCross = isCross: let + isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem"); + in stdenv.lib.optional isDarwin ./darwin-arch.patch; + + extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch; +in + +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + urls = [ + "http://www.openssl.org/source/${name}.tar.gz" + "http://openssl.linux-mirror.org/source/${name}.tar.gz" + ]; + sha256 = "0jijgzf72659pikms2bc5w31h78xrd1h5zp2r01an2h340y3kdhm"; + }; + + patches = (patchesCross false) ++ extraPatches; + + buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; + + nativeBuildInputs = [ perl ]; + + # On x86_64-darwin, "./config" misdetects the system as + # "darwin-i386-cc". So specify the system type explicitly. + configureScript = + if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" + else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc" + else "./config"; + + configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + + stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; + + # CYGXXX: used to be set for cygwin with optionalString. Not needed + # anymore but kept to prevent rebuild. + preBuild = ""; + + makeFlags = "MANDIR=$(out)/share/man"; + + # Parallel building is broken in OpenSSL. + enableParallelBuilding = false; + + postInstall = + '' + # If we're building dynamic libraries, then don't install static + # libraries. + if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then + rm $out/lib/*.a + fi + ''; # */ + + crossAttrs = { + patches = patchesCross true; + + preConfigure='' + # It's configure does not like --build or --host + export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" + ''; + + postInstall = '' + # Openssl installs readonly files, which otherwise we can't strip. + # This could at some stdenv hash change be put out of crossAttrs, too + chmod -R +w $out + + # Remove references to perl, to avoid depending on it at runtime + rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget + ''; + configureScript = "./Configure"; + } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") { + CC = "gcc"; + }; + + meta = { + homepage = http://www.openssl.org/; + description = "A cryptographic library that implements the SSL and TLS protocols"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + priority = 10; # resolves collision with ‘man-pages’ + }; +} diff --git a/pkgs/development/libraries/openssl/cert-file-path-max.patch b/pkgs/development/libraries/openssl/cert-file-path-max.patch deleted file mode 100644 index 50621c5cb82..00000000000 --- a/pkgs/development/libraries/openssl/cert-file-path-max.patch +++ /dev/null @@ -1,34 +0,0 @@ -This patch, to be applied after `cert-file.patch', fixes compilation -on GNU/Hurd where `PATH_MAX' is not defined. - -diff -ubB --show-c-function openssl-1.0.0e/crypto/x509/x509_def.c.orig openssl-1.0.0e/crypto/x509/x509_def.c ---- openssl-1.0.0e/crypto/x509/x509_def.c.orig 2012-01-06 00:08:48.000000000 +0100 -+++ openssl-1.0.0e/crypto/x509/x509_def.c 2012-01-06 00:11:29.000000000 +0100 -@@ -58,6 +58,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -76,14 +77,16 @@ const char *X509_get_default_cert_dir(vo - - const char *X509_get_default_cert_file(void) - { -- static char buf[PATH_MAX] = X509_CERT_FILE; -+ static char *buf; - static int init = 0; - if (!init) { - init = 1; - char * s = getenv("OPENSSL_X509_CERT_FILE"); - if (s && getuid() == geteuid()) { -- strncpy(buf, s, sizeof(buf)); -- buf[sizeof(buf) - 1] = 0; -+ buf = strdup(s); -+ } -+ if (!s) { -+ buf = strdup(X509_CERT_FILE); - } - } - return buf; diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch deleted file mode 100644 index e6e66111201..00000000000 --- a/pkgs/development/libraries/openssl/cert-file.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru openssl-1.0.1m-orig/crypto/x509/x509_def.c openssl-1.0.1m/crypto/x509/x509_def.c ---- openssl-1.0.1m-orig/crypto/x509/x509_def.c 2015-03-19 14:19:00.000000000 +0100 -+++ openssl-1.0.1m/crypto/x509/x509_def.c 2015-03-19 15:50:44.676683616 +0100 -@@ -57,6 +57,10 @@ - */ - - #include -+#include -+#include -+#include -+#include - #include "cryptlib.h" - #include - #include -@@ -78,7 +82,23 @@ - - const char *X509_get_default_cert_file(void) - { -- return (X509_CERT_FILE); -+ static char buf[PATH_MAX] = X509_CERT_FILE; -+ static int init = 0; -+ if (!init) { -+ init = 1; -+ char * s = getenv("OPENSSL_X509_CERT_FILE"); -+ if (s) { -+#ifndef OPENSSL_SYS_WINDOWS -+ if (getuid() == geteuid()) { -+#endif -+ strncpy(buf, s, sizeof(buf)); -+ buf[sizeof(buf) - 1] = 0; -+#ifndef OPENSSL_SYS_WINDOWS -+ } -+#endif -+ } -+ } -+ return buf; - } - - const char *X509_get_default_cert_dir_env(void) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 7255e91f282..d475f7ae833 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -10,31 +10,9 @@ let patchesCross = isCross: let isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem"); - in - [ # Allow the location of the X509 certificate file (the CA - # bundle) to be set through the environment variable - # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the - # default location ($out/ssl/cert.pem) doesn't exist, and - # hardcoding something like /etc/ssl/cert.pem is impure and - # cannot be overriden per-process. For security, the - # environment variable is ignored for setuid binaries. - # FIXME: drop this patch; it really isn't necessary, because - # OpenSSL already supports a ‘SSL_CERT_FILE’ variable. - ./cert-file.patch - ] - - ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") - [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually - ./gnu.patch # submitted upstream - ] - - ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu") - [ ./gnu.patch - ./kfreebsd-gnu.patch - ] - - ++ stdenv.lib.optional isDarwin ./darwin-arch.patch; + in stdenv.lib.optional isDarwin ./darwin-arch.patch; + extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch; in stdenv.mkDerivation { @@ -48,7 +26,7 @@ stdenv.mkDerivation { sha256 = "0x7gvyybmqm4lv62mlhlm80f1rn7il2qh8224rahqv0i15xhnpq9"; }; - patches = patchesCross false; + patches = (patchesCross false) ++ extraPatches; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; @@ -62,12 +40,11 @@ stdenv.mkDerivation { else "./config"; configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + - stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" + - stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm"; + stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; - preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") '' - sed -i -e "s|-march=i486|-march=x86-64|g" Makefile - ''; + # CYGXXX: used to be set for cygwin with optionalString. Not needed + # anymore but kept to prevent rebuild. + preBuild = ""; makeFlags = "MANDIR=$(out)/share/man"; @@ -81,6 +58,9 @@ stdenv.mkDerivation { if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then rm $out/lib/*.a fi + + # remove dependency on Perl at runtime + rm -rf $out/etc/ssl/misc ''; # */ crossAttrs = { diff --git a/pkgs/development/libraries/openssl/gnu.patch b/pkgs/development/libraries/openssl/gnu.patch deleted file mode 100644 index 3cc6d049c94..00000000000 --- a/pkgs/development/libraries/openssl/gnu.patch +++ /dev/null @@ -1,25 +0,0 @@ -Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD. - ---- openssl-1.0.0e/Configure 2012-01-06 00:39:49.000000000 +0100 -+++ openssl-1.0.0e/Configure 2012-01-06 00:39:51.000000000 +0100 -@@ -563,7 +563,7 @@ my %table=( - "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", - - ##### GNU Hurd --"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", -+"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - ##### OS/2 EMX - "OS2-EMX", "gcc::::::::", - ---- openssl-1.0.0e/crypto/dso/dso_dlfcn.c 2012-01-06 00:05:47.000000000 +0100 -+++ openssl-1.0.0e/crypto/dso/dso_dlfcn.c 2012-01-06 00:21:05.000000000 +0100 -@@ -60,7 +60,7 @@ - that handle _GNU_SOURCE and other similar macros. Defining it later - is simply too late, because those headers are protected from re- - inclusion. */ --#ifdef __linux -+#if defined __linux || defined __GNU__ || defined __GLIBC__ - # ifndef _GNU_SOURCE - # define _GNU_SOURCE /* make sure dladdr is declared */ - # endif diff --git a/pkgs/development/libraries/openssl/hurd-target.patch b/pkgs/development/libraries/openssl/hurd-target.patch deleted file mode 100644 index 399a37a69ed..00000000000 --- a/pkgs/development/libraries/openssl/hurd-target.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openssl-1.0.0d-orig/Configure openssl-1.0.0d/Configure ---- openssl-1.0.0d-orig/Configure 2010-11-30 17:19:26.000000000 -0500 -+++ openssl-1.0.0d/Configure 2011-11-16 13:52:57.614416683 -0500 -@@ -563,7 +563,7 @@ - "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", - - ##### GNU Hurd --"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", -+"hurd-x86","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - ##### OS/2 EMX - "OS2-EMX", "gcc::::::::", diff --git a/pkgs/development/libraries/openssl/kfreebsd-gnu.patch b/pkgs/development/libraries/openssl/kfreebsd-gnu.patch deleted file mode 100644 index 66cedf746ba..00000000000 --- a/pkgs/development/libraries/openssl/kfreebsd-gnu.patch +++ /dev/null @@ -1,36 +0,0 @@ -Allow compilation on GNU/kFreeBSD. Ideally, there'd be a single way to process -all glibc-based system, but the build system is soooo broken. - ---- openssl-1.0.0i/config -+++ openssl-1.0.0i/config -@@ -170,6 +170,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ - echo "${MACHINE}-whatever-linux1"; exit 0 - ;; - -+ GNU/kFreeBSD*) -+ echo "kfreebsd-gnu"; exit 0; -+ ;; -+ - GNU*) - echo "hurd-x86"; exit 0; - ;; -@@ -810,6 +814,7 @@ case "$GUESSOS" in - beos-*) OUT="$GUESSOS" ;; - x86pc-*-qnx6) OUT="QNX6-i386" ;; - *-*-qnx6) OUT="QNX6" ;; -+ kfreebsd-gnu) OUT="kfreebsd-gnu";; - *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; - esac - - ---- openssl-1.0.0i/Configure -+++ openssl-1.0.0i/Configure -@@ -565,6 +565,9 @@ my %table=( - ##### GNU Hurd - "hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", - -+##### GNU/kFreeBSD on x86_64, copied from "linux-x86_64" -+"kfreebsd-gnu", "gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+ - ##### OS/2 EMX - "OS2-EMX", "gcc::::::::", diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix new file mode 100644 index 00000000000..a2c00719463 --- /dev/null +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -0,0 +1,70 @@ +{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio }: + +let requireSource = version: part: hash: (requireFile rec { + name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; + message = '' + This Nix expression requires that ${name} already + be part of the store. Download the file + manually at + + http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html + + and add it to the Nix store with the following command: + + nix-prefetch-url file://${name} ${hash} --type sha256 +''; + url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"; + sha256 = hash; +}); in stdenv.mkDerivation rec { + version = "12.1.0.2.0-1"; + name = "oracle-instantclient-${version}"; + + srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed"); + srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296"); + srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam"); + + buildInputs = [ glibc patchelf rpmextract ]; + + buildCommand = '' + mkdir -p "${name}" + cd "${name}" + ${rpmextract}/bin/rpmextract "${srcBase}" + ${rpmextract}/bin/rpmextract "${srcDevel}" + ${rpmextract}/bin/rpmextract "${srcSqlplus}" + + mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"} + mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/" + mv "usr/include/oracle/12.1/client64/"* "$out/include/" + mv "usr/lib/oracle/12.1/client64/lib/"* "$out/lib/" + mv "usr/lib/oracle/12.1/client64/bin/"* "$out/bin/" + ln -s "$out/bin/sqlplus" "$out/bin/sqlplus64" + + for lib in $out/lib/lib*.so; do + test -f $lib || continue + chmod +x $lib + patchelf --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ + $lib + done + + for exe in $out/bin/sqlplus; do + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ + $exe + done + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "Oracle instant client libraries and sqlplus CLI."; + longDescription = '' + Oracle instant client provides access to Oracle databases (OCI, + OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus + command line SQL client. + ''; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ pesterhazy ]; + }; +} diff --git a/pkgs/development/libraries/phonon/qt4/default.nix b/pkgs/development/libraries/phonon/qt4/default.nix index a127c063ffb..9875b216e06 100644 --- a/pkgs/development/libraries/phonon/qt4/default.nix +++ b/pkgs/development/libraries/phonon/qt4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }: +{ stdenv, fetchurl, cmake, automoc4, libpulseaudio, qt4 }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn"; }; - buildInputs = [ qt4 pulseaudio ]; + buildInputs = [ qt4 libpulseaudio ]; nativeBuildInputs = [ cmake automoc4 ]; diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix index 248e0427709..94d3b0fc0de 100644 --- a/pkgs/development/libraries/phonon/qt5/default.nix +++ b/pkgs/development/libraries/phonon/qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, pkgconfig, pulseaudio, qt5, debug ? false }: +{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; }; - buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ]; + buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 14529c6c643..d50c0c5d69c 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; - patches = stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./fix-clang36.patch; + patches = stdenv.lib.optional stdenv.cc.isClang ./fix-clang36.patch; meta = { homepage = http://pixman.org; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 5443df89704..c4f0ad16fb7 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig openssl autoconf automake libtool ]; - meta = { + meta = with stdenv.lib; { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; - license = [ "BSD" "GPLv2" ]; + license = with licenses; [ "BSD" gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; }; } diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/pkgs/development/libraries/popt/1.16-cygwin.patch new file mode 100644 index 00000000000..9c084f0b8ea --- /dev/null +++ b/pkgs/development/libraries/popt/1.16-cygwin.patch @@ -0,0 +1,11 @@ +--- origsrc/poptconfig.c 2009-05-20 08:18:07.000000000 -0500 ++++ src/poptconfig.c 2012-03-29 18:13:46.869286100 -0500 +@@ -42,7 +42,7 @@ extern int glob_pattern_p (const char *_ + /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/ + #endif /* __LCLINT__ */ + +-#if !defined(__GLIBC__) ++#if !defined(__GLIBC__) && !defined(__CYGWIN__) + /* Return nonzero if PATTERN contains any metacharacters. + Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ + static int diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/pkgs/development/libraries/popt/1.16-vpath.patch new file mode 100644 index 00000000000..4cfa1c8fb4d --- /dev/null +++ b/pkgs/development/libraries/popt/1.16-vpath.patch @@ -0,0 +1,34 @@ +--- origsrc/Doxyfile.in 2008-04-26 16:57:32.000000000 -0500 ++++ src/Doxyfile.in 2012-03-29 18:15:56.649709100 -0500 +@@ -460,14 +460,14 @@ WARN_LOGFILE = + # with spaces. + + INPUT = \ +- ./popt.c \ +- ./popt.h \ +- ./poptconfig.c \ +- ./popthelp.c \ +- ./poptint.c \ +- ./poptint.h \ +- ./poptparse.c \ +- ./system.h ++ @srcdir@/popt.c \ ++ @srcdir@/popt.h \ ++ @srcdir@/poptconfig.c \ ++ @srcdir@/popthelp.c \ ++ @srcdir@/poptint.c \ ++ @srcdir@/poptint.h \ ++ @srcdir@/poptparse.c \ ++ @srcdir@/system.h + + # If the value of the INPUT tag contains directories, you can use the + # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +@@ -658,7 +658,7 @@ HTML_HEADER = + # each generated HTML page. If it is left blank doxygen will generate a + # standard footer. + +-HTML_FOOTER = footer_no_timestamp.html ++HTML_FOOTER = @srcdir@/footer_no_timestamp.html + + # The HTML_STYLESHEET tag can be used to specify a user-defined cascading + # style sheet that is used by each HTML page. It can be used to diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 03f917daa23..f99514f054a 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -2,12 +2,17 @@ stdenv.mkDerivation rec { name = "popt-1.16"; - + src = fetchurl { url = "http://rpm5.org/files/popt/${name}.tar.gz"; sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; }; + patches = if stdenv.isCygwin then [ + ./1.16-cygwin.patch + ./1.16-vpath.patch + ] else null; + meta = { description = "command line option parsing library"; }; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix new file mode 100644 index 00000000000..d0bcb73151f --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }: + +let + rev = "088ff642fc2990871e3555e73c94c9287e7514a9"; + shortrev = builtins.substring 0 7 rev; +in +stdenv.mkDerivation rec { + name = "qca-qt5-20150422-${shortrev}"; + src = fetchgit { + url = "git://anongit.kde.org/qca.git"; + branchName = "qt5"; + inherit rev; + sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8"; + }; + + buildInputs = [ openssl qt5.base ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "Qt 5 Cryptographic Architecture"; + homepage = http://delta.affinix.com/qca; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 32d9bd0a8e5..9c657ec52d7 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordifish90/qmltermwidget"; - license = with stdenv.lib.licenses; [ gpl2 ]; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index e9d506f58fe..93935175092 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://qpdf.sourceforge.net/; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.artistic2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index a65cbeed3fd..8715af062c7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let v_maj = "4.8"; - v_min = "6"; + v_min = "7"; vers = "${v_maj}.${v_min}"; in @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz"; - sha256 = "0b036iqgmbbv37dgwwfihw3mihjbnw3kb5kaisdy0qi8nn8xs54b"; + sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; }; # The version property must be kept because it will be included into the QtSDK package name @@ -126,9 +126,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig which ]; - # occasional build problems if one has too many cores (like on Hydra) - # @vcunat has been unable to find a *reliable* fix - enableParallelBuilding = false; + enableParallelBuilding = true; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; diff --git a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch b/pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch similarity index 57% rename from pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch rename to pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch index 1acfb87bfbc..29045df456f 100644 --- a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch +++ b/pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch @@ -1,82 +1,17 @@ ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig 2015-04-13 18:39:20.763864030 +0200 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-04-13 18:43:29.756164227 +0200 -@@ -118,7 +118,7 @@ - WebKitVideoSink* sink = reinterpret_cast(data); - WebKitVideoSinkPrivate* priv = sink->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - GstBuffer* buffer = priv->buffer; - priv->buffer = 0; - priv->timeoutId = 0; -@@ -140,7 +140,7 @@ - WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink); - WebKitVideoSinkPrivate* priv = sink->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - - if (priv->unlocked) - return GST_FLOW_OK; -@@ -279,7 +279,7 @@ - - static void unlockBufferMutex(WebKitVideoSinkPrivate* priv) - { -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - - if (priv->buffer) { - gst_buffer_unref(priv->buffer); -@@ -305,7 +305,7 @@ - WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv; - - { -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - priv->unlocked = false; - } - -@@ -330,7 +330,7 @@ - { - WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - priv->unlocked = false; - return TRUE; - } ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2015-04-13 18:36:44.258046776 +0200 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-04-13 18:44:10.004374397 +0200 -@@ -316,7 +316,7 @@ - #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS) - PassRefPtr MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper) - { -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - if (!m_buffer) - return nullptr; - -@@ -366,7 +366,7 @@ - g_return_if_fail(GST_IS_BUFFER(buffer)); - - { -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - gst_buffer_replace(&m_buffer, buffer); - } - -@@ -398,7 +398,7 @@ - if (!m_player->visible()) - return; - -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - if (!m_buffer) - return; - ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-04-13 18:37:20.083233858 +0200 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-04-13 18:44:37.753519299 +0200 -@@ -346,7 +346,7 @@ +From f8485382e319da57abea99797387ee9f6f94d32e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 13 May 2015 12:42:07 -0500 +Subject: [PATCH] glib mutexlocker + +--- + .../gstreamer/WebKitWebSourceGStreamer.cpp | 48 +++++++++++----------- + 1 file changed, 24 insertions(+), 24 deletions(-) + +diff --git a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp +index 5625873..a6d961f 100644 +--- a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp ++++ b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp +@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue* switch (propID) { case PROP_IRADIO_MODE: { @@ -85,7 +20,7 @@ priv->iradioMode = g_value_get_boolean(value); break; } -@@ -364,7 +364,7 @@ +@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value WebKitWebSrc* src = WEBKIT_WEB_SRC(object); WebKitWebSrcPrivate* priv = src->priv; @@ -94,7 +29,7 @@ switch (propID) { case PROP_IRADIO_MODE: g_value_set_boolean(value, priv->iradioMode); -@@ -417,7 +417,7 @@ +@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src) ASSERT(isMainThread()); @@ -103,7 +38,7 @@ bool seeking = priv->seekID; -@@ -476,7 +476,7 @@ +@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src) ASSERT(isMainThread()); @@ -111,8 +46,8 @@ + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); priv->startID = 0; - priv->corsAccessCheck = CORSNoCheck; -@@ -573,7 +573,7 @@ + +@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat return ret; } @@ -121,7 +56,7 @@ switch (transition) { case GST_STATE_CHANGE_READY_TO_PAUSED: GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -604,7 +604,7 @@ +@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ gst_query_parse_duration(query, &format, NULL); GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); @@ -130,7 +65,7 @@ if (format == GST_FORMAT_BYTES && src->priv->size > 0) { gst_query_set_duration(query, format, src->priv->size); result = TRUE; -@@ -612,7 +612,7 @@ +@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ break; } case GST_QUERY_URI: { @@ -139,7 +74,7 @@ gst_query_set_uri(query, src->priv->uri); result = TRUE; break; -@@ -653,7 +653,7 @@ +@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler) WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); gchar* ret; @@ -148,7 +83,7 @@ ret = g_strdup(src->priv->uri); return ret; } -@@ -668,7 +668,7 @@ +@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr return FALSE; } @@ -157,7 +92,25 @@ g_free(priv->uri); priv->uri = 0; -@@ -704,7 +704,7 @@ +@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler* handler) + WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); + gchar* ret; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + ret = g_strdup(src->priv->uri); + return ret; + } +@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri) + return FALSE; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + g_free(priv->uri); + priv->uri = 0; +@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src) ASSERT(isMainThread()); @@ -166,7 +119,7 @@ // already stopped if (!priv->needDataID) return FALSE; -@@ -725,7 +725,7 @@ +@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData) GST_DEBUG_OBJECT(src, "Need more data: %u", length); @@ -175,7 +128,7 @@ if (priv->needDataID || !priv->paused) { return; } -@@ -739,7 +739,7 @@ +@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src) ASSERT(isMainThread()); @@ -184,7 +137,7 @@ // already stopped if (!priv->enoughDataID) return FALSE; -@@ -760,7 +760,7 @@ +@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData) GST_DEBUG_OBJECT(src, "Have enough data"); @@ -193,7 +146,7 @@ if (priv->enoughDataID || priv->paused) { return; } -@@ -774,7 +774,7 @@ +@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src) ASSERT(isMainThread()); @@ -202,7 +155,7 @@ // already stopped if (!priv->seekID) return FALSE; -@@ -792,7 +792,7 @@ +@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user WebKitWebSrcPrivate* priv = src->priv; GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); @@ -211,43 +164,43 @@ if (offset == priv->offset && priv->requestedOffset == priv->offset) return TRUE; -@@ -811,7 +811,7 @@ +@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) { ASSERT(player); - GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); src->priv->player = player; + s_cachedResourceLoader = player->cachedResourceLoader(); } - -@@ -841,7 +841,7 @@ - +@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize mapGstBuffer(buffer); + #endif - GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); priv->buffer = adoptGRef(buffer); locker.unlock(); -@@ -867,7 +867,7 @@ - return; - } +@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response) + + GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); - GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->corsAccessCheck = corsAccessCheck; - -@@ -966,7 +966,7 @@ - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src); + // If we seeked we need 206 == PARTIAL_CONTENT + if (priv->requestedOffset && response.httpStatusCode() != 206) { +@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char* data, int length) + WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); WebKitWebSrcPrivate* priv = src->priv; - GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast(gst_buffer_get_size(priv->buffer.get())) : length); + GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); -@@ -1035,7 +1035,7 @@ +@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished() GST_DEBUG_OBJECT(src, "Have EOS"); @@ -256,21 +209,24 @@ if (!priv->seekID) { locker.unlock(); gst_app_src_end_of_stream(priv->appsrc); -@@ -1194,7 +1194,7 @@ +@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*) GST_ERROR_OBJECT(src, "Request was blocked"); - GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.reset(g_strdup(src->priv->uri)); + uri.set(g_strdup(src->priv->uri)); locker.unlock(); -@@ -1208,7 +1208,7 @@ +@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*) GST_ERROR_OBJECT(src, "Cannot show URL"); - GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.reset(g_strdup(src->priv->uri)); + uri.set(g_strdup(src->priv->uri)); locker.unlock(); +-- +2.3.6 + diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index d7ae685af6d..693f62a63eb 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -5,7 +5,7 @@ , gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage , xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon , alsaLib, gstreamer, gst_plugins_base -, pulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor +, libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor , flashplayerFix ? false , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , buildDocs ? false @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; }) (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) + ./0013-qtwebkit-glib-2.44.patch ]; preConfigure = '' @@ -118,6 +119,7 @@ stdenv.mkDerivation rec { -xcb -qpa xcb -${optionalString (cups == null) "no-"}cups + -${optionalString (!gtkStyle) "no-"}gtkstyle -no-eglfs -no-directfb @@ -146,7 +148,7 @@ stdenv.mkDerivation rec { xlibs.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu - libwebp alsaLib gstreamer gst_plugins_base pulseaudio + libwebp alsaLib gstreamer gst_plugins_base libpulseaudio xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and @@ -154,7 +156,8 @@ stdenv.mkDerivation rec { ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups ++ optional (mysql != null) mysql.lib - ++ optional (postgresql != null) postgresql; + ++ optional (postgresql != null) postgresql + ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; buildInputs = [ gdb bison flex gperf ruby ]; diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index fe7e024ba4b..fce2c7f1b7b 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -147,14 +147,14 @@ let multimedia = callPackage ( { qtSubmodule, base, declarative - , alsaLib, gstreamer, gst_plugins_base, pulseaudio + , alsaLib, gstreamer, gst_plugins_base, libpulseaudio }: qtSubmodule { name = "qtmultimedia"; qtInputs = [ base declarative ]; buildInputs = [ - alsaLib gstreamer gst_plugins_base pulseaudio + alsaLib gstreamer gst_plugins_base libpulseaudio ]; } ) diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 746889f279d..9e11dcdde86 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -115,6 +115,7 @@ stdenv.mkDerivation { -xcb -qpa xcb -${optionalString (cups == null) "no-"}cups + -${optionalString (!gtkStyle) "no-"}gtkstyle -no-eglfs -no-directfb @@ -150,7 +151,8 @@ stdenv.mkDerivation { ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups ++ optional (mysql != null) mysql.lib - ++ optional (postgresql != null) postgresql; + ++ optional (postgresql != null) postgresql + ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; buildInputs = [ gdb bison flex gperf ruby ]; diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 3d2f098267d..46df5459dca 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. - meta = { + meta = with stdenv.lib; { description = "A free implementation of the OpenGL Character Renderer"; longDescription = '' QuesoGLC is a free (as in free speech) implementation of the OpenGL @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { platform that supports both FreeType and the OpenGL API. ''; homepage = http://quesoglc.sourceforge.net/; - license = [ "LGPLv2.1+" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix index 84a7a9b4ccf..2c92ba5618c 100644 --- a/pkgs/development/libraries/rabbitmq-c/0.4.nix +++ b/pkgs/development/libraries/rabbitmq-c/0.4.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; - license = with stdenv.lib.licenses; mit; + license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index 2183aa83e20..a1708ba59c3 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; homepage = http://www.rabbitmq.com/java-client.html; - license = [ "MPLv1.1" "GPLv2" ]; + license = with licenses; [ mpl11 gpl2 ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 301fcc84b9f..b2dfa8884e9 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/re2/; description = "An efficient, principled regular expression library"; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 93e24ed0c03..f770fabb35d 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { # Don't run the native `strip' when cross-compiling. dontStrip = stdenv ? cross; + bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; meta = with stdenv.lib; { description = "Library for interactive line editing"; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 88d94ec0f2c..9a720a35ff0 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "3.10"; + version = "3.11"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "1px345x9cyaxyjlzsf3bcxixvfaxn9x3ysq7biajyfhk8wq1n4p0"; + sha256 = "06gf0k6hjarc7iw0w0p8814d27f8vrc3s0laarh7qdd4wshw02s8"; }; buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ]; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 544ab215345..4dd1ca46e95 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, blas, liblapack, gfortran }: stdenv.mkDerivation rec { - version = "3.12.1"; + version = "3.12.3"; name = "ipopt-${version}"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0x0wcc21d2bfs3zq8nvhva1nv7xi86wjbyixvvxvcrg2kqjlybdy"; + sha256 = "0h8qx3hq2m21qrg4v3n26v2qbhl6saxrpa7rbhnmkkcfj5s942yr"; }; preConfigure = '' diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index 0b4badf26e7..ef89c0bfee2 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -1,10 +1,22 @@ -{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }: +{ + stdenv, + fetchurl, + gfortran, + cmake, + python, + atlas ? null, + shared ? false +}: let - atlasMaybeShared = atlas.override { inherit shared; }; + atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } + else null; usedLibExtension = if shared then ".so" else ".a"; -in -stdenv.mkDerivation rec { + inherit (stdenv.lib) optional optionals concatStringsSep; + inherit (builtins) hasAttr attrNames; version = "3.5.0"; +in + +stdenv.mkDerivation rec { name = "liblapack-${version}"; src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; @@ -17,11 +29,16 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_OPTIMIZED_BLAS=ON" - "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" - "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" "-DCMAKE_Fortran_FLAGS=-fPIC" ] - ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON") + ++ (optionals (atlas != null) [ + "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" + "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" + ]) + ++ (optional shared "-DBUILD_SHARED_LIBS=ON") + # If we're on darwin, CMake will automatically detect impure paths. This switch + # prevents that. + ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''") ; doCheck = ! shared; @@ -37,13 +54,13 @@ stdenv.mkDerivation rec { blas = atlas; }; - meta = { + meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - license = "revised-BSD"; + license = licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.all; + maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 9f4f43311a4..f3832ba0a20 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,9 +1,21 @@ -{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }: +{ + stdenv, + fetchurl, + gfortran, + cmake, + python, + atlas ? null, + shared ? false +}: let - atlasMaybeShared = atlas.override { inherit shared; }; + atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } + else null; usedLibExtension = if shared then ".so" else ".a"; + inherit (stdenv.lib) optional optionals concatStringsSep; + inherit (builtins) hasAttr attrNames; version = "3.4.1"; in + stdenv.mkDerivation rec { name = "liblapack-${version}"; src = fetchurl { @@ -17,11 +29,16 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_OPTIMIZED_BLAS=ON" - "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" - "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" "-DCMAKE_Fortran_FLAGS=-fPIC" ] - ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON") + ++ (optionals (atlas != null) [ + "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" + "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" + ]) + ++ (optional shared "-DBUILD_SHARED_LIBS=ON") + # If we're on darwin, CMake will automatically detect impure paths. This switch + # prevents that. + ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''") ; doCheck = ! shared; @@ -37,13 +54,13 @@ stdenv.mkDerivation rec { blas = atlas; }; - meta = { + meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - license = "revised-BSD"; + license = licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.all; + maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index e779957a6fb..67d95f97e07 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config }: +{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils }: with stdenv.lib; @@ -7,6 +7,7 @@ let local = config.openblas.preferLocalBuild or false; { i686-linux = "32"; x86_64-linux = "64"; + x86_64-darwin = "64"; }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); genericFlags = [ @@ -29,14 +30,18 @@ stdenv.mkDerivation rec { preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; - nativeBuildInputs = [gfortran perl]; + nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl]; makeFlags = (if local then localFlags else genericFlags) ++ + optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"] + ++ [ "FC=gfortran" - "CC=gcc" + # Note that clang is available through the stdenv on OSX and + # thus is not an explicit dependency. + "CC=${if stdenv.isDarwin then "clang" else "gcc"}" ''PREFIX="''$(out)"'' "INTERFACE64=1" ]; @@ -45,7 +50,7 @@ stdenv.mkDerivation rec { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = with platforms; linux; + platforms = with platforms; unix; maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 24dc443ca70..16e7b09a0f2 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; inherit version; updateWalker = true; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 1a9a6d486f3..7112afbea8a 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "speexdsp-1.2rc3"; - + src = fetchurl { url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz"; sha256 = "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja"; }; patches = [ ./build-fix.patch ]; - + postPatch = "sed '3i#include ' -i ./include/speex/speexdsp_config_types.h.in"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ fftw ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index e7a048f0a31..d525c143d9c 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1 -, openssl, pulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib +, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup , gtk3, enableGTK3 ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection + spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection libjpeg_turbo zlib cyrus_sasl python pygtk usbredir ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]); diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix new file mode 100644 index 00000000000..4e5d360aea0 --- /dev/null +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchurl, unzip, tcl }: + +stdenv.mkDerivation { + name = "sqlite3_analzer-3.8.10.1"; + + src = fetchurl { + url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip"; + sha1 = "6z7w8y69jxr0xwxbhs8z3zf56zfs5x7z"; + }; + + buildInputs = [ unzip tcl ]; + + # A bug in the latest release of sqlite3 prevents bulding sqlite3_analyzer. + # Hopefully this work-around can be removed for future releases. + postConfigure = '' + substituteInPlace Makefile \ + --replace '"#define SQLITE_ENABLE_DBSTAT_VTAB"' '"#define SQLITE_ENABLE_DBSTAT_VTAB 1"' + ''; + + buildPhase = '' + make sqlite3_analyzer + ''; + + installPhase = '' + mkdir -p "$out/bin" + mv sqlite3_analyzer "$out/bin" + ''; + + meta = { + homepage = http://www.sqlite.org/; + description = "A tool that shows statistics about sqlite databases"; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ pesterhazy ]; + }; +} diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 23590f17ca8..9ebd27e8277 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -1,24 +1,34 @@ -{stdenv, fetchurl, cmake, parallel ? true }: +{ stdenv, fetchurl, cmake +, parallel ? true +}: stdenv.mkDerivation rec { - name = "stxxl-1.4.1"; + name = "stxxl-${version}"; + version = "1.4.1"; src = fetchurl { - url = "https://github.com/stxxl/stxxl/archive/1.4.1.tar.gz"; + url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz"; sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - cmakeFlags = let parallel_str = if parallel then "ON" else "OFF"; in "-DUSE_GNU_PARALLEL=${parallel_str}"; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_LIBS=OFF" + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_GNU_PARALLEL=${if parallel then "ON" else "OFF"}" + ]; passthru = { inherit parallel; }; - meta = { - homepage = https://github.com/stxxl/stxxl; + meta = with stdenv.lib; { description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; - license = stdenv.lib.licenses.boost; + homepage = https://github.com/stxxl/stxxl; + license = licenses.boost; + maintainers = with maintainers; [ ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 039dc59774c..5ed773c56d2 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXaw ]; buildFlags = "without_doc"; - postInstall = "chmod +x $out/lib/*.so.*"; # ?? + postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? } diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 55438e2c201..eb795d6b28e 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, kerberos }: +{ fetchurl, stdenv, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-0.2.5"; + name = "libtirpc-0.3.0"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1nq2w227j9nh8qsz7b3c1pha00k5yvzf2c3pfmlcb1l65iydxyb2"; + sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna"; }; - buildInputs = [ kerberos ]; + propagatedBuildInputs = [ libkrb5 ]; # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf preConfigure = '' diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 11f3294b289..663432f8ec8 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A very basic terminfo library"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 8c715fbd928..63de08b46dd 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,25 +1,25 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "v1.1.6"; - name = "utf8proc-${version}"; + version = "v1.2"; - src = fetchurl { - url = "http://www.public-software-group.org/pub/projects/utf8proc/${version}/utf8proc-${version}.tar.gz"; - sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y"; + src = fetchFromGitHub { + owner = "JuliaLang"; + repo = "utf8proc"; + rev = "${version}"; + sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf"; }; installPhase = '' - mkdir -pv $out/lib $out/include - cp libutf8proc.so libutf8proc.a $out/lib - cp utf8proc.h $out/include + make install prefix=$out ''; - meta = { - description = "A library for processing UTF-8 encoded Unicode strings"; - homepage = http://www.public-software-group.org/utf8proc; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "A clean C library for processing UTF-8 Unicode data"; + homepage = http://julialang.org/utf8proc; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.ftrvxmtrx ]; }; } diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 5c868838c99..3800a6f78dd 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.4.8"; + version = "2.4.9"; meta = with stdenv.lib; { description = "Web content rendering engine, GTK+ port"; @@ -21,11 +21,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "08xxqsxpa63nzgbsz63vrdxdxgpysyiy7jdcjb57k1hprdcibwb8"; + sha256 = "0r651ar3p0f8zwl7764kyimxk5hy88cwy116pv8cl5l8hbkjkpxg"; }; - patches = [ ./webkitgtk-2.4-gmutexlocker.patch ./bug140241.patch ]; - CC = "cc"; prePatch = '' @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = true; nativeBuildInputs = [ - autoreconfHook/*bug140241.patch*/ perl python ruby bison gperf flex + autoreconfHook perl python ruby bison gperf flex pkgconfig which gettext gobjectIntrospection ]; @@ -61,8 +59,7 @@ stdenv.mkDerivation rec { (if withGtk2 then gtk2 else gtk3) ]; - # Probably OK now, see: - # https://bugs.webkit.org/show_bug.cgi?id=79498 - enableParallelBuilding = true; -} + # Still fails with transient errors in version 2.4.9. + enableParallelBuilding = false; +} diff --git a/pkgs/development/libraries/webkitgtk/bug140241.patch b/pkgs/development/libraries/webkitgtk/bug140241.patch deleted file mode 100644 index 8d8c1bae0be..00000000000 --- a/pkgs/development/libraries/webkitgtk/bug140241.patch +++ /dev/null @@ -1,59 +0,0 @@ -@@ -, +, @@ - REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled - https://bugs.webkit.org/show_bug.cgi?id=140241 - Reviewed by NOBODY (OOPS!). - We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp - just when WebKit2 is enabled and we are not building for X11. - * GNUmakefile.list.am: ---- - Source/WebCore/ChangeLog | 12 ++++++++++++ - Source/WebCore/GNUmakefile.list.am | 8 ++++++++ - 2 files changed, 20 insertions(+) ---- a/Source/WebCore/ChangeLog -+++ a/Source/WebCore/ChangeLog -@@ -1,3 +1,15 @@ -+2015-01-16 Tomas Popela -+ -+ REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled -+ https://bugs.webkit.org/show_bug.cgi?id=140241 -+ -+ Reviewed by NOBODY (OOPS!). -+ -+ We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp -+ just when WebKit2 is enabled and we are not building for X11. -+ -+ * GNUmakefile.list.am: -+ - 2014-11-10 Csaba Osztrogonác - - Crash in WebCore::Node::getFlag ---- a/Source/WebCore/GNUmakefile.list.am -+++ a/Source/WebCore/GNUmakefile.list.am -@@ -6254,9 +6254,13 @@ endif # END USE_GLX - endif # END TARGET_X11 - - if TARGET_WAYLAND -+if !TARGET_X11 -+if ENABLE_WEBKIT2 - webcore_sources += \ - Source/WebCore/plugins/PluginPackageNone.cpp \ - Source/WebCore/plugins/PluginViewNone.cpp -+endif # END ENABLE_WEBKIT2 -+endif # END !TARGET_X11 - endif # END TARGET_WAYLAND - - if TARGET_X11_OR_WAYLAND -@@ -6305,9 +6309,13 @@ webcoregtk_sources += \ - endif # END TARGET_WIN32 - - if TARGET_QUARTZ -+if !TARGET_X11 -+if ENABLE_WEBKIT2 - webcore_sources += \ - Source/WebCore/plugins/PluginPackageNone.cpp \ - Source/WebCore/plugins/PluginViewNone.cpp -+endif # END ENABLE_WEBKIT2 -+endif # END !TARGET_X11 - platformgtk_sources += \ - Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \ - Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 54502610887..e7dc0d4982c 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.8.0"; + version = "2.8.3"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "05b8mkr1mv1w5vi5vyczzirgf5nr6qavrdwbcaiv0dghylwx5yh5"; + sha256 = "05igg61lflgwy83cmxgyzmvf2bkhplmp8710ssrlpmbfcz461pmk"; }; patches = [ ./finding-harfbuzz-icu.patch ]; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 395a4040153..514dcd5972a 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -1,34 +1,56 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool -, bzip2, snappy, zlib, db + +# Optional Dependencies +, lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null +, gperftools ? null, leveldb ? null }: +with stdenv; +let + optLz4 = shouldUsePkg lz4; + optSnappy = shouldUsePkg snappy; + optZlib = shouldUsePkg zlib; + optBzip2 = shouldUsePkg bzip2; + optDb = shouldUsePkg db; + optGperftools = shouldUsePkg gperftools; + optLeveldb = shouldUsePkg leveldb; +in +with stdenv.lib; stdenv.mkDerivation rec { name = "wiredtiger-${version}"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { repo = "wiredtiger"; owner = "wiredtiger"; rev = version; - sha256 = "1rk26gfs4zpz88mkbdkhz65q4admpgf46x5zsnghl0ndirmnvq3p"; + sha256 = "0i2r03bpq9xzp5pw7c67kjac5j7mssiawd9id8lqjdbr6c6772cv"; }; nativeBuildInputs = [ automake autoconf libtool ]; - buildInputs = [ bzip2 snappy zlib db ]; + buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; configureFlags = [ - "--with-berkeleydb=${db}" - "--enable-bzip2" - "--enable-leveldb" - "--enable-snappy" - "--enable-zlib" + (mkWith false "attach" null) + (mkWith true "builtins" "") + (mkEnable (optBzip2 != null) "bzip2" null) + (mkEnable false "diagnostic" null) + (mkEnable false "java" null) + (mkEnable (optLeveldb != null) "leveldb" null) + (mkEnable false "python" null) + (mkEnable (optSnappy != null) "snappy" null) + (mkEnable (optLz4 != null) "lz4" null) + (mkEnable (optGperftools != null) "tcmalloc" null) + (mkEnable (optZlib != null) "zlib" null) + (mkWith (optDb != null) "berkeleydb" optDb) + (mkWith false "helium" null) ]; preConfigure = '' ./autogen.sh ''; - meta = with stdenv.lib; { + meta = { homepage = http://wiredtiger.com/; description = ""; license = licenses.gpl2; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index a2af56cbca6..1598fec6194 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,11 +16,11 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/videolan/x265/archive/${version}.tar.gz"; - sha256 = "17c1phwmgcvvh9bakh1249rj2js77nr7y9igg34i3f8hsrdc4x0w"; + sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq"; }; patchPhase = '' diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 11ba5df80ca..89b2d77db82 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg -, flac, libcaca, pulseaudio, libmng, libcdio, libv4l, vcdimager +, flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac - libcaca pulseaudio libmng libcdio libv4l vcdimager libmpcdec + libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss"; diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 82f1514cd3d..2492063be27 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/xlslib/files/; license = licenses.bsd2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 162bae54d37..419a2584ca8 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation (rec { makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; }; - # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. - cygwinConfigureEnableShared = true; + # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds + cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null; passthru.version = version; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index dcfaafc2b7d..1e474e722ff 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Library to extract data from files archived in a zip file"; longDescription = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { zip/unzip tools. ''; - license = [ "LGPLv2+" "MPLv1.1" ]; + license = with licenses; [ lgpl2Plus mpl11 ]; homepage = http://zziplib.sourceforge.net/; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 7d4c88e5c9e..32f5928cccd 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -40,7 +40,7 @@ let lispPackages = rec { url = "https://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); overrides = x: { configurePhase="buildPhase(){ true; }"; }; @@ -190,15 +190,18 @@ let lispPackages = rec { clsql = buildLispPackage rec { baseName = "clsql"; - version = "git-20141112"; + version = "git-20150514"; description = "Common Lisp SQL Interface library"; deps = [uffi]; buildInputs = [pkgs.mysql.lib pkgs.zlib]; # Source type: git src = pkgs.fetchgit { - url = ''http://git.b9.com/clsql.git''; - sha256 = "dacd56bc9a0348e8101184bf154b971407a98f3a753d7cce34c7a44b4b19f8fd"; - rev = ''180b52cb686a87487e12e87b13bafe131e6c3bef''; + url = + #''http://git.b9.com/clsql.git'' + "http://repo.or.cz/r/clsql.git" + ; + sha256 = "1wzc7qsnq8hk0j0h9jmj4xczmh7h6njafwab2zylh8wxmfzwp2nw"; + rev = ''a646f558b54191eda1d64f2926eee7b4fa763f89''; }; overrides = x:{ preConfigure = '' @@ -223,14 +226,14 @@ let lispPackages = rec { query-fs = buildLispPackage rec { baseName = "query-fs"; - version = "git-20141113"; + version = "git-20150523"; description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace]; # Source type: git src = pkgs.fetchgit { url = ''https://github.com/fb08af68/query-fs''; - sha256 = "4ed66f255e50d2c9ea9f0b3fbaa92bde9b8acf6a5fafb0d7f12b254be9de99e9"; - rev = ''831f0180967f09b1dd345fef82144f48334279c3''; + sha256 = "19h6hscza7p93bc7jvb6ya7ghg96dr1c1v4imlxpjqfdhhdpxsq6"; + rev = ''0f28e3f31a4cd3636a8edb346230482e68af86c2''; }; overrides = x: { linkedSystems = []; @@ -311,19 +314,19 @@ let lispPackages = rec { src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); }; cl-fuse-meta-fs = buildLispPackage rec { baseName = "cl-fuse-meta-fs"; - version = "git-20141113"; + version = "git-20150523"; description = "CFFI bindings to FUSE (Filesystem in user space)"; deps = [bordeaux-threads cl-fuse iterate pcall]; # Source type: git src = pkgs.fetchgit { url = ''https://github.com/fb08af68/cl-fuse-meta-fs''; - sha256 = "259303effea61baf293ffc5d080cb071ef15bed8fa1c76f0c1631f68d2aa3c85"; - rev = ''d3d332471ce9330e3eaebf9d6cecdd2014c3599b''; + sha256 = "0cpxwsc0ma1ypl54n3n37wbgdxhz5j67h28q6rhghjn96dgy4ac9"; + rev = ''6ab92ebbb8e6f1f69d179214032915e3744d8c03''; }; }; @@ -560,5 +563,19 @@ let lispPackages = rec { rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6''; }; }; + + clx-xkeyboard = buildLispPackage rec { + baseName = "clx-xkeyboard"; + version = "git-20150523"; + description = "CLX support for X Keyboard extensions"; + deps = [clx]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/filonenko-mikhail/clx-xkeyboard''; + sha256 = "11b34da7d354a709a24774032e85a8947be023594f8a333eaff6d4aa79f2b3db"; + rev = ''11455d36283ef31c498bd58ffebf48c0f6b86ea6''; + }; + }; + }; in lispPackages diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 14ef4c20047..cc3f607c0c3 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.0.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.1.GA"}: let # We have to use Oracle's JDK. On Darwin, just simply expose the host system's @@ -33,7 +33,7 @@ rec { else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix - else if tiVersion == "3.5.0.GA" then ./titaniumsdk-3.5.nix + else if tiVersion == "3.5.1.GA" then ./titaniumsdk-3.5.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 487f93052f2..13345f5dedd 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -2,7 +2,7 @@ , systems ? [ "x86_64-linux" "x86_64-darwin" ] , xcodeVersion ? "6.1.1" , xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "3.5.0.GA" +, tiVersion ? "3.5.1.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.1", iosWwdrCertificate ? null , allowUnfree ? false diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix index 8a868321e13..f9c5ce8812f 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { - name = "mobilesdk-3.5.0.GA"; + name = "mobilesdk-3.5.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-linux.zip; - sha1 = "c9850d5db29d8fb0c26b114e8c34bb2c91958eed"; + url = http://builds.appcelerator.com/mobile/3.5.1/mobilesdk-3.5.1.GA-linux.zip; + sha1 = "2fd8c50081af9d03b65ffaf824e2e417832efd92"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-osx.zip; - sha1 = "a5ce74f13da09215b7efa81d626c6e6e83d6dc3b"; + url = http://builds.appcelerator.com/mobile/3.5.1/mobilesdk-3.5.1.GA-osx.zip; + sha1 = "f000e66980c2c3a40b6a6fd40a0bd0554fcb0424"; } else throw "Platform: ${stdenv.system} not supported!"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { # Rename ugly version number cd mobilesdk/* - cd 3.5.0.GA + cd 3.5.1.GA # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that # Yes, I know it's nasty :-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix new file mode 100644 index 00000000000..68edfca25a8 --- /dev/null +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcaml, fetchurl, ounit, re, cmdliner}: + +buildOcaml rec { + name = "alcotest"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/samoht/alcotest/archive/${version}.tar.gz"; + sha256 = "a0e6c9a33c59b206ecc949655fa6e17bdd1078c8b610b14d8f6f0f1b489b0b43"; + }; + + propagatedBuildInputs = [ ounit re cmdliner ]; + + meta = with stdenv.lib; { + homepage = https://github.com/samoht/alcotest; + description = "A lightweight and colourful test framework"; + license = stdenv.lib.licenses.isc; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix new file mode 100644 index 00000000000..2b84519036c --- /dev/null +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, async_kernel, + async_unix, async_extra, pa_ounit}: + +buildOcaml rec { + name = "async"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async/archive/${version}.tar.gz"; + sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; + }; + + propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async; + description = "Jane Street Capital's asynchronous execution library"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix new file mode 100644 index 00000000000..2d1e1dea69c --- /dev/null +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -0,0 +1,26 @@ +{stdenv, buildOcaml, fetchurl, async_kernel, async_unix, + bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit, + pipebang, pa_test, sexplib}: + +buildOcaml rec { + name = "async_extra"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_extra/archive/${version}.tar.gz"; + sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28"; + }; + + buildInputs = [ pa_test pa_ounit ]; + propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf + fieldslib herelib pipebang sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_extra; + description = "Jane Street Capital's asynchronous execution library (extra)"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix new file mode 100644 index 00000000000..ae10e931ce2 --- /dev/null +++ b/pkgs/development/ocaml-modules/async_find/default.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcaml, fetchurl, async, core, sexplib}: + +buildOcaml rec { + name = "async_find"; + version = "111.28.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_find/archive/${version}.tar.gz"; + sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; + }; + + propagatedBuildInputs = [ async core sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_find; + description = "Directory traversal with Async"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix new file mode 100644 index 00000000000..8c0d8d7c851 --- /dev/null +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -0,0 +1,25 @@ +{stdenv, buildOcaml, fetchurl, core_kernel, + bin_prot, fieldslib, pa_ounit, pa_test, + sexplib, herelib}: + +buildOcaml rec { + name = "async_kernel"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_kernel/archive/${version}.tar.gz"; + sha256 = "95caf4249b55c5a6b38da56e314845e9ea9a0876eedd4cf0ddcb6c8dd660c6a0"; + }; + + buildInputs = [ pa_test pa_ounit ]; + propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_kernel; + description = "Jane Street Capital's asynchronous execution library (core) "; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix new file mode 100644 index 00000000000..75755833a5f --- /dev/null +++ b/pkgs/development/ocaml-modules/async_shell/default.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcaml, fetchurl, async, core, core_extended}: + +buildOcaml rec { + name = "async_shell"; + version = "109.28.03"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz"; + sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; + }; + + propagatedBuildInputs = [ async core core_extended ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_shell; + description = "Shell helpers for Async"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix new file mode 100644 index 00000000000..527d56ceaa0 --- /dev/null +++ b/pkgs/development/ocaml-modules/async_ssl/default.nix @@ -0,0 +1,25 @@ +{stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, + fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}: + +buildOcaml rec { + name = "async_ssl"; + version = "112.24.03"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_ssl/archive/${version}.tar.gz"; + sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68"; + }; + + buildInputs = [ pa_bench pa_test ]; + propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa_ounit + herelib pipebang sexplib openssl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_ssl; + description = "Async wrappers for ssl"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix new file mode 100644 index 00000000000..81fbd6a9918 --- /dev/null +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -0,0 +1,27 @@ +{stdenv, buildOcaml, fetchurl, async_kernel, + bin_prot, comparelib, core, fieldslib, herelib, pa_ounit, + pipebang, pa_test, sexplib}: + +buildOcaml rec { + name = "async_unix"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/async_unix/archive/${version}.tar.gz"; + sha256 = "d490b1dc42f0987a131fa9695b55f215ad90cdaffbfac35b7f9f88f3834337ab"; + }; + + hasSharedObjects = true; + buildInputs = [ pa_ounit ]; + propagatedBuildInputs = [ async_kernel core bin_prot comparelib + fieldslib herelib pipebang pa_test sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_unix; + description = "Jane Street Capital's asynchronous execution library (unix)"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix new file mode 100644 index 00000000000..c7f8bc3d10f --- /dev/null +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -0,0 +1,26 @@ +{stdenv, menhir, easy-format, buildOcaml, fetchurl, which}: + +buildOcaml rec { + name = "atd"; + version = "1.1.2"; + + src = fetchurl { + url = "https://github.com/mjambon/atd/archive/v${version}.tar.gz"; + sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291"; + }; + + installPhase = '' + mkdir -p $out/bin + make PREFIX=$out install + ''; + + buildInputs = [ which ]; + propagatedBuildInputs = [ menhir easy-format ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mjambon/atd; + description = "Syntax for cross-language type definitions"; + license = licenses.bsd3; + maintainers = [ maintainers.jwilberding ]; + }; +} diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix new file mode 100644 index 00000000000..bab2541fd74 --- /dev/null +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -0,0 +1,25 @@ +{stdenv, atd, yojson, menhir, easy-format, biniou, cppo, buildOcaml, fetchurl, which}: + +buildOcaml rec { + name = "atdgen"; + version = "1.6.0"; + + src = fetchurl { + url = "https://github.com/mjambon/atdgen/archive/v${version}.tar.gz"; + sha256 = "1icdxgb7qqq1pcbfqi0ikryiwaljd594z3acyci8g3bnlq0yc7zn"; + }; + + installPhase = '' + mkdir -p $out/bin + make PREFIX=$out install + ''; + + buildInputs = [ which atd biniou yojson ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mjambon/atdgen; + description = "Generates optimized boilerplate OCaml code for JSON and Biniou IO from type definitions"; + license = licenses.bsd3; + maintainers = [ maintainers.jwilberding ]; + }; +} diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix new file mode 100644 index 00000000000..4a2b9846271 --- /dev/null +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -0,0 +1,24 @@ +{stdenv, writeText, buildOcaml, fetchurl, type_conv}: + +buildOcaml rec { + name = "bin_prot"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/bin_prot/archive/${version}.tar.gz"; + sha256 = "dc0c978a825c7c123990af3317637c218f61079e6f35dc878260651084f1adb4"; + }; + + propagatedBuildInputs = [ type_conv ]; + + hasSharedObjects = true; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/bin_prot; + description = "Binary protocol generator "; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix new file mode 100644 index 00000000000..e219b59de5d --- /dev/null +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -0,0 +1,29 @@ +{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit, + stringext, base64, magic-mime, ounit, alcotest, lwt ? null, + async ? null, async_ssl ? null}: + +buildOcaml rec { + name = "cohttp"; + version = "0.17.1"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; + sha256 = "fb124fb2fb5ff2e74559bf380627f6a537e208c1518ddcb01f0d37b62b55f673"; + }; + + buildInputs = [ alcotest ]; + propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib + conduit stringext base64 magic-mime ounit async + async_ssl lwt ]; + + buildFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-cohttp; + description = "Very lightweight HTTP server using Lwt or Async"; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix new file mode 100644 index 00000000000..95001215814 --- /dev/null +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcaml, fetchurl, type_conv}: + +buildOcaml rec { + name = "comparelib"; + version = "109.60.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz"; + sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e"; + }; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/comparelib; + description = "Syntax extension for deriving \"compare\" functions automatically"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix new file mode 100644 index 00000000000..dbb83f4c8cf --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -0,0 +1,24 @@ +{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr, + async ? null, async_ssl ? null, lwt ? null}: + +buildOcaml rec { + name = "conduit"; + version = "0.8.3"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; + sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; + }; + + propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ] + ++ stdenv.lib.optional (lwt != null) lwt + ++ stdenv.lib.optional (async != null) async + ++ stdenv.lib.optional (async_ssl != null) async_ssl); + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-conduit; + description = "Resolve URIs into communication channels for Async or Lwt "; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix new file mode 100644 index 00000000000..96fd80087d6 --- /dev/null +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -0,0 +1,30 @@ +{stdenv, buildOcaml, fetchurl, type_conv, + core_kernel, bin_prot, comparelib, custom_printf, enumerate, + fieldslib, herelib, pa_bench, pa_test, pa_ounit, + pipebang, sexplib, typerep, variantslib}: + +buildOcaml rec { + name = "core"; + version = "112.24.01"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/core/archive/${version}.tar.gz"; + sha256 = "be5d53ebd4fd04ef23ebf9b3b2840c7aeced6bc4cc6cd3f5e89f71c9949000f4"; + }; + + hasSharedObjects = true; + + buildInputs = [ pa_bench pa_test pa_ounit ]; + propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib + custom_printf enumerate fieldslib herelib + pipebang sexplib typerep variantslib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core; + description = "Jane Street Capital's standard library overlay"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix new file mode 100644 index 00000000000..f311aae3d30 --- /dev/null +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -0,0 +1,26 @@ +{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, + fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}: + +buildOcaml rec { + name = "core_extended"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/core_extended/archive/${version}.tar.gz"; + sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3"; + }; + + hasSharedObjects = true; + buildInputs = [ pa_bench pa_test pa_ounit ]; + propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib + pipebang textutils re2 sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_extended; + description = "Jane Street Capital's standard library overlay"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix new file mode 100644 index 00000000000..0fed12b195d --- /dev/null +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -0,0 +1,30 @@ +{stdenv, buildOcaml, fetchurl, type_conv, + bin_prot, comparelib, custom_printf, enumerate, + fieldslib, herelib, pa_bench, pa_test, pa_ounit, + pipebang, sexplib, typerep, variantslib}: + +buildOcaml rec { + name = "core_kernel"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/core_kernel/archive/${version}.tar.gz"; + sha256 = "93e1f21e35ade98a2bfbe45ba76eef4a8ad3fed97cdc0769f96e0fcc86d6a761"; + }; + + hasSharedObjects = true; + + buildInputs = [ pa_test pa_ounit ]; + propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf + enumerate fieldslib herelib pipebang sexplib + typerep variantslib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_kernel; + description = "Jane Street Capital's standard library overlay (kernel)"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 194a852e7ef..d62b9397a73 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchzip, ocaml, findlib, sexplib, ocplib-endian, lwt, camlp4 }: +{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib, findlib, + async ? null, lwt ? null, camlp4}: -let version = "1.6.0"; in +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in stdenv.mkDerivation { - name = "ocaml-cstruct-${version}"; + name = "ocaml-cstruct-1.6.0"; - src = fetchzip { - url = "https://github.com/mirage/ocaml-cstruct/archive/v${version}.tar.gz"; - sha256 = "09qw3rhfiq2kkns6660p9cwm5610k72md52a04cy91gr6gsig6ic"; + src = fetchurl { + url = https://github.com/mirage/ocaml-cstruct/archive/v1.6.0.tar.gz; + sha256 = "0f90a1b7a03091cf22a3ccb11a0cce03b6500f064ad3766b5ed81418ac008ece"; }; - buildInputs = [ ocaml findlib lwt camlp4 ]; - propagatedBuildInputs = [ ocplib-endian sexplib ]; - - configureFlags = "--enable-lwt"; + configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ + (if async != null then ["--enable-async"] else [])); + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [ocplib-endian sexplib lwt async]; createFindlibDestdir = true; + dontStrip = true; - meta = { - description = "Map OCaml arrays onto C-like structs"; + meta = with stdenv.lib; { homepage = https://github.com/mirage/ocaml-cstruct; + description = "Map OCaml arrays onto C-like structs"; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix new file mode 100644 index 00000000000..43c7ddbb290 --- /dev/null +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -0,0 +1,32 @@ +{stdenv, buildOcaml, fetchurl, libffi, pkgconfig, ncurses}: + +buildOcaml rec { + name = "ctypes"; + version = "0.4.1"; + + src = fetchurl { + url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; + sha256 = "74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5"; + }; + + buildInputs = [ ncurses pkgconfig ]; + propagatedBuildInputs = [ libffi ]; + + hasSharedObjects = true; + + buildPhase = '' + make XEN=false libffi.config ctypes-base ctypes-stubs + make XEN=false ctypes-foreign + ''; + + installPhase = '' + make install XEN=false + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ocamllabs/ocaml-ctypes; + description = "Library for binding to C libraries using pure OCaml"; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix new file mode 100644 index 00000000000..05a8ecfe616 --- /dev/null +++ b/pkgs/development/ocaml-modules/custom_printf/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}: + +buildOcaml rec { + name = "custom_printf"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/custom_printf/archive/${version}.tar.gz"; + sha256 = "dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9"; + }; + + buildInputs = [ pa_ounit ]; + propagatedBuildInputs = [ type_conv sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/custom_printf; + description = "Syntax extension for printf format strings"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 9700a1d8cc5..54644d83699 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving, js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, - ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, + ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, reactivedata, opam}: stdenv.mkDerivation rec @@ -17,7 +17,7 @@ stdenv.mkDerivation rec buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving js_of_ocaml ocaml_optcomp opam]; - propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ocaml_ipaddr + propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 28b83d3af46..38548790329 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ ocaml_typeconv camlp4 ]; + propagatedBuildInputs = [ type_conv camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix new file mode 100644 index 00000000000..fd955602844 --- /dev/null +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcaml, fetchurl}: + +buildOcaml rec { + version = "109.35.02"; + name = "herelib"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz"; + sha256 = "7f8394169cb63f6d41e91c9affa1b8ec240d5f6e9dfeda3fbb611df521d4b05a"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/herelib; + description = "Syntax extension for inserting the current location"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix new file mode 100644 index 00000000000..749b6a1d94e --- /dev/null +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -0,0 +1,32 @@ +{stdenv, buildOcaml, fetchurl, sexplib}: + +buildOcaml rec { + name = "ipaddr"; + version = "2.6.1"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz"; + sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; + }; + + propagatedBuildInputs = [ sexplib ]; + + configurePhase = '' + ocaml setup.ml -configure --prefix $out + ''; + + buildPhase = '' + make build + ''; + + installPhase = '' + make install + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-ipaddr; + description = "A library for manipulation of IP (and MAC) address representations "; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix new file mode 100644 index 00000000000..4f42f51c16e --- /dev/null +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, batteries, pcre}: + +buildOcaml rec { + name = "jingoo"; + version = "1.2.7"; + + src = fetchurl { + url = "https://github.com/tategakibunko/jingoo/archive/v${version}.tar.gz"; + sha256 = "8ffc5723d77b323a12761981d048c046af77db47543a4b1076573aa5f4003009"; + }; + + propagatedBuildInputs = [ batteries pcre ]; + + preInstall = "mkdir -p $out/bin"; + installFlags = "BINDIR=$(out)/bin"; + + meta = with stdenv.lib; { + homepage = https://github.com/tategakibunko/jingoo; + description = "OCaml template engine almost compatible with jinja2"; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 20acb75d931..0c81775f236 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9"; }; - buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses camlp4]; + buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4]; - propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ]; + propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" "--disable-ppx" ] ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel"; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index d5db6e9c7e0..0a73f8aa04a 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { export PREFIX=$out ''; - meta = { + meta = with stdenv.lib; { homepage = http://pauillac.inria.fr/~fpottier/menhir/; description = "A LR(1) parser generator for OCaml"; longDescription = '' @@ -41,10 +41,11 @@ stdenv.mkDerivation { to OCaml code. Menhir was designed and implemented by François Pottier and Yann Régis-Gianas. ''; - license = [ "QPL" /* generator */ "LGPLv2" /* library */ ]; - platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z + license = with licenses; [ + qpl /* generator */ + lgpl2 /* library */ ]; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix deleted file mode 100644 index 09cfe1c350d..00000000000 --- a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ocaml, findlib, stdenv, fetchurl, ocaml_sexplib}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; -stdenv.mkDerivation { - name = "ocaml-ipaddr-2.5.0"; - - src = fetchurl { - url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz; - sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917"; - }; - - buildInputs = [ocaml findlib]; - propagatedBuildInputs = [ocaml_sexplib]; - - createFindlibDestdir = true; - - meta = with stdenv.lib; { - description = "An OCaml library for manipulation of IP (and MAC) address representations"; - license = licenses.isc; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; - }; - -} diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index d5c066ae2aa..58d8b047ec1 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,17 +1,17 @@ {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, -ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib, +ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf}: stdenv.mkDerivation { name = "ocsigenserver-2.5"; - + src = fetchurl { url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz; sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r"; }; buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt - ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl + ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl ocaml_sqlite3 tree uutf]; configureFlags = "--root $(out) --prefix /"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - postFixup = + postFixup = '' rm -rf $out/var/run ''; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index bfffb67d4b0..eaeb7e7b22f 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib ocaml_typeconv ounit camlp4]; + buildInputs = [ocaml findlib type_conv ounit camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix new file mode 100644 index 00000000000..d8ce0dbc7ea --- /dev/null +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}: + +buildOcaml rec { + name = "pa_bench"; + version = "112.06.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/pa_bench/archive/${version}.tar.gz"; + sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870"; + }; + + buildInputs = [ pa_ounit ]; + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/pa_bench; + description = "Syntax extension for inline benchmarks"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix new file mode 100644 index 00000000000..5970aba1e50 --- /dev/null +++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcaml, fetchurl, ounit}: + +buildOcaml rec { + name = "pa_ounit"; + version = "112.24.00"; + + src = fetchurl { + url = "https://github.com/janestreet/pa_ounit/archive/${version}.tar.gz"; + sha256 = "fa04e72fe1db41e6dc64f9707cf5705cb9b957aa93265120c875c808eb9b9b96"; + }; + + propagatedBuildInputs = [ ounit ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/pa_ounit; + description = "OCaml inline testing"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix new file mode 100644 index 00000000000..faf17e20dc1 --- /dev/null +++ b/pkgs/development/ocaml-modules/pa_test/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}: + +buildOcaml rec { + name = "pa_test"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/pa_test/archive/${version}.tar.gz"; + sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6"; + }; + + buildInputs = [ pa_ounit ]; + propagatedBuildInputs = [ type_conv sexplib herelib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/pa_test; + description = "Syntax to reduce boiler plate in testing"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix new file mode 100644 index 00000000000..fa9a9f8f86a --- /dev/null +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcaml, fetchurl}: + +buildOcaml rec { + name = "pipebang"; + version = "110.01.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/pipebang/archive/${version}.tar.gz"; + sha256 = "a8858d9607c15cdf0a775196be060c8d91de724fc80a347d7a76ef1d38329096"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/pipebang; + description = "Syntax extension to transform x |! f into f x"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/re2/Makefile.patch b/pkgs/development/ocaml-modules/re2/Makefile.patch new file mode 100644 index 00000000000..fcb6eefe62b --- /dev/null +++ b/pkgs/development/ocaml-modules/re2/Makefile.patch @@ -0,0 +1,17 @@ +--- ./lib/Makefile 2014-11-18 08:16:19.000000000 -0800 ++++ ./lib/Makefile 2015-05-23 14:48:31.000000000 -0700 +@@ -6,12 +6,12 @@ + all: libre2_stubs.a dllre2_stubs.so + + dllre2_stubs.so libre2_stubs.a: stubs.o $(LIBRE2) +- ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lstdc++ ++ ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lc++ + rm libre2_stubs.a # ocamlmklib just includes $(LIBRE2) inside the stubs archive + cp $(LIBRE2) libre2_stubs.a && ar r libre2_stubs.a stubs.o + + stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h +- g++ -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ ++ $(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ + -I$(RE2_HOME) -I$(ocaml-version-selected-include-path) -c stubs.cpp + + #stubs.o: %.o: %.cpp %.h diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix new file mode 100644 index 00000000000..e89e28fe1e5 --- /dev/null +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -0,0 +1,29 @@ +{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, + bin_prot, comparelib, sexplib, rsync}: + +buildOcaml rec { + name = "re2"; + version = "112.06.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/re2/archive/${version}.tar.gz"; + sha256 = "a538765872363fcb67f12b95c07455a0afd68f5ae9008b59bb85a996d97cc752"; + }; + patches = if stdenv.isDarwin + then [./Makefile.patch ./myocamlbuild.patch] + else null; + + buildInputs = [ pa_ounit pa_test rsync ]; + propagatedBuildInputs = [ core bin_prot comparelib sexplib ]; + + hasSharedObjects = true; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/re2; + description = "OCaml bindings for RE2"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch b/pkgs/development/ocaml-modules/re2/myocamlbuild.patch new file mode 100644 index 00000000000..46ad6fa801b --- /dev/null +++ b/pkgs/development/ocaml-modules/re2/myocamlbuild.patch @@ -0,0 +1,24 @@ +--- ./myocamlbuild.ml 2015-05-23 14:35:18.000000000 -0700 ++++ ./myocamlbuild.ml 2015-05-23 15:05:24.000000000 -0700 +@@ -626,16 +626,18 @@ + rule "Generate lib/options.ml" + ~prod:"lib/options.ml" + ~deps:["lib/options.mlp"; "lib/enum_x_macro.h"] +- (fun _ _ -> Cmd (S[A"gcc"; A"-E"; A"-P"; A"-x"; A"c"; ++ (fun _ _ -> Cmd (S[A"cc"; A"-E"; A"-P"; A"-x"; A"c"; + P"lib/options.mlp"; A"-o"; P"lib/options.ml"])); + + flag ["ocaml"; "link"; "library"; "native"] (S[A"-cclib"; A"-Llib"; + A"-cclib"; A"-lre2_stubs"; +- A"-cclib"; A"-lstdc++"]); ++ A"-ccopt"; A"--stdlib=libc++"; ++ A"-cclib"; A"-lc++"]); + flag ["ocaml"; "link"; "library"; "byte"] (S[A"-dllib"; A"dllre2_stubs.so"; + A"-cclib"; A"-Llib"; + A"-cclib"; A"-lre2_stubs"; +- A"-cclib"; A"-lstdc++"]); ++ A"-ccopt"; A"--stdlib=libc++"; ++ A"-cclib"; A"-lc++"]); + | _ -> + () + diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index bde9c271371..dd9e89bcef7 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; buildInputs = [ocaml findlib]; - propagatedBuildInputs = [typeconv camlp4]; + propagatedBuildInputs = [type_conv camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix similarity index 75% rename from pkgs/development/ocaml-modules/sexplib/default.nix rename to pkgs/development/ocaml-modules/sexplib/111.25.00.nix index a32c6a0e2ce..61d46e205fa 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "4.00" ocaml_version; stdenv.mkDerivation { - name = "ocaml-sexplib-111.25.0"; + name = "ocaml-sexplib-111.25.00"; src = fetchurl { url = https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; buildInputs = [ocaml findlib]; - propagatedBuildInputs = [ocaml_typeconv camlp4]; + propagatedBuildInputs = [type_conv camlp4]; createFindlibDestdir = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation { homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; - maintainers = [ maintainers.vbgl ]; + maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix new file mode 100644 index 00000000000..b63b5af05e8 --- /dev/null +++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix @@ -0,0 +1,21 @@ +{stdenv, buildOcaml, fetchurl, type_conv, camlp4}: + +buildOcaml rec { + minimumSupportedOcamlVersion = "4.02"; + name = "sexplib"; + version = "112.24.01"; + + src = fetchurl { + url = "https://github.com/janestreet/sexplib/archive/${version}.tar.gz"; + sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073"; + }; + + propagatedBuildInputs = [ type_conv camlp4 ]; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "Library for serializing OCaml values to and from S-expressions"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix new file mode 100644 index 00000000000..377b94eff8b --- /dev/null +++ b/pkgs/development/ocaml-modules/textutils/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}: + +buildOcaml rec { + name = "textutils"; + version = "112.17.00"; + + minimalSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/textutils/archive/${version}.tar.gz"; + sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052"; + }; + + buildInputs = [ pa_test ]; + propagatedBuildInputs = [ core pa_ounit sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/textutils; + description = ""; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix similarity index 95% rename from pkgs/development/ocaml-modules/typeconv/108.08.00.nix rename to pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 24daa366b2a..d3e32105f7d 100644 --- a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "3.12" ocaml_version; stdenv.mkDerivation { - name = "ocaml-typeconv-108.08.00"; + name = "ocaml-type_conv-108.08.00"; src = fetchurl { url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz; diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix similarity index 95% rename from pkgs/development/ocaml-modules/typeconv/default.nix rename to pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 359f906ce34..fe42dd5ddcb 100644 --- a/pkgs/development/ocaml-modules/typeconv/default.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "4.00" ocaml_version; stdenv.mkDerivation { - name = "ocaml-typeconv-109.60.01"; + name = "ocaml-type_conv-109.60.01"; src = fetchurl { url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix new file mode 100644 index 00000000000..e65306d1501 --- /dev/null +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, buildOcaml}: + +buildOcaml rec { + minimumSupportedOcamlVersion = "4.02"; + + name = "type_conv"; + version = "112.01.01"; + + src = fetchurl { + url = "https://github.com/janestreet/type_conv/archive/${version}.tar.gz"; + sha256 = "dbbc33b7ab420e8442d79ba4308ea6c0c16903b310d33525be18841159aa8855"; + }; + + meta = { + homepage = "https://github.com/janestreet/type_conv/"; + description = "Support library for preprocessor type conversions"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ z77z ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix new file mode 100644 index 00000000000..9500579e245 --- /dev/null +++ b/pkgs/development/ocaml-modules/typerep/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildOcaml, fetchurl, type_conv}: + +buildOcaml rec { + name = "typerep"; + version = "112.24.00"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/typerep/archive/${version}.tar.gz"; + sha256 = "4f1ab611a00aaf774e9774b26b687233e0c70d91f684415a876f094a9969eada"; + }; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/typerep; + description = "Runtime types for OCaml (beta version)"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix new file mode 100644 index 00000000000..cb25b844606 --- /dev/null +++ b/pkgs/development/ocaml-modules/variantslib/default.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcaml, fetchurl, type_conv}: + +buildOcaml rec { + name = "variantslib"; + version = "109.15.03"; + + minimumSupportedOcamlVersion = "4.00"; + + src = fetchurl { + url = "https://github.com/janestreet/variantslib/archive/${version}.tar.gz"; + sha256 = "a948dcdd4ca54786fe0646386b6e37a9db03bf276c6557ea374d82740bf18055"; + }; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/variantslib; + description = "OCaml variants as first class values"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch index c0fa85ecce8..4a4b49a829d 100644 --- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch +++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -1,4 +1,4 @@ -Use $OPENSSL_X509_CERT_FILE to get the CA certificates. +Use $SSL_CERT_FILE to get the CA certificates. diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm --- LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm 2011-03-27 13:54:01.000000000 +0200 @@ -7,8 +7,8 @@ diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Prot } if ($ssl_opts{SSL_verify_mode}) { unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -+ if (defined $ENV{'OPENSSL_X509_CERT_FILE'}) { -+ $ssl_opts{SSL_ca_file} = $ENV{'OPENSSL_X509_CERT_FILE'}; ++ if (defined $ENV{'SSL_CERT_FILE'}) { ++ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'}; + } + } + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix new file mode 100644 index 00000000000..7b14b20dc83 --- /dev/null +++ b/pkgs/development/pure-modules/audio/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }: + +stdenv.mkDerivation rec { + baseName = "audio"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A digital audio interface for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-audio.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix new file mode 100644 index 00000000000..e22e1fae220 --- /dev/null +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, avahi }: + +stdenv.mkDerivation rec { + baseName = "avahi"; + version = "0.3"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure avahi ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A digital audio interface for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-avahi.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix new file mode 100644 index 00000000000..6d41f2c5e6a --- /dev/null +++ b/pkgs/development/pure-modules/csv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "csv"; + version = "1.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Comma Separated Value Interface for the Pure Programming Language"; + homepage = http://puredocs.bitbucket.org/pure-csv.html; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix new file mode 100644 index 00000000000..68a08334375 --- /dev/null +++ b/pkgs/development/pure-modules/doc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "doc"; + version = "0.7"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; + }; + + buildInputs = [ pkgconfig pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + + meta = { + description = "A simple utility for literate programming and documenting source code written in the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-doc.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix new file mode 100644 index 00000000000..f1bc49c5ecc --- /dev/null +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, fcgi }: + +stdenv.mkDerivation rec { + baseName = "fastcgi"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure fcgi ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache"; + homepage = http://puredocs.bitbucket.org/pure-fastcgi.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix new file mode 100644 index 00000000000..7f5c4801d5d --- /dev/null +++ b/pkgs/development/pure-modules/faust/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }: + +stdenv.mkDerivation rec { + baseName = "faust"; + version = "0.11"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure faust libtool ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Lets you load and run Faust-generated signal processing modules in Pure"; + homepage = http://puredocs.bitbucket.org/pure-faust.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix new file mode 100644 index 00000000000..a9a3a56ebb8 --- /dev/null +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, libffi }: + +stdenv.mkDerivation rec { + baseName = "ffi"; + version = "0.14"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure libffi ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa"; + homepage = http://puredocs.bitbucket.org/pure-ffi.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix new file mode 100644 index 00000000000..082a8c88c61 --- /dev/null +++ b/pkgs/development/pure-modules/gen/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, + pkgconfig, pure, haskellPackages }: + +stdenv.mkDerivation rec { + baseName = "gen"; + version = "0.20"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "cfadd99a378b296325937d2492347611cc1e1d9f24594f91f3c2293eca01a4a8"; + }; + + hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); + buildInputs = [ pkgconfig hsEnv pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + + meta = { + description = "Pure interface generator"; + homepage = http://puredocs.bitbucket.org/pure-gen.html; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/pure-gsl/setup-hook.sh b/pkgs/development/pure-modules/generic-setup-hook.sh similarity index 100% rename from pkgs/development/pure-modules/pure-gsl/setup-hook.sh rename to pkgs/development/pure-modules/generic-setup-hook.sh diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix new file mode 100644 index 00000000000..37026ad9344 --- /dev/null +++ b/pkgs/development/pure-modules/gl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }: + +stdenv.mkDerivation rec { + baseName = "gl"; + version = "0.9"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure freeglut mesa x11 ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure"; + homepage = http://puredocs.bitbucket.org/pure-gl.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix new file mode 100644 index 00000000000..22d2bc17738 --- /dev/null +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, + pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }: + +stdenv.mkDerivation rec { + baseName = "glpk"; + version = "0.5"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "5d6dc11706985dda02d96d481ea5f164c9e95ee446432fc4fc3d0db61a076346"; + }; + + glpkWithExtras = lib.overrideDerivation glpk (attrs: { + propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ]; + + preConfigure = '' + substituteInPlace configure \ + --replace /usr/include/mysql ${libmysql}/include/mysql + ''; + configureFlags = [ "--enable-dl" + "--enable-odbc" + "--enable-mysql" + "--with-gmp=yes" ]; + }); + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure glpkWithExtras ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "GLPK interface for the Pure Programming Language"; + homepage = http://puredocs.bitbucket.org/pure-glpk.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix new file mode 100644 index 00000000000..acaf1efdaaa --- /dev/null +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, gnuplot }: + +stdenv.mkDerivation rec { + baseName = "gplot"; + version = "0.1"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure gnuplot ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "a pure binding to gnuplot"; + homepage = http://puredocs.bitbucket.org/pure-gplot.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/pure-gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix similarity index 60% rename from pkgs/development/pure-modules/pure-gsl/default.nix rename to pkgs/development/pure-modules/gsl/default.nix index bbad1e380d5..10eddeeb797 100644 --- a/pkgs/development/pure-modules/pure-gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl, pure, pkgconfig, gsl }: -stdenv.mkDerivation { - name = "pure-gsl-0.12"; +stdenv.mkDerivation rec { + baseName = "gsl"; + version = "0.12"; + name = "pure-${baseName}-${version}"; + src = fetchurl { - url = https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-0.12.tar.gz; + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gsl ]; - - installPhase = '' - mkdir -p $out/lib/pure/gsl - install gsl.pure gsl$(pkg-config pure --variable DLL) $out/lib/pure - install gsl/*.pure $out/lib/pure/gsl - ''; - - setupHook = ./setup-hook.sh; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; meta = { description = "GNU Scientific Library interface for Pure"; @@ -25,4 +22,4 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix new file mode 100644 index 00000000000..fd2460b5c1b --- /dev/null +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }: + +stdenv.mkDerivation rec { + baseName = "gtk"; + version = "0.13"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure pure-ffi gtk2 ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A collection of bindings to use the GTK+ GUI toolkit version 2.x with Pure"; + homepage = http://puredocs.bitbucket.org/pure-gtk.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix new file mode 100644 index 00000000000..a68d04f901f --- /dev/null +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, liblo }: + +stdenv.mkDerivation rec { + baseName = "liblo"; + version = "0.9"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure liblo ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol"; + homepage = http://puredocs.bitbucket.org/pure-liblo.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix new file mode 100644 index 00000000000..4f2d5abba1e --- /dev/null +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }: + +stdenv.mkDerivation rec { + baseName = "lilv"; + version = "0.4"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; + makeFlags = "CFLAGS=-I${lilv}/include/lilv-0 libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers"; + homepage = http://puredocs.bitbucket.org/pure-lilv.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix new file mode 100644 index 00000000000..63a8cafc474 --- /dev/null +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, lv2 }: + +stdenv.mkDerivation rec { + baseName = "lv2"; + version = "0.2"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure lv2 ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules"; + homepage = http://puredocs.bitbucket.org/pure-lv2.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix new file mode 100644 index 00000000000..bbf20b66c29 --- /dev/null +++ b/pkgs/development/pure-modules/midi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, portmidi }: + +stdenv.mkDerivation rec { + baseName = "midi"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure portmidi ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A MIDI interface for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-midi.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix new file mode 100644 index 00000000000..ccc32739a49 --- /dev/null +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "mpfr"; + version = "0.5"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "This module makes the MPFR multiprecision floats available in Pure"; + homepage = http://puredocs.bitbucket.org/pure-mpfr.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix new file mode 100644 index 00000000000..6a039313f0e --- /dev/null +++ b/pkgs/development/pure-modules/octave/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, octave }: + +stdenv.mkDerivation rec { + baseName = "octave"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "5a42e8dff8023f6bf1214ed31b7999645d88ce2f103d9fba23b527259da9a0df"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure octave ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "An Octave module for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-octave.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix new file mode 100644 index 00000000000..666cf55044d --- /dev/null +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, libiodbc }: + +stdenv.mkDerivation rec { + baseName = "odbc"; + version = "0.10"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure libiodbc ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A simple ODBC interface for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-odbc.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix new file mode 100644 index 00000000000..b51f2ff5e87 --- /dev/null +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }: + +stdenv.mkDerivation rec { + baseName = "pandoc"; + version = "0.1"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; + }; + + buildInputs = [ pkgconfig pure ]; + propagatedBuildInputs = [ pandoc gawk getopt ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = { + description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc"; + homepage = http://puredocs.bitbucket.org/pure-pandoc.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix new file mode 100644 index 00000000000..42ead62b256 --- /dev/null +++ b/pkgs/development/pure-modules/rational/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "rational"; + version = "0.1"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure"; + homepage = http://puredocs.bitbucket.org/pure-rational.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix new file mode 100644 index 00000000000..e93207943b0 --- /dev/null +++ b/pkgs/development/pure-modules/readline/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, readline }: + +stdenv.mkDerivation rec { + baseName = "readline"; + version = "0.3"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure readline ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface"; + homepage = http://puredocs.bitbucket.org/pure-readline.html; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix new file mode 100644 index 00000000000..522446104ff --- /dev/null +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "sockets"; + version = "0.7"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A Pure interface to the Berkeley socket functions"; + homepage = http://puredocs.bitbucket.org/pure-sockets.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix new file mode 100644 index 00000000000..f937b9eb530 --- /dev/null +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, sqlite }: + +stdenv.mkDerivation rec { + baseName = "sql3"; + version = "0.5"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure sqlite ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A SQLite module for the Pure programming language"; + homepage = http://puredocs.bitbucket.org/pure-sql3.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix new file mode 100644 index 00000000000..abfc0d0fdef --- /dev/null +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "stldict"; + version = "0.8"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A Pure interface to the C++ dictionary containers map and unordered_map"; + homepage = http://puredocs.bitbucket.org/pure-stldict.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix new file mode 100644 index 00000000000..3be7bccf2a4 --- /dev/null +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure }: + +stdenv.mkDerivation rec { + baseName = "stllib"; + version = "0.6"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stllib-${version}.tar.gz"; + sha256 = "1d550764fc2f8ba6ddbd1fbd3da2d6965b69e2c992747265d9ebe4f16aa5e455"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap"; + homepage = http://puredocs.bitbucket.org/pure-stllib.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix new file mode 100644 index 00000000000..b36a58279fa --- /dev/null +++ b/pkgs/development/pure-modules/tk/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }: + +stdenv.mkDerivation rec { + baseName = "tk"; + version = "0.5"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure tcl tk x11 ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A basic interface between Pure and Tcl/Tk"; + homepage = http://puredocs.bitbucket.org/pure-tk.html; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix new file mode 100644 index 00000000000..ed08cdf5209 --- /dev/null +++ b/pkgs/development/pure-modules/xml/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }: + +stdenv.mkDerivation rec { + baseName = "xml"; + version = "0.7"; + name = "pure-${baseName}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure libxml2 libxslt ]; + makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + setupHook = ../generic-setup-hook.sh; + + meta = { + description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure"; + homepage = http://puredocs.bitbucket.org/pure-xml.html; + license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index f84c836c056..3065af0fd15 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -39,10 +39,10 @@ in buildPythonPackage rec { # Tests are in . doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; - license = [ "GPLv2+" "LGPLv2.1+" ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/boto/content-length-str.patch b/pkgs/development/python-modules/boto/content-length-str.patch deleted file mode 100644 index 7895e223c6b..00000000000 --- a/pkgs/development/python-modules/boto/content-length-str.patch +++ /dev/null @@ -1,16 +0,0 @@ -Cherry-picked from https://github.com/boto/boto/pull/2932 - -This fix is required for things like docker-registry to interact with S3. Will -be obsolete after the next boto release (> 2.36.0) - ---- a/boto/connection.py -+++ b/boto/connection.py -@@ -381,7 +381,7 @@ class HTTPRequest(object): - if 'Content-Length' not in self.headers: - if 'Transfer-Encoding' not in self.headers or \ - self.headers['Transfer-Encoding'] != 'chunked': -- self.headers['Content-Length'] = len(self.body) -+ self.headers['Content-Length'] = str(len(self.body)) - - - class HTTPResponse(http_client.HTTPResponse): diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index b962e9f8472..378f047939f 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -47,11 +47,19 @@ # Execute after shell hook , postShellHook ? "" +# Additional arguments to pass to the makeWrapper function, which wraps +# generated binaries. +, makeWrapperArgs ? [] + , ... } @ attrs: # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // { +if disabled +then throw "${name} not supported for interpreter ${python.executable}" +else + +python.stdenv.mkDerivation (attrs // { inherit doCheck; name = namePrefix + name; diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 220ddf26b30..33b9a06f608 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -1,51 +1,81 @@ +# Wrapper around wrapPythonProgramsIn, below. The $pythonPath +# variable is passed in from the buildPythonPackage function. wrapPythonPrograms() { wrapPythonProgramsIn $out "$out $pythonPath" } +# Transforms any binaries generated by the setup.py script, replacing them +# with an executable shell script which will set some environment variables +# and then call into the original binary (which has been given a .wrapped +# suffix). wrapPythonProgramsIn() { local dir="$1" local pythonPath="$2" local python="@executable@" - local i + local path + local f + # Create an empty table of python paths (see doc on _addToPythonPath + # for how this is used). Build up the program_PATH and program_PYTHONPATH + # variables. declare -A pythonPathsSeen=() program_PYTHONPATH= program_PATH= - for i in $pythonPath; do - _addToPythonPath $i + for path in $pythonPath; do + _addToPythonPath $path done - for i in $(find "$dir" -type f -perm +0100); do + # Find all regular files in the output directory that are executable. + for f in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". - if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then - sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" + if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - + # catch /python and /.python-wrapped - if head -n1 "$i" | grep -q '/\.\?\(python\|pypy\)'; then + if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then # dont wrap EGG-INFO scripts since they are called from python - if echo "$i" | grep -v EGG-INFO/scripts; then - echo "wrapping \`$i'..." - sed -i "$i" -re '@magicalSedExpression@' - wrapProgram "$i" \ - --prefix PYTHONPATH ":" $program_PYTHONPATH \ - --prefix PATH ":" $program_PATH + if echo "$f" | grep -qv EGG-INFO/scripts; then + echo "wrapping \`$f'..." + sed -i "$f" -re '@magicalSedExpression@' + # wrapProgram creates the executable shell script described + # above. The script will set PYTHONPATH and PATH variables.! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + local wrap_args="$f \ + --prefix PYTHONPATH ':' $program_PYTHONPATH \ + --prefix PATH ':' $program_PATH" + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildPythonPackage. + for arg in $makeWrapperArgs; do + wrap_args="$wrap_args $arg" + done + wrapProgram $wrap_args fi fi done } +# Adds the lib and bin directories to the PYTHONPATH and PATH variables, +# respectively. Recurses on any paths declared in +# `propagated-native-build-inputs`, while avoiding duplicating paths by +# flagging the directories it has visited in `pythonPathsSeen`. _addToPythonPath() { local dir="$1" + # Stop if we've already visited here. if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi pythonPathsSeen[$dir]=1 + # addToSearchPath is defined in stdenv/generic/setup.sh. It will have + # the effect of calling `export program_X=$dir/...:$program_X`. addToSearchPath program_PYTHONPATH $dir/lib/@libPrefix@/site-packages addToSearchPath program_PATH $dir/bin + + # Inspect the propagated inputs (if they exist) and recur on them. local prop="$dir/nix-support/propagated-native-build-inputs" if [ -e $prop ]; then - local i - for i in $(cat $prop); do - _addToPythonPath $i + local new_path + for new_path in $(cat $prop); do + _addToPythonPath $new_path done fi } diff --git a/pkgs/development/python-modules/gevent_sslwrap.patch b/pkgs/development/python-modules/gevent_sslwrap.patch deleted file mode 100644 index a9bb0eab5de..00000000000 --- a/pkgs/development/python-modules/gevent_sslwrap.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 485cebc4d9bab2dae51cf29f91fad2f1cf157fec Mon Sep 17 00:00:00 2001 -From: Eugene Pankov -Date: Sun, 21 Sep 2014 12:04:13 +0300 -Subject: [PATCH] Work around missing sslwrap in Python 2.7.9 (fixes #477) - ---- - gevent/_ssl2.py | 28 ++++++++++++++++++++-------- - 1 file changed, 20 insertions(+), 8 deletions(-) - -diff --git a/gevent/ssl.py b/gevent/ssl.py -index 21491b7..85e6a86 100644 ---- a/gevent/ssl.py -+++ b/gevent/ssl.py -@@ -80,15 +80,27 @@ def __init__(self, sock, keyfile=None, certfile=None, - self._sslobj = None - else: - # yes, create the SSL object -- if ciphers is None: -- self._sslobj = _ssl.sslwrap(self._sock, server_side, -- keyfile, certfile, -- cert_reqs, ssl_version, ca_certs) -+ if hasattr(_ssl, 'sslwrap'): -+ if ciphers is None: -+ self._sslobj = _ssl.sslwrap(self._sock, server_side, -+ keyfile, certfile, -+ cert_reqs, ssl_version, ca_certs) -+ else: -+ self._sslobj = _ssl.sslwrap(self._sock, server_side, -+ keyfile, certfile, -+ cert_reqs, ssl_version, ca_certs, -+ ciphers) - else: -- self._sslobj = _ssl.sslwrap(self._sock, server_side, -- keyfile, certfile, -- cert_reqs, ssl_version, ca_certs, -- ciphers) -+ self.context = __ssl__.SSLContext(ssl_version) -+ self.context.verify_mode = cert_reqs -+ if ca_certs: -+ self.context.load_verify_locations(ca_certs) -+ if certfile: -+ self.context.load_cert_chain(certfile, keyfile) -+ if ciphers: -+ self.context.set_ciphers(ciphers) -+ self._sslobj = self.context._wrap_socket(self._sock, server_side=server_side, ssl_sock=self) -+ - if do_handshake_on_connect: - self.do_handshake() - self.keyfile = keyfile diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index aa5deb6d6db..46571978a6d 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -3,7 +3,7 @@ pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper, gobjectIntrospection, pygobject3, gtk3, matplotlib }: stdenv.mkDerivation rec { - version = "2.2.36"; + version = "2.2.42"; name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0wp81dp2kd4bzsl6f3gxjmf11hiqr7rz7g0wa1j38fc0chq31q71"; + sha256 = "124qmd0mgam7hm87gscp3836ymhhwwnlfm2c5pzpml06da1w0xg9"; }; preConfigure = '' - configureFlags="--with-python-module-path=$out/${python.sitePackages}" + configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp" ''; buildInputs = [ automake m4 pkgconfig makeWrapper ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index d22c8cf3231..15716f20422 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -10,11 +10,11 @@ assert enableGhostscript -> ghostscript != null; assert enableGtk2 -> pygtk != null; buildPythonPackage rec { - name = "matplotlib-1.4.2"; + name = "matplotlib-1.4.3"; src = fetchurl { url = "mirror://sourceforge/matplotlib/${name}.tar.gz"; - sha256 = "0m6v9nwdldlwk22gcd339zg6mny5m301fxgks7z8sb8m9wawg8qp"; + sha256 = "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av"; }; XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 889f3df52ae..b6375081551 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -1,13 +1,17 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - name = "rbtools-0.7.1"; + name = "rbtools-0.7.2"; namePrefix = ""; src = fetchurl { - url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.1.tar.gz"; - sha256 = "0axi4jf19ia2jwrs3b0xni7v317v03wj35richi111cm3pw6p2gb"; + url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz"; + sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i"; }; propagatedBuildInputs = [ python.modules.sqlite3 pythonPackages.six ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e0b19f465c9..11d7193edee 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -947,9 +947,20 @@ let "WideLM" # depends on proprietary cudatoolkit "x_ent" # requires opencpu "zoib" # tarball is invalid on server + "timeSeq" # depends on missing edgeR + "survJamda" # depends on missing survcomp + "ssizeRNA" # depends on missing 'Biobase', 'edgeR', 'limma', 'qvalue' + "h5" # depends on missing h5 system library ]; otherOverrides = old: new: { + xml2 = old.xml2.overrideDerivation (attrs: { + preConfigure = '' + export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2 + export LIBXML_LIBDIR=${pkgs.libxml2}/lib + ''; + }); + curl = old.curl.overrideDerivation (attrs: { preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl"; }); diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix new file mode 100644 index 00000000000..72bed9d46ca --- /dev/null +++ b/pkgs/development/tools/activator/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, unzip, jre }: + +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + pname = "activator"; + version = "1.3.2"; + + src = fetchurl { + url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip"; + sha256 = "0a6x4w63829fbp13gk1l37p6di11lfmgla26gqnr065vzpkg90y6"; + }; + + buildInputs = [ unzip jre ]; + + installPhase = '' + mkdir -p $out/{bin,lib} + mv repository $out/lib + sed -i -e "s,declare.*activator_home.*=.*,declare -r activator_home=$out/lib/,g" activator + mv activator $out/bin + mv activator-launch-${version}.jar $out/lib + ''; + + meta = with stdenv.lib; { + description = "A scafollding tool for setting up reactive projects"; + homepage = "http://typesafe.com/activator"; + license = licenses.asl20; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 2c16f1f6f6c..e0be56e5037 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://alloy.mit.edu/; downloadPage = http://alloy.mit.edu/alloy/download.html; - license = with licenses; mit; + license = licenses.mit; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 4d47d513437..3addd0f5a25 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.5"; + version = "6.7"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "1231rzmk7kzv77hpa0jj227152br9ahjdvxvzifk0mdfw0b34rdl"; + sha256 = "0na3gfkxzgnnbjvr4sys4x3mb1s1hn9xy9krmvnxqq0wmm4lysjd"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index cd8cde1ae52..ce9b8a9a59d 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { application of this sort. ''; homepage = http://coan2.sourceforge.net/; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index c3381186aa8..9a8df0f4690 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { replacing #includes with forward-declares when possible. ''; homepage = http://include-what-you-use.com; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/atom-shell/default.nix index 983c5c451d0..4e5413b5012 100644 --- a/pkgs/development/tools/atom-shell/default.nix +++ b/pkgs/development/tools/atom-shell/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross platform desktop application shell"; homepage = https://github.com/atom/atom-shell; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = [ maintainers.fluffynukeit ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 6ae4da408c0..d4fddbb1791 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { - version = "2.0.0-rc14"; + version = "2.0.0"; name = "boot-${version}"; src = fetchurl { diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index 84158e65a4d..94b9ca1f665 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -26,6 +26,7 @@ meta = with stdenv.lib; { homepage = http://crates.io; description = "Downloads your Rust project's dependencies and builds your project"; + maintainers = with maintainers; [ wizeman ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index f7dd77a12a7..e7a45f1c348 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -11,11 +11,11 @@ buildRustPackage rec { src = fetchgit { url = "https://github.com/rust-lang/cargo.git"; rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c"; - sha256 = "1hvsxjv9s30qylcq2vb2nqqn8fix4sk0ah718f8c0flrcqbwa58z"; + sha256 = "0sppd3x2cacmbnypcjip44amnh66lrrbwwzsbz8rqf3nq2ah496x"; leaveDotGit = true; }; - depsSha256 = "0s9f00kg7q9dxd8g98k3z4qv404p9ra73l1bzxs6qzk54qhg44dp"; + depsSha256 = "1b0mpdxmp7inkg59n2phjwzpz5gx22wqg9rfd1s01a5ylara37jw"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch new file mode 100644 index 00000000000..e16dab32632 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch @@ -0,0 +1,237 @@ +--- cmake-2.8.10/Source/cmFileCommand.cxx 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/cmFileCommand.cxx 2013-03-16 22:55:11.306681100 -0500 +@@ -1002,7 +1002,7 @@ protected: + MatchProperties CollectMatchProperties(const char* file) + { + // Match rules are case-insensitive on some platforms. +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + std::string lower = cmSystemTools::LowerCase(file); + const char* file_to_match = lower.c_str(); + #else +--- cmake-2.8.10/Source/cmInstallCommand.cxx 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/cmInstallCommand.cxx 2013-03-16 22:56:21.008667800 -0500 +@@ -1090,7 +1090,7 @@ cmInstallCommand::HandleDirectoryMode(st + { + literal_args += " REGEX \""; + // Match rules are case-insensitive on some platforms. +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + std::string regex = cmSystemTools::LowerCase(args[i]); + #else + std::string regex = args[i]; +--- cmake-2.8.10/Source/kwsys/Glob.cxx 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/kwsys/Glob.cxx 2013-03-16 22:58:54.192429400 -0500 +@@ -37,7 +37,7 @@ + #include + namespace KWSYS_NAMESPACE + { +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + // On Windows and apple, no difference between lower and upper case + # define KWSYS_GLOB_CASE_INDEPENDENT + #endif +--- cmake-2.8.11/Source/kwsys/SystemInformation.cxx 2013-05-15 12:38:13.000000000 -0500 ++++ cmake-2.8.11/Source/kwsys/SystemInformation.cxx 2013-07-08 01:57:31.216321800 -0500 +@@ -888,7 +888,7 @@ void SystemInformation::RunMemoryCheck() + // Hide implementation details in an anonymous namespace. + namespace { + // ***************************************************************************** +-#if defined(__linux) || defined(__APPLE__) ++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) + int LoadLines( + FILE *file, + kwsys_stl::vector &lines) +@@ -918,7 +918,7 @@ int LoadLines( + return nRead; + } + +-# if defined(__linux) ++# if defined(__linux) || defined(__CYGWIN__) + // ***************************************************************************** + int LoadLines( + const char *fileName, +@@ -957,7 +957,7 @@ int NameValue( + } + #endif + +-#if defined(__linux) ++#if defined(__linux) || defined(__CYGWIN__) + // **************************************************************************** + template + int GetFieldsFromFile( +@@ -2869,7 +2869,6 @@ bool SystemInformationImplementation::Re + pos = buffer.find("processor\t",pos+1); + } + +-#ifdef __linux + // Find the largest physical id. + int maxId = -1; + kwsys_stl::string idc = +@@ -2893,14 +2892,6 @@ bool SystemInformationImplementation::Re + this->NumberOfPhysicalCPU=static_cast( + numberOfCoresPerCPU*(maxId+1)); + +-#else // __CYGWIN__ +- // does not have "physical id" entries, neither "cpu cores" +- // this has to be fixed for hyper-threading. +- kwsys_stl::string cpucount = +- this->ExtractValueFromCpuInfoFile(buffer,"cpu count"); +- this->NumberOfPhysicalCPU= +- this->NumberOfLogicalCPU = atoi(cpucount.c_str()); +-#endif + // gotta have one, and if this is 0 then we get a / by 0n + // better to have a bad answer than a crash + if(this->NumberOfPhysicalCPU <= 0) +@@ -3086,7 +3077,7 @@ SystemInformationImplementation::GetHost + GlobalMemoryStatusEx(&statex); + return statex.ullTotalPhys/1024; + # endif +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + SystemInformation::LongLong memTotal=0; + int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal); + if (ierr) +@@ -3217,7 +3208,7 @@ SystemInformationImplementation::GetHost + GlobalMemoryStatusEx(&statex); + return (statex.ullTotalPhys - statex.ullAvailPhys)/1024; + # endif +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + const char *names[3]={"MemTotal:","MemFree:",NULL}; + SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; + int ierr=GetFieldsFromFile("/proc/meminfo",names,values); +@@ -3276,7 +3267,7 @@ SystemInformationImplementation::GetProc + return -2; + } + return pmc.WorkingSetSize/1024; +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + SystemInformation::LongLong memUsed=0; + int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed); + if (ierr) +@@ -3328,7 +3319,7 @@ SystemInformationImplementation::GetProc + { + #if defined(_WIN32) + return GetCurrentProcessId(); +-#elif defined(__linux) || defined(__APPLE__) ++#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) + return getpid(); + #else + return -1; +--- cmake-2.8.10/Source/kwsys/SystemTools.cxx 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/kwsys/SystemTools.cxx 2013-03-16 22:52:11.830415600 -0500 +@@ -75,19 +75,12 @@ + // Windows API. + #if defined(_WIN32) + # include +-#elif defined (__CYGWIN__) +-# include +-# undef _WIN32 + #endif + + #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H + extern char **environ; + #endif + +-#ifdef __CYGWIN__ +-extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path); +-#endif +- + // getpwnam doesn't exist on Windows and Cray Xt3/Catamount + // same for TIOCGWINSZ + #if defined(_WIN32) || defined (__LIBCATAMOUNT__) +@@ -1068,7 +1061,7 @@ bool SystemTools::SameFile(const char* f + } + + //---------------------------------------------------------------------------- +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + static bool WindowsFileExists(const char* filename) + { + WIN32_FILE_ATTRIBUTE_DATA fd; +@@ -1083,7 +1076,7 @@ bool SystemTools::FileExists(const char* + { + return false; + } +-#if defined(__CYGWIN__) ++#if 0 + // Convert filename to native windows path if possible. + char winpath[MAX_PATH]; + if(SystemTools::PathCygwinToWin32(filename, winpath)) +@@ -1111,7 +1104,7 @@ bool SystemTools::FileExists(const char* + } + + //---------------------------------------------------------------------------- +-#ifdef __CYGWIN__ ++#if 0 + bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) + { + SystemToolsTranslationMap::iterator i = +@@ -3894,7 +3887,7 @@ bool SystemTools::LocateFileInDir(const + bool SystemTools::FileIsFullPath(const char* in_name) + { + kwsys_stl::string name = in_name; +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + // On Windows, the name must be at least two characters long. + if(name.length() < 2) + { +@@ -4712,9 +4705,6 @@ bool SystemTools::ParseURL( const kwsys_ + unsigned int SystemToolsManagerCount; + SystemToolsTranslationMap *SystemTools::TranslationMap; + SystemToolsTranslationMap *SystemTools::LongPathMap; +-#ifdef __CYGWIN__ +-SystemToolsTranslationMap *SystemTools::Cyg2Win32Map; +-#endif + + // SystemToolsManager manages the SystemTools singleton. + // SystemToolsManager should be included in any translation unit +@@ -4760,9 +4750,6 @@ void SystemTools::ClassInitialize() + // Allocate the translation map first. + SystemTools::TranslationMap = new SystemToolsTranslationMap; + SystemTools::LongPathMap = new SystemToolsTranslationMap; +-#ifdef __CYGWIN__ +- SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap; +-#endif + + // Add some special translation paths for unix. These are not added + // for windows because drive letters need to be maintained. Also, +@@ -4817,9 +4804,6 @@ void SystemTools::ClassFinalize() + { + delete SystemTools::TranslationMap; + delete SystemTools::LongPathMap; +-#ifdef __CYGWIN__ +- delete SystemTools::Cyg2Win32Map; +-#endif + } + + +--- cmake-2.8.10/Source/kwsys/SystemTools.hxx.in 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/kwsys/SystemTools.hxx.in 2013-03-16 23:10:30.185237900 -0500 +@@ -277,15 +277,6 @@ public: + static bool FileExists(const char* filename); + + /** +- * Converts Cygwin path to Win32 path. Uses dictionary container for +- * caching and calls to cygwin_conv_to_win32_path from Cygwin dll +- * for actual translation. Returns true on success, else false. +- */ +-#ifdef __CYGWIN__ +- static bool PathCygwinToWin32(const char *path, char *win32_path); +-#endif +- +- /** + * Return file length + */ + static unsigned long FileLength(const char *filename); +@@ -887,9 +878,6 @@ private: + */ + static SystemToolsTranslationMap *TranslationMap; + static SystemToolsTranslationMap *LongPathMap; +-#ifdef __CYGWIN__ +- static SystemToolsTranslationMap *Cyg2Win32Map; +-#endif + friend class SystemToolsManager; + }; + diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix new file mode 100644 index 00000000000..60a941a6637 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +}: + +with stdenv.lib; + +assert wantPS -> (ps != null); + +let + os = stdenv.lib.optionalString; + majorVersion = "2.8"; + minorVersion = "12.2"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; + }; + + enableParallelBuilding = true; + + patches = + [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 + name = "FindFreetype-2.5.patch"; + url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; + })] ++ + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path.patch ++ + optional (stdenv ? cross) (fetchurl { + name = "fix-darwin-cross-compile.patch"; + url = "http://public.kitware.com/Bug/file_download.php?" + + "file_id=4981&type=bug"; + sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; + }); + + buildInputs = [ curl expat zlib bzip2 libarchive ] + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + propagatedBuildInputs = optional wantPS ps; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + dontUseCmakeConfigure = true; + + preConfigure = optionalString (stdenv ? glibc) + '' + source $setupHook + fixCmakeFiles . + substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 77863c4532d..02847c749bf 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { url = "http://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); + }) ++ stdenv.lib.optional stdenv.isCygwin ./2.8.11-cygwin.patch; buildInputs = [ bzip2 curl expat libarchive xz zlib ] @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; configureFlags = - [ - "--docdir=/share/doc/${name}" + [ "--docdir=/share/doc/${name}" "--mandir=/share/man" - "--system-libs" "--no-system-jsoncpp" - ] - ++ optional useQt4 "--qt-gui"; + ++ optional (!stdenv.isCygwin) "--system-libs" + ++ optional useQt4 "--qt-gui" + ++ ["--"] + ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch new file mode 100644 index 00000000000..31c85d6f522 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -0,0 +1,97 @@ +diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake +index fe8e003..378512c 100644 +--- a/Modules/Platform/Linux.cmake ++++ b/Modules/Platform/Linux.cmake +@@ -36,13 +36,13 @@ else() + # checking the platform every time. This option is advanced enough + # that only package maintainers should need to adjust it. They are + # capable of providing a setting on the command line. +- if(EXISTS "/etc/debian_version") +- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- "Install .so files without execute permission.") +- else() ++ # if(EXISTS "/etc/debian_version") ++ # set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL ++ # "Install .so files without execute permission.") ++ # else() + set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + "Install .so files without execute permission.") +- endif() ++ # endif() + endif() + + # Match multiarch library directory names. +@@ -52,6 +52,6 @@ include(Platform/UnixPaths) + + # Debian has lib64 paths only for compatibility so they should not be + # searched. +-if(EXISTS "/etc/debian_version") +- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +-endif() ++# if(EXISTS "/etc/debian_version") ++# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) ++#endif() +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index ccb2663..39834e6 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) + # search types. + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard +- /usr/local /usr / +- +- # CMake install location +- "${_CMAKE_INSTALL_DIR}" +- +- # Project install destination. +- "${CMAKE_INSTALL_PREFIX}" +- ) +- +-# List common include file locations not under the common prefixes. +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include +- ) +- +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib +- ) +- +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ "@glibc@" + ) + + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /usr/lib /usr/lib32 /usr/lib64 ++ "@glibc@/lib" + ) + + list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + + # Enable use of lib64 search path variants by default. diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index fa7bb9e122a..ce5eff878ea 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { }; /* On Darwin, there are 3 test failures that haven't been investigated - yet. */ - doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD; + yet. On cygwin at least parallelsim test hangs. */ + doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.isCygwin; patches = [ diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index a4e81864985..d83ae51aaaa 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "7.22.00"; + version = "7.22.01"; src = fetchurl { url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz"; - sha256 = "013vxnilygad981zb2608f95q2h3svvbgpjvzvk16qyxjy4y4q6z"; + sha256 = "1iv6p9cyvr9i2sjhklplr65llg1ycxqy7z4dfgn0nkwxgs9yf8mm"; }; preConfigure = '' diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index f8e759b83ee..ee49423a8b1 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -13,7 +13,7 @@ bundlerEnv { meta = with lib; { description = "A streamlined development and deployment workflow for Chef platform"; homepage = https://downloads.chef.io/chef-dk/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 7c4aefee639..6668df6a828 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,13 +1,13 @@ -{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7, bash}: +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk8, bash}: stdenv.mkDerivation rec { - version = "4.0.3.16.84"; + version = "4.1.0.19.07"; name = "sqldeveloper-${version}"; src = requireFile { name = "${name}-no-jre.zip"; url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html; - sha256 = "1qbqjkfda7xry716da2hdbbazks96rgyslrw1lw0azmqdp1mir7g"; + sha256 = "09gr40n4574fw9hg47xi4dk8vwgawzkjzzzj2h5jaicy0fdjkpbx"; }; buildInputs = [ makeWrapper unzip ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { chmod +x $out/sqldeveloper/bin/sqldeveloper wrapProgram $out/bin/sqldeveloper \ - --set JAVA_HOME "${oraclejdk7}" + --set JAVA_HOME "${oraclejdk8}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index e1f7f19dd56..6d93dc6def0 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.21"; + version = "1.24"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "0gpfh25qxsic7n25pfl74mjp38hdm3pr4islhlaxv3p05q0lv4sx"; + sha256 = "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l"; }; # maybe there is a better way to pass the needed dtd and xsl files diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix new file mode 100644 index 00000000000..91bd207581d --- /dev/null +++ b/pkgs/development/tools/goimports/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchFromGitHub }: + +stdenv.mkDerivation rec { + rev = "7534f4943d94a318edde90212439e538ed54cdde"; + version = "git-2015-04-26"; + name = "goimports-${version}"; + + buildInputs = [ go ]; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "tools"; + sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50"; + }; + + buildPhase = '' + export GOPATH=$src + go build -v -o goimports golang.org/x/tools/cmd/goimports + ''; + + installPhase = '' + mkdir -p $out/bin + mv goimports $out/bin + ''; + + meta = with lib; { + description = "Import management tool for go"; + homepage = https://godoc.org/golang.org/x/tools/cmd/goimports; + license = licenses.bsd3; + maintainers = with maintainers; [ jzellner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index d933b97d1c1..7c36390b91e 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,16 +2,17 @@ , deepseq, deepseq-generics, directory, doctest, filepath, gitMinimal , hackage-db, hspec, lens, monad-par, monad-par-extras, mtl, pretty , process, QuickCheck, regex-posix, SHA, split, stdenv, transformers -, utf8-string, cartel, nix-prefetch-scripts, makeWrapper +, utf8-string, cartel, nix-prefetch-scripts, optparse-applicative +, makeWrapper }: mkDerivation rec { pname = "cabal2nix"; - version = "20150505"; + version = "20150531"; src = fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "db53ac3a644eebda581c9f036ccd55a19ff3c629"; - sha256 = "1bimja9qsq865dmpjpy5wxxz43rc8wk9yva58l7hydmm87a4ch8y"; + rev = "513a5fce6cfabe0b062424f6deb191a12f7e2187"; + sha256 = "1j4x85cqj823d9swi473b4i9rz9wlm9m7c1il73h02dq5i67wida"; deepClone = true; }; isExecutable = true; @@ -21,6 +22,7 @@ mkDerivation rec { aeson base bytestring Cabal containers deepseq-generics directory filepath hackage-db lens monad-par monad-par-extras mtl pretty process regex-posix SHA split transformers utf8-string cartel + optparse-applicative ]; testDepends = [ aeson base bytestring Cabal containers deepseq deepseq-generics @@ -35,6 +37,8 @@ mkDerivation rec { install -D $out/bin/cabal2nix $exe rm -rf $out/{bin,lib,share} makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin" + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix ''; homepage = "http://github.com/NixOS/cabal2nix/"; description = "Convert Cabal files into Nix build instructions"; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix new file mode 100644 index 00000000000..df5f6454f6d --- /dev/null +++ b/pkgs/development/tools/heroku/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, postgresql, ruby }: + +with stdenv.lib; +stdenv.mkDerivation rec { + version = "3.32.0"; + name = "heroku-${version}"; + + meta = { + homepage = "https://toolbelt.heroku.com"; + description = "Everything you need to get started using Heroku"; + maintainers = with maintainers; [ aflatter mirdhyn ]; + license = licenses.mit; + }; + + src = fetchurl { + url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; + sha256 = "1596zmnlwshx15xiccfskm71syrlm87jf40y2x0y7wn0vfcyis5s"; + }; + + installPhase = '' + mkdir -p $out + cp -R * $out/ + ''; + + buildInputs = [ ruby postgresql ]; +} diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 6025a59f44c..f6cf63afc2a 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: -let version = "0_100"; in +let version = "0_101"; in stdenv.mkDerivation rec { name = "cfr-${version}"; src = fetchurl { - sha256 = "0q5kh5qdksykz339p55jz0q5cjqvxdzv3a7r4kkijgbfjm1ldr5f"; + sha256 = "0zwl3whypdm2qrw3hwaqjnifkb4wcdn8fx9scrjkli54bhr6dqch"; url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; }; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { entirely in Java 6. ''; homepage = http://www.benf.org/other/cfr/; - license = with licenses; mit; - platforms = with platforms; linux; + license = licenses.mit; + platforms = with platforms; all; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 309d20d675b..dfa83ffb312 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/phacility/libphutil.git"; - rev = "efc338d50f17dec594a66337034797c90c8b10c1"; - sha256 = "9a9df8667d9bf31667facd1cd873adef292c63893adc15d32bd819c47256027c"; + rev = "672c0f7d5da9be6cda619428a9da3b91a670ea2f"; + sha256 = "830c7abce7244afa188255a6f288c345004cc4be1c8bbe93afa2aa2f1768f025"; }; arcanist = fetchgit { url = "git://github.com/phacility/arcanist.git"; - rev = "e101496508e279e1b9ee15d7d549735a0352f8ab"; - sha256 = "4f2ae195173d859f9920378c42e257d70e5720b7f54c02d9af2c398f936f20b9"; + rev = "64d03ff68bf2ff4ef99186472704df8aface9ef3"; + sha256 = "e9c5f9a9dcb1be0b7fd6f5fbda865e14277ddb0c1cedd256c459b3540ec6ded7"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20150412"; + version = "20150525"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 770162c237e..3951212495d 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; }; - sourceRoot = if (stdenv.cc.cc.isClang or false) + sourceRoot = if stdenv.cc.isClang then "astyle/build/clang" else "astyle/build/gcc"; diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 48533f553fe..01c5fd7dcba 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -24,7 +24,7 @@ let version = "5.18"; in #doCheck = true; # 2 tests fail because of missing /dev/tty - meta = { + meta = with stdenv.lib; { description = "Automated text and program generation tool"; longDescription = '' @@ -46,7 +46,7 @@ let version = "5.18"; in documentation of program options. ''; - license = ["GPLv3+" "LGPLv3+" ]; + license = with licenses; [ gpl3Plus lgpl3Plus ]; homepage = http://www.gnu.org/software/autogen/; diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix new file mode 100644 index 00000000000..7d33d8ee3c3 --- /dev/null +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libelf, txt2man }: + +let version = "0.2"; in +stdenv.mkDerivation rec { + name = "bin_replace_string-${version}"; + + src = fetchurl { + sha256 = "1gnpddxwpsfrg4l76x5yplsvbcdbviybciqpn22yq3g3qgnr5c2a"; + url = "ftp://ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Edit precompiled binaries"; + longDescription = '' + bin_replace_string edits C-style strings in precompiled binaries. This is + intended to be useful to replace arbitrary strings in binaries whose + source code is not available. However, because of the nature of compiled + binaries, bin_replace_string may only replace a given C-string with a + shorter C-string. + ''; + homepage = http://ohnopub.net/~ohnobinki/bin_replace_string/; + downloadPage = ftp://ohnopub.net/mirror/; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ libelf ]; + nativeBuildInputs = [ txt2man ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index db02fef9f2a..f7d2dfc4957 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; downloadPage = https://ccache.samba.org/download.html; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; }; }; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 5afe5525d0e..df26db519dc 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 pep8 python - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3 ]; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix new file mode 100644 index 00000000000..6c80e6faf5e --- /dev/null +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, python}: + +stdenv.mkDerivation { + name = "doclifter-2.15"; + src = fetchurl { + url = http://www.catb.org/~esr/doclifter/doclifter-2.15.tar.gz; + sha256 = "14k750bxp0kpnm130pp22vx3vmppfnzwisc042din1416ka07yv0"; + }; + buildInputs = [ python ]; + + makeFlags = "PREFIX=$(out)"; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + cp manlifter $out/bin + cp manlifter.1 $out/share/man/man1 + ''; + + meta = { + description = "Lift documents in nroff markups to XML-DocBook"; + homepage = http://www.catb.org/esr/doclifter; + license = "BSD"; + }; +} diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 8f7f9437d4e..487c57c5484 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub -, autoconf -, automake +, autoreconfHook , findutils # for xargs , gettext , libtool @@ -9,26 +8,18 @@ , texinfo }: -let - - version = "1.4.6"; - -in stdenv.mkDerivation { - +stdenv.mkDerivation rec { name = "fswatch-${version}"; + version = "1.4.7"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4"; + sha256 = "0f6aa14v31gy3j7qx563ml37r8mylpbqfjrz2v5g44zrrg6086w7"; }; - buildInputs = [ autoconf automake gettext libtool makeWrapper texinfo ]; - - preConfigure = '' - ./autogen.sh - ''; + buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ]; postFixup = '' for prog in fswatch-run fswatch-run-bash; do diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch new file mode 100644 index 00000000000..20b99998154 --- /dev/null +++ b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch @@ -0,0 +1,165 @@ +LD_PRELOAD by itself only works with Cygwin builtin functions, but +textdomain() and friends come from libintl. In order to override +those functions, we have to "replace" cygintl-?.dll since functions are +bound to a DLL name at link time. Our replacement will be used since +it is loaded first by LD_PRELOAD. + +But as we are making this *the* libintl, we need to provide +pass-throughs for the other functions which we're not overriding, +otherwise Locale::gettext won't load (not to mention the program +that we're trying to help2man). + +--- help2man-1.46.5/Makefile.in 2014-10-09 13:03:01.000000000 +0200 ++++ help2man-1.46.5/Makefile.in 2015-05-12 14:46:52.995521900 +0200 +@@ -76,7 +76,8 @@ + fi + + install_preload: install_dirs preload +- $(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir) ++ $(INSTALL_PROGRAM) lib/cygintl-8.dll $(DESTDIR)$(pkglibdir) ++ ln -sf cygintl-8.dll $(DESTDIR)$(pkglibdir)/$(preload).so + + install_l10n: install_dirs msg_l10n man_l10n info_l10n + set -e; \ +@@ -144,7 +146,9 @@ + + preload: $(preload).so + $(preload).so: $(srcdir)/$(preload).c +- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS) ++ mkdir -p lib ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-8.dll -shared $? $(LIBS) ++ ln -sf lib/cygintl-8.dll $@ + + man: $(target).1 + $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL +--- help2man-1.46.5/bindtextdomain.c 2009-11-13 00:01:34.000000000 -0600 ++++ help2man-1.46.5/bindtextdomain.c 2011-12-29 00:24:33.608078600 -0600 +@@ -27,12 +27,34 @@ static char *(*r_textdomain)(char const + static char *(*r_bindtextdomain)(char const *, char const *) = 0; + static char *(*r_bind_textdomain_codeset)(char const *, char const *) = 0; + ++#ifdef __CYGWIN__ ++static void *RTLD_NEXT = 0; ++static char *(*r_gettext)(const char *) = 0; ++static char *(*r_dgettext)(const char *, const char *) = 0; ++static char *(*r_dcgettext)(const char *, const char *, int) = 0; ++static char *(*r_ngettext)(const char *, const char *, unsigned long int) = 0; ++static char *(*r_dngettext)(const char *, const char *, const char *, ++ unsigned long int) = 0; ++static char *(*r_dcngettext)(const char *, const char *, const char *, ++ unsigned long int, int) = 0; ++static char *(*r_setlocale)(int, const char *) = 0; ++ ++#define SYM(sym) libintl_ ## sym ++#else ++#define SYM(sym) sym ++#endif ++ + void setup() + { + static int done = 0; + if (done++) + return; + ++#ifdef __CYGWIN__ ++ if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-8.dll", RTLD_LAZY))) ++ die("libintl8 not found"); ++#endif ++ + if (!(e_textdomain = getenv("TEXTDOMAIN"))) + die("TEXTDOMAIN not set"); + +@@ -48,9 +70,19 @@ void setup() + if (!(r_bind_textdomain_codeset = dlsym(RTLD_NEXT, + "bind_textdomain_codeset"))) + die("can't find symbol \"bind_textdomain_codeset\""); ++ ++#ifdef __CYGWIN__ ++ r_gettext = dlsym(RTLD_NEXT, "libintl_gettext"); ++ r_dgettext = dlsym(RTLD_NEXT, "libintl_dgettext"); ++ r_dcgettext = dlsym(RTLD_NEXT, "libintl_dcgettext"); ++ r_ngettext = dlsym(RTLD_NEXT, "libintl_ngettext"); ++ r_dngettext = dlsym(RTLD_NEXT, "libintl_dngettext"); ++ r_dcngettext = dlsym(RTLD_NEXT, "libintl_dcngettext"); ++ r_setlocale = dlsym(RTLD_NEXT, "libintl_setlocale"); ++#endif + } + +-char *textdomain(char const *domainname) ++char *SYM(textdomain)(char const *domainname) + { + char *r; + setup(); +@@ -61,7 +93,7 @@ char *textdomain(char const *domainname) + return r; + } + +-char *bindtextdomain(char const *domainname, char const *dirname) ++char *SYM(bindtextdomain)(char const *domainname, char const *dirname) + { + char const *dir = dirname; + setup(); +@@ -71,7 +103,7 @@ char *bindtextdomain(char const *domainn + return r_bindtextdomain(domainname, dir); + } + +-char *bind_textdomain_codeset(char const *domainname, char const *codeset) ++char *SYM(bind_textdomain_codeset)(char const *domainname, char const *codeset) + { + char *r; + setup(); +@@ -81,3 +113,54 @@ char *bind_textdomain_codeset(char const + + return r; + } ++ ++#ifdef __CYGWIN__ ++ ++char *libintl_gettext(const char *msgid) ++{ ++ setup(); ++ return r_gettext(msgid); ++} ++ ++char *libintl_dgettext (const char *domainname, const char *msgid) ++{ ++ setup(); ++ return r_dgettext(domainname, msgid); ++} ++ ++char *libintl_dcgettext (const char *domainname, const char *msgid, ++ int category) ++{ ++ setup(); ++ return r_dcgettext (domainname, msgid, category); ++} ++ ++char *libintl_ngettext (const char *msgid1, const char *msgid2, ++ unsigned long int n) ++{ ++ setup(); ++ return r_ngettext (msgid1, msgid2, n); ++} ++ ++char *libintl_dngettext (const char *domainname, const char *msgid1, ++ const char *msgid2, unsigned long int n) ++{ ++ setup(); ++ return r_dngettext (domainname, msgid1, msgid2, n); ++} ++ ++char *libintl_dcngettext (const char *domainname, ++ const char *msgid1, const char *msgid2, ++ unsigned long int n, int category) ++{ ++ setup(); ++ return r_dcngettext (domainname, msgid1, msgid2, n, category); ++} ++ ++char *libintl_setlocale (int i, const char *s) ++{ ++ setup(); ++ return r_setlocale (i, s); ++} ++ ++#endif diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 088e1574ebe..79dbb533d03 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.46.5"; + name = "help2man-1.46.6"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1gqfqgxq3qgwnldjz3i5mxvzyx2w3j042r3fw1wygic3f6327nha"; + sha256 = "1brccgnjf09f2zg70s6gv6gn68mi59kp3zf50wvxp79n72ngapv1"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; doCheck = false; # target `check' is missing + patches = if stdenv.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; + postInstall = '' wrapProgram "$out/bin/help2man" \ --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)" diff --git a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch new file mode 100644 index 00000000000..8285867d8ed --- /dev/null +++ b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch @@ -0,0 +1,37 @@ +From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 18 Mar 2015 08:36:37 +0000 +Subject: lib/batch: Trivial compile fix for 32-bit builds + +intel_batchbuffer.c: In function 'fill_object': +intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + obj->relocs_ptr = (uint64_t)relocs; + ^ +intel_batchbuffer.c: In function 'exec_blit': +intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + exec.buffers_ptr = (uint64_t)objs; + +Signed-off-by: Chris Wilson + +diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c +index 666c323..c1c27a6 100644 +--- a/lib/intel_batchbuffer.c ++++ b/lib/intel_batchbuffer.c +@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle, + memset(obj, 0, sizeof(*obj)); + obj->handle = gem_handle; + obj->relocation_count = count; +- obj->relocs_ptr = (uint64_t)relocs; ++ obj->relocs_ptr = (uintptr_t)relocs; + } + + static void exec_blit(int fd, +@@ -557,7 +557,7 @@ static void exec_blit(int fd, + { + struct drm_i915_gem_execbuffer2 exec; + +- exec.buffers_ptr = (uint64_t)objs; ++ exec.buffers_ptr = (uintptr_t)objs; + exec.buffer_count = count; + exec.batch_start_offset = 0; + exec.batch_len = batch_len * 4; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 72a364e682a..997f1bfc012 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; + patches = [ ./compile-fix.patch ]; + meta = with stdenv.lib; { homepage = https://01.org/linuxgraphics/; description = "Tools for development and testing of the Intel DRM driver"; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 1d20d8eef45..c8f888f6dff 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ltrace-0.7.3"; src = fetchurl { - url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2; + url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2; sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; diff --git a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch new file mode 100644 index 00000000000..246173d465a --- /dev/null +++ b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch @@ -0,0 +1,311 @@ +--- a/glib/configure.ac 2013-08-04 20:21:20.808722600 -0500 ++++ b/glib/configure.ac 2013-08-04 18:30:21.852852200 -0500 +@@ -1880,7 +1880,7 @@ dnl ************************************ + + AC_MSG_CHECKING(for platform-dependent source) + case "$host" in +- *-*-cygwin*|*-*-mingw*) ++ *-*-mingw*) + PLATFORMDEP=gwin32.lo + ;; + *) +@@ -2594,9 +2594,6 @@ dnl *** Win32 API libs *** + dnl ********************** + + case $host in +- *-*-cygwin*) +- G_LIBS_EXTRA="-luser32 -lkernel32" +- ;; + *-*-mingw*) + G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm -lshlwapi" + ;; +--- a/glib/glib/gatomic.c 2013-08-04 20:21:20.907728300 -0500 ++++ b/glib/glib/gatomic.c 2013-08-04 18:11:14.000000000 -0500 +@@ -464,7 +464,7 @@ gsize + return g_atomic_pointer_xor ((volatile gpointer *) atomic, val); + } + +-#elif defined (G_PLATFORM_WIN32) ++#elif defined (G_OS_WIN32) + + #include + #if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) && !(defined _MSC_VER && _MSC_VER <= 1200) +--- a/glib/glib/gcharset.c 2013-08-04 20:21:20.925729300 -0500 ++++ b/glib/glib/gcharset.c 2013-08-04 18:11:14.000000000 -0500 +@@ -496,7 +496,7 @@ guess_category_value (const gchar *categ + if ((retval != NULL) && (retval[0] != '\0')) + return retval; + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + /* g_win32_getlocale() first checks for LC_ALL, LC_MESSAGES and + * LANG, which we already did above. Oh well. The main point of + * calling g_win32_getlocale() is to get the thread's locale as used +--- a/glib/glib/gconvert.c 2013-08-04 20:21:20.933729800 -0500 ++++ b/glib/glib/gconvert.c 2013-08-04 18:11:14.000000000 -0500 +@@ -33,9 +33,6 @@ + + #ifdef G_OS_WIN32 + #include "win_iconv.c" +-#endif +- +-#ifdef G_PLATFORM_WIN32 + #define STRICT + #include + #undef STRICT +@@ -1258,7 +1255,7 @@ g_locale_from_utf8 (const gchar *utf8str + charset, "UTF-8", bytes_read, bytes_written, error); + } + +-#ifndef G_PLATFORM_WIN32 ++#ifndef G_OS_WIN32 + + typedef struct _GFilenameCharsetCache GFilenameCharsetCache; + +@@ -1374,7 +1371,7 @@ g_get_filename_charsets (const gchar *** + return cache->is_utf8; + } + +-#else /* G_PLATFORM_WIN32 */ ++#else /* G_OS_WIN32 */ + + gboolean + g_get_filename_charsets (const gchar ***filename_charsets) +@@ -1403,7 +1400,7 @@ g_get_filename_charsets (const gchar *** + #endif + } + +-#endif /* G_PLATFORM_WIN32 */ ++#endif /* G_OS_WIN32 */ + + static gboolean + get_filename_charset (const gchar **filename_charset) +--- a/glib/glib/gfileutils.c 2013-08-04 20:21:20.942730300 -0500 ++++ b/glib/glib/gfileutils.c 2013-08-04 18:11:14.000000000 -0500 +@@ -2153,7 +2153,7 @@ g_path_skip_root (const gchar *file_name + { + g_return_val_if_fail (file_name != NULL, NULL); + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + /* Skip \\server\share or //server/share */ + if (G_IS_DIR_SEPARATOR (file_name[0]) && + G_IS_DIR_SEPARATOR (file_name[1]) && +@@ -2163,7 +2163,6 @@ g_path_skip_root (const gchar *file_name + gchar *p; + p = strchr (file_name + 2, G_DIR_SEPARATOR); + +-#ifdef G_OS_WIN32 + { + gchar *q; + +@@ -2171,7 +2170,6 @@ g_path_skip_root (const gchar *file_name + if (p == NULL || (q != NULL && q < p)) + p = q; + } +-#endif + + if (p && p > file_name + 2 && p[1]) + { +--- a/glib/glib/glib.h 2013-08-04 20:21:20.949730700 -0500 ++++ b/glib/glib/glib.h 2013-08-04 18:11:14.000000000 -0500 +@@ -96,7 +96,7 @@ + #include + #include + #include +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + #include + #endif + +--- a/glib/glib/gutf8.c 2013-08-04 20:21:20.984732700 -0500 ++++ b/glib/glib/gutf8.c 2013-08-04 18:11:14.000000000 -0500 +@@ -27,7 +27,7 @@ + #endif + #include + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + #include + #define STRICT + #include +--- a/glib/glib/gutils.c 2013-08-04 20:21:21.015734500 -0500 ++++ b/glib/glib/gutils.c 2013-08-04 18:11:14.000000000 -0500 +@@ -72,7 +72,7 @@ + #include "garray.h" + #include "glibintl.h" + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + #include "gconvert.h" + #include "gwin32.h" + #endif +@@ -86,16 +86,13 @@ + * These are portable utility functions. + */ + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + # include + # ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS + # define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2 + # define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 4 + # endif + # include /* For UNLEN */ +-#endif /* G_PLATFORM_WIN32 */ +- +-#ifdef G_OS_WIN32 + # include + # include + /* older SDK (e.g. msvc 5.0) does not have these*/ +@@ -131,7 +128,7 @@ + #include + #endif + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + + gchar * + _glib_get_dll_directory (void) +--- a/glib/glib/gutils.h 2013-08-04 20:21:21.067737500 -0500 ++++ b/glib/glib/gutils.h 2013-08-04 18:11:14.000000000 -0500 +@@ -350,7 +350,7 @@ g_bit_storage (gulong number) + * On non-Windows platforms, expands to nothing. + */ + +-#ifndef G_PLATFORM_WIN32 ++#ifndef G_OS_WIN32 + # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name) + #else + # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name) \ +@@ -378,7 +378,7 @@ DllMain (HINSTANCE hinstDLL, \ + + #endif /* !G_DISABLE_DEPRECATED */ + +-#endif /* G_PLATFORM_WIN32 */ ++#endif /* G_OS_WIN32 */ + + G_END_DECLS + +--- a/glib/glib/gwin32.h 2013-08-04 20:21:21.081738300 -0500 ++++ b/glib/glib/gwin32.h 2013-08-04 18:11:14.000000000 -0500 +@@ -33,7 +33,7 @@ + + #include + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + + G_BEGIN_DECLS + +@@ -41,8 +41,6 @@ G_BEGIN_DECLS + #define MAXPATHLEN 1024 + #endif + +-#ifdef G_OS_WIN32 +- + /* + * To get prototypes for the following POSIXish functions, you have to + * include the indicated non-POSIX headers. The functions are defined +@@ -68,7 +66,6 @@ G_BEGIN_DECLS + GLIB_AVAILABLE_IN_ALL + gint g_win32_ftruncate (gint f, + guint size); +-#endif /* G_OS_WIN32 */ + + /* The MS setlocale uses locale names of the form "English_United + * States.1252" etc. We want the Unixish standard form "en", "zh_TW" +@@ -112,7 +109,7 @@ gchar* g_win32_locale_filename_ + + G_END_DECLS + +-#endif /* G_PLATFORM_WIN32 */ ++#endif /* G_OS_WIN32 */ + + #ifdef G_OS_WIN32 + #ifdef _WIN64 +--- a/glib/glib/libcharset/localcharset.c 2013-08-04 20:21:21.095739100 -0500 ++++ b/glib/glib/libcharset/localcharset.c 2013-08-04 18:11:14.000000000 -0500 +@@ -46,10 +46,6 @@ + # include + # endif + # endif +-# ifdef __CYGWIN__ +-# define WIN32_LEAN_AND_MEAN +-# include +-# endif + #elif defined WIN32_NATIVE + # define WIN32_LEAN_AND_MEAN + # include +@@ -111,7 +107,7 @@ _g_locale_get_charset_aliases (void) + cp = charset_aliases; + if (cp == NULL) + { +-#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) ++#if !(defined VMS || defined WIN32_NATIVE) + FILE *fp; + const char *dir; + const char *base = "charset.alias"; +@@ -237,7 +233,7 @@ _g_locale_get_charset_aliases (void) + "DECKOREAN" "\0" "EUC-KR" "\0"; + # endif + +-# if defined WIN32_NATIVE || defined __CYGWIN__ ++# if defined WIN32_NATIVE + /* To avoid the troubles of installing a separate file in the same + directory as the DLL and of retrieving the DLL's directory at + runtime, simply inline the aliases here. */ +@@ -292,53 +288,6 @@ _g_locale_charset_raw (void) + /* Most systems support nl_langinfo (CODESET) nowadays. */ + codeset = nl_langinfo (CODESET); + +-# ifdef __CYGWIN__ +- /* Cygwin 2006 does not have locales. nl_langinfo (CODESET) always +- returns "US-ASCII". As long as this is not fixed, return the suffix +- of the locale name from the environment variables (if present) or +- the codepage as a number. */ +- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) +- { +- const char *locale; +- static char buf[2 + 10 + 1]; +- +- locale = getenv ("LC_ALL"); +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_CTYPE"); +- if (locale == NULL || locale[0] == '\0') +- locale = getenv ("LANG"); +- } +- if (locale != NULL && locale[0] != '\0') +- { +- /* If the locale name contains an encoding after the dot, return +- it. */ +- const char *dot = strchr (locale, '.'); +- +- if (dot != NULL) +- { +- const char *modifier; +- +- dot++; +- /* Look for the possible @... trailer and remove it, if any. */ +- modifier = strchr (dot, '@'); +- if (modifier == NULL) +- return dot; +- if (modifier - dot < sizeof (buf)) +- { +- memcpy (buf, dot, modifier - dot); +- buf [modifier - dot] = '\0'; +- return buf; +- } +- } +- } +- +- /* Woe32 has a function returning the locale's codepage as a number. */ +- sprintf (buf, "CP%u", GetACP ()); +- codeset = buf; +- } +-# endif +- + # else + + /* On old systems which lack it, use setlocale or getenv. */ diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 2ce1fd7b6e4..f01b52cbba7 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, vanilla ? false}: +{stdenv, fetchurl, automake, libiconv, vanilla ? false}: stdenv.mkDerivation (rec { name = "pkg-config-0.28"; @@ -10,13 +10,15 @@ stdenv.mkDerivation (rec { sha256 = "0igqq5m204w71m11y0nipbdf5apx87hwfll6axs12hn4dqfb6vkb"; }; + buildInputs = stdenv.lib.optional stdenv.isCygwin libiconv; + configureFlags = [ "--with-internal-glib" ]; - patches = if vanilla then [] else [ + patches = (if vanilla then [] else [ # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. ./requires-private.patch - ]; + ]) ++ stdenv.lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; meta = { description = "A tool that allows packages to find out information about other packages"; diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix new file mode 100644 index 00000000000..1d2a3cda2b6 --- /dev/null +++ b/pkgs/development/tools/misc/rman/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "rman-3.2"; + src = fetchurl { + url = mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz; + sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8"; + }; + makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man"; + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man + ''; + + meta = { + description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; + license = "artistic"; + }; +} diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index f4add9a4b9e..70aedbb48d2 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify"; + name = "${product}-${version}"; + product = "uncrustify"; version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz"; sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index d6667b76759..e5862785717 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "yodl-${version}"; - version = "3.05.00"; + version = "3.05.01"; buildInputs = [ perl icmake ]; src = fetchurl { url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz"; - sha256 = "12hv5ghrsk6kdi414glg888v3qk3m1nmicl8f0h5k4szm1i00dig"; + sha256 = "0ghdzr3lzgfzvfymnjbj4mw8vpq098swvipxghhqgfmv58dhwgas"; }; preConfigure = '' diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 29507f49c18..e823466f417 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4, +{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4, ocamlmod, ocamlify, ounit, expect}: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ - ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4 + ocaml findlib type_conv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b6dce132868..0d765ec93bb 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -37,13 +37,13 @@ let sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.2.1.zip"; - sha256 = "1mvsy89l5g9nvwmmls5jf46anh6gk8dk8a1dn42rmnihnb0zjcs4"; + url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; + sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "1.2.1"; + version = "1.2.2"; buildInputs = [ unzip curl ncurses ocaml ]; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 0d96c562c16..0a7e2530526 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; homepage = http://flexcpp.sourceforge.net/; downloadPage = http://sourceforge.net/projects/flexcpp/files/; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 5169cd1567c..0b614f4edc6 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -4,16 +4,14 @@ with rustPlatform; buildRustPackage rec { #TODO add emacs support - name = "racer-git-2015-05-04"; + name = "racer-git-2015-05-18"; src = fetchgit { url = https://github.com/phildawes/racer; - rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c"; - sha256 = "0ldf05d19ghxk3fslxrc87j18zg8bam2y0ygdy456h37y2p1d1ck"; + rev = "c2d31ed49baa11f06ffc0c7bc8f95dd00037d035"; + sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7"; }; - patches = [ ./pr-232.patch ]; - - depsSha256 = "0rinyh365znx39aygxyyxmi496pw0alblf2dl7l8fbmz63nkhfv2"; + depsSha256 = "0s951apqcr96lvc1jamk6qw3631gwnlnfgcx55vlznfm7shnmywn"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/racer/pr-232.patch b/pkgs/development/tools/rust/racer/pr-232.patch deleted file mode 100644 index 354307d71e4..00000000000 --- a/pkgs/development/tools/rust/racer/pr-232.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3f354d69881424c7c902408d22f9138412a872b4 Mon Sep 17 00:00:00 2001 -From: Ricardo Martins -Date: Sat, 9 May 2015 17:12:55 +0100 -Subject: [PATCH] Use `Vec::extend` instead of binary operation `+`. - ---- - src/racer/nameres.rs | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/racer/nameres.rs b/src/racer/nameres.rs -index 60636c6..ad1e01c 100644 ---- a/src/racer/nameres.rs -+++ b/src/racer/nameres.rs -@@ -620,9 +620,9 @@ pub fn search_scope(start: usize, point: usize, src: &str, - } - - // There's a good chance of a match. Run the matchers -- out = out + &*run_matchers_on_blob(src, start+blobstart, start+blobend, -- searchstr, -- filepath, search_type, local, namespace); -+ out.extend(run_matchers_on_blob(src, start+blobstart, start+blobend, -+ searchstr, -+ filepath, search_type, local, namespace)); - if let ExactMatch = search_type { - if !out.is_empty() { - return out.into_iter(); diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index e41b45dff68..948e39f4b55 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; - license = "unfree"; + license = licenses.unfree; homepage = https://docs.saucelabs.com/reference/sauce-connect/; maintainers = with maintainers; [offline]; platforms = with platforms; platforms.linux; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index f2d39938a48..8d9db34446d 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -7,10 +7,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "chromedriver_linux64"; + product = "chromedriver_linux64"; + name = "${product}-2.14"; + version = "2.14"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip"; + url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip"; sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin"; }; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 6a009f5af09..26435088ade 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "selenium-server-standalone-${version}"; - version = "2.44.0"; + version = "2.45.0"; src = fetchurl { - url = "http://selenium-release.storage.googleapis.com/2.44/selenium-server-standalone-2.44.0.jar"; - sha256 = "1n53pyrxpmfh9lvr68d1l9rsiw7qr36farirpl3ivkyvnpm5iwm5"; + url = "http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar"; + sha256 = "0yvmmngqff3k5si1js8v87nx3whlsx7q4p78v6ybqhsbv6idywhi"; }; unpackPhase = "true"; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix new file mode 100644 index 00000000000..a5bfb8bfc59 --- /dev/null +++ b/pkgs/development/tools/thrust/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk +, pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss +, xlibs, libcap, unzip +}: + +let + thrustEnv = buildEnv { + name = "env-thrust"; + paths = [ + stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf + cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 + xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite + xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap + ]; + }; +in stdenv.mkDerivation rec { + name = "thrust-${version}"; + version = "0.7.6"; + + src = fetchurl { + url = "https://github.com/breach/thrust/releases/download/v${version}/thrust-v${version}-linux-x64.zip"; + sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc"; + }; + + buildInputs = [ thrustEnv makeWrapper unzip ]; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/libexec/thrust + unzip -d $out/libexec/thrust/ $src + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/libexec/thrust/thrust_shell + wrapProgram $out/libexec/thrust/thrust_shell \ + --prefix "LD_LIBRARY_PATH" : "${thrustEnv}/lib:${thrustEnv}/lib64" + ln -s $out/libexec/thrust/thrust_shell $out/bin + ''; + + meta = with stdenv.lib; { + description = "Chromium-based cross-platform / cross-language application framework"; + homepage = https://github.com/breach/thrust; + license = licenses.mit; + maintainers = [ maintainers.osener ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 5edc57e2f81..73a8b64ed22 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = ''scons install''; meta = { - licence = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index fa9b680f281..b3b9881559d 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv }: +{ stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: let - version = "1.6.4"; + version = "2.1.0"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; src = fetchurl { url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; - sha256 = "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7"; + sha256 = "0v6jzsrq3ym0nqy7nb9chn8ij79agifwdvsp5nysgr609na7617i"; }; prePatch = '' @@ -17,7 +17,11 @@ in stdenv.mkDerivation { configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ]; - buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); + # iojs has --enable-static but no --disable-static. Automatically adding --disable-static + # causes configure to fail, so don't add --disable-static. + dontDisableStatic = true; + + buildInputs = [ python openssl_1_0_2 http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); setupHook = ../nodejs/setup-hook.sh; passthru.interpreterName = "iojs"; diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 9698818c557..5a0bdcd70a7 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchurl, python27 , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL +, openal, mesa, xproto, libX11, libXcursor, nspr, SDL , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ zeroadData python27 pkgconfig spidermonkey_24 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet - miniupnpc openalSoft mesa xproto libX11 libXcursor nspr + miniupnpc openal mesa xproto libX11 libXcursor nspr SDL gloox nvidia-texture-tools ] ++ stdenv.lib.optional withEditor wxGTK; @@ -112,10 +112,13 @@ stdenv.mkDerivation rec { done "$out"/share/applications/0ad.desktop ''; - meta = { + meta = with stdenv.lib; { description = "A free, open-source game of ancient warfare"; homepage = "http://wildfiregames.com/0ad/"; - license = [ "GPLv2" "LGPLv2.1" "MIT" "CC BY-SA 3.0" "zlib" ]; + license = with licenses; [ + gpl2 lgpl21 mit cc-by-sa-30 + licenses.zlib # otherwise masked by pkgs.zlib + ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 25524528c5c..d44da3d41b7 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio +{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio , xlibs, plowshare }: assert stdenv.isLinux; @@ -8,7 +8,7 @@ let inherit (xlibs) libXext libX11; lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ - zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio]; + zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; in assert stdenv.is64bit; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index b3c2dd14718..a7d6bbc63d9 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace libGL.so.1 ${mesa}/lib/libGL.so.1 ''; - meta = { + meta = with stdenv.lib; { description = "A free, stand-alone first-person shooter computer game"; longDescription = '' Do you like old school deathmatch with modern features? How @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { ''; homepage = http://red.planetarena.org; # Engine is under GPLv2, everything else is under - license = [ "unfree-redistributable" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 8cb38c859ed..af90c826705 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, lame, mplayer, pulseaudio, portaudio +{ stdenv, lib, fetchurl, lame, mplayer, libpulseaudio, portaudio , python, pyqt4, pythonPackages # This little flag adds a huge number of dependencies, but we assume that # everyone wants Anki to draw plots with statistics by default. @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio ] ++ lib.optional plotsSupport py.matplotlib; - buildInputs = [ python py.wrapPython lame mplayer pulseaudio ]; + buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ]; preConfigure = '' substituteInPlace anki \ diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 801b7ea7277..c577d65a559 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = ''A blobby volleyball game''; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; homepage = "http://blobby.sourceforge.net/"; diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index f0d885c1f88..e3efd84f0fb 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis -, openalSoft, curl }: +, openal, curl }: stdenv.mkDerivation rec { hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd */neo ''; - buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft + buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openal curl ]; enableParallelBuilding = true; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index e7a420b894a..46cd66d22af 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Enhanched port of Duke Nukem 3D for various platforms"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; homepage = http://eduke32.com; maintainers = with maintainers; [ nckx sander ]; }; diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix index 642a86ac4de..4c1a385baaf 100644 --- a/pkgs/games/gsb/default.nix +++ b/pkgs/games/gsb/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/GSB ''; - meta = { + meta = with stdenv.lib; { description = "Gratuitous Space Battles"; longDescription = '' a strategy / management / simulation game that does away with all the @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { battle (or at least blow to bits in aesthetically pleasing ways). ''; homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html; - license = [ "unfree" ]; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = licenses.unfree; + maintainers = with maintainers; [ jcumming ]; platforms = [ "x86_64-linux" "i686-linux" ] ; }; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix new file mode 100644 index 00000000000..66d01905aaf --- /dev/null +++ b/pkgs/games/gzdoom/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL2}: + +stdenv.mkDerivation { + name = "gzdoom-2015-05-07"; + src = fetchFromGitHub{ + owner = "coelckers"; + repo = "gzdoom"; + rev = "a59824cd8897dea5dd452c31be1328415478f990"; + sha256 = "1lg9dk5prn2bjmyznq941a862alljvfgbb42whbpg0vw9vhpikak"; + }; + + buildInputs = [ cmake fmod mesa SDL2 ]; + + cmakeFlags = [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]; + + preConfigure='' + sed s@gzdoom.pk3@$out/share/gzdoom.pk3@ -i src/version.h + ''; + + installPhase = '' + mkdir -p $out/bin + cp gzdoom $out/bin + mkdir -p $out/share + cp gzdoom.pk3 $out/share + ''; + + meta = { + homepage = https://github.com/coelckers/gzdoom; + description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; + maintainer = [ stdenv.lib.maintainers.lassulus ]; + }; +} + diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 042d4f9fd4a..bb776a7a10d 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { contact with explosions, to zero (the damage dealt to the attacked hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; - maintainers = maintainers.kragniz; + maintainers = with maintainers; [ kragniz ]; platforms = ghc.meta.platforms; }; } diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 3198ad785f0..9a19366a074 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm -, mesa, openal, alsaOss, pulseaudioSupport ? false, pulseaudio }: +, mesa, openal, alsaOss, pulseaudioSupport ? false, libpulseaudio }: assert jre ? architecture; @@ -23,7 +23,7 @@ stdenv.mkDerivation { # wrapper for minecraft export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ - ${if pulseaudioSupport then "${pulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ + ${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ ${jre}/bin/java -jar $out/minecraft.jar EOF diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 6c53bc3fdb3..72673ea010c 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2, - libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }: +{ stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp +, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype +, gettext +}: let - version = "0.4.4"; + version = "0.4.12"; sources = { src = fetchgit { - url = "https://github.com/celeron55/minetest.git"; - rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8"; - sha256 = "033gajwxgs8dqxb8684waaav28s0qd6cd4rlzfldwgdbkwam9cb1"; + url = "https://github.com/minetest/minetest.git"; + rev = "7993a403f2c17a215e4895ba1848aaf69bb61980"; + sha256 = "04v6fd9r9by8g47xbjzkhkgac5zpik01idngbbx2in4fxrg3ac7c"; }; data = fetchgit { - url = "https://github.com/celeron55/minetest_game.git"; - rev = "3928eccf74af0288d12ffb14f8222fae479bc06b"; - sha256 = "1gw2267bnqwfpnm7iq014y1vkb1v3nhpg1dmg9vgm9z5yja2blif"; + url = "https://github.com/minetest/minetest_game.git"; + rev = "03c00a831d5c2fd37096449bee49557879068af1"; + sha256 = "1qqhlfz296rmi3mmlvq1rwv7hq5w964w1scry095xaih7y11ycmk"; }; }; in stdenv.mkDerivation { @@ -21,12 +23,15 @@ in stdenv.mkDerivation { src = sources.src; cmakeFlags = [ - "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht" + "-DENABLE_FREETYPE=1" + "-DENABLE_GETTEXT=1" + "-DCURL_INCLUDE_DIR=${curl}/include/curl" + "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" ]; buildInputs = [ - cmake irrlicht3843 libpng bzip2 libjpeg - libXxf86vm mesa openal libvorbis x11 + cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa + openal libvorbis x11 sqlite luajit freetype gettext ]; postInstall = '' @@ -34,9 +39,11 @@ in stdenv.mkDerivation { cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ ''; - meta = { - homepage = "http://minetest.net/"; + meta = with stdenv.lib; { + homepage = http://minetest.net/; description = "Infinite-world block sandbox game"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds c0dehero ]; }; } diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index 1d0bf636e2e..8e9f5a988bf 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://dev.haeleth.net/onscripter.shtml"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 376d1e33473..da4a34cfec8 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gcc -, mesa_glu, libX11, libXext, libXcursor, pulseaudio +, mesa_glu, libX11, libXext, libXcursor, libpulseaudio }: stdenv.mkDerivation { name = "scrolls-2014-03-08"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; - licence = stdenv.lib.licenses.unfree; + license = stdenv.lib.licenses.unfree; }; src = fetchurl { @@ -25,7 +25,7 @@ stdenv.mkDerivation { libX11 libXext libXcursor - pulseaudio + libpulseaudio ]; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b8e5c646758..1876e81dc31 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -56,7 +56,7 @@ buildFHSUserEnv { pkgs.alsaLib pkgs.libvorbis pkgs.openal - pkgs.pulseaudio + pkgs.libpulseaudio pkgs.flashplayer diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 0478e208da2..2f2ce921176 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, traceDeps ? false}: stdenv.mkDerivation rec { - name = "${program}-${version}"; + name = "${program}-original-${version}"; program = "steam"; version = "1.0.0.49"; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 82cffc8dec6..99bafe95b75 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, pkgconfig, autoconf, automake, yasm, zlib, bzip2, alsaLib -, pulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk +, libpulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk , mesa, glew }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig autoconf automake yasm zlib bzip2 alsaLib pulseaudio libmad libtheora + pkgconfig autoconf automake yasm zlib bzip2 alsaLib libpulseaudio libmad libtheora libvorbis libpng libjpeg gtk mesa glew ]; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index f3574d137d3..29e923108e1 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,30 +1,34 @@ -{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa +{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa , libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig -, fribidi, autoconf, automake, libtool, bluez }: +, fribidi, autoconf, automake, libtool, bluez, libjpeg }: stdenv.mkDerivation rec { - version = "0.8.1"; name = "supertuxkart-${version}"; - src = fetchurl { - url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2"; - sha256 = "1mpqmi62a2kl6n58mw11fj0dr5xiwmjkqnfmd2z7ghdhc6p02lrk"; - }; - + version = "0.9"; + srcs = [ + (fetchgit { + url = "https://github.com/supertuxkart/stk-code"; + rev = "28a525f6d4aba2667c41a549b027149fcceda97e"; + sha256 = "0b5izr7j3clm6pcxanwwaas06f17wi454s6hwmgv1mg48aay2v97"; + name = "stk-code"; + }) + (fetchsvn { + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "16293"; + sha256 = "07jdkli28xr3rcxvixyy5bwi26n5i7dkhd9q0j4wifgs4pymm8r5"; + name = "stk-assets"; + }) + ]; + buildInputs = [ plib SDL openal freealut mesa libvorbis libogg gettext - libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez + libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg ]; enableParallelBuilding = true; - preConfigure = '' - echo Building internal Irrlicht - cd lib/irrlicht/source/Irrlicht/ - cp "${mesa}"/include/GL/{gl,glx,wgl}ext.h . - NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - cd - - ''; + sourceRoot = "stk-code"; meta = { description = "A Free 3D kart racing game"; @@ -35,6 +39,6 @@ stdenv.mkDerivation rec { ''; homepage = http://supertuxkart.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ]; }; } diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix index c8e0d3f097f..11429cfadd2 100644 --- a/pkgs/games/super-tux/default.nix +++ b/pkgs/games/super-tux/default.nix @@ -1,28 +1,34 @@ -{ fetchurl, stdenv, SDL, SDL_image, SDL_mixer, curl, gettext, libogg, libvorbis, mesa, openal }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer +, curl, gettext, libogg, libvorbis, mesa, openal, physfs, boost, glew +, libiconv }: -let - - version = "0.1.3"; - -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "supertux-${version}"; + version = "0.3.5a"; - src = fetchurl { - url = "mirror://sourceforge/supertux.berlios/supertux-${version}.tar.bz2"; - sha256 = "15xdq99jy4hayr96jpqcp15rbr9cs5iamjirafajcrkpa61mi4h0"; + src = fetchFromGitHub { + owner = "SuperTux"; + repo = "supertux"; + rev = "v${version}"; + sha256 = "0f522wsv0gx7v1h70x8xznklaqr5bm2l9h7ls9vjywy0z4iy1ahp"; }; - buildInputs = [ SDL SDL_image SDL_mixer curl gettext libogg libvorbis mesa openal ]; + buildInputs = [ pkgconfig cmake SDL2 SDL2_image SDL2_mixer curl gettext + libogg libvorbis mesa openal physfs boost glew libiconv ]; - patches = [ ./g++4.patch ]; + preConfigure = '' + patchShebangs configure + ''; - meta = { + postInstall = '' + mkdir $out/bin + ln -s $out/games/supertux2 $out/bin + ''; + + meta = with stdenv.lib; { description = "Classic 2D jump'n run sidescroller game"; - - homepage = http://supertux.lethargik.org/index.html; - - license = stdenv.lib.licenses.gpl2; + homepage = http://supertux.github.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/games/super-tux/g++4.patch b/pkgs/games/super-tux/g++4.patch deleted file mode 100644 index a7378c80a29..00000000000 --- a/pkgs/games/super-tux/g++4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/menu.h b/src/menu.h -index 3c67c45..7c7ab8e 100644 ---- a/src/menu.h -+++ b/src/menu.h -@@ -207,7 +207,7 @@ public: - - bool isToggled(int id); - -- void Menu::get_controlfield_key_into_input(MenuItem *item); -+ void get_controlfield_key_into_input(MenuItem *item); - - void draw (); - void draw_item(int index, int menu_width, int menu_height); diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index 3fcbff42527..fd80eecfd55 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { done ''; dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "A game that blends a team based FPS with elements of an RTS"; longDescription = '' Tremulous is a free, open source game that blends a team based FPS with @@ -70,9 +70,12 @@ stdenv.mkDerivation rec { degree), healing functions and much more... ''; homepage = http://www.tremulous.net; - license = [ "GPLv2" ]; # media under cc by-sa 2.5 - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ + gpl2 + cc-by-sa-25 /* media */ + ]; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; broken = true; }; } diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 6b4c6e68bac..9224d5872c2 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { cur_rpath=$(patchelf --print-rpath $p) patchelf --set-rpath $cur_rpath:${mesa}/lib $p ''; - meta = { + meta = with stdenv.lib; { description = "A multiplayer tactical FPS on top of Quake 3 engine"; longDescription = '' Urban Terror is a free multiplayer first person shooter developed by @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { realism". This results in a very unique, enjoyable and addictive game. ''; homepage = http://www.urbanterror.net; - license = [ "unfree-redistributable" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index cab6a269f93..f85fd267485 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, SDL, pulseaudio, alsaLib }: +{ stdenv, requireFile, SDL, libpulseaudio, alsaLib }: stdenv.mkDerivation rec { name = "vessel-12082012"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ld_preload = ./isatty.c; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ; + + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; installPhase = '' mkdir -p $out/libexec/strangeloop/vessel/ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/Vessel ''; - meta = { + meta = with stdenv.lib; { description = "A fluid physics based puzzle game"; longDescription = '' Living liquid machines have overrun this world of unstoppable progress, @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { to life, and all the consequences that ensue. ''; homepage = http://www.strangeloopgames.com; - license = [ "unfree" ]; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = licenses.unfree; + maintainers = with maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix new file mode 100644 index 00000000000..b6bd54f779d --- /dev/null +++ b/pkgs/games/voxelands/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite +, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, pkgconfig }: + +stdenv.mkDerivation rec { + name = "voxelands-${version}"; + version = "1504.01"; + + src = fetchurl { + url = "http://voxelands.com/downloads/${name}-src.tar.bz2"; + sha256 = "17jv2pz0mbkkf7jw3jcpix8hb46b382hc7vki42n9rrdynydq5zp"; + }; + + cmakeFlags = [ + "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" + "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG" + "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG" + ]; + + buildInputs = [ + cmake irrlicht libpng bzip2 libjpeg sqlite + libXxf86vm mesa openal libvorbis x11 pkgconfig + ]; + + meta = with stdenv.lib; { + homepage = http://voxelands.com/; + description = "Infinite-world block sandbox game based on Minetest"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds c0dehero ]; + }; +} diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 84d15efb810..95086d04630 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { cur_rpath=$(patchelf --print-rpath $p) patchelf --set-rpath $cur_rpath:${mesa}/lib $p ''; - meta = { + meta = with stdenv.lib; { description = "Multiplayer FPS game designed for competitive gaming"; longDescription = '' Set in a futuristic cartoon-like world where rocketlauncher-wielding @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.warsow.net; # Engine is under GPLv2, everything else is under - license = [ "unfree-redistributable" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 248b58a4e1a..bd94fbecb2a 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng -, libtheora, openalSoft, physfs, mesa, fribidi, fontconfig +, libtheora, openal, physfs, mesa, fribidi, fontconfig , freetype, qt4, glew, libogg, libvorbis, zlib, libX11 , libXrandr, zip, unzip, which , withVideos ? false @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz"; sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa"; }; - buildInputs = [ bison flex gettext pkgconfig libpng libtheora openalSoft + buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal physfs mesa fribidi fontconfig freetype qt4 glew libogg libvorbis zlib libX11 libXrandr zip unzip diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 8df3ef1e840..ba887d91de1 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/WorldofGoo ''; - meta = { + meta = with stdenv.lib; { description = "A physics based puzzle game"; longDescription = '' World of Goo is a physics based puzzle / construction game. The millions of Goo @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { game, or that they are extremely delicious. ''; homepage = http://worldofgoo.com; - license = [ "unfree" ]; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = licenses.unfree; + maintainers = with maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix new file mode 100644 index 00000000000..787aebef2d5 --- /dev/null +++ b/pkgs/games/xbomb/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libX11, libXaw }: + +stdenv.mkDerivation rec { + name = "xbomb-2.2b"; + src = fetchurl { + url = "http://www.gedanken.org.uk/software/xbomb/download/${name}.tgz"; + sha256 = "0692gjw28qvh8wj9l58scjw6kxj7jdyb3yzgcgs9wcznq11q839m"; + }; + + buildInputs = [ libX11 libXaw ]; + + preBuild = '' + substituteInPlace Makefile \ + --replace /usr/local $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.gedanken.org.uk/software/xbomb/; + description = "Minesweeper for X11 with various grid sizes and shapes"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index ba8245bb700..7b68e1e3d36 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { aims to become the best possible open-source FPS of its kind. ''; homepage = http://www.xonotic.org; - license = with stdenv.lib.licenses; gpl2Plus; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 68b77dd091b..503deb695f7 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "1.42"; - name = "xsnow"; + name = "xsnow-${version}"; src = fetchurl { - url = "http://dropmix.xs4all.nl/rick/Xsnow/xsnow-${version}.tar.gz"; + url = "http://dropmix.xs4all.nl/rick/Xsnow/${name}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 59a88191d2e..0bc63855299 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -1,24 +1,25 @@ -{stdenv, fetchurl, cmake, SDL, nasm, p7zip, zlib, flac, fmod, libjpeg}: +{ stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL }: stdenv.mkDerivation { - name = "zdoom-2.6.1"; - src = fetchurl { - url = http://zdoom.org/files/zdoom/2.6/zdoom-2.6.1-src.7z; - sha256 = "1ha7hygwf243vkgw0dfh4dxphf5vffb3kkci1p1p75a7r1g1bir8"; + name = "zdoom-2.7.1"; + src = fetchFromGitHub { + #url = "https://github.com/rheit/zdoom"; + owner = "rheit"; + repo = "zdoom"; + rev = "2.7.1"; + sha256 = "00bx4sgl9j1dyih7yysfq4ah6msxw8580g53p99jfym34ky5ppkh"; }; - # XXX: shouldn't inclusion of p7zip handle this? - unpackPhase = '' - mkdir zdoom - cd zdoom - 7z x $src - ''; + buildInputs = [ cmake fmod mesa SDL ]; - buildInputs = [cmake nasm SDL p7zip zlib flac fmod libjpeg]; + cmakeFlags = [ + "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" + "-DSDL_INCLUDE_DIR=${SDL}/include" + ]; - cmakeFlags = [ "-DSDL_INCLUDE_DIR=${SDL}/include/SDL" ]; + NIX_CFLAGS_COMPILE = [ "-I ${SDL}/include/SDL" ]; - preConfigure='' + preConfigure = '' sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h ''; @@ -32,6 +33,7 @@ stdenv.mkDerivation { meta = { homepage = http://zdoom.org/; description = "Enhanced port of the official DOOM source code"; + maintainer = [ stdenv.lib.maintainers.lassulus ]; }; } diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 41ed3e71042..8558d1f7dee 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, automake, pkgconfig , cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus -, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp -, withPlugin ? false, substituteAll +, polkit, qtSupport ? true, qt4, pyqt4, net_snmp +, withPlugin ? false, substituteAll, makeWrapper }: let - name = "hplip-3.15.2"; + name = "hplip-3.15.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0z7n62vdbr0p0kls1m2sr3nhvkhx3rawcbzd0zdl0lnq8fkyq0jz"; + sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3"; }; hplip_state = @@ -21,9 +21,17 @@ let version = (builtins.parseDrvName name).version; }; + hplip_arch = + { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "arm6l-linux" = "arm32"; + "arm7l-linux" = "arm32"; + }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}"); + plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "0j8z8m3ygwahka7jv3hpzvfz187lh3kzzjhcy7grgaw2k01v5frm"; + sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392"; }; in @@ -66,7 +74,21 @@ stdenv.mkDerivation { postInstall = '' - wrapPythonPrograms + # Wrap the user-facing Python scripts in /bin without turning the ones + # in /share into shell scripts (they need to be importable). + # Complicated by the fact that /bin contains just symlinks to /share. + for bin in $out/bin/*; do + py=`readlink -m $bin` + rm $bin + cp $py $bin + wrapPythonProgramsIn $bin "$out $pythonPath" + sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin + done + + # Remove originals. Knows a little too much about wrapPythonProgramsIn. + rm -f $out/bin/.*-wrapped + + wrapPythonPrograms $out/lib "$out $pythonPath" '' + (stdenv.lib.optionalString withPlugin (let hplip_arch = @@ -122,8 +144,8 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional qtSupport qt4; pythonPath = with pythonPackages; [ + dbus pillow - pythonDBus pygobject recursivePthLoader reportlab @@ -135,7 +157,7 @@ stdenv.mkDerivation { license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel jgeerds ]; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ ttuegel jgeerds nckx ]; }; } diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 6126108b642..c9651fd0614 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -5,7 +5,8 @@ let pkg = import ./base.nix { pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v"; }; in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ]; + buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper + gnome3.defaultIconTheme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/image-analyzer \ diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index b3d7f6d23ec..226031a2eb7 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -5,7 +5,8 @@ let pkg = import ./base.nix { pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk"; }; in callPackage pkg { - buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ]; + buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper + gnome3.defaultIconTheme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/gcdemu \ diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 275e6f06520..461d3c11c3c 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, libpthreadstubs, libXrandr, libXext, readline , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl -, pulseaudio ? null }: +, libpulseaudio ? null }: stdenv.mkDerivation rec { name = "dolphin-emu-4.0.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - libXdmcp portaudio SDL wxGTK30 pulseaudio ]; + libXdmcp portaudio SDL wxGTK30 libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index cbff76610f1..fd293298b45 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, git, libpthreadstubs, libXrandr, libXext, readline , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb -, pulseaudio ? null }: +, libpulseaudio ? null }: stdenv.mkDerivation rec { name = "dolphin-emu-20150421"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - git libXdmcp portaudio SDL wxGTK30 libusb pulseaudio ]; + git libXdmcp portaudio SDL wxGTK30 libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 3eb60b81b81..95793de9884 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -3,7 +3,7 @@ , libX11, libXv , udev , mesa, SDL -, libao, openal, pulseaudio +, libao, openal, libpulseaudio , profile ? "performance" # Options: accuracy, balanced, performance , guiToolkit ? "gtk" # can be gtk or qt4 , gtk ? null, qt4 ? null }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig libX11 libXv udev mesa SDL libao openal pulseaudio ] + [ pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio ] ++ optionals (guiToolkit == "gtk") [ gtk ] ++ optionals (guiToolkit == "qt4") [ qt4 ]; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index faa143d9273..fa5e501c434 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit , freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib -, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }: +, libX11, libXext, libXxf86vm, libXdmcp, SDL, libpulseaudio ? null }: stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils - python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ]; + python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL libpulseaudio ]; patchPhase = '' export GLOBAL_CONFIG_DIR=$out/etc diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 760821e3654..32d47093d68 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, pulseaudio}: +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 pulseaudio]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 85fc6df9520..f877eff5c64 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, pkgconfig, gtk, alsaLib, SDL}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "uae-0.8.29"; src = fetchurl { - url = http://www.amigaemulator.org/files/sources/develop/uae-0.8.29.tar.bz2; + url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/${name}.tar.bz2"; sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4"; }; configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.amigaemulator.org; + homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index ce39740f113..bf63340d35d 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -6,30 +6,29 @@ assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; +with import ./util.nix { inherit lib; }; + stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { builder = buildScript; -}) // { +}) // rec { 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 + buildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [ + pkgconfig alsaLib lcms2 fontforge libxml2 libxslt makeWrapper flex bison + ]); + + nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ + freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses ]) ++ (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))); + NIX_LDFLAGS = map + (path: "-rpath ${path}/lib") + ([ stdenv.cc.cc ] ++ nativeBuildInputs); # Don't shrink the ELF RPATHs in order to keep the extra RPATH # elements specified above. @@ -51,6 +50,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { enableParallelBuilding = true; + passthru = { inherit pkgArches; }; meta = { inherit version platforms; homepage = "http://www.winehq.org/"; diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh index 9f946f3b71f..c7d9ed55a3f 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -3,6 +3,7 @@ source $stdenv/setup unpackPhase +cd $TMP/$sourceRoot patchPhase configureScript=$TMP/$sourceRoot/configure diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 962aee9fb5d..8b7e438a115 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -1,15 +1,22 @@ ## Configuration: # Control you default wine config in nixpkgs-config: # wine = { -# release = "stable"; # "stable", "unstable" +# release = "stable"; # "stable", "unstable", "staging" # build = "wineWow"; # "wine32", "wine64", "wineWow" # }; # Make additional configurations on demand: -# wine.overrideConfig { build = "wine32"; }; -{ lib, system, callPackage, +# wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; +{ lib, pkgs, system, callPackage, wineRelease ? "stable", - wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32") }: + wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), + libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }: -lib.getAttr wineBuild (callPackage ./packages.nix { - inherit wineRelease; -}) +if wineRelease == "staging" then + callPackage ./staging.nix { + inherit libtxc_dxtn_Name; + wine = lib.getAttr wineBuild (callPackage ./packages.nix { wineRelease = "unstable"; }); + } +else + lib.getAttr wineBuild (callPackage ./packages.nix { + inherit wineRelease; + }) diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index a6ff309b08e..1de37f56504 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchFromGitHub, wine, perl, autoconf, utillinux -, pulseaudio, libtxc_dxtn }: +{ stdenv, callPackage, lib, fetchFromGitHub, wine, libtxc_dxtn_Name }: -let version = "1.7.42"; +with callPackage ./util.nix {}; + +let v = (import ./versions.nix).staging; + inherit (v) version; patch = fetchFromGitHub { + inherit (v) sha256; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; - sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17"; }; - + build-inputs = pkgNames: extra: + (mkBuildInputs wine.pkgArches pkgNames) ++ extra; in assert (builtins.parseDrvName wine.name).version == version; stdenv.lib.overrideDerivation wine (self: { - nativeBuildInputs = [ pulseaudio libtxc_dxtn ] ++ self.nativeBuildInputs; - buildInputs = [ perl utillinux autoconf ] ++ self.buildInputs; + nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; @@ -23,7 +26,7 @@ stdenv.lib.overrideDerivation wine (self: { chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR=.. --all + ./patchinstall.sh DESTDIR="$TMP/$sourceRoot" --all cd .. ''; }) diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/misc/emulators/wine/util.nix new file mode 100644 index 00000000000..b90a68e72df --- /dev/null +++ b/pkgs/misc/emulators/wine/util.nix @@ -0,0 +1,9 @@ +{ lib }: +rec { + toPackages = pkgNames: pkgs: + map (pn: lib.getAttr pn pkgs) pkgNames; + toBuildInputs = pkgArches: archPkgs: + lib.concatLists (map archPkgs pkgArches); + mkBuildInputs = pkgArches: pkgNames: + toBuildInputs pkgArches (toPackages pkgNames); +} diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index e599f04f857..84a3ff8f86d 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -1,7 +1,7 @@ { unstable = { - wineVersion = "1.7.42"; - wineSha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss"; + wineVersion = "1.7.43"; + wineSha256 = "08kqj02m8xc1ppzhs5y83zzykjnz0qliq495rx1n90ybzyd9pm2k"; geckoVersion = "2.36"; geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; gecko64Version = "2.36"; @@ -22,4 +22,12 @@ #monoVersion = "0.0.8"; #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; }; + staging = { + version = "1.7.43"; + sha256 = "01b7npa8hc2nrv4hm16r9ikic4wd34nbz1lvfhy0ali2jbcsaqqb"; + }; + winetricks = { + version = "20150416"; + sha256 = "0467cn5hqry6fscjskpvxw0y00lr059jmldv1csicbav4l0dxx8k"; + }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 34a2a6efbbb..39aaa098cfe 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, wine, perl, which, coreutils, zenity, curl , cabextract, unzip, p7zip, gnused, gnugrep, bash } : -let version = "20150316"; +let v = (import ./versions.nix).winetricks; in stdenv.mkDerivation rec { - name = "winetricks-${version}"; + name = "winetricks-${v.version}"; src = fetchFromGitHub { owner = "Winetricks"; repo = "winetricks"; - rev = version; - sha256 = "00c55jpca6l3v3p02xc0gy5l4xb17gf90282hq5h85nh72kqsbrh"; + rev = v.version; + sha256 = v.sha256; }; buildInputs = [ perl which ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 47511cf58b0..adddd3ac211 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -9,10 +9,9 @@ , prefix ? "" }: +with stdenv; with stdenv.lib; let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - libOnly = prefix == "lib"; optDbus = shouldUsePkg dbus; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 1c5c78548f5..343c3af9cee 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -4,9 +4,8 @@ , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null }: +with stdenv; let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; optLibuuid = shouldUsePkg libuuid; diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix index ab68dc69015..f6ccbf9ec76 100644 --- a/pkgs/misc/sails/default.nix +++ b/pkgs/misc/sails/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { Sails is a simulator designed to test the AI of autonomous sailing robots. It emulates the basic physics of sailing a small single sail boat''; - maintainers = maintainers.kragniz; + maintainers = with maintainers; [ kragniz ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index c2405c9c380..9083a90f6f5 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -2,13 +2,13 @@ , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { - date = "20141209"; + date = "20150418"; name = "alock-${date}"; src = fetchgit { url = https://github.com/Arkq/alock; - rev = "5ab7e6014faa1659c2d55bf9734bfa3ce7137443"; - sha256 = "07wf3vxh54ncxslp3zf8m7szpqbissxf8q9rs5zgvg333zdqd49s"; + rev = "69b547602d965733d415f877eb59d05966bd158d"; + sha256 = "c1f00bf90c966b2b76e00061cc4b54a3c0bc6547e788731ab694b43f55a216ab"; }; preConfigure = "autoreconf -fvi"; diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 48d88ed40ce..56d176a710c 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - licence = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix new file mode 100644 index 00000000000..f2fda02f9ae --- /dev/null +++ b/pkgs/misc/talkfilters/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +let + name = "talkfilters"; + version = "2.3.8"; +in + +stdenv.mkDerivation { + name = "${name}"; + + src = fetchurl { + url = "http://www.hyperrealm.com/${name}/${name}-${version}.tar.gz"; + sha256 = "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6"; + }; + + meta = { + description = "Converts English text into text that mimics a stereotyped or humorous dialect"; + homepage = "http://http://www.hyperrealm.com/${name}"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; + }; +} + diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 9b1c181c2a4..a1a78e9fb64 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -527,12 +527,12 @@ rec { ''; }; - wakatime = buildVimPlugin { - name = "wakatime-4.0.0"; + vim-wakatime = buildVimPlugin { + name = "vim-wakatime-4.0.1"; src = fetchFromGitHub { - sha256 = "0yfqcln1ah7a9hs6vl8llfyg5rzg1zbsf3y431wdgb0zvp9dlk25"; - rev = "a7d48d3507499b8667bfca0b12f8865c01b26678"; + sha256 = "0vhnfjl9qv6qwfvf106cw4mg4xss2nsafz5k2jadkryss6f3ga10"; + rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d"; repo = "vim-wakatime"; owner = "wakatime"; }; @@ -540,7 +540,7 @@ rec { meta = with stdenv.lib; { description = "Analytics about your programming"; homepage = https://wakatime.com; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix index 9bbf5882e5d..2d1eb7b6b3c 100644 --- a/pkgs/os-specific/darwin/command-line-tools/default.nix +++ b/pkgs/os-specific/darwin/command-line-tools/default.nix @@ -7,7 +7,7 @@ let src = fetchurl { # Magic url found in: # https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog - url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/yiervn212jfs091cp9hwmb7gjq7ky91crs/${name}.pkg"; + url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/${name}.pkg"; inherit sha256; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 05b9eb9e56f..8365017d13b 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,29 +1,61 @@ -{ stdenv, fetchurl, openldap -, enablePython ? false, python ? null +{ stdenv, fetchurl +, libcap_ng + +# Optional Dependencies +, openldap ? null, python ? null, go ? null, krb5 ? null, tcp_wrappers ? null + +# Extra arguments +, prefix ? "" }: -assert enablePython -> python != null; +with stdenv; +let + libOnly = prefix == "lib"; + optOpenldap = if libOnly then null else shouldUsePkg openldap; + optPython = shouldUsePkg python; + optGo = shouldUsePkg go; + optKrb5 = if libOnly then null else shouldUsePkg krb5; + optTcp_wrappers = if libOnly then null else shouldUsePkg tcp_wrappers; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "audit-2.4.1"; + name = "${prefix}audit-${version}"; + version = "2.4.2"; src = fetchurl { - url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5"; + url = "http://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz"; + sha256 = "08j134s4509rxfi3hwsp8yyxzlqqxl8kqgv2rfv6p3qng5pjd80j"; }; - buildInputs = [ openldap ] - ++ stdenv.lib.optional enablePython python; + buildInputs = [ libcap_ng optOpenldap optPython optGo optKrb5 optTcp_wrappers ]; - configureFlags = '' - ${if enablePython then "--with-python" else "--without-python"} + # For libs only build and install the lib portion + preBuild = optionalString libOnly '' + cd lib ''; + configureFlags = [ + (mkWith (optPython != null) "python" null) + (mkWith (optGo != null) "golang" null) + (mkEnable (!libOnly) "listener" null) + (mkEnable (optKrb5 != null) "gssapi-krb5" null) + (mkEnable false "systemd" null) + (mkWith false "debug" null) + (mkWith false "warn" null) + (mkWith false "alpha" null) # TODO: Support + (mkWith false "arm" null) # TODO: Support + (mkWith false "aarch64" null) # TODO: Support + (mkWith (!libOnly) "apparmor" null) + (mkWith false "prelude" null) + (mkWith (optTcp_wrappers != null) "libwrap" optTcp_wrappers) + ]; + meta = { description = "Audit Library"; homepage = "http://people.redhat.com/sgrubb/audit/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ fuuzetsu wkennington ]; }; } diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index 6a309197dd7..440f99b0ad6 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cramfsswap-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz; + url = mirror://debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz; sha256 = "0c6lbx1inkbcvvhh3y6fvfaq3w7d1zv7psgpjs5f3zjk1jysi9qd"; }; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 50ea3f6a067..4e3ede284b4 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +{ stdenv, fetchurl, devicemapper, openssl, libuuid, pkgconfig, popt , enablePython ? false, python ? null }: @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0878vwblazms1dac2ds7vyz8pgi1aac8870ccnl2s0v2sv428g62"; }; - configureFlags = [ "--enable-cryptsetup-reencrypt" ] + configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] ++ stdenv.lib.optional enablePython "--enable-python"; - buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ] + buildInputs = [ devicemapper openssl libuuid pkgconfig popt ] ++ stdenv.lib.optional enablePython python; meta = { diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 39c606f3fb5..b8fc6e5f6ce 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { inherit version; description = "Report system-wide file access events"; homepage = https://launchpad.net/fatrace/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' fatrace reports file access events from all running processes. Its main purpose is to find processes which keep waking up the disk diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index b0f545b2171..49a7d820a1c 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -9,10 +9,8 @@ , prefix ? "" }: +with stdenv; let - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - libOnly = prefix == "lib"; optLibjack2 = shouldUsePkg libjack2; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 6ac468774ad..8ab80ee1e4d 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-03-20"; + version = "2015-05-13"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "f404336ba808cbd57547196e13367079a23b822c"; - sha256 = "0avz5vxax2b3s4gafib47vih1lbq78agdmpjcjnnnykw2kschkwa"; + url = "http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c"; + sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 7d5ed0cd3ee..4c1497367e3 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { the internal hard drive and park its heads on the ramp when critical situations are anticipated. This has no effect on SSD devices! ''; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 4733ce95bb2..e4165b08d7d 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Show progress of open files and file systems"; homepage = https://code.google.com/p/ftop/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' Ftop is to files what top is to processes. The progress of all open files and file systems can be monitored. If run as a regular user, the set of diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index f61318e1b6b..c385971104d 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { package. Provides the minimum necessary functionality to enable libflashplayer.so/libadobecp.so to play back DRM content. ''; - license = "afl21 gpl2"; + license = with licenses; [ afl21 gpl2 ]; maintainers = with maintainers; [ malyn ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 7672318392f..4b371097ee6 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { - Customizable multi-threaded caching ''; homepage = http://seasonofcode.com/pages/jfbview.html; - license = with licenses; asl20; + license = licenses.asl20; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix new file mode 100644 index 00000000000..1bc07f357a8 --- /dev/null +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "kbdlight-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "hobarrera"; + repo = "kbdlight"; + rev = "v${version}"; + sha256 = "1f08aid1xrbl4sb5447gkip9lnvkia1c4ap0v8zih5s9w8v72bny"; + }; + + preConfigure = '' + substituteInPlace Makefile \ + --replace /usr/local $out + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/hobarrera/kbdlight; + description = "A very simple application that changes MacBooks' keyboard backlight level"; + license = licenses.isc; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5fdfdb3b6a1..25b707614ed 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -190,18 +190,26 @@ with stdenv.lib; OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y UBIFS_FS_ADVANCED_COMPR? y - ${optionalString (versionAtLeast version "3.6") '' - NFS_SWAP y - ''} - ${optionalString (versionAtLeast version "3.11") '' - NFS_V4_1 y # NFSv4.1 client support - NFS_V4_2 y + ${optionalString (versionAtLeast version "4.0") '' + NFSD_PNFS y ''} NFSD_V2_ACL y NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + ${optionalString (versionAtLeast version "3.11") '' + NFSD_V4_SECURITY_LABEL y + ''} NFS_FSCACHE y + ${optionalString (versionAtLeast version "3.6") '' + NFS_SWAP y + ''} + NFS_V3_ACL y + ${optionalString (versionAtLeast version "3.11") '' + NFS_V4_1 y # NFSv4.1 client support + NFS_V4_2 y + NFS_V4_SECURITY_LABEL y + ''} CIFS_XATTR y CIFS_POSIX y CIFS_FSCACHE y @@ -226,7 +234,9 @@ with stdenv.lib; # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default - DEVKMEM? n # Disable /dev/kmem + ${optionalString (!(features.grsecurity or false)) '' + DEVKMEM n # Disable /dev/kmem + ''} ${if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack '' else '' @@ -292,6 +302,9 @@ with stdenv.lib; LOGO n # not needed MEDIA_ATTACH y MEGARAID_NEWGEN y + ${optionalString (versionAtLeast version "3.15") '' + MLX4_EN_VXLAN y + ''} MODVERSIONS y MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension MTRR_SANITIZER y @@ -367,15 +380,34 @@ with stdenv.lib; # Virtualisation. PARAVIRT? y - ${if versionAtLeast version "3.10" then '' - HYPERVISOR_GUEST? y - '' else '' - PARAVIRT_GUEST? y - ''} - KVM_GUEST? y + ${optionalString (!(features.grsecurity or false)) + (if versionAtLeast version "3.10" then '' + HYPERVISOR_GUEST y + '' else '' + PARAVIRT_GUEST? y + '') + } + KVM_APIC_ARCHITECTURE y + KVM_ASYNC_PF y ${optionalString (versionOlder version "3.7") '' KVM_CLOCK? y ''} + ${optionalString (versionAtLeast version "4.0") '' + KVM_COMPAT y + ''} + ${optionalString (versionAtLeast version "3.10") '' + KVM_DEVICE_ASSIGNMENT? y + ''} + ${optionalString (versionAtLeast version "4.0") '' + KVM_GENERIC_DIRTYLOG_READ_PROTECT y + ''} + ${optionalString (!features.grsecurity or true) '' + KVM_GUEST y + ''} + KVM_MMIO y + ${optionalString (versionAtLeast version "3.13") '' + KVM_VFIO y + ''} XEN? y XEN_DOM0? y ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index a6ceb5b0954..b270f0852f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.77"; + version = "3.10.79"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1vx2sg0pab3b3rflwhxrimwx18azqayys8zidzr6sv0x7ir9bc31"; + sha256 = "0m30c9v4pvim72ha8ya8w6y691a8zkcrhxhj43kh668q1yqpqvkp"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 810087b55a7..2646bf93b0a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.42"; + version = "3.12.43"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0vp6yllal2gcyng1kklp9n8r18fhcb1m1ssavjbcbfax5chi7w5s"; + sha256 = "08nsppn3rpwydkq0pd8k8fgjfm67y2nbbrcz1hri227crxxx13dm"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 75ab538ddf5..52fa5eba109 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.41"; + version = "3.14.43"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0qghsf648nvzsh2x44x3w0d8lciml8rj6dvglqvmq1zcg492k8i2"; + sha256 = "1m5gdzff46xm24p5x5ajxka99g0maf1y50nj59mbjccbqx3s7kvf"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index eb694497931..592086b6547 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.13"; + version = "3.18.14"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "043bqjvbamzi201csgnw7hsf8810qm0dn7x9p0kc7s9p9jnyq79n"; + sha256 = "1xh0vvn1l2g1kkg54f0mg0inbpsiqs24ybgsakksmcpcadjgqk1i"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 03c0db55626..90c5f9e31d3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19.7"; + version = "3.19.8"; extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0xd38f7g5yfn0b6b2l4qr022f9hcr82ddbysjs4npbgk5ms7341k"; + sha256 = "0yg2mlq0h9my6k1bg3b255w4qnyx609ngh1nhssx3gbzslwf0jyg"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 54cf9bc9324..2fc240f6196 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.68"; + version = "3.2.69"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0yz3k3qqr13r6fa2f8i83rryiawy4rrd7qk2zx6jxq6byfd31ba2"; + sha256 = "0fs7aj3vn51dlx7yfgkx05qpki2msh6j2irwajd9bw0l26cbycd3"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index a5dafd4c806..9c7fb2c3bd8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.2"; + version = "4.0.4"; # Remember to update grsecurity! extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jq4583wwqmwqkqlkck57fxw18xszng92b6ma3avf0djd11b2izz"; + sha256 = "1j5l87z6gd05cqzg680id0x1nk38kd6sjffd2lifl0fz5k6iqr9h"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 769381355d4..f073a09dd0b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0-rc7"; - modDirVersion = "4.0.0-rc7"; - extraMeta.branch = "4.0"; + version = "4.1-rc5"; + modDirVersion = "4.1.0-rc5"; + extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1261p44zmsaq7gf08b8sd9xng2y46d4v7jyfipjlgrrmlkyfgqki"; + sha256 = "0kqw5y5p8x1qyljlzj78vhg5zmj9ngn3m76c9qyji6izclh3y8vv"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4e5facc4483..000dfbd21c5 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.41"; - revision = "201505101121"; + { kversion = "3.14.43"; + revision = "201505272112"; branch = "stable"; - sha256 = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g"; + sha256 = "06zwwzrqp59rkv5pi75iskznnlnmc6hsc91dqxymfgd533sbpxp9"; }; grsecurity_unstable = grsecPatch - { kversion = "4.0.2"; - revision = "201505101122"; + { kversion = "4.0.4"; + revision = "201505272113"; branch = "test"; - sha256 = "14fi31xwlgirbwk7f1xh8vanjxk8b473rz7z38savl4nx2wr5r24"; + sha256 = "1aa8qc4g68ybdjc4gb1p0rk1m2bqhj8a5iz6cica6lrr54lda9hx"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 1ffdaa36e96..8157270d67d 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, attr, perl }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "libcap-${version}"; version = "2.24"; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 599da9e4b3c..fbb4be53211 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }: +{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, libaudit }: stdenv.mkDerivation rec { name = "libsemanage-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_CFLAGS_LINK = "-lsepol"; - buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ]; + buildInputs = [ libsepol libselinux ustr bzip2 bison flex libaudit ]; meta = with stdenv.lib; { inherit (libsepol.meta) homepage platforms maintainers; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 9939a552574..8115aa1055b 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,13 +9,13 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "lxc-1.1.1"; + name = "lxc-1.1.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; rev = name; - sha256 = "04zpznd364862y3dwn97klvwfw9i2b6n1lh4fkci0z74c6z9svql"; + sha256 = "149nq630h9bg87hb3cn086ci0cz29l7fp3i6qf1mqxv7hnildm8p"; }; buildInputs = [ @@ -41,18 +41,13 @@ stdenv.mkDerivation rec { "--enable-tests" ]; - installFlags = [ "DESTDIR=\${out}" ]; - - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - # Remove the unneeded var/lib directories - rm -rf $out/var - ''; + installFlags = [ + "localstatedir=\${TMPDIR}" + "sysconfdir=\${out}/etc" + "sysconfigdir=\${out}/etc/default" + "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" + "LXCPATH=\${TMPDIR}/var/lib/lxc" + ]; meta = { homepage = "http://lxc.sourceforge.net"; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index a5f6242f84f..16f1331d320 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { inherit version; description = "Log machine checks (memory, IO, and CPU hardware errors)"; homepage = http://mcelog.org/; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 1dae1d215ec..392a3c4049a 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "04vq4a1hm81kbxfcqa30s6xpzbqf3568gbysfxcmb72v8438b4ps"; + sha256 = "0gi8638c5gh9i4gsihfczigg78l2q0hd9c3ws26chwprr9rp3gq0"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 2e25c0383b7..0e5dbeebf92 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,50 +1,65 @@ -{ stdenv, fetchurl, openssl, python27, iproute, perl, kernel ? null}: +{ stdenv, fetchurl, makeWrapper +, openssl, python27, iproute, perl, kernel ? null }: + +with stdenv.lib; + let - - version = "2.1.2"; - - skipKernelMod = kernel == null; - -in -stdenv.mkDerivation { - version = "2.1.2"; + _kernel = kernel; +in stdenv.mkDerivation rec { + version = "2.3.1"; name = "openvswitch-${version}"; + src = fetchurl { - url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz"; - sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47"; + url = "http://openvswitch.org/releases/${name}.tar.gz"; + sha256 = "1lmwyhm5wmdv1l4v1v5xd36d5ra21jz9ix57nh1lgm8iqc0lj5r1"; }; - kernel = if skipKernelMod then null else kernel.dev; - buildInputs = [ - openssl - python27 - perl - ]; + + kernel = optional (_kernel != null) _kernel.dev; + + buildInputs = [ makeWrapper openssl python27 perl ]; + configureFlags = [ "--localstatedir=/var" "--sharedstatedir=/var" "--sbindir=$(out)/bin" - ] ++ (if skipKernelMod then [] else ["--with-linux"]); + ] ++ (optionals (_kernel != null) ["--with-linux"]); + # Leave /var out of this! installFlags = [ "LOGDIR=$(TMPDIR)/dummy" "RUNDIR=$(TMPDIR)/dummy" "PKIDIR=$(TMPDIR)/dummy" ]; - meta = { - platforms = stdenv.lib.platforms.linux; + + postInstall = '' + cp debian/ovs-monitor-ipsec $out/share/openvswitch/scripts + makeWrapper \ + $out/share/openvswitch/scripts/ovs-monitor-ipsec \ + $out/bin/ovs-monitor-ipsec \ + --prefix PYTHONPATH : "$out/share/openvswitch/python" + substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ + --replace "UnixctlServer.create(None)" "UnixctlServer.create(os.environ['UNIXCTLPATH'])" + substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ + --replace "self.psk_file" "root_prefix + self.psk_file" + substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ + --replace "self.cert_dir" "root_prefix + self.cert_dir" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; description = "A multilayer virtual switch"; - longDescription = + longDescription = '' - Open vSwitch is a production quality, multilayer virtual switch - licensed under the open source Apache 2.0 license. It is - designed to enable massive network automation through - programmatic extension, while still supporting standard - management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, - RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to - support distribution across multiple physical servers similar + Open vSwitch is a production quality, multilayer virtual switch + licensed under the open source Apache 2.0 license. It is + designed to enable massive network automation through + programmatic extension, while still supporting standard + management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, + RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to + support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; homepage = "http://openvswitch.org/"; - licence = "Apache 2.0"; + license = licenses.asl20; }; } diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 29cfa64b22d..96debd66e5b 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchurl, flex, cracklib }: +{ stdenv, fetchurl, pkgconfig +# Optional Depdencies +, cracklib ? null, libaudit ? null, db ? null +}: + +with stdenv; +let + optCracklib = shouldUsePkg cracklib; + optLibaudit = shouldUsePkg libaudit; + optDb = shouldUsePkg db; +in +with stdenv.lib; stdenv.mkDerivation rec { name = "linux-pam-${version}"; version = "1.2.0"; @@ -9,37 +20,45 @@ stdenv.mkDerivation rec { sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd"; }; - nativeBuildInputs = [ flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ optCracklib optLibaudit optDb ]; - buildInputs = [ cracklib ]; + configureFlags = [ + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkOther "includedir" "\${out}/include/security") + (mkEnable false "static-modules" null) + (mkEnable true "pie" null) + (mkEnable false "prelude" null) + (mkEnable false "debug" null) + (mkEnable false "pamlocking" null) + (mkEnable true "read-both-confs" null) + (mkEnable true "lckpwdf" null) + (mkWith true "xauth" "/run/current-system/sw/bin/xauth") + (mkEnable (optCracklib != null) "cracklib" null) + (mkEnable (optLibaudit != null) "audit" null) + (mkEnable (optDb != null) "db" "db") + (mkEnable true "nis" null) # TODO: Consider tirpc support here + (mkEnable false "selinux" null) + (mkEnable false "regenerate-docu" null) + ]; - crossAttrs = { - propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; - preConfigure = preConfigure + '' - ar x ${flex.crossDrv}/lib/libfl.a - mv libyywrap.o libyywrap-target.o - ar x ${flex}/lib/libfl.a - mv libyywrap.o libyywrap-host.o - export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o" - sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in - ''; - postConfigure = '' - sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile - ''; - }; + installFlags = [ + "sysconfdir=\${out}/etc" + "SCONFIGDIR=\${out}/etc/security" + ]; postInstall = '' + # Prepare unix_chkpwd for setuid wrapping mv -v $out/sbin/unix_chkpwd{,.orig} ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd ''; - preConfigure = '' - configureFlags="$configureFlags --includedir=$out/include/security" - ''; - meta = { homepage = http://ftp.kernel.org/pub/linux/libs/pam/; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index ac60501929a..4b656967386 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.linux-phc.org/; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index 7ec74c895c6..99100b85cb6 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }: -let version = "v0.8-8-g2499679"; in +let version = "2015-05-28"; in stdenv.mkDerivation { name = "radeontop-${version}"; src = fetchFromGitHub { - sha256 = "112zf6ms0qpmr9h3l4lg5wik5j206mgij0nypba5lnqzksxh2f88"; - rev = "2499679fda60c3f6239886296fd2a74155f45f77"; + sha256 = "0s281fblqbvl7vgaqiwh3s16y0bah3z0i1ssf4mbwl2iayj1cliq"; + rev = "b9428f18ea4631fdd5f9ccee81570aa7ac472c07"; repo = "radeontop"; owner = "clbr"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; patchPhase = '' - substituteInPlace getver.sh --replace ver=unknown ver=${version} + substituteInPlace getver.sh --replace ver=unknown ver=${version}-git ''; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 3b0f7c694ac..fab13a125c4 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://sg.danny.cz/sg/sdparm.html; description = "A utility to access SCSI device parameters"; - license = with licenses; bsd3; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 7559562965d..0748da25f16 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-04-08"; + version = "2015-04-24"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "cd69f020e4b0f9c416dd07a264e48c9488a7633f"; - sha256 = "1fy5zlh8cs65s52vixkp00ihrlrhs2frd6vwxwjqmpzyb7fnh3m8"; + rev = "62e2eb2329d99f7c39bcda47bc9ecb2887608fa5"; + sha256 = "1i59sps2y0mgm9sj4a0h03xl0hlgiym4637j5j6zc5g125zzcnrd"; }; patches = [ ./const.patch ./install_prefix.patch ]; diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index b4e37a36ff5..0e1ecdd6d7d 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -1,31 +1,25 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, gcc_multi, glibc_multi }: + +let version = "1.7.3"; in +stdenv.mkDerivation { + name = "statifier-${version}"; - version = a.lib.attrByPath ["version"] "1.6.15" a; - buildInputs = with a; [ - - ]; -in -rec { src = fetchurl { url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz"; - sha256 = "0lhdbp7hc15nn6r31yxx7i993a5k8926n5r6j2gi2vvkmf1hciqf"; + sha256 = "0jc67kq3clkdwvahpr2bjp2zix4j7z7z8b7bcn1b3g3sybh1cbd6"; }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ gcc_multi glibc_multi ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixPaths" "doMakeInstall"]; + phaseNames = [ "patchPhase" "installPhase" ]; - fixPaths = a.fullDepEntry ('' + postPatch = '' sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier - sed -e s@/bin/bash@"$shell"@g -i src/*.sh - '') ["minInit" "doUnpack"]; + sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh + ''; - name = "statifier-" + version; - meta = { + meta = with stdenv.lib; { description = "Tool for creating static Linux binaries"; + platforms = with platforms; [ linux ]; }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 13749d7eaa1..7f2aeca255c 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: stdenv.mkDerivation rec { - name = "util-linux-2.26.1"; + name = "util-linux-2.26.2"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v2.26/${name}.tar.xz"; - sha256 = "0vmvk5khfwf71xbsnplvmk9ikwnlbhysc96mnkgwpqk2faairp12"; + sha256 = "0rlnzmiqdannzf81fbh41541lrck63v9zhskm6h4i2jj8ahvsa8f"; }; - patches = [ ./rtcwake-search-PATH-for-shutdown.patch - ]; + patches = [ + ./rtcwake-search-PATH-for-shutdown.patch + ]; #FIXME: make it also work on non-nixos? postPatch = '' diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 1a27ae8f571..17b21f92c17 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { - name = "v4l-utils-1.6.2"; + name = "v4l-utils-1.6.3"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0zdyjrja2mkqlijpdb4gz1vw0g7pslswmgqqsgri3yq408gypmnk"; + sha256 = "0k46z5gqjzg702m2vs4sv6sxynq1sj14m0pgwvl2gkgg3dfbyjhn"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index a7d312c4041..130a02c86e8 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-04-08"; + version = "2015-05-13"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "d07a16360c1ee219b8820f80d035e56a18c58b84"; - sha256 = "0yyc0n960bzd4fmrg1mwp0xy1db7yn90g33ds44chh4g74mrfgdz"; + rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c"; + sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437"; }; patches = [ ./nix-build.patch ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 9b17551a8cb..c13ad64fca3 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison readline ]; + patches = [ + ./dont-create-sysconfdir.patch + ]; + + configureFlags = [ + "--localstatedir /var" + ]; + meta = { description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; diff --git a/pkgs/servers/bird/dont-create-sysconfdir.patch b/pkgs/servers/bird/dont-create-sysconfdir.patch new file mode 100644 index 00000000000..0a11c8a2a8d --- /dev/null +++ b/pkgs/servers/bird/dont-create-sysconfdir.patch @@ -0,0 +1,13 @@ +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 062ba91..4fd7453 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -68,7 +68,7 @@ tags: + cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` + + install: all +- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ ++ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) + $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@ + $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@ + if test -n "@CLIENT@" ; then \ diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index d95e929ff82..6d0037f74bd 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux }: +{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux +, file, libtool, which }: stdenv.mkDerivation rec { - name = "torque-4.2.8"; + name = "torque-4.2.10"; src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2730"; - sha256 = "1sjpvndzm9ccdmfwdf9887ppmapawfsh5qdkzr92kadg5jxp796j"; + url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2880"; + sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; }; - buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux ]; + buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool + which ]; enableParallelBuilding = true; preConfigure = '' + substituteInPlace ./configure \ + --replace '/usr/bin/file' '${file}/bin/file' + + # fix broken libxml2 detection + sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure + for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \ --replace "schedprivdir = " "schedprivdir = $out/" diff --git a/pkgs/servers/consul/alerts.nix b/pkgs/servers/consul/alerts.nix deleted file mode 100644 index b3dbb21d5bb..00000000000 --- a/pkgs/servers/consul/alerts.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - name = "consul-alerts-${version}"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "AcalephStorage"; - repo = "consul-alerts"; - rev = "v${version}"; - sha256 = "02rgz68g3i408biq2aqilpqraqirzmba9mh7avdga5bljp427jgn"; - }; - - goPackagePath = "github.com/AcalephStorage/consul-alerts"; - dontInstallSrc = true; - subPackages = [ "./" ]; - - meta = with lib; { - description = "A simple daemon to send notifications based on Consul health checks"; - homepage = https://github.com/AcalephStorage/consul-alerts; - license = licenses.gpl2; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix deleted file mode 100644 index b299981bee2..00000000000 --- a/pkgs/servers/consul/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub , ruby , nodejs -, bundlerEnv }: - -let - version = "0.5.0"; - # `sass` et al - gems = bundlerEnv { - name = "consul-deps"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - }; -in - -with lib; -stdenv.mkDerivation { - name = "consul-${version}"; - - src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; - }; - - buildInputs = [ go ruby gems nodejs ]; - - buildPhase = '' - # Build consul binary - export GOPATH=$src - go build -v -o consul github.com/hashicorp/consul - - # Build ui static files - ({ - cp -r src/github.com/hashicorp/consul/ui . - cd ui - chmod -R u+w . - make dist - }) - ''; - - outputs = [ "out" "ui" ]; - - installPhase = '' - # Fix references to go-deps in the binary - hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') - xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) - sed -i "s,$hash,$xs,g" consul - - # Install consul binary - mkdir -p $out/bin - cp consul $out/bin - - # Install ui static files - mkdir -p $ui - mv ui/dist/* $ui - ''; - - meta = with lib; { - homepage = http://www.consul.io/; - description = "A tool for service discovery, monitoring and configuration"; - maintainers = with maintainers; [ cstrahan wkennington ]; - license = licenses.mpl20 ; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix deleted file mode 100644 index ad41dbb70a5..00000000000 --- a/pkgs/servers/consul/deps.nix +++ /dev/null @@ -1,315 +0,0 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -let - goDeps = [ - { - root = "github.com/armon/circbuf"; - src = fetchFromGitHub { - owner = "armon"; - repo = "circbuf"; - rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; - sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; - }; - } - { - root = "github.com/armon/consul-api"; - src = fetchFromGitHub { - owner = "armon"; - repo = "consul-api"; - rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c"; - sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d"; - }; - } - { - root = "github.com/armon/go-metrics"; - src = fetchFromGitHub { - owner = "armon"; - repo = "go-metrics"; - rev = "88b7658f24511c4b885942b26e9ea7a61ee37ebc"; - sha256 = "18f7nr6khirdmcsy5mic1yggwc189wfiqvms8i7yfcvfns5nq9cc"; - }; - } - { - root = "github.com/armon/go-radix"; - src = fetchFromGitHub { - owner = "armon"; - repo = "go-radix"; - rev = "e39d623f12e8e41c7b5529e9a9dd67a1e2261f80"; - sha256 = "10vhgr35dfbsm90q8aqp82vhdf4izqrx8bzzgn0h3vrx94c2pnq1"; - }; - } - { - root = "github.com/armon/gomdb"; - src = fetchFromGitHub { - owner = "armon"; - repo = "gomdb"; - rev = "151f2e08ef45cb0e57d694b2562f351955dff572"; - sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61"; - }; - } - { - root = "github.com/golang/protobuf"; - src = fetchFromGitHub { - owner = "golang"; - repo = "protobuf"; - rev = "c22ae3cf020a21ebb7ae566dccbe90fc8ea4f9ea"; - sha256 = "1ab605jw0cprq0kbp0b5iyjw805wk08r3p9mvcyland7v4gfqys2"; - }; - } - { - root = "github.com/hashicorp/consul"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "consul"; - rev = "a022dfcb32246274adc8fb383882353c056d1da3"; - sha256 = "1al6bc62c8qygq4yhr8rq9jkx51ijv11816kipphylw73kyyrzg5"; - }; - } - { - root = "github.com/hashicorp/go-multierror"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-multierror"; - rev = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e"; - sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz"; - }; - } - { - root = "github.com/hashicorp/consul-template"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "consul-template"; - rev = "v0.7.0"; - sha256 = "0xaym2mi8j3hw1waplhqfypnxv32fi81xxx3clfzk0a6bjmaihfx"; - }; - } - { - root = "github.com/hashicorp/go-checkpoint"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-checkpoint"; - rev = "88326f6851319068e7b34981032128c0b1a6524d"; - sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4"; - }; - } - { - root = "github.com/hashicorp/go-msgpack"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-msgpack"; - rev = "71c2886f5a673a35f909803f38ece5810165097b"; - sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; - }; - } - { - root = "github.com/hashicorp/go-syslog"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-syslog"; - rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; - sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; - }; - } - { - root = "github.com/hashicorp/golang-lru"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "golang-lru"; - rev = "f09f965649501e2ac1b0c310c632a7bebdbdc1d4"; - sha256 = "0yjnmk2d2x0kqvkg1sdfkl3jr408yl76rpyqzkkbpkvdcjrz554c"; - }; - } - { - root = "github.com/hashicorp/hcl"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "hcl"; - rev = "513e04c400ee2e81e97f5e011c08fb42c6f69b84"; - sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c"; - }; - } - { - root = "github.com/hashicorp/logutils"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "logutils"; - rev = "23b0af5510a2d1442103ef83ffcf53eb82f3debc"; - sha256 = "018bfknmc2qdk0br1ri6dgd45sx308j3qd77sxnzxsyaivw1mm0d"; - }; - } - { - root = "github.com/hashicorp/memberlist"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "memberlist"; - rev = "3d05e25e06bbb9e2b0e0afbd0b1c7dcebdd29cab"; - sha256 = "1pjknjfvbs692y6laizgd4fmd4pqn039vvnmnag7q362mrpf5aj4"; - }; - } - { - root = "github.com/hashicorp/net-rpc-msgpackrpc"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "net-rpc-msgpackrpc"; - rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2"; - sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969"; - }; - } - { - root = "github.com/hashicorp/raft"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "raft"; - rev = "a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab"; - sha256 = "02kr7919m6iv7l26wnihalfi4lydz886j6x75a53vgchdcsbv7ai"; - }; - } - { - root = "github.com/hashicorp/raft-mdb"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "raft-mdb"; - rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0"; - sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i"; - }; - } - { - root = "github.com/hashicorp/scada-client"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "scada-client"; - rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae"; - sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b"; - }; - } - { - root = "github.com/hashicorp/serf"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "serf"; - rev = "f1fd5030d6a55d3edc6916d2ba58e933c21314de"; - sha256 = "0w84iw255aray7acasacwn8njm36aqbxiyalnjqwfsn0pwfjla0b"; - }; - } - { - root = "github.com/hashicorp/terraform"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform"; - rev = "v0.3.7"; - sha256 = "04cs6sjwysg95l5cfsmnpnx3d126bv86qbkg91gj8h98knk5bs6z"; - }; - } - { - root = "github.com/hashicorp/yamux"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "yamux"; - rev = "b4f943b3f25da97dec8e26bee1c3269019de070d"; - sha256 = "18ivpiix006f0g085a11gra8z0n6bq344rrgc5rphn7nmnghqchz"; - }; - } - { - root = "github.com/inconshreveable/muxado"; - src = fetchFromGitHub { - owner = "inconshreveable"; - repo = "muxado"; - rev = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848"; - sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs"; - }; - } - { - root = "github.com/matttproud/golang_protobuf_extensions"; - src = fetchFromGitHub { - owner = "matttproud"; - repo = "golang_protobuf_extensions"; - rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"; - sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936"; - }; - } - { - root = "github.com/miekg/dns"; - src = fetchFromGitHub { - owner = "miekg"; - repo = "dns"; - rev = "6427527bba3ea8fdf2b56fba43d20d1e3e76336d"; - sha256 = "1zszpn44kak4cs5lmy9i7sslizqngldgb0ixn0la9x9gxf16h9zn"; - }; - } - { - root = "github.com/mitchellh/cli"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "cli"; - rev = "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0"; - sha256 = "1fwf7wmlhri19bl2yyjd4zlgndgwwqrdry45clpszzjsr8b5wfgm"; - }; - } - { - root = "github.com/mitchellh/mapstructure"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "mapstructure"; - rev = "442e588f213303bec7936deba67901f8fc8f18b1"; - sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd"; - }; - } - { - root = "github.com/prometheus/client_golang"; - src = fetchFromGitHub { - owner = "prometheus"; - repo = "client_golang"; - rev = "0.2.0"; - sha256 = "0iq2hlmdazwmpjq2k9gvpv2zprzxzmyzsc89c2kalrwl52ksg250"; - }; - } - { - root = "github.com/prometheus/client_model"; - src = fetchFromGitHub { - owner = "prometheus"; - repo = "client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - root = "github.com/prometheus/procfs"; - src = fetchFromGitHub { - owner = "prometheus"; - repo = "procfs"; - rev = "6c34ef819e19b4e16f410100ace4aa006f0e3bf8"; - sha256 = "1n48jhx50bhnjznxds4nmz04digbbbbjq3hkvvl29js1grylda0i"; - }; - } - { - root = "github.com/ryanuber/columnize"; - src = fetchFromGitHub { - owner = "ryanuber"; - repo = "columnize"; - rev = "v2.0.1"; - sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f"; - }; - } - { - root = "github.com/ugorji/go"; - src = fetchFromGitHub { - owner = "ugorji"; - repo = "go"; - rev = "c8676e5e9db1226325ca0ed7771633fb0109878b"; - sha256 = "18r1iajmc9a461kx0pz3lpv91lzlfg93cjw0k0j7ffk6901m0084"; - }; - } - ]; - -in - -stdenv.mkDerivation rec { - name = "go-deps"; - - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); -} diff --git a/pkgs/servers/consul/template.nix b/pkgs/servers/consul/template.nix deleted file mode 100644 index 59ca524b51e..00000000000 --- a/pkgs/servers/consul/template.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "consul-template-${version}"; - version = "0.7.0"; - - src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; - }; - - buildInputs = [ go ]; - - buildPhase = '' - GOPATH=$src go build -v -o consul-template github.com/hashicorp/consul-template - ''; - - installPhase = '' - # Fix references to go-deps in the binary - hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') - xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) - sed -i "s,$hash,$xs,g" consul-template - - mkdir -p $out/bin - cp consul-template $out/bin - ''; - - meta = with lib; { - description = "Generic template rendering and notifications with Consul"; - homepage = https://github.com/hashicorp/consul-template; - license = licenses.mpl20; - maintainers = with maintainers; [ puffnfresh wkennington ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix new file mode 100644 index 00000000000..eb7093ec615 --- /dev/null +++ b/pkgs/servers/consul/ui.nix @@ -0,0 +1,39 @@ +{ stdenv, goPackages, ruby , nodejs, bundlerEnv }: + +let + # `sass` et al + gems = bundlerEnv { + name = "consul-ui-deps"; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; +in + +stdenv.mkDerivation { + name = "consul-ui-${goPackages.consul.rev}"; + + src = goPackages.consul.src; + + buildInputs = [ ruby gems nodejs ]; + + buildPhase = '' + # Build ui static files + cd ui + make dist + ''; + + installPhase = '' + # Install ui static files + mkdir -p $out + mv dist/* $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.consul.io/; + description = "A tool for service discovery, monitoring and configuration"; + maintainers = with maintainers; [ cstrahan wkennington ]; + license = licenses.mpl20 ; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index f345fe71a34..f898034719f 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flexible dictionary server and client implementing RFC 2229"; homepage = http://www.gnu.org/software/dico/; - license = "GPLv3+"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index fbfa2d8d9b7..604908a4522 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,12 +1,47 @@ -{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }: +{ stdenv, fetchurl, libtool, docbook5_xsl -let version = "9.10.2"; in +# Optional Dependencies +, libseccomp ? null, python ? null, kerberos ? null, openssl ? null +, libxml2 ? null, json_c ? null, readline ? null, libcap ? null, idnkit ? null +, libiconv ? null +# Optional DLZ Modules +, postgresql ? null, libmysql ? null, db ? null, openldap ? null + +# Extra arguments +, suffix ? "" +}: + +with stdenv; +let + version = "9.10.2"; + + toolsOnly = suffix == "tools"; + + optLibseccomp = shouldUsePkg libseccomp; + optPython = if toolsOnly then null else shouldUsePkg python; + optKerberos = shouldUsePkg kerberos; + optOpenssl = shouldUsePkg openssl; + optLibxml2 = shouldUsePkg libxml2; + optJson_c = shouldUsePkg json_c; + optReadline = shouldUsePkg readline; + optLibcap = if !stdenv.isLinux then null else shouldUsePkg libcap; + optIdnkit = shouldUsePkg idnkit; + optLibiconv = shouldUsePkg libiconv; + + optPostgresql = if toolsOnly then null else shouldUsePkg postgresql; + optLibmysql = if toolsOnly then null else shouldUsePkg libmysql; + optDb = if toolsOnly then null else shouldUsePkg db; + optOpenldap = if toolsOnly then null else shouldUsePkg openldap; + + pythonBin = if optPython == null then null else "${optPython}/bin/python"; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "bind-${version}"; + name = "bind${optionalString (suffix != "") "-${suffix}"}-${version}"; src = fetchurl { - url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; + url = "http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz"; sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg"; }; @@ -14,30 +49,95 @@ stdenv.mkDerivation rec { sed -i 's/^\t.*run/\t/' Makefile.in ''; - buildInputs = [ openssl libtool perl libxml2 ]; + nativeBuildInputs = [ optPython libtool docbook5_xsl ]; + buildInputs = [ + optLibseccomp optPython optKerberos optOpenssl optLibxml2 optJson_c + optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql + optDb optOpenldap + ]; + # TODO(wkennington): Remove this hack once we fix header / .la / .pc files + propagatedBuildInputs = [ + optKerberos optOpenssl optLibxml2 optJson_c + optLibseccomp optLibcap + ]; configureFlags = [ - "--localstatedir=/var" - "--with-libtool" - "--with-libxml2=${libxml2}" - "--with-openssl=${openssl}" - "--without-atf" - "--without-dlopen" - "--without-docbook-xsl" - "--without-gssapi" - "--without-idn" - "--without-idnlib" - "--without-pkcs11" - "--without-purify" - "--without-python" + (mkOther "localstatedir" "/var") + (mkOther "sysconfdir" "/etc") + (mkEnable (optLibseccomp != null) "seccomp" null) + (mkWith (optPython != null) "python" pythonBin) + (mkEnable true "kqueue" null) + (mkEnable true "epoll" null) + (mkEnable true "devpoll" null) + (mkWith false "geoip" null) # TODO(wkennington): GeoDNS support + (mkWith (optKerberos != null) "gssapi" optKerberos) + (mkWith true "libtool" null) + (mkEnable (optOpenssl == null) "native-pkcs11" null) + (mkWith (optOpenssl != null) "openssl" optOpenssl) + (mkWith true "pkcs11" null) + (mkWith true "ecdsa" null) + (mkWith false "gost" null) # Insecure cipher + (mkWith true "aes" null) + (mkEnable (optOpenssl != null) "openssl-hash" null) + (mkEnable true "sit" null) + (mkWith true "sit-alg" "aes") + (mkWith (optLibxml2 != null) "libxml2" optLibxml2) + (mkWith (optJson_c != null) "libjson" optJson_c) + (mkEnable true "largefile" null) + (mkWith false "purify" null) + (mkWith false "gperftools-profiler" null) + (mkEnable false "backtrace" null) + (mkEnable false "symtable" null) + (mkEnable true "ipv6" null) + (mkWith false "kame" null) + (mkWith (optReadline != null) "readline" null) + (mkEnable (optKerberos == null) "isc-spnego" null) + (mkEnable true "chroot" null) + (mkEnable (optLibcap != null) "linux-caps" null) + (mkEnable true "atomic" null) + (mkEnable false "fixed-rrset" null) + (mkEnable true "rpz-nsip" null) + (mkEnable true "rpz-nsdname" null) + (mkEnable true "filter-aaaa" null) + (mkWith true "docbook-xsl" "${docbook5_xsl}/share/xsl/docbook") + (mkWith (optIdnkit != null) "idn" optIdnkit) + (mkWith (optLibiconv != null) "libiconv" optLibiconv) + (mkWith false "atf" null) + (mkWith true "tuning" "large") + (mkWith true "dlopen" null) + (mkWith false "make-clean" null) + (mkEnable true "full-report" null) + (mkWith (optPostgresql != null) "dlz-postgres" optPostgresql) + (mkWith (optLibmysql != null) "dlz-mysql" optLibmysql) + (mkWith (optDb != null) "dlz-bdb" optDb) + (mkWith true "dlz-filesystem" null) + (mkWith (optOpenldap != null) "dlz-ldap" optOpenldap) + (mkWith false "dlz-odbc" null) + (mkWith true "dlz-stub" null) ]; + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ] ++ optionals toolsOnly [ + "DESTDIR=\${TMPDIR}" + ]; + + postInstall = optionalString toolsOnly '' + mkdir -p $out/{bin,etc,lib,share/man/man1} + install -m 0755 $TMPDIR/$out/bin/{dig,nslookup,nsupdate} $out/bin + install -m 0644 $TMPDIR/$out/etc/bind.keys $out/etc + install -m 0644 $TMPDIR/$out/lib/*.so.* $out/lib + install -m 0644 $TMPDIR/$out/share/man/man1/{dig,nslookup,nsupdate}.1 $out/share/man/man1 + ''; + + enableParallelBuilding = true; + meta = { homepage = "http://www.isc.org/software/bind"; description = "Domain name server"; - license = stdenv.lib.licenses.isc; - - maintainers = with stdenv.lib.maintainers; [viric simons]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.isc; + maintainers = with maintainers; [ viric simons wkennington ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix index 6536ad972b7..ba311918c71 100644 --- a/pkgs/servers/dns/skydns/default.nix +++ b/pkgs/servers/dns/skydns/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "1bnc9r22kwvmn1bgz7zaidkjqm7pmw99bn5n87r76vcrd7n2a9pd"; }; - buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb-go go-systemd go-log dns stathat osext etcd ]; + buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ]; dontInstallSrc = true; subPackages = [ "." ]; diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 08f5d745684..d156576b21a 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ]; + postPatch = '' + substituteInPlace dist/version.sh \ + --replace 'GIT=`git describe --always`' "" \ + --replace '-$GIT' "" + ''; + preInstall = '' installFlags="LIBEXECDIR=$out/modules $installFlags" mkdir -p $out/modules $out/bin diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix new file mode 100644 index 00000000000..ba7c69ef7db --- /dev/null +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "micro-httpd-20140814"; + + src = fetchurl { + url = "http://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz"; + sha256 = "0mlm24bi31s0s8w55i0sysv2nc1n2x4cfp6dm47slz49h2fz24rk"; + }; + + preBuild = '' + makeFlagsArray=(BINDIR="$out/bin" MANDIR="$out/share/man/man8") + mkdir -p $out/bin + mkdir -p $out/share/man/man8 + ''; + + meta = with stdenv.lib; { + homepage = "http://acme.com/software/micro_httpd/"; + description = "a really small HTTP server"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ copumpkin ]; + }; +} + diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index fe500bf3462..87a4cc398a9 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -57,8 +57,8 @@ let lua-ext = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.15"; - sha256 = "0kicfs0gyfb5fhjmrwr6p09c5x6g0jwsh0wg5bsp3p209rnbq94q"; + rev = "v0.9.16rc1"; + sha256 = "0fdrzfkzdrxykbyxrpas7ns6kxzjf9s6h0fj7k4423wfwybi0kic"; }; set-misc-ext = fetchFromGitHub { @@ -102,9 +102,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-select_module" "--with-poll_module" - "--with-aio_module" "--with-threads" - "--with-file-aio" "--with-http_ssl_module" "--with-http_spdy_module" "--with-http_realip_module" @@ -133,7 +131,8 @@ stdenv.mkDerivation rec { ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" ++ optional set_misc "--add-module=${set-misc-ext}" - ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio" + ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) + [ "--with-file-aio" "--with-aio_module" ] ++ optional fluent "--add-module=${fluentd}"; diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 19f20cc8823..71f1d62f4d8 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "6"; - versionMinor = "0.39"; - sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy"; + versionMinor = "0.44"; + sha256 = "0942f0ss6w9k23xg94nir2dbbkqrqp5k628jflk51ikm5qr95dxa"; } diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index ab0ba4fd934..a38a25c8a5c 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/atheme/charybdis; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lassulus ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index cadf6e71691..30d3fc3ab18 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -51,15 +51,15 @@ stdenv.mkDerivation rec { mv $out/src/utils/* $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = https://code.google.com/p/kippo; description = "SSH Honeypot"; longDescription = '' Default port is 2222. Recommend using something like this for port redirection to default SSH port: networking.firewall.extraCommands = ''' iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222''' ''; - license = stdenv.lib.licenses.bsd3; - platforms = pkgs.stdenv.lib.platforms.linux; - maintainers = pkgs.stdenv.lib.maintainers.tomberek; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ tomberek ]; }; } diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 685d365ed18..33d63f6ee03 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl -, svrcore, icu, net_snmp, kerberos, pcre, perlPackages +, svrcore, icu, net_snmp, libkrb5, pcre, perlPackages }: let version = "1.3.3.9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu - net_snmp kerberos pcre + net_snmp libkrb5 pcre ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index b796e12e9f4..ab8ec59ca8c 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, bison -, libasr, libevent, zlib, openssl, db, pam +, libasr, libevent, zlib, openssl, db, pam, cacert }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-sock-dir=/run" "--with-privsep-user=smtpd" "--with-queue-user=smtpq" - "--with-ca-file=/etc/ssl/certs/ca-bundle.crt" + "--with-ca-file=${cacert}/ca-bundle.crt" ]; installFlags = [ diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 4ab9148118c..807ee702267 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150409220449"; + rev = "20150506172827"; name = "bosun-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "02bvq9hx2h4pgjclv09nm0al8ybvq0syhyhn5cvw0wgnn9bwn5mb"; + sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8"; }; subPackages = [ "cmd/bosun" ]; diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix index 9f432f7f8c1..bd4a5cb1047 100644 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150409220449"; - name = "bosun-${rev}"; + rev = "20150506172827"; + name = "scollector-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "02bvq9hx2h4pgjclv09nm0al8ybvq0syhyhn5cvw0wgnn9bwn5mb"; + sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8"; }; subPackages = [ "cmd/scollector" ]; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix index 4ef870bfcf9..56fcee76278 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix @@ -1,23 +1,21 @@ { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: -with goPackages; - -buildGoPackage rec { +goPackages.buildGoPackage rec { name = "prometheus-alertmanager-${version}"; - version = "0.1.0"; + version = "0.0.1"; goPackagePath = "github.com/prometheus/alertmanager"; src = fetchFromGitHub { owner = "prometheus"; repo = "alertmanager"; - rev = "942cd35dea6dc406b106d7a57ffe7adbb3b978a5"; - sha256 = "1c14vgn9s0dn322ss8fs5b47blw1g8cxy9w4yjn0f7x2sdwplx1i"; + rev = "2b6c5caf89a492b013204e8d7db99fbb78c5dcd4"; + sha256 = "13rdqnvmx11ks305dlnzv9gwf8c4zjyi5fkwcd69xgjfars2m4f3"; }; buildInputs = [ goPackages.glog goPackages.protobuf - goPackages.fsnotify + goPackages.fsnotify.v0 goPackages.httprouter goPackages.prometheus.client_golang goPackages.pushover @@ -31,7 +29,7 @@ buildGoPackage rec { -X main.buildBranch master -X main.buildUser nix@nixpkgs -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} + -X main.goVersion ${lib.getVersion goPackages.go} ''; preBuild = '' diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix index f1f5ef9975c..701ee46d498 100644 --- a/pkgs/servers/monitoring/prometheus/cli/default.nix +++ b/pkgs/servers/monitoring/prometheus/cli/default.nix @@ -1,13 +1,15 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-cli-0.2.0"; + name = "prometheus-cli-${rev}"; + rev = "0.3.0"; goPackagePath = "github.com/prometheus/prometheus_cli"; + src = fetchFromGitHub { owner = "prometheus"; repo = "prometheus_cli"; - rev = "b36c21d2301cf686bff81953573a29a6d5a0a883"; - sha256 = "190dlc6fyrfgxab4xj3gaz4jwx33jhzg57d8h36xjx56gbvp7iyk"; + inherit rev; + sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix new file mode 100644 index 00000000000..a859c437701 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix @@ -0,0 +1,24 @@ +{ goPackages, lib, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-collectd-exporter-${rev}"; + rev = "0.1.0"; + goPackagePath = "github.com/prometheus/collectd_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "collectd_exporter"; + inherit rev; + sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; + }; + + buildInputs = [ goPackages.prometheus.client_golang ]; + + meta = with lib; { + description = "Relay server for exporting metrics from collectd to Prometheus"; + homepage = "https://github.com/prometheus/alertmanager"; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 6e181c6ec9e..8180d24aa9e 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,23 +1,25 @@ { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: -with goPackages; - -buildGoPackage rec { +goPackages.buildGoPackage rec { name = "prometheus-${version}"; - version = "0.12.0"; + version = "0.13.4"; goPackagePath = "github.com/prometheus/prometheus"; - rev = "55dcb55498b43bafe94915a4de7907d6d66b4427"; + rev = "612da96c46f0b7ea6cc28a3fc614f14eae0189d0"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "17bbdk9axr91m2947ddbnzqwaap2vrzsbknbrlpdsmlsjhc8h7cb"; + sha256 = "1r3pcnxs1cdh18lmqd60r3nh614cw543wzd4slkr2nzr73pn5x4j"; }; buildInputs = [ - dns glog goleveldb prometheus.client_golang + goPackages.dns + goPackages.glog goPackages.protobuf + goPackages.goleveldb + goPackages.net + goPackages.prometheus.client_golang protobuf # the non-golang package, for protoc vim # for xxd, used in embed-static.sh ]; @@ -30,7 +32,7 @@ buildGoPackage rec { -X main.buildBranch master -X main.buildUser nix@nixpkgs -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} + -X main.goVersion ${lib.getVersion goPackages.go} ''; preBuild = '' diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix index e816f346e53..fec66af2469 100644 --- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix @@ -1,18 +1,22 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-mesos-exporter-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "a4a6638d6db6b5137e130cd4903b30dd82b78e9a"; + name = "prometheus-mesos-exporter-${rev}"; + rev = "0.1.0"; goPackagePath = "github.com/prometheus/mesos_exporter"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "mesos_exporter"; - sha256 = "1h4yxfcr8l9i2m1s5ygk3slhxdrs4mvmpn3sq8m5s205abvp891q"; + sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; - buildInputs = [ goPackages.mesos-stats ]; + buildInputs = [ + goPackages.mesos-stats + goPackages.prometheus.client_golang + goPackages.glog + ]; meta = with lib; { description = "Export Mesos metrics to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix new file mode 100644 index 00000000000..0b399d0cfff --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix @@ -0,0 +1,27 @@ +{ goPackages, lib, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-mysqld-exporter-${rev}"; + rev = "0.1.0"; + goPackagePath = "github.com/prometheus/mysqld_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "mysqld_exporter"; + inherit rev; + sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; + }; + + buildInputs = with goPackages; [ + mysql + prometheus.client_golang + ]; + + meta = with lib; { + description = "Prometheus exporter for MySQL server metrics"; + homepage = https://github.com/prometheus/mysqld_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix index 97169a0e298..c60985d3aa7 100644 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix @@ -3,14 +3,15 @@ with goPackages; buildGoPackage rec { - name = "prometheus-node-exporter-0.8.0"; + name = "prometheus-node-exporter-${rev}"; + rev = "0.8.1"; goPackagePath = "github.com/prometheus/node_exporter"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; - rev = "aaf01e52e25883671fd67234b415df7abd0e4eac"; - sha256 = "0j1qvgsc2hcv50l9lyfivkzsyjkjp3w1yyqvd1gzfybk7hi59dya"; + inherit rev; + sha256 = "15vp88w0b7h6sryy61qk369yjr3p4qvpch1nbxd9rm51bdgsqyys"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix new file mode 100644 index 00000000000..95457758cd2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/prom2json/default.nix @@ -0,0 +1,28 @@ +{ goPackages, lib, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prom2json-${rev}"; + rev = "0.1.0"; + goPackagePath = "github.com/prometheus/prom2json"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "prom2json"; + inherit rev; + sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; + }; + + buildInputs = with goPackages; [ + golang_protobuf_extensions + prometheus.client_golang + protobuf + ]; + + meta = with lib; { + description = "A tool to scrape a Prometheus client and dump the result as JSON."; + homepage = https://github.com/prometheus/prom2json; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix index db66e963208..ae1e1e38902 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix @@ -3,16 +3,15 @@ with goPackages; buildGoPackage rec { - name = "prometheus-pushgateway-${version}"; - version = "0.1.0"; + name = "prometheus-pushgateway-${rev}"; + rev = "0.1.1"; goPackagePath = "github.com/prometheus/pushgateway"; - rev = "3f1d42dade342ddb88381607358bae61a0a6b6c7"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "1wqxbl9rlnxszp9ylvdbx6f5lyj2z0if3x099fnjahbqmz8yhnf4"; + sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; }; buildInputs = [ @@ -25,7 +24,7 @@ buildGoPackage rec { buildFlagsArray = '' -ldflags= - -X main.buildVersion ${version} + -X main.buildVersion ${rev} -X main.buildRev ${rev} -X main.buildBranch master -X main.buildUser nix@nixpkgs diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix index da15952f0f3..31acf79c813 100644 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-statsd-bridge-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "9715b183150c7bed8a10affb23d33fb55c597180"; + name = "prometheus-statsd-bridge-${version}"; + version = "0.1.0"; goPackagePath = "github.com/prometheus/statsd_bridge"; src = fetchFromGitHub { - inherit rev; + rev = version; owner = "prometheus"; repo = "statsd_bridge"; - sha256 = "119024xb08qjwbhplpl5d94bjdfhn92w4ffn4kxr7aviri1gynfz"; + sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; }; buildInputs = with goPackages; [ - fsnotify + fsnotify.v0 prometheus.client_golang ]; diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/servers/monitoring/riemann-dash/Gemfile index 496302e7643..6b770b70818 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem "riemann-dash", "0.2.9" +gem "riemann-dash", "0.2.11" diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock index cd0ace470e2..a5445b953c4 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock @@ -3,25 +3,25 @@ GEM specs: erubis (2.7.0) multi_json (1.3.6) - rack (1.5.2) + rack (1.6.1) rack-protection (1.5.3) rack - riemann-dash (0.2.9) + riemann-dash (0.2.11) erubis (>= 2.7.0) multi_json (= 1.3.6) sass (>= 3.1.14) sinatra (~> 1.4.5) webrick (~> 1.3.1) - sass (3.4.8) - sinatra (1.4.5) + sass (3.4.14) + sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - tilt (1.4.1) + tilt (>= 1.3, < 3) + tilt (2.0.1) webrick (1.3.1) PLATFORMS ruby DEPENDENCIES - riemann-dash (= 0.2.9) + riemann-dash (= 0.2.11) diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix index f2e80e9aca4..b98fd452f1a 100644 --- a/pkgs/servers/monitoring/riemann-dash/gemset.nix +++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix @@ -1,26 +1,26 @@ { - erubis = { + "erubis" = { version = "2.7.0"; source = { type = "gem"; sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; }; }; - multi_json = { + "multi_json" = { version = "1.3.6"; source = { type = "gem"; sha256 = "0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr"; }; }; - rack = { - version = "1.5.2"; + "rack" = { + version = "1.6.1"; source = { type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; + sha256 = "0f73v6phkwczl1sfv0wgdwsnlsg364bhialbnfkg2dnxhh57l0gl"; }; }; - rack-protection = { + "rack-protection" = { version = "1.5.3"; source = { type = "gem"; @@ -30,11 +30,11 @@ "rack" ]; }; - riemann-dash = { - version = "0.2.9"; + "riemann-dash" = { + version = "0.2.11"; source = { type = "gem"; - sha256 = "0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3"; + sha256 = "1vzb75hf1xy7ssil7fp9z7z51vh79ba22x56ific7f1kcb21lzk7"; }; dependencies = [ "erubis" @@ -44,18 +44,18 @@ "webrick" ]; }; - sass = { - version = "3.4.8"; + "sass" = { + version = "3.4.14"; source = { type = "gem"; - sha256 = "1ianyj2figwk314h10fkzpjql2xxi5l4njv1h0w8iyzjda85rqlp"; + sha256 = "0x2mg6pid87s4ddvv6xnxfzwgy72pjmkm461pav92ngqnngx2ggk"; }; }; - sinatra = { - version = "1.4.5"; + "sinatra" = { + version = "1.4.6"; source = { type = "gem"; - sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s"; + sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7"; }; dependencies = [ "rack" @@ -63,18 +63,18 @@ "tilt" ]; }; - tilt = { - version = "1.4.1"; + "tilt" = { + version = "2.0.1"; source = { type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; + sha256 = "1qc1k2r6whnb006m10751dyz3168cq72vj8mgp5m2hpys8n6xp3k"; }; }; - webrick = { + "webrick" = { version = "1.3.1"; source = { type = "gem"; sha256 = "0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g"; }; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index f8cd73605ca..132275a56e0 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.2.8"; + version = "0.2.9"; src = fetchurl { url = "http://aphyr.com/riemann/${name}.tar.bz2"; - sha256 = "1p2pdkxy2xc5zlj6kadf4z8l0f0r4bvdgipqf52193l7rdm6dfzm"; + sha256 = "10zz92sg9ak8g7xsfc05p4kic6hzwj7nqpkjgsd8f7f3slvfjqw3"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 38e59a39f38..2bb81d83337 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -11,7 +11,7 @@ meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; homepage = http://sensuapp.org/; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ theuni ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 36b78388980..c1611952a1e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -17,7 +17,7 @@ , mmsSupport ? true, libmms , mpg123Support ? true, mpg123 , aacSupport ? true, faad2 -, pulseaudioSupport ? true, pulseaudio +, pulseaudioSupport ? true, libpulseaudio , jackSupport ? true, jack2 , gmeSupport ? true, game-music-emu , icuSupport ? true, icu @@ -25,13 +25,13 @@ , opusSupport ? true, libopus }: +with stdenv.lib; let - opt = stdenv.lib.optional; - mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; + opt = optional; major = "0.19"; minor = "9"; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 ++ opt zipSupport zziplib - ++ opt pulseaudioSupport pulseaudio + ++ opt pulseaudioSupport libpulseaudio ++ opt jackSupport jack2 ++ opt gmeSupport game-music-emu ++ opt icuSupport icu @@ -68,33 +68,33 @@ in stdenv.mkDerivation rec { ++ opt opusSupport libopus; configureFlags = - [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") - (mkFlag flacSupport "flac") - (mkFlag vorbisSupport "vorbis") - (mkFlag vorbisSupport "vorbis-encoder") - (mkFlag (!stdenv.isDarwin && madSupport) "mad") - (mkFlag mikmodSupport "mikmod") - (mkFlag id3tagSupport "id3") - (mkFlag shoutSupport "shout") - (mkFlag sqliteSupport "sqlite") - (mkFlag curlSupport "curl") - (mkFlag audiofileSupport "audiofile") - (mkFlag bzip2Support "bzip2") - (mkFlag ffmpegSupport "ffmpeg") - (mkFlag fluidsynthSupport "fluidsynth") - (mkFlag zipSupport "zzip") - (mkFlag samplerateSupport "lsr") - (mkFlag mmsSupport "mms") - (mkFlag mpg123Support "mpg123") - (mkFlag aacSupport "aac") - (mkFlag pulseaudioSupport "pulse") - (mkFlag jackSupport "jack") - (mkFlag stdenv.isDarwin "osx") - (mkFlag icuSupport "icu") - (mkFlag gmeSupport "gme") - (mkFlag clientSupport "libmpdclient") - (mkFlag opusSupport "opus") - "--enable-debug" + [ (mkEnable (!stdenv.isDarwin && alsaSupport) "alsa" null) + (mkEnable flacSupport "flac" null) + (mkEnable vorbisSupport "vorbis" null) + (mkEnable vorbisSupport "vorbis-encoder" null) + (mkEnable (!stdenv.isDarwin && madSupport) "mad" null) + (mkEnable mikmodSupport "mikmod" null) + (mkEnable id3tagSupport "id3" null) + (mkEnable shoutSupport "shout" null) + (mkEnable sqliteSupport "sqlite" null) + (mkEnable curlSupport "curl" null) + (mkEnable audiofileSupport "audiofile" null) + (mkEnable bzip2Support "bzip2" null) + (mkEnable ffmpegSupport "ffmpeg" null) + (mkEnable fluidsynthSupport "fluidsynth" null) + (mkEnable zipSupport "zzip" null) + (mkEnable samplerateSupport "lsr" null) + (mkEnable mmsSupport "mms" null) + (mkEnable mpg123Support "mpg123" null) + (mkEnable aacSupport "aac" null) + (mkEnable pulseaudioSupport "pulse" null) + (mkEnable jackSupport "jack" null) + (mkEnable stdenv.isDarwin "osx" null) + (mkEnable icuSupport "icu" null) + (mkEnable gmeSupport "gme" null) + (mkEnable clientSupport "libmpdclient" null) + (mkEnable opusSupport "opus" null) + (mkEnable true "debug" null) ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { ${if shoutSupport then "-lshout" else ""} ''; - meta = with stdenv.lib; { + meta = { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix new file mode 100644 index 00000000000..4ff12f630c9 --- /dev/null +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, openssl, zlib, python, gyp, bash, go, readline }: + +stdenv.mkDerivation rec { + version = "2.5.3"; + name = "arangodb-${version}"; + + src = fetchFromGitHub { + repo = "arangodb"; + owner = "arangodb"; + rev = "67d995aa22ea341129398326fa10c5f6c14e94e9"; + sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc"; + }; + + buildInputs = [ + openssl zlib python gyp go readline + ]; + + configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ]; + + patchPhase = '' + substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash + substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/arangodb/arangodb"; + description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + }; +} diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index defb4f657d6..a0392d0f95a 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -10,8 +10,8 @@ let - version = "2.0.14"; - sha256 = "06vsv141dk5i5z47nh1glkqpscjl5fgynbhaxb4yjab9lskwv5jk"; + version = "2.0.15"; + sha256 = "00rxmf8il9w1fmfpxfy9gbhbvgid5h8d80g3ljw25jscr00lcyh0"; in @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = http://cassandra.apache.org/; description = "A massively scalable open source NoSQL database"; platforms = with platforms; all; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ nckx rushmorem ]; }; } diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index d62e8aa450c..bbac243c7a0 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -10,8 +10,8 @@ let - version = "2.1.4"; - sha256 = "1wdp1hcp541bwja0h5kb0ff2yy74mlhkr93chrlz2199lynynpgv"; + version = "2.1.5"; + sha256 = "1zrnmwyxcrdphcbi82ps0qp81yrn1gny4iv2wa4n4mwwp8pqwxid"; in @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = http://cassandra.apache.org/; description = "A massively scalable open source NoSQL database"; platforms = with platforms; all; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ nckx rushmorem ]; }; } diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ef08dd3747f..a465d1c4a59 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -let version = "3.0.2"; +let version = "3.0.3"; system-libraries = [ "pcre" "wiredtiger" @@ -17,14 +17,14 @@ let version = "3.0.2"; ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; buildInputs = [ sasl boost gperftools pcre snappy - zlib libyamlcpp sasl openssl libpcap wiredtiger - ]; + zlib libyamlcpp sasl openssl libpcap + ] ++ optional stdenv.is64bit wiredtiger; other-args = concatStringsSep " " ([ "--c++11=on" "--ssl" #"--rocksdb" # Don't have this packaged yet - "--wiredtiger=on" + "--wiredtiger=${if stdenv.is64bit then "on" else "off"}" "--js-engine=v8-3.25" "--use-sasl-client" "--variant-dir=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "16c3cr7l8ddziavmxrg2aq9bp1knnscy57xx5zsvz6yv7hh24181"; + sha256 = "01q8fas8afch50h4kjdrdrcrb1qx243wafz6zdsbc2waq60mlxjp"; }; nativeBuildInputs = [ scons ]; diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix index 049639ad684..0e7a7d0f250 100644 --- a/pkgs/servers/nosql/redis/3.0.nix +++ b/pkgs/servers/nosql/redis/3.0.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.0.0-rc3"; + version = "3.0.1"; name = "redis-${version}"; src = fetchurl { url = "https://github.com/antirez/redis/archive/${version}.tar.gz"; - sha256 = "1695fa532eafc14c95f45add5d8a71d07e0e87b5c8f06c29dfa06313322d27b7"; + sha256 = "1m34s60qvj1xyqw7x7ar0graw52wypx47dhvfb0br67vfb62l8sl"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index ef01a3976bc..449eee556c1 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name= "owncloud-${version}"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { url = "https://download.owncloud.org/community/${name}.tar.bz2"; - sha256 = "0djgqdyxkrh1wc4sn21fmdjr09dkmnjm3gs6lbkp6yn5fpbzhybi"; + sha256 = "1j21b7ljvbhni9l0b1cpzlhsjy36scyas1l1j222mqdg2srfsi9y"; }; installPhase = diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 1161d73c28f..3930c45a097 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -15,16 +15,8 @@ , prefix ? "" }: +with stdenv; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - libOnly = prefix == "lib"; hasXlibs = xlibs != null; @@ -38,7 +30,7 @@ let optCoreaudio = if libOnly then null else shouldUsePkg coreaudio; optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; optEsound = if libOnly then null else shouldUsePkg esound; - optGlib = if libOnly then null else shouldUsePkg glib; + optGlib = shouldUsePkg glib; optGtk3 = if libOnly || !hasXlibs then null else shouldUsePkg gtk3; optGconf = if libOnly then null else shouldUsePkg gconf; optAvahi = if libOnly then null else shouldUsePkg avahi; @@ -66,6 +58,7 @@ let simple = null; }.${databaseName}; in +with stdenv.lib; stdenv.mkDerivation rec { name = "${prefix}pulseaudio-${version}"; version = "6.0"; @@ -84,9 +77,9 @@ stdenv.mkDerivation rec { optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing - ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [ + ] ++ optionals hasXlibs (with xlibs; [ libX11 libxcb libICE libSM libXtst xextproto libXi - ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ]; + ]) ++ optionals (optBluez5 != null) [ optBluez5 optSbc ]; preConfigure = '' # Performs and autoreconf @@ -115,7 +108,7 @@ stdenv.mkDerivation rec { (mkEnable false "samplerate" null) # Deprecated (mkWith true "database" databaseName) (mkEnable hasOss "oss-output" null) - (mkEnable hasOss "oss-wrapper" null) + (mkEnable true "oss-wrapper" null) # Does not use OSS (mkEnable (optCoreaudio != null) "coreaudio-output" null) (mkEnable (optAlsaLib != null) "alsa" null) (mkEnable (optEsound != null) "esound" null) @@ -162,7 +155,7 @@ stdenv.mkDerivation rec { # the alternative is to copy the files from /usr/include to src, but there are # probably a large number of files that would need to be copied (I stopped # after the seventh) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-I/usr/include"; installFlags = [ @@ -170,11 +163,11 @@ stdenv.mkDerivation rec { "pulseconfdir=$(out)/etc/pulse" ]; - postInstall = stdenv.lib.optionalString libOnly '' + postInstall = optionalString libOnly '' rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} ''; - meta = with stdenv.lib; { + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; # Note: Practically, the server is under the GPL due to the diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 705a4ba43e7..8a831f7ff69 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/restund.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 854a2ab94b7..6eb8a57cab4 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, pkgconfig, libtirpc , useSystemd ? true, systemd }: -let version = "0.2.2"; +let version = "0.2.3"; in stdenv.mkDerivation rec { name = "rpcbind-${version}"; src = fetchurl { url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2"; - sha256 = "0acgl1c07ymnks692b90aq5ldj4h0km7n03kz26wxq6vjv3winqk"; + sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq"; }; patches = [ ./sunrpc.patch ]; @@ -23,6 +23,7 @@ in stdenv.mkDerivation rec { description = "ONC RPC portmapper"; license = licenses.bsd3; platforms = platforms.unix; + homepage = http://sourceforge.net/projects/rpcbind/; maintainers = with maintainers; [ abbradar ]; longDescription = '' Universal addresses to RPC program number mapper. diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/servers/rpcbind/sunrpc.patch index af9b3b71679..450d33aa1c4 100644 --- a/pkgs/servers/rpcbind/sunrpc.patch +++ b/pkgs/servers/rpcbind/sunrpc.patch @@ -3,9 +3,10 @@ http://projects.archlinux.org/svntogit/packages.git/tree/trunk/rpcbind-sunrpc.pa Lookup "sunrpc" instead of "rpcbind" in /etc/services, since the former is the official IANA name. ---- rpcbind-0.1.7/src/rpcbind.c.orig 2008-11-19 14:17:34.000000000 +0100 -+++ rpcbind-0.1.7/src/rpcbind.c 2010-01-07 13:03:37.416632894 +0100 -@@ -114,7 +114,7 @@ +diff -ru3 rpcbind-0.2.3/src/rpcbind.c rpcbind-0.2.3.new/src/rpcbind.c +--- rpcbind-0.2.3/src/rpcbind.c 2015-04-27 17:07:43.000000000 +0300 ++++ rpcbind-0.2.3.new/src/rpcbind.c 2015-05-18 16:29:24.938380694 +0300 +@@ -132,7 +132,7 @@ char *udp_uaddr; /* Universal UDP address */ char *tcp_uaddr; /* Universal TCP address */ #endif @@ -14,14 +15,15 @@ official IANA name. static char superuser[] = "superuser"; int main __P((int, char *[])); ---- rpcbind-0.1.7/src/rpcinfo.c~ 2010-01-08 16:14:24.592156602 +0000 -+++ rpcbind-0.1.7/src/rpcinfo.c 2010-01-08 16:14:31.578838609 +0000 -@@ -633,7 +633,7 @@ - { - memset (&hints, 0, sizeof hints); - hints.ai_family = AF_INET; -- if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 && -+ if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 && - (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0) - { - fprintf (stderr, "rpcinfo: %s: %s\n", +diff -ru3 rpcbind-0.2.3/src/rpcinfo.c rpcbind-0.2.3.new/src/rpcinfo.c +--- rpcbind-0.2.3/src/rpcinfo.c 2015-04-27 17:07:43.000000000 +0300 ++++ rpcbind-0.2.3.new/src/rpcinfo.c 2015-05-18 16:30:14.197025336 +0300 +@@ -1842,7 +1842,7 @@ + + /* Get the address of the rpcbind */ + memset (&hints, 0, sizeof hints); +- if ((getaddrinfo (host, "rpcbind", &hints, &res) != 0) && ++ if ((getaddrinfo (host, "sunrpc", &hints, &res) != 0) && + (getaddrinfo (host, "portmapper",&hints, &res) != 0)) + { + rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c785d76ddce..877850f532b 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -37,18 +37,12 @@ assert kerberos != null -> zlib != null; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - bundledLibs = if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err"; hasGnutls = gnutls != null && libgcrypt != null && libgpgerror != null; isKrb5OrNull = if kerberos != null && kerberos.implementation == "krb5" then true else null; hasInfinibandOrNull = if libibverbs != null && librdmacm != null then true else null; in +with stdenv.lib; stdenv.mkDerivation rec { name = "samba-4.2.1"; @@ -60,7 +54,7 @@ stdenv.mkDerivation rec { patches = [ ./4.x-no-persistent-install.patch ./4.x-fix-ctdb-deps.patch - ] ++ stdenv.lib.optional (kerberos != null) ./4.x-heimdal-compat.patch; + ] ++ optional (kerberos != null) ./4.x-heimdal-compat.patch; buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 @@ -162,7 +156,7 @@ stdenv.mkDerivation rec { find $out -type f -exec $SHELL -c "$SCRIPT" \; ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 16705433084..2bfe74900f6 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, pulseaudio }: +{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, libpulseaudio }: stdenv.mkDerivation rec { version = "2.3.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { popt unzip libconfig - pulseaudio + libpulseaudio ]; enableParallelBuilding = true; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index a97e6847a45..bc4e57ba116 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -5,16 +5,8 @@ , pam ? null, libidn ? null, gnutls ? null }: +with stdenv; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; optGnutls = shouldUsePkg gnutls; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fe7c70ced2d..21ccd50e3ef 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.18"; + version = "10.0.19"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "1xcs391cm0vnl9bvx1470v8z4d77zqv16n6iaqi12jm0ma8fwvv8"; + sha256 = "0cm1j4805ypbmrhajn4ar5rqsis1p5haxs7c04b6k540gmfmxgrg"; }; buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ] diff --git a/pkgs/servers/sql/mysql/5.5.17-cygwin.patch b/pkgs/servers/sql/mysql/5.5.17-cygwin.patch new file mode 100644 index 00000000000..f5178cd3f39 --- /dev/null +++ b/pkgs/servers/sql/mysql/5.5.17-cygwin.patch @@ -0,0 +1,44 @@ +--- mysql-5.5.17/cmake/install_macros.cmake 2011-10-12 07:10:24.000000000 -0500 ++++ mysql-5.5.17/cmake/install_macros.cmake 2011-11-07 23:19:35.772837800 -0600 +@@ -230,7 +230,13 @@ FUNCTION(MYSQL_INSTALL_TARGETS) + IF(ARG_COMPONENT) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ENDIF() +- INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP}) ++ IF(${ARG_DESTINATION} STREQUAL "${INSTALL_LIBDIR}") ++ INSTALL(TARGETS ${TARGETS} LIBRARY DESTINATION ${ARG_DESTINATION} ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP}) ++ ELSE() ++ INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP}) ++ ENDIF() + SET(INSTALL_LOCATION ${ARG_DESTINATION} ) + INSTALL_DEBUG_SYMBOLS("${TARGETS}") + SET(INSTALL_LOCATION) +--- mysql-5.5.17/libmysql/CMakeLists.txt 2011-10-12 07:10:24.000000000 -0500 ++++ mysql-5.5.17/libmysql/CMakeLists.txt 2011-11-08 03:19:31.379219300 -0600 +@@ -214,6 +214,7 @@ IF(NOT DISABLE_SHARED) + SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) + SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) + ++ IF(NOT CYGWIN) + # Install links to libmysqlclient.so (client_r) + GET_VERSIONED_LIBNAME( + "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r" +@@ -231,5 +232,6 @@ IF(NOT DISABLE_SHARED) + linkname) + INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) + ENDFOREACH() ++ ENDIF(NOT CYGWIN) + ENDIF() + ENDIF() +--- mysql-5.5.17/strings/dtoa.c 2011-10-12 07:10:25.000000000 -0500 ++++ mysql-5.5.17/strings/dtoa.c 2011-11-07 20:38:05.064690100 -0600 +@@ -36,6 +36,7 @@ + + ***************************************************************/ + ++#define __STRICT_ANSI__ + #include /* for EOVERFLOW on Windows */ + #include + #include /* for memcpy and NOT_FIXED_DEC */ diff --git a/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch b/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch new file mode 100644 index 00000000000..edc93c44dfe --- /dev/null +++ b/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch @@ -0,0 +1,22 @@ +--- mysql-5.5.17/libmysql/CMakeLists.txt 2011-10-12 07:10:24.000000000 -0500 ++++ mysql-5.5.17/libmysql/CMakeLists.txt 2011-11-08 03:19:31.379219300 -0600 +@@ -25,6 +25,11 @@ INCLUDE_DIRECTORIES( + ADD_DEFINITIONS(${SSL_DEFINES}) + + SET(CLIENT_API_FUNCTIONS ++dynstr_free ++dynstr_append_mem ++dynstr_append_os_quoted ++dynstr_realloc ++init_dynamic_string + get_tty_password + handle_options + load_defaults +@@ -131,6 +136,7 @@ mysql_server_end + mysql_set_character_set + mysql_get_character_set_info + mysql_stmt_next_result ++strfill + + CACHE INTERNAL "Functions exported by client API" + diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index d25882b826e..8469ae4e948 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -4,13 +4,18 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.42"; + version = "5.5.43"; src = fetchurl { url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; - sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8"; + sha256 = "1kbl8xp6xi9yclc4q0q97s89rr498mm0avpbkmsa4ff8wmwxzls3"; }; + patches = if stdenv.isCygwin then [ + ./5.5.17-cygwin.patch + ./5.5.17-export-symbols.patch + ] else null; + preConfigure = stdenv.lib.optional stdenv.isDarwin '' ln -s /bin/ps $TMPDIR/ps export PATH=$PATH:$TMPDIR diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index d77a539cb5d..0254bbe951d 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,30 +1,11 @@ -{ stdenv, fetchurl, zlib, ncurses, readline, openssl }: +{ callPackage, fetchurl, ... } @ args: -let version = "8.4.22"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "8.4"; + version = "${psqlSchema}.22"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; - - buildInputs = [ zlib ncurses readline openssl ]; - - LC_ALL = "C"; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./less-is-more.patch ]; - - passthru = { inherit readline; }; - - meta = { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 340307c01f9..dba42e4fb11 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,33 +1,11 @@ -{ stdenv, fetchurl, zlib, readline, openssl }: +{ callPackage, fetchurl, ... } @ args: -let version = "9.0.19"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "9.0"; + version = "${psqlSchema}.20"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; }; - - buildInputs = [ zlib readline openssl ]; - - LC_ALL = "C"; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./less-is-more.patch ]; - - passthru = { - inherit readline; - psqlSchema = "9.0"; - }; - - meta = { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 5b0774d6229..138bc4a3023 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,41 +1,11 @@ -{ stdenv, fetchurl, zlib, readline, openssl }: +{ callPackage, fetchurl, ... } @ args: -let version = "9.1.15"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "9.1"; + version = "${psqlSchema}.16"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; }; - - buildInputs = [ zlib readline openssl ]; - - enableParallelBuilding = true; - - LC_ALL = "C"; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./less-is-more.patch ]; - - postInstall = - '' - mkdir -p $out/share/man - cp -rvd doc/src/sgml/man1 $out/share/man - ''; - - passthru = { - inherit readline; - psqlSchema = "9.1"; - }; - - meta = { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index d09cde5b995..9517b4e803c 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,39 +1,11 @@ -{ stdenv, fetchurl, zlib, readline, openssl }: +{ callPackage, fetchurl, ... } @ args: -let version = "9.2.10"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "9.2"; + version = "${psqlSchema}.11"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; }; - - buildInputs = [ zlib readline openssl ]; - - enableParallelBuilding = true; - - makeFlags = [ "world" ]; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - passthru = { - inherit readline; - psqlSchema = "9.2"; - }; - - meta = { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 6467ce80af1..fabc6dbc1de 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -1,43 +1,11 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}: +{ callPackage, fetchurl, ... } @ args: -with stdenv.lib; - -let version = "9.3.6"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "9.3"; + version = "${psqlSchema}.7"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b"; }; - - buildInputs = [ zlib readline openssl ] - ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; - - enableParallelBuilding = true; - - makeFlags = [ "world" ]; - - configureFlags = [ "--with-openssl" ] - ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; - - patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - passthru = { - inherit readline; - psqlSchema = "9.3"; - }; - - meta = { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 6649975d790..0d8b573dcc5 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -1,43 +1,11 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }: +{ callPackage, fetchurl, ... } @ args: -with stdenv.lib; - -let version = "9.4.1"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "9.4"; + version = "${psqlSchema}.2"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1"; }; - - buildInputs = [ zlib readline openssl ] - ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; - - enableParallelBuilding = true; - - makeFlags = [ "world" ]; - - configureFlags = [ "--with-openssl" ] - ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; - - patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - passthru = { - inherit readline; - psqlSchema = "9.4"; - }; - - meta = { - homepage = http://www.postgresql.org/ ; - description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = with stdenv.lib.maintainers; [ aristid ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix new file mode 100644 index 00000000000..ded9247f42a --- /dev/null +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -0,0 +1,108 @@ +{ stdenv, bison, flex +, gettext + +# Optional Dependencies +, kerberos ? null, pam ? null, openldap ? null, openssl ? null, readline ? null +, libossp_uuid ? null, libxml2 ? null, libxslt ? null, zlib ? null + +# Extra Arguments +, blockSizeKB ? 8, segmentSizeGB ? 1 +, walBlockSizeKB ? 8, walSegmentSizeMB ? 16 + +# Version specific arguments +, psqlSchema , version, src +, ... +}: + +with stdenv; +let + optKerberos = shouldUsePkg kerberos; + optPam = shouldUsePkg pam; + optOpenldap = shouldUsePkg openldap; + optOpenssl = shouldUsePkg openssl; + optReadline = shouldUsePkg readline; + optLibossp_uuid = shouldUsePkg libossp_uuid; + optLibxml2 = shouldUsePkg libxml2; + optLibxslt = shouldUsePkg libxslt; + optZlib = shouldUsePkg zlib; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + inherit src; + + patches = [ + ./less-is-more.patch + ] ++ optionals (versionOlder version "9.4.0") [ + ./disable-resolve_symlinks.patch + ] ++ optionals (versionAtLeast version "9.4.0") [ + ./disable-resolve_symlinks-94.patch + ]; + + nativeBuildInputs = [ bison flex ]; + buildInputs = [ + gettext optKerberos optPam optOpenldap optOpenssl optReadline + optLibossp_uuid optLibxml2 optLibxslt optZlib + ]; + + configureFlags = [ + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable true "integer-datetimes" null) + (mkEnable true "nls" null) + (mkWith true "pgport" "5432") + (mkEnable true "rpath" null) + (mkEnable true "spinlocks" null) + (mkEnable false "debug" null) + (mkEnable false "profiling" null) + (mkEnable false "coverage" null) + (mkEnable false "dtrace" null) + (mkWith true "blocksize" (toString blockSizeKB)) + (mkWith true "segsize" (toString segmentSizeGB)) + (mkWith true "wal-blocksize" (toString walBlockSizeKB)) + (mkWith true "wal-segsize" (toString walSegmentSizeMB)) + (mkEnable true "depend" null) + (mkEnable false "cassert" null) + (mkEnable true "thread-safety" null) + (mkWith false "tcl" null) # Maybe enable some day + (mkWith false "perl" null) # Maybe enable some day + (mkWith false "python" null) # Maybe enable some day + (mkWith (optKerberos != null) "gssapi" null) + (mkWith (optPam != null) "pam" null) + (mkWith (optOpenldap != null) "ldap" null) + (mkWith false "bonjour" null) + (mkWith (optOpenssl != null) "openssl" null) + (mkWith (optReadline != null) "readline" null) + (mkWith false "libedit-preferred" null) + (mkWith (optLibxml2 != null) "libxml" null) + (mkWith (optLibxslt != null) "libxslt" null) + (mkWith (optZlib != null) "zlib" null) + ] ++ optionals (versionAtLeast version "9.1.0") [ + (mkWith false "selinux" null) + ] ++ optionals (versionOlder version "9.3.0") [ + (mkEnable true "shared" null) + ] ++ optionals (versionAtLeast version "9.4.0") [ + (mkEnable false "tap-tests" null) + (mkWith (optLibossp_uuid != null) "uuid" "ossp") + ] ++ optionals (versionOlder version "9.4.0") [ + (mkWith false "krb5" null) + (mkWith (optLibossp_uuid != null) "ossp-uuid" null) + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + maintainers = with maintainers; [ ocharles wkennington ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; + }; + + passthru = { + inherit psqlSchema; + readline = optReadline; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b7e5eef6d56..1d8997e3c1d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -545,11 +545,11 @@ let }) // {inherit ;}; kbproto = (mkDerivation "kbproto" { - name = "kbproto-1.0.6"; + name = "kbproto-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2; - sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03"; + url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2; + sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; @@ -565,11 +565,11 @@ let }) // {inherit applewmproto libX11 libXext xextproto ;}; libFS = (mkDerivation "libFS" { - name = "libFS-1.0.6"; + name = "libFS-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2; - sha256 = "1mxfsvj9m3pn8cdkcn4kg190zp665mf4pv0083g6xykvsgxzq1wh"; + url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; + sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; }) // {inherit fontsproto xproto xtrans ;}; @@ -635,11 +635,11 @@ let }) // {inherit xproto ;}; libXaw = (mkDerivation "libXaw" { - name = "libXaw-1.0.12"; + name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2; - sha256 = "1xnv7jy86j9vhmw74frkzcraynqbw1p1s79jasargsgwfi433z4n"; + url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; + sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; @@ -774,22 +774,32 @@ let buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; }) // {inherit libX11 libXext xextproto xproto libXt ;}; - libXrandr = (mkDerivation "libXrandr" { - name = "libXrandr-1.4.2"; + libXpresent = (mkDerivation "libXpresent" { + name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.4.2.tar.bz2; - sha256 = "1b95p3l84ppv6j7dbbmg0zrz6k8xdwvnag1l6ajm3gk9qwdb79ya"; + url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2; + sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; + }; + buildInputs = [pkgconfig presentproto libX11 xextproto xproto ]; + }) // {inherit presentproto libX11 xextproto xproto ;}; + + libXrandr = (mkDerivation "libXrandr" { + name = "libXrandr-1.5.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2; + sha256 = "0n6ycs1arf4wb1cal9il6v7vbxbf21qhs9sbfl8xndgwnxclk1kg"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; libXrender = (mkDerivation "libXrender" { - name = "libXrender-0.9.8"; + name = "libXrender-0.9.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2; - sha256 = "0qpwyjhbpp734vnhca992pjh4w7ijslidkzx1pcwbbk000pv050x"; + url = mirror://xorg/individual/lib/libXrender-0.9.9.tar.bz2; + sha256 = "06myx7044qqdswxndsmd82fpp670klnizkgzdm194h51h1wyabzw"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; }) // {inherit renderproto libX11 xproto ;}; @@ -805,11 +815,11 @@ let }) // {inherit resourceproto libX11 libXext xextproto xproto ;}; libXt = (mkDerivation "libXt" { - name = "libXt-1.1.4"; + name = "libXt-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2; - sha256 = "0myxwbx9ylam5x3ia5b5f4x8azcqdm420h9ad1r4hrgmi2lrffl4"; + url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2; + sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6"; }; buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; }) // {inherit libICE kbproto libSM libX11 xproto ;}; @@ -885,21 +895,21 @@ let }) // {inherit dmxproto libX11 libXext xextproto ;}; libfontenc = (mkDerivation "libfontenc" { - name = "libfontenc-1.1.2"; + name = "libfontenc-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2; - sha256 = "0qign0ivqk166l9yfd51gw9lbhgs718bcrmvc40yicjr6gnyz959"; + url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; + sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; }; buildInputs = [pkgconfig xproto zlib ]; }) // {inherit xproto zlib ;}; libpciaccess = (mkDerivation "libpciaccess" { - name = "libpciaccess-0.13.3"; + name = "libpciaccess-0.13.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2; - sha256 = "1qy2i776jb7912dxqylv59p41sa0hw8lmn7asd3ywvp0wk56rmvc"; + url = mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2; + sha256 = "1krgryi9ngjr66242v0v5mczihgv0y7rrvx0563arr318mjn9y07"; }; buildInputs = [pkgconfig zlib ]; }) // {inherit zlib ;}; @@ -925,11 +935,11 @@ let }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; libxkbfile = (mkDerivation "libxkbfile" { - name = "libxkbfile-1.0.8"; + name = "libxkbfile-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2; - sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"; + url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; + sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; }; buildInputs = [pkgconfig kbproto libX11 ]; }) // {inherit kbproto libX11 ;}; @@ -1015,11 +1025,11 @@ let }) // {inherit libXau ;}; randrproto = (mkDerivation "randrproto" { - name = "randrproto-1.4.1"; + name = "randrproto-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/randrproto-1.4.1.tar.bz2; - sha256 = "1p7155hsp48b0sjm4rc67wz6y1nxqrq69vyw0sjxh8h6pcpcngal"; + url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2; + sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; @@ -1075,31 +1085,31 @@ let }) // {inherit xproto ;}; setxkbmap = (mkDerivation "setxkbmap" { - name = "setxkbmap-1.3.0"; + name = "setxkbmap-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2; - sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x"; + url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2; + sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; }) // {inherit libX11 libxkbfile ;}; smproxy = (mkDerivation "smproxy" { - name = "smproxy-1.0.5"; + name = "smproxy-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2; - sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67"; + url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2; + sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; buildInputs = [pkgconfig libICE libSM libXmu libXt ]; }) // {inherit libICE libSM libXmu libXt ;}; twm = (mkDerivation "twm" { - name = "twm-1.0.8"; + name = "twm-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/twm-1.0.8.tar.bz2; - sha256 = "0i1ff8h2gh1ab311da5dlhl0nrma0qbrk403ymzi4cnnacikaq3n"; + url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2; + sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5"; }; buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ]; }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; @@ -1135,14 +1145,14 @@ let }) // {inherit ;}; x11perf = (mkDerivation "x11perf" { - name = "x11perf-1.5.4"; + name = "x11perf-1.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2; - sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4"; + url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; + sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; }; - buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ]; - }) // {inherit libX11 libXext libXft libXmu libXrender ;}; + buildInputs = [pkgconfig libX11 libXext libXft libXmu xproto libXrender ]; + }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;}; xauth = (mkDerivation "xauth" { name = "xauth-1.0.9"; @@ -1204,6 +1214,16 @@ let buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;}; + xcbutilerrors = (mkDerivation "xcbutilerrors" { + name = "xcb-util-errors-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; + sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; + }; + buildInputs = [pkgconfig gperf m4 libxcb xcbproto xproto ]; + }) // {inherit gperf m4 libxcb xcbproto xproto ;}; + xcbutilimage = (mkDerivation "xcbutilimage" { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; @@ -1265,15 +1285,25 @@ let }) // {inherit ;}; xcmsdb = (mkDerivation "xcmsdb" { - name = "xcmsdb-1.0.4"; + name = "xcmsdb-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2; - sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"; + url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2; + sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; buildInputs = [pkgconfig libX11 ]; }) // {inherit libX11 ;}; + xcompmgr = (mkDerivation "xcompmgr" { + name = "xcompmgr-1.1.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; + sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; + }; + buildInputs = [pkgconfig libXcomposite libXdamage libXext libXfixes libXrender ]; + }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;}; + xcursorgen = (mkDerivation "xcursorgen" { name = "xcursorgen-1.0.6"; builder = ./builder.sh; @@ -1305,31 +1335,31 @@ let }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; xdpyinfo = (mkDerivation "xdpyinfo" { - name = "xdpyinfo-1.3.1"; + name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2; - sha256 = "154b29zlrq33lmni883jgwyrb2kx7z8h52jx1s3ys5x5d582iydf"; + url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2; + sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; xdriinfo = (mkDerivation "xdriinfo" { - name = "xdriinfo-1.0.4"; + name = "xdriinfo-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2; - sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim"; + url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2; + sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"; }; buildInputs = [pkgconfig glproto libX11 ]; }) // {inherit glproto libX11 ;}; xev = (mkDerivation "xev" { - name = "xev-1.2.1"; + name = "xev-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xev-1.2.1.tar.bz2; - sha256 = "0hv296mysglcgkx6lj1wxc23kshb2kix1a8yqppxj5vz16mpzw8i"; + url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; + sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; }; buildInputs = [pkgconfig libX11 xproto libXrandr ]; }) // {inherit libX11 xproto libXrandr ;}; @@ -1405,21 +1435,21 @@ let }) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { - name = "xf86-input-keyboard-1.8.0"; + name = "xf86-input-keyboard-1.8.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2; - sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1"; + url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2; + sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.8.0"; + name = "xf86-input-libinput-0.10.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2; - sha256 = "0fm4vrkw7azipbnwvc2l18g65z77pllsznaajd8q3zpg9ycb0li1"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.10.0.tar.bz2; + sha256 = "1w1v83qlr7n4iqgd7grmhx0gbz1fhsnpk88j4a136dk4xmc069x4"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; }) // {inherit inputproto xorgserver xproto ;}; @@ -1455,11 +1485,11 @@ let }) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputvoid = (mkDerivation "xf86inputvoid" { - name = "xf86-input-void-1.4.0"; + name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2; - sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"; + url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2; + sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; buildInputs = [pkgconfig xorgserver xproto ]; }) // {inherit xorgserver xproto ;}; @@ -1505,11 +1535,11 @@ let }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videocirrus = (mkDerivation "xf86videocirrus" { - name = "xf86-video-cirrus-1.5.2"; + name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2; - sha256 = "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k"; + url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2; + sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1535,11 +1565,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; xf86videogeode = (mkDerivation "xf86videogeode" { - name = "xf86-video-geode-2.11.16"; + name = "xf86-video-geode-2.11.17"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2; - sha256 = "19y13xl7yfrgyis92rmxi0ld95ajgr5il0n9j1dridwzw9aizz1q"; + url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2; + sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1595,11 +1625,11 @@ let }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { - name = "xf86-video-mach64-6.9.4"; + name = "xf86-video-mach64-6.9.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2; - sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp"; + url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2; + sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1625,11 +1655,11 @@ let }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;}; xf86videoneomagic = (mkDerivation "xf86videoneomagic" { - name = "xf86-video-neomagic-1.2.8"; + name = "xf86-video-neomagic-1.2.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2; - sha256 = "0x48sxs1p3kmwk3pq1j7vl93y59gdmgkq1x5xbnh0yal0angdash"; + url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2; + sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"; }; buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ]; }) // {inherit fontsproto libpciaccess xorgserver xproto ;}; @@ -1685,31 +1715,31 @@ let }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videor128 = (mkDerivation "xf86videor128" { - name = "xf86-video-r128-6.9.2"; + name = "xf86-video-r128-6.10.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2; - sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb"; + url = mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2; + sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; xf86videosavage = (mkDerivation "xf86videosavage" { - name = "xf86-video-savage-2.3.7"; + name = "xf86-video-savage-2.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2; - sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784"; + url = mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2; + sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" { - name = "xf86-video-siliconmotion-1.7.7"; + name = "xf86-video-siliconmotion-1.7.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2; - sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47"; + url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2; + sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79"; }; buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; @@ -1845,21 +1875,31 @@ let }) // {inherit libXfont xproto xtrans ;}; xgamma = (mkDerivation "xgamma" { - name = "xgamma-1.0.5"; + name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2; - sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3"; + url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2; + sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; - buildInputs = [pkgconfig libX11 libXxf86vm ]; - }) // {inherit libX11 libXxf86vm ;}; + buildInputs = [pkgconfig libX11 xproto libXxf86vm ]; + }) // {inherit libX11 xproto libXxf86vm ;}; + + xgc = (mkDerivation "xgc" { + name = "xgc-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2; + sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; + }; + buildInputs = [pkgconfig libXaw libXt ]; + }) // {inherit libXaw libXt ;}; xhost = (mkDerivation "xhost" { - name = "xhost-1.0.6"; + name = "xhost-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xhost-1.0.6.tar.bz2; - sha256 = "1hlxm0is9nks1cx033s1733kkib9ivx2bxa3pb9yayqavwibkxd6"; + url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; + sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; }; buildInputs = [pkgconfig libX11 libXau libXmu xproto ]; }) // {inherit libX11 libXau libXmu xproto ;}; @@ -1905,24 +1945,24 @@ let }) // {inherit libX11 libxkbfile xproto ;}; xkbevd = (mkDerivation "xkbevd" { - name = "xkbevd-1.1.3"; + name = "xkbevd-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2; - sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm"; + url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2; + sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; }) // {inherit libX11 libxkbfile ;}; xkbprint = (mkDerivation "xkbprint" { - name = "xkbprint-1.0.3"; + name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2; - sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s"; + url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2; + sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; - }) // {inherit libX11 libxkbfile ;}; + buildInputs = [pkgconfig libX11 libxkbfile xproto ]; + }) // {inherit libX11 libxkbfile xproto ;}; xkbutils = (mkDerivation "xkbutils" { name = "xkbutils-1.0.4"; @@ -1955,11 +1995,11 @@ let }) // {inherit libX11 libXmu xproto ;}; xlsatoms = (mkDerivation "xlsatoms" { - name = "xlsatoms-1.1.1"; + name = "xlsatoms-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2; - sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv"; + url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; + sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; }; buildInputs = [pkgconfig libxcb ]; }) // {inherit libxcb ;}; @@ -1974,6 +2014,26 @@ let buildInputs = [pkgconfig libxcb ]; }) // {inherit libxcb ;}; + xlsfonts = (mkDerivation "xlsfonts" { + name = "xlsfonts-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; + sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; + }; + buildInputs = [pkgconfig libX11 xproto ]; + }) // {inherit libX11 xproto ;}; + + xmag = (mkDerivation "xmag" { + name = "xmag-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2; + sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; + }; + buildInputs = [pkgconfig libX11 libXaw libXmu libXt ]; + }) // {inherit libX11 libXaw libXmu libXt ;}; + xmessage = (mkDerivation "xmessage" { name = "xmessage-1.0.4"; builder = ./builder.sh; @@ -1985,11 +2045,11 @@ let }) // {inherit libXaw libXt ;}; xmodmap = (mkDerivation "xmodmap" { - name = "xmodmap-1.0.8"; + name = "xmodmap-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2; - sha256 = "1hwzm54m4ng09ls9i4bq0x84zbyhamgzasgrvhxxp8jqk34f7qpg"; + url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; + sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; }; buildInputs = [pkgconfig libX11 xproto ]; }) // {inherit libX11 xproto ;}; @@ -2005,11 +2065,11 @@ let }) // {inherit ;}; xorgdocs = (mkDerivation "xorgdocs" { - name = "xorg-docs-1.7"; + name = "xorg-docs-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2; - sha256 = "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr"; + url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2; + sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; @@ -2125,11 +2185,11 @@ let }) // {inherit ;}; xvinfo = (mkDerivation "xvinfo" { - name = "xvinfo-1.1.2"; + name = "xvinfo-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2; - sha256 = "1qsh7fszi727l3vwlaf9pb7bpikdv15smrx5qhlgg3kqzl7xklzf"; + url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; + sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; }; buildInputs = [pkgconfig libX11 xproto libXv ]; }) // {inherit libX11 xproto libXv ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index f0bf8bf7378..8a445a69c69 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -7,3 +7,4 @@ http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0965a72c43c..1ef0d88ce3a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -80,7 +80,7 @@ in }; libxkbfile = attrs: attrs // { - patches = lib.optional (stdenv.cc.cc.isClang or false) ./libxkbfile-clang36.patch; + patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch; }; libpciaccess = attrs : attrs // { @@ -173,6 +173,9 @@ in patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }; + libXpresent = attrs: attrs + // { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; }; + setxkbmap = attrs: attrs // { postInstall = '' diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index f02dd1e89f0..932d4f1236f 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -49,19 +49,19 @@ mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 +mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 -mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2 -mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2 +mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.3.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 -mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2 +mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 @@ -72,14 +72,15 @@ mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2 -mirror://xorg/individual/lib/libXrandr-1.4.2.tar.bz2 -mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2 +mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2 +mirror://xorg/individual/lib/libXrender-0.9.9.tar.bz2 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 -mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2 mirror://xorg/individual/lib/libXvMC-1.0.9.tar.bz2 @@ -89,65 +90,67 @@ mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 -mirror://xorg/individual/proto/randrproto-1.4.1.tar.bz2 +mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2 +mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 +mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 +mirror://xorg/individual/app/twm-1.0.9.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2 +mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.9.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2 +mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 +mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2 -mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2 -mirror://xorg/individual/app/xev-1.2.1.tar.bz2 +mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 +mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2 +mirror://xorg/individual/app/xev-1.2.2.tar.bz2 mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.10.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2 -mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2 +mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 @@ -160,19 +163,22 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2 -mirror://xorg/individual/app/xhost-1.0.6.tar.bz2 +mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 +mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 +mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.1.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 +mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 +mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 -mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 +mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 +mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 +mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 +mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 @@ -184,8 +190,8 @@ mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2 -mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2 +mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2 -mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2 +mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 diff --git a/pkgs/shells/bash/bash-4.1-patches.nix b/pkgs/shells/bash/bash-4.1-patches.nix new file mode 100644 index 00000000000..2affe1efa60 --- /dev/null +++ b/pkgs/shells/bash/bash-4.1-patches.nix @@ -0,0 +1,21 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56") +(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij") +(patch "003" "0v95ng8qa78dbh26rr6jpzkn3s6n78xymymkvvvkz35rpgfksxli") +(patch "004" "17pzykkywh5jmdy1ikj9xyxm7qm29ii2fmrfpyjr1wy16jx67h3q") +(patch "005" "06lwfgxx9kacz018nr4dmxqqrzipcg8pjn61gr6yfjv6s7c3k5ji") +(patch "006" "0j9c1zhhwvc2p4cdxi77nxmcxa00cimaxwbhasyqgc606g7sp1jr") +(patch "007" "19q5qba77hfda8g4xylh77awiakhr1d1asgbqcrbakxs50n2l0bl") +(patch "008" "058j911q9wcbr93w59jnpgmdpx4qsq3gvd6m9nwgdk9j2hjjqb2f") +(patch "009" "1lany70f0rx1i2xikzkahr1zskh8620j05ic0gc5x2p89ab0ch5x") +(patch "010" "05fqv7w12g9izy332wypynilgxzdh87vy5q2pqq3bjdncyl5hxvr") +(patch "011" "088n54yh5zp8aa917y1ng3802amchgal1acn0v0mdjqj0yi82aqv") +(patch "012" "0vbvc1vxljyd882wk6rcd64xrf1lda6wirys41mqjbl0lalj8bi7") +(patch "013" "1y7x62i0q3wkr9jdjzvm2rl9dp11vzp8fwkz2zb2x21l0pi25mya") +(patch "014" "0gpizgbx1w712awpd11x5nvahpranl0aiq16nhp3xmm8vvz1wpar") +(patch "015" "17nf6kw1vhmzn9nzb1vyn8r4wp2nl109f9yawzavjkf06670ln7c") +(patch "016" "129hknigxhxrh1rbjhc4fm6argpjb6lp9fl616narbnzsv3qhc3l") +(patch "017" "0vy02x6fmpd6i66n97r4fwrq9pncbgzya07iyca2bb6yyzmymgg5") +] diff --git a/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch b/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch new file mode 100644 index 00000000000..e0959d0446a --- /dev/null +++ b/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch @@ -0,0 +1,1393 @@ +--- bashline.c 2015-02-06 17:12:55.823275600 -0700 ++++ bashline.c 2015-02-06 17:14:11.000103800 -0700 +@@ -71,6 +71,16 @@ + # include "pcomplete.h" + #endif + ++#if __CYGWIN__ ++# ifdef __x86_64__ ++# define IMP(x) __imp_##x ++# else ++# define IMP(x) _imp__##x ++# endif ++#else ++# define IMP(x) x ++#endif ++ + /* These should agree with the defines for emacs_mode and vi_mode in + rldefs.h, even though that's not a public readline header file. */ + #ifndef EMACS_EDITING_MODE +@@ -264,6 +274,11 @@ int no_empty_command_completion; + are the only possible matches, even if FIGNORE says to. */ + int force_fignore = 1; + ++#if __CYGWIN__ ++/* If set, shorten "foo.exe" to "foo" when they are the same file. */ ++int completion_strip_exe; ++#endif /* __CYGWIN__ */ ++ + /* Perform spelling correction on directory names during word completion */ + int dircomplete_spelling = 0; + +@@ -491,11 +506,12 @@ initialize_readline () + kseq[0] = CTRL('J'); + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == rl_vi_editing_mode) ++ extern rl_command_func_t *IMP(rl_vi_editing_mode); ++ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) + rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap); + kseq[0] = CTRL('M'); + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == rl_vi_editing_mode) ++ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) + rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap); + #if defined (VI_MODE) + rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap); +@@ -514,7 +530,8 @@ initialize_readline () + kseq[0] = '~'; + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == 0 || func == rl_tilde_expand) ++ extern rl_command_func_t *IMP(rl_tilde_expand); ++ if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand)) + rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap); + + rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap); +@@ -537,7 +554,8 @@ initialize_readline () + kseq[0] = TAB; + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == 0 || func == rl_tab_insert) ++ extern rl_command_func_t *IMP(rl_tab_insert); ++ if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert)) + rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap); + + /* Tell the completer that we want a crack first. */ +@@ -2109,6 +2127,21 @@ globword: + + if (match && executable_completion ((searching_path ? val : cval), searching_path)) + { ++#if __CYGWIN__ ++ if (completion_strip_exe) ++ { ++ size_t val_len = strlen (val); ++ char *candidate; ++ if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe") ++ && (candidate = strdup (val))) ++ { ++ candidate[val_len - 4] = '\0'; ++ if (same_file (val, candidate, NULL, NULL)) ++ temp[strlen (temp) - 4] = '\0'; ++ free (candidate); ++ } ++ } ++#endif + if (cval != val) + free (cval); + free (val); +@@ -2844,6 +2877,17 @@ test_for_directory (name) + int r; + + fn = bash_tilde_expand (name, 0); ++#if __CYGWIN__ ++ /* stat("//server") can only be successful as a directory, but takes ++ a several-second timeout to fail. It is much faster to assume ++ that //server is a valid name than it is to wait for the stat, ++ even though it gives false positives on bad names. */ ++ if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/')) ++ { ++ free (fn); ++ return 1; ++ } ++#endif /* __CYGWIN__ */ + r = file_isdir (fn); + free (fn); + +--- builtins/evalstring.c 2015-02-06 17:12:55.682776800 -0700 ++++ builtins/evalstring.c 2015-02-06 17:14:11.015662800 -0700 +@@ -195,7 +195,7 @@ parse_and_execute (string, from_file, fl + int code, lreset; + volatile int should_jump_to_top_level, last_result; + COMMAND *volatile command; +- volatile sigset_t pe_sigmask; ++ sigset_t pe_sigmask; + + parse_prologue (string, flags, PE_TAG); + +@@ -451,7 +451,7 @@ parse_string (string, from_file, flags, + volatile int should_jump_to_top_level; + COMMAND *volatile command, *oglobal; + char *ostring; +- volatile sigset_t ps_sigmask; ++ sigset_t ps_sigmask; + + parse_prologue (string, flags, PS_TAG); + +--- builtins/set.def 2013-04-19 05:20:34.000000000 -0600 ++++ builtins/set.def 2015-02-06 17:14:11.015662800 -0700 +@@ -56,6 +56,13 @@ extern int dont_save_function_defs; + #if defined (READLINE) + extern int no_line_editing; + #endif /* READLINE */ ++#if __CYGWIN__ ++extern int igncr; ++static int set_minus_o_option_maybe (int, const char *, int); ++# define INTERACTIVE_ONLY ,1 ++#else /* ! __CYGWIN__ */ ++# define INTERACTIVE_ONLY ++#endif + + $BUILTIN set + $FUNCTION set_builtin +@@ -92,6 +99,9 @@ Options: + #if defined (HISTORY) + history enable command history + #endif ++#if __CYGWIN__ ++ igncr on cygwin, ignore \r in line endings ++#endif + ignoreeof the shell will not exit upon reading EOF + interactive-comments + allow comments to appear in interactive commands +@@ -188,29 +198,41 @@ const struct { + int *variable; + setopt_set_func_t *set_func; + setopt_get_func_t *get_func; ++#if __CYGWIN__ ++ /* Cygwin users have taken to exporting SHELLOPTS for the ++ cygwin-specific igncr. As a result, we need to make sure ++ SHELLOPTS parsing does not turn on interactive options when ++ exported from an interactive shell, but parsed in a ++ non-interactive setting, since some interactive options violate ++ POSIX /bin/sh rules. */ ++ int interactive_only; ++#endif /* __CYGWIN__ */ + } o_options[] = { + { "allexport", 'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (BRACE_EXPANSION) + { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #endif + #if defined (READLINE) +- { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, ++ { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, + #endif + { "errexit", 'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "errtrace", 'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "functrace", 'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "hashall", 'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (BANG_HISTORY) +- { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, ++ { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, + #endif /* BANG_HISTORY */ + #if defined (HISTORY) +- { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL }, ++ { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, ++#endif ++#if __CYGWIN__ ++ { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL }, + #endif + { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL }, + { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "keyword", 'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (JOB_CONTROL) +- { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, ++ { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, + #endif + { "noclobber", 'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "noexec", 'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +@@ -229,7 +251,7 @@ const struct { + { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "verbose", 'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (READLINE) +- { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, ++ { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, + #endif + { "xtrace", 'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +@@ -416,6 +438,15 @@ int + set_minus_o_option (on_or_off, option_name) + int on_or_off; + char *option_name; ++#if __CYGWIN__ ++{ ++ /* See cygwin comments above. */ ++ return set_minus_o_option_maybe (on_or_off, option_name, 0); ++} ++static int ++set_minus_o_option_maybe (int on_or_off, const char *option_name, ++ int avoid_interactive) ++#endif /* __CYGWIN__ */ + { + register int i; + +@@ -423,6 +454,10 @@ set_minus_o_option (on_or_off, option_na + { + if (STREQ (option_name, o_options[i].name)) + { ++#if __CYGWIN__ ++ if (o_options[i].interactive_only && avoid_interactive) ++ return EXECUTION_SUCCESS; ++#endif /* __CYGWIN__ */ + if (o_options[i].letter == 0) + { + SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name); +@@ -548,7 +583,11 @@ parse_shellopts (value) + vptr = 0; + while (vname = extract_colon_unit (value, &vptr)) + { ++#if __CYGWIN__ ++ set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell); ++#else /* !__CYGWIN__ */ + set_minus_o_option (FLAG_ON, vname); ++#endif + free (vname); + } + } +--- builtins/shopt.def 2013-02-27 07:43:20.000000000 -0700 ++++ builtins/shopt.def 2015-02-06 17:14:11.015662800 -0700 +@@ -91,6 +91,11 @@ extern int glob_star; + extern int glob_asciirange; + extern int lastpipe_opt; + ++#if __CYGWIN__ ++extern int completion_strip_exe; ++#endif ++ ++ + #if defined (EXTENDED_GLOB) + extern int extended_glob; + #endif +@@ -161,6 +166,9 @@ static struct { + { "compat40", &shopt_compat40, set_compatibility_level }, + { "compat41", &shopt_compat41, set_compatibility_level }, + { "compat42", &shopt_compat41, set_compatibility_level }, ++#if __CYGWIN__ ++ { "completion_strip_exe", &completion_strip_exe, NULL }, ++#endif + #if defined (READLINE) + { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, + { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, +--- config-top.h 2012-08-18 18:51:30.000000000 -0600 ++++ config-top.h 2015-02-06 17:14:11.015662800 -0700 +@@ -80,10 +80,10 @@ + #define KSH_COMPATIBLE_SELECT + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++#define SYS_BASHRC "/etc/bash.bashrc" + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" + + /* Define this to make non-interactive shells begun with argv[0][0] == '-' + run the startup files when not in posix mode. */ +@@ -93,7 +93,7 @@ + sshd and source the .bashrc if so (like the rshd behavior). This checks + for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, + which can be fooled under certain not-uncommon circumstances. */ +-/* #define SSH_SOURCE_BASHRC */ ++#define SSH_SOURCE_BASHRC + + /* Define if you want the case-capitalizing operators (~[~]) and the + `capcase' variable attribute (declare -c). */ +--- doc/Makefile.in 2013-10-30 14:18:12.000000000 -0600 ++++ doc/Makefile.in 2015-02-06 17:14:11.015662800 -0700 +@@ -176,7 +176,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER) + $(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi + + bash.info: bashref.info +- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \ ++ ${SHELL} ${INFOPOST} < bashref.info > $@ ; \ + + bash.txt: bash.1 + bash.ps: bash.1 +@@ -237,9 +237,9 @@ install: info installdirs bash.info + -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext} + -$(INSTALL_DATA) $(OTHER_DOCS) $(DESTDIR)$(docdir) + # uncomment the next lines to install the builtins man page +-# sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 +-# -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} +-# -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 ++ sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 ++ -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} ++ -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 + -if test -f bash.info; then d=.; else d=$(srcdir); fi; \ + $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info + # run install-info if it is present to update the info directory +--- doc/bash.1 2014-02-06 07:03:52.000000000 -0700 ++++ doc/bash.1 2015-02-06 17:14:11.015662800 -0700 +@@ -1658,6 +1658,14 @@ subsequently reset. + Expands to the effective user ID of the current user, initialized at + shell startup. This variable is readonly. + .TP ++.B EXECIGNORE ++A colon-separated list of extended glob (see \fBPattern Matching\fP) ++patterns. Files with full paths matching one of these patterns are ++not considered executable for the purposes of completion and PATH ++searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not ++affected. Use this variable to deal with systems that set the ++executable bit on files that are not actually executable. ++.TP + .B FUNCNAME + An array variable containing the names of all shell functions + currently in the execution call stack. +@@ -3308,6 +3316,10 @@ the character + .B ``.'' + at the start of a name or immediately following a slash + must be matched explicitly, unless the shell option ++.B completion_strip_exe ++If set, whenever bash sees `foo.exe' during completion, it checks if ++`foo' is the same file and strips the suffix. ++.TP 8 + .B dotglob + is set. + When matching a pathname, the slash character must always be +--- doc/bashref.texi 2014-02-22 11:20:36.000000000 -0700 ++++ doc/bashref.texi 2015-02-06 17:14:11.015662800 -0700 +@@ -4992,6 +4992,10 @@ filenames. + This variable is set by default, which is the default Bash behavior in + versions through 4.2. + ++@item completion_strip_exe ++If set, whenever bash sees `foo.exe' during completion, it checks if ++`foo' is the same file and strips the suffix. ++ + @item direxpand + If set, Bash + replaces directory names with the results of word expansion when performing +@@ -5578,6 +5582,14 @@ Similar to @code{BASH_ENV}; used when th + The numeric effective user id of the current user. This variable + is readonly. + ++@item EXECIGNORE ++A colon-separated list of extended glob ((@pxref{Pattern Matching}) ++patterns. Files with full paths matching one of these patterns are ++not considered executable for the purposes of completion and PATH ++searching, but the @code{[}, @code{[[}, and @code{test} builtins are ++not affected. Use this variable to deal with systems that set the ++executable bit on files that are not actually executable. ++ + @item FCEDIT + The editor used as a default by the @option{-e} option to the @code{fc} + builtin command. +--- doc/builtins.1 2012-02-21 12:32:05.000000000 -0700 ++++ doc/builtins.1 2015-02-06 17:14:11.031260100 -0700 +@@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim + ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1) + .SH BASH BUILTIN COMMANDS + .nr zZ 1 +-.so bash.1 ++.so man1/bash.1 + .SH SEE ALSO + bash(1), sh(1) +--- execute_cmd.c 2015-02-06 17:12:55.261573700 -0700 ++++ execute_cmd.c 2015-02-06 17:14:11.031260100 -0700 +@@ -58,6 +58,7 @@ extern int errno; + #endif + + #define NEED_FPURGE_DECL ++#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */ + + #include "bashansi.h" + #include "bashintl.h" +--- expr.c 2014-01-03 06:55:00.000000000 -0700 ++++ expr.c 2015-02-06 17:14:11.031260100 -0700 +@@ -83,6 +83,7 @@ + + #include "shell.h" + #include "typemax.h" /* INTMAX_MAX, INTMAX_MIN */ ++#define exp2 exp2_ + + /* Because of the $((...)) construct, expressions may include newlines. + Here is a macro which accepts newlines, tabs and spaces as whitespace. */ +--- findcmd.c 2012-10-15 05:45:04.000000000 -0600 ++++ findcmd.c 2015-02-06 17:14:11.031260100 -0700 +@@ -48,6 +48,8 @@ + extern int errno; + #endif + ++#include ++ + extern int posixly_correct; + extern int last_command_exit_value; + +@@ -77,6 +79,38 @@ int check_hashed_filenames; + containing the file of interest. */ + int dot_found_in_search = 0; + ++static struct ignorevar execignore = ++{ ++ "EXECIGNORE", ++ (struct ign *)0, ++ 0, ++ (char *)0, ++ (sh_iv_item_func_t *)0, ++}; ++ ++void ++setup_exec_ignore (char *varname) ++{ ++ setup_ignore_patterns (&execignore); ++} ++ ++/* Return whether we should never consider file executable ++ * even if the system tells us it is. */ ++static int ++is_on_exec_blacklist (char *name) ++{ ++ struct ign *p; ++ int flags = FNM_EXTMATCH | FNM_CASEFOLD; ++ ++ for (p = execignore.ignores; p && p->val; p++) ++ { ++ if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH) ++ return (1); ++ } ++ ++ return (0); ++} ++ + /* Return some flags based on information about this file. + The EXISTS bit is non-zero if the file is found. + The EXECABLE bit is non-zero the file is executble. +@@ -104,7 +138,7 @@ file_status (name) + file access mechanisms into account. eaccess uses the effective + user and group IDs, not the real ones. We could use sh_eaccess, + but we don't want any special treatment for /dev/fd. */ +- if (eaccess (name, X_OK) == 0) ++ if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0) + r |= FS_EXECABLE; + if (eaccess (name, R_OK) == 0) + r |= FS_READABLE; +--- findcmd.h 2012-01-14 16:56:25.000000000 -0700 ++++ findcmd.h 2015-02-06 17:14:11.031260100 -0700 +@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons + extern char *find_path_file __P((const char *)); + extern char *search_for_command __P((const char *, int)); + extern char *user_command_matches __P((const char *, int, int)); ++extern void setup_exec_ignore __P((char *)); + + #endif /* _FINDCMD_H_ */ +--- general.c 2014-01-30 14:46:15.000000000 -0700 ++++ general.c 2015-02-06 17:14:11.031260100 -0700 +@@ -44,6 +44,10 @@ + + #include + ++#ifdef __CYGWIN__ ++# include ++#endif ++ + #if !defined (errno) + extern int errno; + #endif /* !errno */ +@@ -632,7 +636,8 @@ make_absolute (string, dot_path) + { + char pathbuf[PATH_MAX + 1]; + +- cygwin_conv_to_full_posix_path (string, pathbuf); ++ cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf, ++ sizeof pathbuf); + result = savestring (pathbuf); + } + #else +--- include/chartypes.h 2011-04-11 12:30:52.000000000 -0600 ++++ include/chartypes.h 2015-02-06 17:14:11.031260100 -0700 +@@ -40,6 +40,7 @@ + #else + # define IN_CTYPE_DOMAIN(c) isascii(c) + #endif ++#define to_uchar(c) ((unsigned char)(c)) + + #if !defined (isspace) && !defined (HAVE_ISSPACE) + # define isspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\n' || (c) == '\f') +@@ -67,16 +68,16 @@ + + #undef ISPRINT + +-#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) +-#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) +-#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) +-#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) +-#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c)) +-#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) +-#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (c)) +-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) +-#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) +-#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c)) ++#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (to_uchar (c))) ++#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (to_uchar (c))) ++#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (to_uchar (c))) ++#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (to_uchar (c))) ++#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (to_uchar (c))) ++#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (to_uchar (c))) ++#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (to_uchar (c))) ++#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (to_uchar (c))) ++#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (to_uchar (c))) ++#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (to_uchar (c))) + + #define ISLETTER(c) (ISALPHA(c)) + +--- include/posixjmp.h 2012-12-23 20:20:50.000000000 -0700 ++++ include/posixjmp.h 2015-02-06 17:14:11.031260100 -0700 +@@ -27,13 +27,13 @@ + + #if defined (HAVE_POSIX_SIGSETJMP) + # define procenv_t sigjmp_buf +-# if !defined (__OPENNT) ++# if !defined (__OPENNT) && !defined __CYGWIN__ + # undef setjmp + # define setjmp(x) sigsetjmp((x), 1) +-# define setjmp_nosigs(x) sigsetjmp((x), 0) + # undef longjmp + # define longjmp(x, n) siglongjmp((x), (n)) + # endif /* !__OPENNT */ ++# define setjmp_nosigs(x) sigsetjmp((x), 0) + #else + # define procenv_t jmp_buf + # define setjmp_nosigs setjmp +--- input.c 2014-02-07 07:13:08.000000000 -0700 ++++ input.c 2015-02-06 17:14:11.031260100 -0700 +@@ -44,6 +44,10 @@ + #include "quit.h" + #include "trap.h" + ++#if __CYGWIN__ ++int igncr; ++#endif ++ + #if !defined (errno) + extern int errno; + #endif /* !errno */ +@@ -561,6 +565,19 @@ buffered_getchar () + { + CHECK_TERMSIG; + ++#if __CYGWIN__ ++ /* shopt igncr means to discard carriage returns from input stream. ++ If cr is the only character in the buffer, then recurse to pick ++ up the next character; otherwise flatten the buffer. */ ++ if (igncr) ++ { ++ int ch; ++ while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd])) ++ == '\r') ++ ; ++ return ch; ++ } ++#endif /* __CYGWIN__ */ + #if !defined (DJGPP) + return (bufstream_getc (buffers[bash_input.location.buffered_fd])); + #else +--- lib/readline/bind.c 2013-04-06 15:46:38.000000000 -0600 ++++ lib/readline/bind.c 2015-02-06 17:14:11.031260100 -0700 +@@ -452,7 +452,7 @@ rl_translate_keyseq (seq, array, len) + { + register int i, c, l, temp; + +- for (i = l = 0; c = seq[i]; i++) ++ for (i = l = 0; (c = seq[i]); i++) + { + if (c == '\\') + { +@@ -1210,7 +1210,7 @@ _rl_skip_to_delim (string, start, delim) + { + int i, c, passc; + +- for (i = start,passc = 0; c = string[i]; i++) ++ for (i = start,passc = 0; (c = string[i]); i++) + { + if (passc) + { +@@ -1297,7 +1297,6 @@ rl_parse_and_bind (string) + if (_rl_stricmp (string, "set") == 0) + { + char *var, *value, *e; +- int s; + + var = string + i; + /* Make VAR point to start of variable name. */ +@@ -2198,7 +2197,7 @@ rl_function_dumper (print_readably) + + fprintf (rl_outstream, "\n"); + +- for (i = 0; name = names[i]; i++) ++ for (i = 0; (name = names[i]); i++) + { + rl_command_func_t *function; + char **invokers; +--- lib/readline/chardefs.h 2011-07-25 19:47:56.000000000 -0600 ++++ lib/readline/chardefs.h 2015-02-06 17:14:11.046889800 -0700 +@@ -71,6 +71,7 @@ + #else + # define IN_CTYPE_DOMAIN(c) isascii(c) + #endif ++#define to_uchar(c) ((unsigned char)(c)) + + #if !defined (isxdigit) && !defined (HAVE_ISXDIGIT) && !defined (__cplusplus) + # define isxdigit(c) (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F')) +@@ -87,13 +88,13 @@ + + /* Beware: these only work with single-byte ASCII characters. */ + +-#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) +-#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) +-#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) +-#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) +-#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) +-#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) +-#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c)) ++#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (to_uchar (c))) ++#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (to_uchar (c))) ++#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (to_uchar (c))) ++#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (to_uchar (c))) ++#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (to_uchar (c))) ++#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (to_uchar (c))) ++#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (to_uchar (c))) + + #define _rl_lowercase_p(c) (NON_NEGATIVE(c) && ISLOWER(c)) + #define _rl_uppercase_p(c) (NON_NEGATIVE(c) && ISUPPER(c)) +--- lib/readline/complete.c 2013-10-14 07:27:10.000000000 -0600 ++++ lib/readline/complete.c 2015-02-06 17:14:11.046889800 -0700 +@@ -1082,7 +1082,7 @@ _rl_find_completion_word (fp, dp) + /* We didn't find an unclosed quoted substring upon which to do + completion, so use the word break characters to find the + substring on which to complete. */ +- while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)) ++ while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))) + { + scan = rl_line_buffer[rl_point]; + +@@ -2116,7 +2116,7 @@ rl_completion_matches (text, entry_funct + match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *)); + match_list[1] = (char *)NULL; + +- while (string = (*entry_function) (text, matches)) ++ while ((string = (*entry_function) (text, matches))) + { + if (RL_SIG_RECEIVED ()) + { +@@ -2190,7 +2190,7 @@ rl_username_completion_function (text, s + } + + #if defined (HAVE_GETPWENT) +- while (entry = getpwent ()) ++ while ((entry = getpwent ())) + { + /* Null usernames should result in all users as possible completions. */ + if (namelen == 0 || (STREQN (username, entry->pw_name, namelen))) +@@ -2723,7 +2723,7 @@ rl_menu_complete (count, ignore) + static int full_completion = 0; /* set to 1 if menu completion should reinitialize on next call */ + static int orig_start, orig_end; + static char quote_char; +- static int delimiter, cstate; ++ static int delimiter; + + /* The first time through, we generate the list of matches and set things + up to insert them. */ +--- lib/readline/display.c 2015-02-06 17:12:54.793574600 -0700 ++++ lib/readline/display.c 2015-02-06 17:14:11.046889800 -0700 +@@ -66,7 +66,6 @@ extern char *strchr (), *strrchr (); + static void update_line PARAMS((char *, char *, int, int, int, int)); + static void space_to_eol PARAMS((int)); + static void delete_chars PARAMS((int)); +-static void insert_some_chars PARAMS((char *, int, int)); + static void open_some_spaces PARAMS((int)); + static void cr PARAMS((void)); + +@@ -1314,7 +1313,7 @@ update_line (old, new, current_line, oma + int current_line, omax, nmax, inv_botlin; + { + register char *ofd, *ols, *oe, *nfd, *nls, *ne; +- int temp, lendiff, wsatend, od, nd, twidth, o_cpos; ++ int temp, lendiff, wsatend, od, nd, o_cpos; + int current_invis_chars; + int col_lendiff, col_temp; + int bytes_to_insert; +@@ -2485,6 +2484,7 @@ _rl_clear_screen () + #endif /* __DJGPP__ */ + } + ++#if 0 + /* Insert COUNT characters from STRING to the output stream at column COL. */ + static void + insert_some_chars (string, count, col) +@@ -2494,6 +2494,7 @@ insert_some_chars (string, count, col) + open_some_spaces (col); + _rl_output_some_chars (string, count); + } ++#endif + + /* Insert COL spaces, keeping the cursor at the same position. We follow the + ncurses documentation and use either im/ei with explicit spaces, or IC/ic +--- lib/readline/histexpand.c 2013-12-02 07:22:30.000000000 -0700 ++++ lib/readline/histexpand.c 2015-02-06 17:14:11.046889800 -0700 +@@ -204,7 +204,7 @@ get_history_event (string, caller_index, + } + + /* Only a closing `?' or a newline delimit a substring search string. */ +- for (local_index = i; c = string[i]; i++) ++ for (local_index = i; (c = string[i]); i++) + { + #if defined (HANDLE_MULTIBYTE) + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) +@@ -677,7 +677,7 @@ history_expand_internal (string, start, + case 's': + { + char *new_event; +- int delimiter, failed, si, l_temp, ws, we; ++ int delimiter, failed, si, l_temp, we; + + if (c == 's') + { +@@ -776,7 +776,6 @@ history_expand_internal (string, start, + { + for (; temp[si] && whitespace (temp[si]); si++) + ; +- ws = si; + we = history_tokenize_word (temp, si); + } + +--- lib/readline/histfile.c 2013-07-19 06:17:17.000000000 -0600 ++++ lib/readline/histfile.c 2015-02-06 17:14:11.046889800 -0700 +@@ -104,7 +104,7 @@ int history_write_timestamps = 0; + + /* Does S look like the beginning of a history timestamp entry? Placeholder + for more extensive tests. */ +-#define HIST_TIMESTAMP_START(s) (*(s) == history_comment_char && isdigit ((s)[1]) ) ++#define HIST_TIMESTAMP_START(s) (*(s) == history_comment_char && isdigit ((unsigned char) (s)[1]) ) + + /* Return the string that should be used in the place of this + filename. This only matters when you don't specify the +--- lib/readline/input.c 2015-02-06 17:12:55.027577800 -0700 ++++ lib/readline/input.c 2015-02-06 17:14:11.046889800 -0700 +@@ -431,7 +431,7 @@ rl_read_key () + else + { + /* If input is coming from a macro, then use that. */ +- if (c = _rl_next_macro_key ()) ++ if ((c = _rl_next_macro_key ())) + return (c); + + /* If the user has an event function, then call it periodically. */ +--- lib/readline/isearch.c 2013-10-14 07:08:40.000000000 -0600 ++++ lib/readline/isearch.c 2015-02-06 17:14:11.046889800 -0700 +@@ -740,7 +740,7 @@ rl_search_history (direction, invoking_k + int direction, invoking_key; + { + _rl_search_cxt *cxt; /* local for now, but saved globally */ +- int c, r; ++ int r; + + RL_SETSTATE(RL_STATE_ISEARCH); + cxt = _rl_isearch_init (direction); +@@ -755,7 +755,7 @@ rl_search_history (direction, invoking_k + r = -1; + for (;;) + { +- c = _rl_search_getchar (cxt); ++ _rl_search_getchar (cxt); + /* We might want to handle EOF here (c == 0) */ + r = _rl_isearch_dispatch (cxt, cxt->lastc); + if (r <= 0) +@@ -778,9 +778,9 @@ int + _rl_isearch_callback (cxt) + _rl_search_cxt *cxt; + { +- int c, r; ++ int r; + +- c = _rl_search_getchar (cxt); ++ _rl_search_getchar (cxt); + /* We might want to handle EOF here */ + r = _rl_isearch_dispatch (cxt, cxt->lastc); + +--- lib/readline/misc.c 2015-02-06 17:12:55.230384200 -0700 ++++ lib/readline/misc.c 2015-02-06 17:14:11.046889800 -0700 +@@ -455,7 +455,7 @@ _rl_revert_all_lines () + entry = (hpos == history_length) ? previous_history () : current_history (); + while (entry) + { +- if (ul = (UNDO_LIST *)entry->data) ++ if ((ul = (UNDO_LIST *)entry->data)) + { + if (ul == saved_undo_list) + saved_undo_list = 0; +@@ -502,7 +502,7 @@ rl_clear_history () + for (i = 0; i < history_length; i++) + { + hent = hlist[i]; +- if (ul = (UNDO_LIST *)hent->data) ++ if ((ul = (UNDO_LIST *)hent->data)) + { + if (ul == saved_undo_list) + saved_undo_list = 0; +--- lib/readline/nls.c 2013-03-09 12:51:10.000000000 -0700 ++++ lib/readline/nls.c 2015-02-06 17:14:11.046889800 -0700 +@@ -80,7 +80,7 @@ static char *legal_lang_values[] = + static char *normalize_codeset PARAMS((char *)); + #endif /* !HAVE_SETLOCALE */ + +-static char *find_codeset PARAMS((char *, size_t *)); ++static char *find_codeset PARAMS((char *, size_t *)) __attribute__ ((__unused__)); + + static char *_rl_get_locale_var PARAMS((const char *)); + +@@ -104,12 +104,13 @@ utf8locale (lspec) + char *lspec; + { + char *cp; +- size_t len; + + #if HAVE_LANGINFO_CODESET + cp = nl_langinfo (CODESET); + return (STREQ (cp, "UTF-8") || STREQ (cp, "utf8")); + #else ++ size_t len; ++ + cp = find_codeset (lspec, &len); + + if (cp == 0 || len < 4 || len > 5) +--- lib/readline/parens.c 2009-04-19 11:12:06.000000000 -0600 ++++ lib/readline/parens.c 2015-02-06 17:14:11.046889800 -0700 +@@ -106,7 +106,7 @@ rl_insert_close (count, invoking_key) + else + { + #if defined (HAVE_SELECT) +- int orig_point, match_point, ready; ++ int orig_point, match_point; + struct timeval timer; + fd_set readfds; + +@@ -126,7 +126,7 @@ rl_insert_close (count, invoking_key) + orig_point = rl_point; + rl_point = match_point; + (*rl_redisplay_function) (); +- ready = select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer); ++ select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer); + rl_point = orig_point; + #else /* !HAVE_SELECT */ + _rl_insert_char (count, invoking_key); +--- lib/readline/posixjmp.h 2012-12-23 20:20:50.000000000 -0700 ++++ lib/readline/posixjmp.h 2015-02-06 17:14:11.046889800 -0700 +@@ -27,13 +27,13 @@ + + #if defined (HAVE_POSIX_SIGSETJMP) + # define procenv_t sigjmp_buf +-# if !defined (__OPENNT) ++# if !defined (__OPENNT) && !defined __CYGWIN__ + # undef setjmp + # define setjmp(x) sigsetjmp((x), 1) +-# define setjmp_nosigs(x) sigsetjmp((x), 0) + # undef longjmp + # define longjmp(x, n) siglongjmp((x), (n)) + # endif /* !__OPENNT */ ++# define setjmp_nosigs(x) sigsetjmp((x), 0) + #else + # define procenv_t jmp_buf + # define setjmp_nosigs setjmp +--- lib/readline/readline.c 2015-02-06 17:12:54.310964200 -0700 ++++ lib/readline/readline.c 2015-02-06 17:14:11.046889800 -0700 +@@ -95,7 +95,7 @@ static void bind_arrow_keys_internal PAR + static void bind_arrow_keys PARAMS((void)); + + static void readline_default_bindings PARAMS((void)); +-static void reset_default_bindings PARAMS((void)); ++//static void reset_default_bindings PARAMS((void)); + + static int _rl_subseq_result PARAMS((int, Keymap, int, int)); + static int _rl_subseq_getchar PARAMS((int)); +@@ -522,7 +522,7 @@ readline_internal_char () + readline_internal_charloop () + #endif + { +- static int lastc, eof_found; ++ static int lastc, eof_found __attribute__((unused)); + int c, code, lk; + + lastc = -1; +@@ -1204,6 +1204,7 @@ readline_default_bindings () + rl_tty_set_default_bindings (_rl_keymap); + } + ++#if 0 + /* Reset the default bindings for the terminal special characters we're + interested in back to rl_insert and read the new ones. */ + static void +@@ -1215,6 +1216,7 @@ reset_default_bindings () + rl_tty_set_default_bindings (_rl_keymap); + } + } ++#endif + + /* Bind some common arrow key sequences in MAP. */ + static void +--- lib/readline/rltty.c 2013-08-25 14:57:05.000000000 -0600 ++++ lib/readline/rltty.c 2015-02-06 17:14:11.062454900 -0700 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #if defined (HAVE_UNISTD_H) + # include +--- lib/readline/shell.c 2013-03-13 08:17:00.000000000 -0600 ++++ lib/readline/shell.c 2015-02-06 17:14:11.062454900 -0700 +@@ -123,8 +123,10 @@ sh_single_quote (string) + /* Set the environment variables LINES and COLUMNS to lines and cols, + respectively. */ + static char setenv_buf[INT_STRLEN_BOUND (int) + 1]; ++# if !defined (HAVE_SETENV) && defined (HAVE_PUTENV) + static char putenv_buf1[INT_STRLEN_BOUND (int) + 6 + 1]; /* sizeof("LINES=") == 6 */ + static char putenv_buf2[INT_STRLEN_BOUND (int) + 8 + 1]; /* sizeof("COLUMNS=") == 8 */ ++# endif + + void + sh_set_lines_and_columns (lines, cols) +--- lib/readline/signals.c 2014-01-10 13:06:48.000000000 -0700 ++++ lib/readline/signals.c 2015-02-06 17:14:11.062454900 -0700 +@@ -576,7 +576,6 @@ rl_free_line_state () + /* **************************************************************** */ + + #if defined (HAVE_POSIX_SIGNALS) +-static sigset_t sigint_set, sigint_oset; + static sigset_t sigwinch_set, sigwinch_oset; + #else /* !HAVE_POSIX_SIGNALS */ + # if defined (HAVE_BSD_SIGNALS) +--- lib/readline/terminal.c 2013-09-18 07:12:01.000000000 -0600 ++++ lib/readline/terminal.c 2015-02-06 17:14:11.062454900 -0700 +@@ -31,6 +31,7 @@ + #if defined (HAVE_SYS_FILE_H) + # include + #endif /* HAVE_SYS_FILE_H */ ++#include + + #if defined (HAVE_UNISTD_H) + # include +--- lib/readline/text.c 2013-10-14 07:25:05.000000000 -0600 ++++ lib/readline/text.c 2015-02-06 17:14:11.062454900 -0700 +@@ -859,11 +859,10 @@ _rl_overwrite_char (count, c) + int i; + #if defined (HANDLE_MULTIBYTE) + char mbkey[MB_LEN_MAX]; +- int k; + + /* Read an entire multibyte character sequence to insert COUNT times. */ + if (count > 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0) +- k = _rl_read_mbstring (c, mbkey, MB_LEN_MAX); ++ _rl_read_mbstring (c, mbkey, MB_LEN_MAX); + #endif + + rl_begin_undo_group (); +--- lib/readline/tilde.c 2010-07-25 15:42:13.000000000 -0600 ++++ lib/readline/tilde.c 2015-02-06 17:14:11.062454900 -0700 +@@ -196,7 +196,7 @@ tilde_expand (string) + int result_size, result_index; + + result_index = result_size = 0; +- if (result = strchr (string, '~')) ++ if ((result = strchr (string, '~'))) + result = (char *)xmalloc (result_size = (strlen (string) + 16)); + else + result = (char *)xmalloc (result_size = (strlen (string) + 1)); +--- lib/readline/undo.c 2014-02-02 13:47:46.000000000 -0700 ++++ lib/readline/undo.c 2015-02-06 17:14:11.062454900 -0700 +@@ -124,7 +124,7 @@ _rl_free_undo_list (ul) + void + rl_free_undo_list () + { +- UNDO_LIST *release, *orig_list; ++ UNDO_LIST *orig_list; + + orig_list = rl_undo_list; + _rl_free_undo_list (rl_undo_list); +--- lib/readline/vi_mode.c 2012-09-01 16:55:30.000000000 -0600 ++++ lib/readline/vi_mode.c 2015-02-06 17:14:11.062454900 -0700 +@@ -1089,7 +1089,7 @@ static int + rl_domove_motion_callback (m) + _rl_vimotion_cxt *m; + { +- int c, save, r; ++ int c, r; + int old_end; + + _rl_vi_last_motion = c = m->motion; +@@ -1257,7 +1257,6 @@ int + rl_vi_domove (x, ignore) + int x, *ignore; + { +- int r; + _rl_vimotion_cxt *m; + + m = _rl_vimvcxt; +--- lib/sh/pathphys.c 2013-05-28 13:33:58.000000000 -0600 ++++ lib/sh/pathphys.c 2015-02-06 17:14:11.062454900 -0700 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include "shell.h" + +@@ -76,6 +77,10 @@ sh_physpath (path, flags) + char *path; + int flags; + { ++#if __CYGWIN__ ++ /* realpath does this correctly without all the hassle */ ++ return realpath (path, NULL); ++#else + char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1]; + char *result, *p, *q, *qsave, *qbase, *workpath; + int double_slash_path, linklen, nlink; +@@ -214,11 +219,7 @@ error: + { + q = result; + /* Duplicating some code here... */ +-#if defined (__CYGWIN__) +- qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1; +-#else + qbase = workpath + 1; +-#endif + double_slash_path = DOUBLE_SLASH (workpath); + qbase += double_slash_path; + +@@ -249,6 +250,7 @@ error: + } + + return (result); ++#endif /* ! __CYGWIN__ */ + } + + char * +--- lib/sh/tmpfile.c 2013-12-18 15:50:13.000000000 -0700 ++++ lib/sh/tmpfile.c 2015-02-06 17:14:11.062454900 -0700 +@@ -96,7 +96,7 @@ get_tmpdir (flags) + if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX)) + tdir = 0; + +- if (tdir == 0) ++ if (tdir == 0 || !file_iswdir (tdir)) + tdir = get_sys_tmpdir (); + + #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX) +@@ -118,14 +118,15 @@ sh_mktmpname (nameroot, flags) + struct stat sb; + int r, tdlen; + +- filename = (char *)xmalloc (PATH_MAX + 1); ++ filename = NULL; + tdir = get_tmpdir (flags); + tdlen = strlen (tdir); + + lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; + + #ifdef USE_MKTEMP +- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); ++ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) ++ return NULL; + if (mktemp (filename) == 0) + { + free (filename); +@@ -138,7 +139,9 @@ sh_mktmpname (nameroot, flags) + (unsigned long) time ((time_t *)0) ^ + (unsigned long) dollar_dollar_pid ^ + (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++); +- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); ++ free (filename); ++ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) ++ return NULL; + if (tmpnamelen > 0 && tmpnamelen < 32) + filename[tdlen + 1 + tmpnamelen] = '\0'; + # ifdef HAVE_LSTAT +@@ -163,14 +166,19 @@ sh_mktmpfd (nameroot, flags, namep) + char *filename, *tdir, *lroot; + int fd, tdlen; + +- filename = (char *)xmalloc (PATH_MAX + 1); ++ filename = NULL; + tdir = get_tmpdir (flags); + tdlen = strlen (tdir); + + lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; + + #ifdef USE_MKSTEMP +- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); ++ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) ++ { ++ if (namep) ++ *namep = NULL; ++ return -1; ++ } + fd = mkstemp (filename); + if (fd < 0 || namep == 0) + { +@@ -187,7 +195,13 @@ sh_mktmpfd (nameroot, flags, namep) + (unsigned long) time ((time_t *)0) ^ + (unsigned long) dollar_dollar_pid ^ + (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++); +- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); ++ free (filename); ++ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) ++ { ++ if (namep) ++ *namep = NULL; ++ return -1; ++ } + if (tmpnamelen > 0 && tmpnamelen < 32) + filename[tdlen + 1 + tmpnamelen] = '\0'; + fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600); +--- mksyntax.c 2012-07-29 17:48:38.000000000 -0600 ++++ mksyntax.c 2015-02-06 17:14:11.062454900 -0700 +@@ -29,13 +29,13 @@ + + #ifdef HAVE_UNISTD_H + # include ++#else ++extern int optind; ++extern char *optarg; + #endif + + #include "syntax.h" + +-extern int optind; +-extern char *optarg; +- + #ifndef errno + extern int errno; + #endif +--- parse.y 2015-02-06 17:12:55.682776800 -0700 ++++ parse.y 2015-02-06 17:14:11.062454900 -0700 +@@ -1531,14 +1531,20 @@ yy_string_get () + string = bash_input.location.string; + + /* If the string doesn't exist, or is empty, EOF found. */ +- if (string && *string) ++ while (string && *string) + { + c = *string++; + bash_input.location.string = string; ++#if __CYGWIN__ ++ { ++ extern int igncr; ++ if (igncr && c == '\r') ++ continue; ++ } ++#endif + return (c); + } +- else +- return (EOF); ++ return (EOF); + } + + static int +@@ -2305,7 +2311,7 @@ shell_getc (remove_quoted_newline) + if (n <= 2) /* we have to save 1 for the newline added below */ + { + if (truncating == 0) +- internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%llu): line truncated", shell_input_line_size, SIZE_MAX); ++ internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%zu): line truncated", shell_input_line_size, SIZE_MAX); + shell_input_line[i] = '\0'; + truncating = 1; + } +@@ -3582,7 +3588,6 @@ parse_comsub (qc, open, close, lenp, fla + + while (count) + { +-comsub_readchar: + ch = shell_getc (qc != '\'' && (tflags & (LEX_INCOMMENT|LEX_PASSNEXT)) == 0); + + if (ch == EOF) +--- pathexp.h 2009-01-04 12:32:40.000000000 -0700 ++++ pathexp.h 2015-02-06 17:14:11.062454900 -0700 +@@ -86,7 +86,7 @@ struct ign { + typedef int sh_iv_item_func_t __P((struct ign *)); + + struct ignorevar { +- char *varname; /* FIGNORE or GLOBIGNORE */ ++ char *varname; /* FIGNORE or GLOBIGNORE or EXECIGNORE */ + struct ign *ignores; /* Store the ignore strings here */ + int num_ignores; /* How many are there? */ + char *last_ignoreval; /* Last value of variable - cached for speed */ +--- redir.c 2013-10-14 07:19:59.000000000 -0600 ++++ redir.c 2015-02-06 17:14:11.078059300 -0700 +@@ -156,7 +156,6 @@ redirection_error (temp, error) + #endif + else if (expandable_redirection_filename (temp)) + { +-expandable_filename: + oflags = temp->redirectee.filename->flags; + if (posixly_correct && interactive_shell == 0) + temp->redirectee.filename->flags |= W_NOGLOB; +--- subst.c 2015-02-06 17:12:55.370841100 -0700 ++++ subst.c 2015-02-06 17:14:11.078059300 -0700 +@@ -41,6 +41,7 @@ + #include "posixstat.h" + #include "bashintl.h" + ++#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */ + #include "shell.h" + #include "parser.h" + #include "flags.h" +@@ -5268,6 +5269,13 @@ read_comsub (fd, quoted, rflag) + #endif + continue; + } ++#if __CYGWIN__ ++ { ++ extern int igncr; ++ if (igncr && c == '\r') ++ continue; ++ } ++#endif /* __CYGWIN__ */ + + /* Add the character to ISTRING, possibly after resizing it. */ + RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE); +@@ -5385,6 +5393,28 @@ command_substitute (string, quoted) + goto error_exit; + } + ++#if __CYGWIN__ ++ /* Passing a pipe through std fds can cause hangs when talking to a ++ non-cygwin child. Move it. */ ++ if (fildes[0] < 3) ++ { ++ int fd = fcntl (fildes[0], F_DUPFD, 3); ++ close (fildes[0]); ++ fildes[0] = fd; ++ } ++ if (fildes[1] < 3) ++ { ++ int fd = fcntl (fildes[1], F_DUPFD, 3); ++ close (fildes[1]); ++ fildes[1] = fd; ++ } ++ if (fildes[0] < 0 || fildes[1] < 0) ++ { ++ sys_error (_("cannot make pipe for command substitution")); ++ goto error_exit; ++ } ++#endif /* __CYGWIN__ */ ++ + old_pid = last_made_pid; + #if defined (JOB_CONTROL) + old_pipeline_pgrp = pipeline_pgrp; +--- support/bashversion.c 2008-09-09 07:31:53.000000000 -0600 ++++ support/bashversion.c 2015-02-06 17:14:11.078059300 -0700 +@@ -26,6 +26,9 @@ + + #if defined (HAVE_UNISTD_H) + # include ++#else ++extern int optind; ++extern char *optarg; + #endif + + #include "bashansi.h" +@@ -41,9 +44,6 @@ + #define LFLAG 0x0020 + #define XFLAG 0x0040 + +-extern int optind; +-extern char *optarg; +- + extern char *dist_version; + extern int patch_level; + +@@ -65,7 +65,7 @@ main (argc, argv) + char **argv; + { + int opt, oflags; +- char dv[128], *rv; ++ char dv[128], *rv = NULL; + + if (progname = strrchr (argv[0], '/')) + progname++; +--- support/mkversion.sh 2008-08-13 06:25:57.000000000 -0600 ++++ support/mkversion.sh 2015-02-06 17:14:11.078059300 -0700 +@@ -29,7 +29,7 @@ source_dir="." + while [ $# -gt 0 ]; do + case "$1" in + -o) shift; OUTFILE=$1; shift ;; +- -b) shift; inc_build=yes ;; ++ -b) shift; ;;# inc_build=yes ;; # hacked out for cygport + -s) shift; rel_status=$1; shift ;; + -p) shift; patch_level=$1; shift ;; + -d) shift; dist_version=$1; shift ;; +--- variables.c 2015-02-06 17:12:55.729569600 -0700 ++++ variables.c 2015-02-06 17:14:11.078059300 -0700 +@@ -2526,9 +2526,9 @@ bind_variable_internal (name, value, tab + + newname = 0; + #if defined (ARRAY_VARS) +- if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name)) ++ if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference ((char *)name)) + { +- newname = array_variable_name (name, &subp, &sublen); ++ newname = array_variable_name ((char*)name, &subp, &sublen); + if (newname == 0) + return (SHELL_VAR *)NULL; /* XXX */ + entry = hash_lookup (newname, table); +@@ -2573,13 +2573,13 @@ bind_variable_internal (name, value, tab + entry = make_new_array_variable (newname); /* indexed array by default */ + if (entry == 0) + return entry; +- ind = array_expand_index (name, subp, sublen); ++ ind = array_expand_index (entry, subp, sublen); + bind_array_element (entry, ind, value, aflags); + } + #endif + else if (entry == 0) + { +- entry = make_new_variable (name, table); ++ entry = make_new_variable ((char*)name, table); + var_setvalue (entry, make_variable_value (entry, value, 0)); /* XXX */ + } + else if (entry->assign_func) /* array vars have assign functions now */ +@@ -4679,6 +4679,8 @@ static struct name_and_function special_ + { "COMP_WORDBREAKS", sv_comp_wordbreaks }, + #endif + ++ { "EXECIGNORE", sv_execignore }, ++ + { "FUNCNEST", sv_funcnest }, + + { "GLOBIGNORE", sv_globignore }, +@@ -4877,6 +4879,13 @@ sv_globignore (name) + setup_glob_ignore (name); + } + ++/* What to do when EXECIGNORE changes. */ ++void ++sv_execignore (char *name) ++{ ++ setup_exec_ignore (name); ++} ++ + #if defined (READLINE) + void + sv_comp_wordbreaks (name) +@@ -4950,7 +4959,7 @@ sv_winsize (name) + /* Update the value of HOME in the export environment so tilde expansion will + work on cygwin. */ + #if defined (__CYGWIN__) +-sv_home (name) ++void sv_home (name) + char *name; + { + array_needs_making = 1; +--- variables.h 2014-01-08 13:33:29.000000000 -0700 ++++ variables.h 2015-02-06 17:14:11.078059300 -0700 +@@ -372,6 +372,7 @@ extern void sv_ifs __P((char *)); + extern void sv_path __P((char *)); + extern void sv_mail __P((char *)); + extern void sv_funcnest __P((char *)); ++extern void sv_execignore __P((char *)); + extern void sv_globignore __P((char *)); + extern void sv_ignoreeof __P((char *)); + extern void sv_strict_posix __P((char *)); diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index af51ab4e766..014a3ad4a2c 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -3,8 +3,11 @@ assert interactive -> readline != null; let - realName = "bash-4.3"; + version = "4.3"; + realName = "bash-${version}"; + shortName = "bash43"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; + sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; in stdenv.mkDerivation rec { @@ -12,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/bash/${realName}.tar.gz"; - sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; + inherit sha256; }; NIX_CFLAGS_COMPILE = '' @@ -30,15 +33,23 @@ stdenv.mkDerivation rec { (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-4.3-patches/bash43-${nr}"; + url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}"; inherit sha256; }; in - import ./bash-4.3-patches.nix patch); + import ./bash-4.3-patches.nix patch) + ++ stdenv.lib.optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; crossAttrs = { configureFlags = baseConfigureFlags + - " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing"; + " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" + + stdenv.lib.optionalString stdenv.isCygwin '' + --without-libintl-prefix --without-libiconv-prefix + --with-installed-readline + bash_cv_dev_stdin=present + bash_cv_dev_fd=standard + bash_cv_termcap_lib=libncurses + ''; }; configureFlags = baseConfigureFlags; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index d7d69c00c5f..119a3593cec 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { # Required binaries during execution # Python: Autocompletion generated from manpages and config editing - propagatedBuildInputs = [ python which groff gettext man_db bc ]; + propagatedBuildInputs = [ python which groff gettext ] + ++ stdenv.lib.optional (!stdenv.isDarwin) man_db + ++ [ bc ]; postInstall = '' sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" @@ -22,7 +24,9 @@ stdenv.mkDerivation rec { sed -e "s|gettext |${gettext}/bin/gettext |" \ -e "s|which |${which}/bin/which |" \ -i "$out/share/fish/functions/_.fish" + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py" + '' + '' sed -i "s|/sbin /usr/sbin||" \ "$out/share/fish/functions/__fish_complete_subcommand_root.fish" ''; diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 47705a05cc8..a9c672471a8 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null , notebookSupport ? true # ipython notebook , qtconsoleSupport ? true # ipython qtconsole -, pylabSupport ? true # ipython --pylab (backend: agg - no gui, just file) -, pylabQtSupport ? true # ipython --pylab=qt (backend: Qt4Agg - plot to window) +, pylabSupport ? true # '%pylab' magic (backend: agg - no gui, just file) +, pylabQtSupport ? true # '%pylab qt' (backend: Qt4Agg - plot to window) }: # ipython qtconsole works with both pyside and pyqt4. But ipython --pylab=qt diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index e951c24e6a0..28359bb555d 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = with stdenv.lib.licenses; free; + license = stdenv.lib.licenses.free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh b/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh new file mode 100644 index 00000000000..7cb6a58f180 --- /dev/null +++ b/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh @@ -0,0 +1,16 @@ +# On cygwin, automatic runtime dependency detection does not work +# because the binaries do not contain absolute references to store +# locations (yet) +postFixupHooks+=(_cygwinAllBuildInputsAsRuntimeDep) + +_cygwinAllBuildInputsAsRuntimeDep() { + if [ -n "$buildInputs" ]; then + mkdir -p "$out/nix-support" + echo "$buildInputs" >> "$out/nix-support/cygwin-buildinputs-as-runtime-deps" + fi + + if [ -n "$nativeBuildInputs" ]; then + mkdir -p "$out/nix-support" + echo "$nativeBuildInputs" >> "$out/nix-support/cygwin-buildinputs-as-runtime-deps" + fi +} diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh new file mode 100644 index 00000000000..e5695c75a96 --- /dev/null +++ b/pkgs/stdenv/cygwin/rebase-i686.sh @@ -0,0 +1,21 @@ +postFixupHooks+=(_cygwinFixAutoImageBase) + +_cygwinFixAutoImageBase() { + find $out -name "*.dll" | while read DLL; do + if [ -f /etc/rebasenix.nextbase ]; then + NEXTBASE="$(>16)+1)<<16)) + + echo "REBASE FIX: $DLL $BASE -> $NEXTBASE" + /bin/rebase -b $NEXTBASE $DLL + NEXTBASE="0x`printf %x $(($NEXTBASE+$SKIP))`" + + echo $NEXTBASE > /etc/rebasenix.nextbase + done +} diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh new file mode 100644 index 00000000000..f782f18dfd1 --- /dev/null +++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh @@ -0,0 +1,21 @@ +postFixupHooks+=(_cygwinFixAutoImageBase) + +_cygwinFixAutoImageBase() { + find $out -name "*.dll" | while read DLL; do + if [ -f /etc/rebasenix.nextbase ]; then + NEXTBASE="$(>16)+1)<<16)) + + echo "REBASE FIX: $DLL $BASE -> $NEXTBASE" + /bin/rebase -b $NEXTBASE $DLL + NEXTBASE="0x`printf %x $(($NEXTBASE+$SKIP))`" + + echo $NEXTBASE > /etc/rebasenix.nextbase + done +} diff --git a/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh b/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh new file mode 100644 index 00000000000..d0da8c1b65c --- /dev/null +++ b/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh @@ -0,0 +1,74 @@ +postFixupHooks+=(_cygwinWrapExesToFindDlls) + +_cygwinWrapExesToFindDlls() { + find $out -type l | while read LINK; do + TARGET="$(readlink "${LINK}")" + + # fix all non .exe links that link explicitly to a .exe + if [[ ${TARGET} == *.exe ]] && [[ ${LINK} != *.exe ]]; then + mv "${LINK}" "${LINK}.exe" + LINK="${LINK}.exe" + fi + + # generate complementary filenames + if [[ ${LINK} == *.exe ]]; then + _LINK="${LINK%.exe}" + _TARGET="${TARGET%.exe}" + else + _LINK="${LINK}.exe" + _TARGET="${TARGET}.exe" + fi + + # check if sould create complementary link + DOLINK=1 + if [[ ${_TARGET} == *.exe ]]; then + # the canonical target has to be a .exe + CTARGET="$(readlink -f "${LINK}")" + if [[ ${CTARGET} != *.exe ]]; then + CTARGET="${CTARGET}.exe" + fi + + if [ ! -e "${CTARGET}" ]; then + unset DOLINK + fi + fi + + if [ -e "${_LINK}" ]; then + # complementary link seems to exist + # but could be cygwin smoke and mirrors + INO=$(stat -c%i "${LINK}") + _INO=$(stat -c%i "${_LINK}") + if [ "${INO}" -ne "${_INO}" ]; then + unset DOLINK + fi + fi + + # create complementary link + if [ -n "${DOLINK}" ]; then + ln -s "${_TARGET}" "${_LINK}.tmp" + mv "${_LINK}.tmp" "${_LINK}" + fi + done + + find $out -type f -name "*.exe" | while read EXE; do + WRAPPER="${EXE%.exe}" + if [ -e "${WRAPPER}" ]; then + # check if really exists or cygwin smoke and mirrors + INO=$(stat -c%i "${EXE}") + _INO=$(stat -c%i "${WRAPPER}") + if [ "${INO}" -ne "${_INO}" ]; then + continue + fi + fi + + mv "${EXE}" "${EXE}.tmp" + + cat >"${WRAPPER}" <@$xauth/bin/xauth@g" \ - ../vncserver - ./configure - make - cd .. -} - -installPhase() { - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - ./vncinstall $out/bin $out/share/man - - # fix HTTP client: - t=$out/share/tightvnc - mkdir -p $t - sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver - cp -r classes $t -} - -genericBuild diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 6feff044f06..a1a091a90cc 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth, fontDirectories}: +{ stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu +, libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: stdenv.mkDerivation { name = "tightvnc-1.3.10"; @@ -12,8 +13,50 @@ stdenv.mkDerivation { inherit xauth fontDirectories perl; gcc = stdenv.cc.cc; - buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth]; - builder = ./builder.sh; + buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw + libXpm libXp xauth openssh ]; + + patchPhase = '' + fontPath= + for i in $fontDirectories; do + for j in $(find $i -name fonts.dir); do + addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) + done + done + + sed -i "s@/usr/bin/ssh@${openssh}/bin/ssh@g" vncviewer/vncviewer.h + ''; + + buildPhase = '' + xmkmf + make World + sed -e 's@/usr/bin/perl@${perl}/bin/perl@' \ + -e 's@unix/:7100@'$fontPath'@' \ + -i vncserver + + cd Xvnc + sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/linux.cf + sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/Imake.tmpl + sed -i \ + -e 's@"uname","xauth","Xvnc","vncpasswd"@"uname","Xvnc","vncpasswd"@g' \ + -e "s@\@${xauth}/bin/xauth@g" \ + ../vncserver + ./configure + make + cd .. + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ./vncinstall $out/bin $out/share/man + + # fix HTTP client: + t=$out/share/tightvnc + mkdir -p $t + sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver + cp -r classes $t + ''; meta = { license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 79be818bfb3..7a1eec92bbe 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cabextract-1.4"; + name = "cabextract-1.6"; src = fetchurl { url = "http://www.cabextract.org.uk/${name}.tar.gz"; - sha256 = "07p49053a727nwnw7vnx1bpj4xqa43cvx8mads2146fpqai8pfpp"; + sha256 = "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.cabextract.org.uk/; description = "Free Software for extracting Microsoft cabinet files"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 6a61ded4b19..2cd65391216 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation { # one "<" and one "&" sign get mangled in the patch in "cat ${pp} | sed 's/</,,' + '' else null; + meta = { homepage = http://www.gnu.org/software/cpio/; description = "A program to create or extract from cpio archives"; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 8c48417a819..00be3967768 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { # cannot be used as a login shell for now. FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1"; + preConfigure = if stdenv.isCygwin then '' + sed -i gnu/fpending.h -e 's,include ,,' + '' else null; + meta = { homepage = http://www.gnu.org/software/tar/; description = "GNU implementation of the `tar' archiver"; diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index c5f982c955c..c9ce6ac4d10 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Script to extract RPM archives"; platforms = platforms.all; license = licenses.gpl2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 92d8a22fa47..e4da0236cdf 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }: +{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null, libiconv }: assert enableNLS -> libnatspec != null; @@ -13,13 +13,16 @@ stdenv.mkDerivation { sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; + # should be makeFlags on all archs, not changed yet to prevent rebuild buildFlags="-f unix/Makefile generic"; + makeFlags = if stdenv.isCygwin then "-f unix/Makefile ${if stdenv.isCygwin then "cygwin" else "generic"}" else null; installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; - patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else []; + patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; - buildInputs = if enableNLS then [ libnatspec ] else []; + buildInputs = stdenv.lib.optional enableNLS libnatspec + ++ stdenv.lib.optional stdenv.isCygwin libiconv; meta = { description = "Compressor/archiver for creating and modifying zipfiles"; diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix new file mode 100644 index 00000000000..8a9393cd1f6 --- /dev/null +++ b/pkgs/tools/audio/darkice/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, alsaLib, faac, jack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "darkice-${version}"; + version = "1.2"; + + src = fetchurl { + url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz"; + sha256 = "0m5jzmja7a9x15zl1634bhxrg3rccph9rkar0rmz6wlw5nzakyxk"; + }; + + configureFlags = [ + "--with-alsa-prefix=${alsaLib}" + "--with-faac-prefix=${faac}" + "--with-jack-prefix=${jack2}" + "--with-lame-prefix=${lame}" + "--with-opus-prefix=${libopus}" + "--with-pulseaudio-prefix=${libpulseaudio}" + "--with-samplerate-prefix=${libsamplerate}" + "--with-vorbis-prefix=${libvorbis}" +# "--with-aacplus-prefix=${aacplus}" ### missing: aacplus +# "--with-twolame-prefix=${twolame}" ### missing: twolame + ]; + + meta = { + homepage = http://darkice.org/; + description = "Live audio streamer"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; + }; +} diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 6bcddfa72f1..d885a6ac902 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, hicolor_icon_theme, gdk_pixbuf, librsvg }: +{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }: stdenv.mkDerivation { name = "gvolicon"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ]; - propagatedBuildInputs = [ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gdk_pixbuf librsvg ]; + propagatedBuildInputs = [ gnome3.defaultIconTheme gdk_pixbuf librsvg ]; installPhase = '' make install PREFIX=$out wrapProgram "$out/bin/gvolicon" \ diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index d310d5017ed..1da9a6f465c 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, which, pkgconfig , ocaml, ocamlPackages -, libao, portaudio, alsaLib, pulseaudio, jack2 +, libao, portaudio, alsaLib, libpulseaudio, jack2 , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, fdk_aac , faad2, flac, ladspaH, ffmpeg, frei0r, dssi @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ which ocaml ocamlPackages.findlib pkgconfig - libao portaudio alsaLib pulseaudio jack2 + libao portaudio alsaLib libpulseaudio jack2 libsamplerate libmad taglib lame libogg libvorbis speex libtheora libopus fdk_aac faad2 flac ladspaH ffmpeg frei0r dssi diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix new file mode 100644 index 00000000000..82ddc85fd88 --- /dev/null +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, autoreconfHook, intltool +, python, wrapPython, mpd, pygtk, dbus, pynotify +}: + +stdenv.mkDerivation rec { + name = "mpDris2"; + version = "0.6"; + + src = fetchurl { + url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz"; + sha256 = "0zdmamj2ldhr6y3s464w8y2x3yizda784jnlrg3j3myfabssisvz"; + }; + + buildInputs = [ intltool autoreconfHook ]; + propagatedBuildInputs = [ python wrapPython ]; + pythonPath = [ mpd pygtk dbus pynotify ]; + postInstall = "wrapPythonPrograms"; + + meta = with stdenv.lib; { + description = "MPRIS 2 support for mpd"; + homepage = https://github.com/eonpatapon/mpDris2/; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ pjones ]; + }; +} diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 6d5dd6ffca0..d6dcba32233 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: +{ stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation rec { name = "pa-applet"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk3 pulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev + gtk3 libpulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev ]; preConfigure = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 42a2c9c3a12..d214a75b441 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,14 +1,19 @@ -{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: +{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig +, gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}: stdenv.mkDerivation rec { - name = "pasystray-0.4.0"; + name = "pasystray-0.5.2"; - src = fetchurl { - url = "https://github.com/christophgysin/pasystray/archive/${name}.zip"; - sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; + src = fetchFromGitHub { + owner = "christophgysin"; + repo = "pasystray"; + rev = "6709fc1e9f792baf4f7b4507a887d5876b2cfa70"; + sha256 = "1z21wassdiwfnlcrkpdqh8ylblpd1xxjxcmib5mwix9va2lykdfv"; }; - buildInputs = [ unzip autoconf automake makeWrapper pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; + buildInputs = [ autoconf automake makeWrapper pkgconfig + gnome3.defaultIconTheme + avahi gtk3 libnotify libpulseaudio x11 ]; preConfigure = '' aclocal @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/pasystray" \ - --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 4882097c91a..0b29ca1f42a 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Enterprise ready, Network Backup Tool"; homepage = http://bacula.org/; - license = "GPLv2"; + license = licenses.gpl2; maintainers = with maintainers; [ iElectric lovek323 ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 84351e19210..93a7f9e1e39 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -12,17 +12,19 @@ let dummyMount = writeScriptBin "mount" "#!/bin/sh"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "store-backup-3.4"; + version = "3.5"; + + name = "store-backup-${version}"; enableParallelBuilding = true; buildInputs = [ perl makeWrapper ]; src = fetchurl { - url = http://download.savannah.gnu.org/releases/storebackup/storeBackup-3.4.tar.bz2; - sha256 = "101k3nhyfjj8y8hg0v0xqxsr4vlcfkmlczgbihvlv722fb7n5gi3"; + url = "http://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2"; + sha256 = "0y4gzssc93x6y93mjsxm5b5cdh68d7ffa43jf6np7s7c99xxxz78"; }; installPhase = '' diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index 229b0512679..e018972d2aa 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -3,6 +3,8 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bluedevil"; + # bluedevil must have the same major version (x.y) as libbluedevil! + # do not update this package without checking libbluedevil version = "2.1.1"; src = fetchurl { diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index a9a167355ed..5330dfb82bd 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk , notify, pythonDBus, bluez, glib, gtk, libstartup_notification , makeWrapper, xdg_utils, obex_data_server -, pulseaudio +, libpulseaudio }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { for i in $out/bin/* $out/libexec/*; do wrapProgram $i \ --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \ - --set LD_LIBRARY_PATH "${pulseaudio}/lib:" \ + --set LD_LIBRARY_PATH "${libpulseaudio}/lib:" \ --prefix PATH : ${xdg_utils}/bin done diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 85a544ccd4c..aa44c1924bf 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -26,9 +26,13 @@ stdenv.mkDerivation rec { sed -e 's|-m64|-maccumulate-outgoing-args -m64|g' -i filesystems/Make.gnuefi ''; - buildPhase = '' - make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/elf_x86_64_efi.lds gnuefi fs_gnuefi - ''; + buildPhase = + let ldScript = + if stdenv.system == "x86_64-linux" then "elf_x86_64_efi.lds" + else if stdenv.system == "i686-linux" then "elf_ia32_efi.lds" else "null"; + in '' + make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/${ldScript} gnuefi fs_gnuefi + ''; installPhase = '' install -d $out/bin/ diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 44b121117ad..6772e21cb0c 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + preConfigure = if stdenv.isCygwin then '' + sed -i lib/fpending.h -e 's,include ,,' + '' else null; + # In stdenv-linux, prevent a dependency on bootstrap-tools. makeFlags = "SHELL=/bin/sh GREP=grep"; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index e1adefd2167..44f6a0bb7a4 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = http://lbzip2.org/; description = "parallel bzip2 compression utility"; license = licenses.gpl3; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 46b3b2fd7d7..fc3eca6ab10 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, valgrind }: -let version = "129"; in +let version = "130"; in stdenv.mkDerivation rec { name = "lz4-${version}"; src = fetchFromGitHub { - sha256 = "0liq5gvnikchgvalpi52hq0npwlh84w94bj79dcbrcw19may5dwi"; + sha256 = "1050hwnbqyz2m26vayv942dh92689qp73chrbnqlg8awhlb5kyi5"; rev = "r${version}"; repo = "lz4"; owner = "Cyan4973"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - checkFlags = "-j1"; # required since version 128 + checkFlags = "-j1 -C programs"; # -j1 required since version 128, -C should be temporary meta = with stdenv.lib; { description = "Extremely fast compression algorithm"; diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index fcc3b373fd1..5355138ac8c 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { inherit version; description = "Binary differential compression in VCDIFF (RFC 3284) format"; homepage = http://xdelta.org/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 69c14023701..6a9d4582dff 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/doc"; - meta = { + meta = with stdenv.lib; { homepage = http://tukaani.org/xz/; description = "XZ, general-purpose data compression software, successor of LZMA"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { bzip2. ''; - license = [ "GPLv2+" "LGPLv2.1+" ]; - maintainers = with stdenv.lib.maintainers; [ sander ]; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ sander ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index c0a6c8400fd..f47107c85fb 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation { unmount the file system with `fusermount -u mountpoint`. ''; homepage = https://github.com/drotiro/boxfs2; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 9286d58482f..c50367726db 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.0"; in +let version = "4.0.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "07ss0spfkb6dkvcwmkljy6bbyf437abwzngip141a1mhq6ng370p"; + sha256 = "1jwk0bnb4nvhw6b7i9mw5wkvqc6igx99qqg8zwpaj5nxkvki0bic"; }; buildInputs = [ @@ -28,4 +28,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin wkennington ]; platforms = platforms.linux; }; -} +} // (if stdenv.isArm then { + # gcc bug with -O1 on ARM + patchPhase = "sed -i s/-O1/-O2/ configure"; +} else {})) diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index b8d87506b7e..90c23665508 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.94.1.1"; + version = "0.94.1.2"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1qvjj2iqzv2xz5037ksbk7mqjv6gsx2jsprizdzzzij3hnlricp5"; + sha256 = "0ks5djgfhjpydjdlw7s940m3mlzrvz0xhhk75nqx7sbvymgcc73q"; }; patches = [ ./fix-pgrefdebugging.patch ]; diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix deleted file mode 120000 index 31d5e95359c..00000000000 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ /dev/null @@ -1 +0,0 @@ -0.94.nix \ No newline at end of file diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix new file mode 100644 index 00000000000..aec5d35b51a --- /dev/null +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -0,0 +1,13 @@ +{ callPackage, fetchgit, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "9.0.0"; + + src = fetchgit { + url = "https://github.com/ceph/ceph.git"; + rev = "refs/tags/v${version}"; + sha256 = "07x5riqxh2mjcvlblv900vclgh8glnb464s6ssdcgkp31fk1gybg"; + }; + + patches = [ ./fix-pgrefdebugging.patch ]; +}) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 36baee6b99d..056440d4afe 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -26,46 +26,68 @@ # We must have one crypto library assert cryptopp != null || (nss != null && nspr != null); +with stdenv; with stdenv.lib; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; + optSnappy = shouldUsePkg snappy; + optLeveldb = shouldUsePkg leveldb; + optYasm = shouldUsePkg yasm; + optFcgi = shouldUsePkg fcgi; + optExpat = shouldUsePkg expat; + optCurl = shouldUsePkg curl; + optFuse = shouldUsePkg fuse; + optAccelio = shouldUsePkg accelio; + optLibibverbs = shouldUsePkg libibverbs; + optLibrdmacm = shouldUsePkg librdmacm; + optLibedit = shouldUsePkg libedit; + optLibatomic_ops = shouldUsePkg libatomic_ops; + optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client; + optRocksdb = shouldUsePkg rocksdb; + optLibs3 = shouldUsePkg libs3; - hasServer = snappy != null && leveldb != null; + optJemalloc = shouldUsePkg jemalloc; + optGperftools = shouldUsePkg gperftools; + + optCryptopp = shouldUsePkg cryptopp; + optNss = shouldUsePkg nss; + optNspr = shouldUsePkg nspr; + + optLibaio = shouldUsePkg libaio; + optLibxfs = shouldUsePkg libxfs; + optZfs = shouldUsePkg zfs; + + hasServer = optSnappy != null && optLeveldb != null; hasMon = hasServer; hasMds = hasServer; hasOsd = hasServer; - hasRadosgw = fcgi != null && expat != null && curl != null && libedit != null; + hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && - versionAtLeast version "0.95" && - accelio != null && libibverbs != null && librdmacm != null; + versionAtLeast version "9.0.0" && + optAccelio != null && optLibibverbs != null && optLibrdmacm != null; - hasRocksdb = versionAtLeast version "0.95" && rocksdb != null; + hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null; # TODO: Reenable when kinetic support is fixed - hasKinetic = versionAtLeast version "0.95" && kinetic-cpp-client != null && false; + #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null; + hasKinetic = false; # Malloc implementation (can be jemalloc, tcmalloc or null) - malloc = if jemalloc != null then jemalloc else gperftools; + malloc = if optJemalloc != null then optJemalloc else optGperftools; # We prefer nss over cryptopp - cryptoStr = if nss != null && nspr != null then "nss" else - if cryptopp != null then "cryptopp" else "none"; + cryptoStr = if optNss != null && optNspr != null then "nss" else + if optCryptopp != null then "cryptopp" else "none"; cryptoLibsMap = { - nss = [ nss nspr ]; - cryptopp = [ cryptopp ]; + nss = [ optNss optNspr ]; + cryptopp = [ optCryptopp ]; none = [ ]; }; - wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $lib)\"" + wrapArgs = "--set PYTHONPATH : \"$(toPythonPath $lib)\"" + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\"" + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\"" - + " --prefix PATH : \"$out/bin\""; + + " --set PATH : \"$out/bin\""; in stdenv.mkDerivation { name="ceph-${version}"; @@ -76,24 +98,25 @@ stdenv.mkDerivation { ./0001-Makefile-env-Don-t-force-sbin.patch ]; - nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; + nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ] + ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ - boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib - ] ++ optional (versionAtLeast version "0.95") [ + boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib + ] ++ optional (versionAtLeast version "9.0.0") [ git # Used for the gitversion string pythonPackages.sphinx # Used for docs ] ++ optional stdenv.isLinux [ - linuxHeaders libuuid udev keyutils libaio libxfs zfs + linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs ] ++ optional hasServer [ - snappy leveldb + optSnappy optLeveldb ] ++ optional hasRadosgw [ - fcgi expat curl fuse libedit + optFcgi optExpat optCurl optFuse optLibedit ] ++ optional hasXio [ - accelio libibverbs librdmacm + optAccelio optLibibverbs optLibrdmacm ] ++ optional hasRocksdb [ - rocksdb + optRocksdb ] ++ optional hasKinetic [ - kinetic-cpp-client + optKinetic-cpp-client ]; postPatch = '' @@ -102,6 +125,9 @@ stdenv.mkDerivation { # Fix seagate kinetic linking sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am + '' + optionalString (versionAtLeast version "9.0.0") '' + # Fix gmock + patchShebangs src/gmock ''; preConfigure = '' @@ -126,40 +152,49 @@ stdenv.mkDerivation { "--libdir=\${lib}/lib" "--includedir=\${lib}/include" - (mkWith true "rbd" null) - (mkWith true "cephfs" null) - (mkWith hasRadosgw "radosgw" null) - (mkWith true "radosstriper" null) - (mkWith hasServer "mon" null) - (mkWith hasServer "osd" null) - (mkWith hasServer "mds" null) - (mkEnable true "client" null) - (mkEnable hasServer "server" null) - (mkWith (cryptoStr == "cryptopp") "cryptopp" null) - (mkWith (cryptoStr == "nss") "nss" null) - (mkEnable false "root-make-check" null) - (mkWith false "profiler" null) - (mkWith false "debug" null) - (mkEnable false "coverage" null) - (mkWith (fuse != null) "fuse" null) - (mkWith (malloc == jemalloc) "jemalloc" null) - (mkWith (malloc == gperftools) "tcmalloc" null) - (mkEnable false "pgrefdebugging" null) - (mkEnable false "cephfs-java" null) - (mkEnable hasXio "xio" null) - (mkWith (libatomic_ops != null) "libatomic-ops" null) - (mkWith true "ocf" null) - (mkWith hasKinetic "kinetic" null) - (mkWith hasRocksdb "librocksdb" null) - (mkWith false "librocksdb-static" null) - (mkWith (libs3 != null) "system-libs3" null) - (mkWith true "rest-bench" null) + (mkWith true "rbd" null) + (mkWith true "cephfs" null) + (mkWith hasRadosgw "radosgw" null) + (mkWith true "radosstriper" null) + (mkWith hasServer "mon" null) + (mkWith hasServer "osd" null) + (mkWith hasServer "mds" null) + (mkEnable true "client" null) + (mkEnable hasServer "server" null) + (mkWith (cryptoStr == "cryptopp") "cryptopp" null) + (mkWith (cryptoStr == "nss") "nss" null) + (mkEnable false "root-make-check" null) + (mkWith false "profiler" null) + (mkWith false "debug" null) + (mkEnable false "coverage" null) + (mkWith (optFuse != null) "fuse" null) + (mkWith (malloc == optJemalloc) "jemalloc" null) + (mkWith (malloc == optGperftools) "tcmalloc" null) + (mkEnable false "pgrefdebugging" null) + (mkEnable false "cephfs-java" null) + (mkEnable hasXio "xio" null) + (mkWith (optLibatomic_ops != null) "libatomic-ops" null) + (mkWith true "ocf" null) + (mkWith hasKinetic "kinetic" null) + (mkWith hasRocksdb "librocksdb" null) + (mkWith false "librocksdb-static" null) + (mkWith (optLibs3 != null) "system-libs3" null) + (mkWith true "rest-bench" null) ] ++ optional stdenv.isLinux [ - (mkWith (libaio != null) "libaio" null) - (mkWith (libxfs != null) "libxfs" null) - (mkWith (zfs != null) "libzfs" null) + (mkWith (optLibaio != null) "libaio" null) + (mkWith (optLibxfs != null) "libxfs" null) + (mkWith (optZfs != null) "libzfs" null) + ] ++ optional (versionAtLeast version "10.0.0") [ + (mkWith true "man-pages" null) + (mkWith false "tcmalloc-minimal" null) + (mkWith false "valgrind" null) + (mkWith true "systemd-libexec-dir" "\${TMPDIR}") ]; + preBuild = optionalString (versionAtLeast version "9.0.0") '' + (cd src/gmock; make -j $NIX_BUILD_CORES) + ''; + installFlags = [ "sysconfdir=\${out}/etc" ]; outputs = [ "out" "lib" ]; diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index 8aa4bbd34bb..c964548b65e 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,11 +1,11 @@ { callPackage, fetchgit, git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-04-22"; + version = "2015-05-29"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20"; - sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb"; + rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7"; + sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9"; }; }) diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 409e7a8c36f..59cb07dead0 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quickly find duplicate files"; homepage = http://duff.dreda.org/; - license = with licenses; zlib; + license = licenses.zlib; longDescription = '' Duff is a Unix command-line utility for quickly finding duplicates in a given set of files. diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7617e82f1a8..c4b44b824f0 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,34 +1,66 @@ -{ stdenv, fetchurl, pkgconfig, libuuid }: +{ stdenv, fetchurl, pkgconfig +# Optional Dependencies +, libuuid +}: + +with stdenv; +let + optLibuuid = shouldUsePkg libuuid; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.12"; + name = "e2fsprogs-1.42.13"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71"; + sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; }; - buildInputs = [ pkgconfig libuuid ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ optLibuuid ]; - crossAttrs = { - preConfigure = '' - export CC=$crossConfig-gcc - ''; - }; - - # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). - configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; + configureFlags = [ + (mkEnable true "symlink-install" null) + (mkEnable true "relative-symlinks" null) + (mkEnable true "symlink-relative-symlinks" null) + (mkEnable false "compression" null) + (mkEnable true "htree" null) + (mkEnable true "elf-shlibs" null) + (mkEnable false "profile" null) + (mkEnable false "gcov" null) + (mkEnable false "jbd-debug" null) + (mkEnable false "blkid-debug" null) + (mkEnable false "testio-debug" null) + (mkEnable (optLibuuid == null) "libuuid" null) + (mkEnable (optLibuuid == null) "libblkid" null) + (mkEnable true "quota" null) + (mkEnable false "backtrace" null) + (mkEnable false "debugfs" null) + (mkEnable true "imager" null) + (mkEnable true "resizer" null) + (mkEnable true "defrag" null) + (mkEnable true "fsck" null) + (mkEnable false "e2initrd-helper" null) + (mkEnable true "tls" null) + (mkEnable false "uuidd" null) # Build is broken in 1.42.13 + ]; enableParallelBuilding = true; - preInstall = "installFlagsArray=('LN=ln -s')"; + installFlags = [ + "LN=ln -s" + ]; - postInstall = "make install-libs"; + postInstall = '' + make install-libs + ''; - meta = { + meta = with stdenv.lib; { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eelco wkennington ]; }; } diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 81a3b46cacb..211690606ef 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://vgough.github.io/encfs; description = "Provides an encrypted filesystem in user-space via FUSE"; - license = with licenses; lgpl2; + license = licenses.lgpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix index a767ba36b3f..3215b0d9174 100644 --- a/pkgs/tools/filesystems/exfat-utils/default.nix +++ b/pkgs/tools/filesystems/exfat-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { Unix-like systems. ''; homepage = https://code.google.com/p/exfat; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix index 983228e9de5..ae9f9e32fa8 100644 --- a/pkgs/tools/filesystems/fuse-exfat/default.nix +++ b/pkgs/tools/filesystems/fuse-exfat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/exfat/; description = "A FUSE-based filesystem that allows read and write access to exFAT devices"; platforms = with platforms; linux; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 86dad1cc0fa..2a2ff0a47a5 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl -, autoconf, automake -, unzip, pkgconfig -, file, fuse, libmtp }: +{ stdenv, fetchFromGitHub, pkgconfig, file, fuse, libmtp }: -stdenv.mkDerivation rec { - version = "0.5"; +let version = "0.5"; in +stdenv.mkDerivation { name = "jmtpfs-${version}"; - src = fetchurl { - url = "https://github.com/JasonFerrara/jmtpfs/archive/v0.5.zip"; - sha256 = "09fw4g350mjz1mnga7ws5nvnsnfzs8s7cscl300mas1m9s6vmhz6"; + src = fetchFromGitHub { + sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; + rev = "v${version}"; + repo = "jmtpfs"; + owner = "JasonFerrara"; }; - buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ]; + buildInputs = [ file fuse libmtp pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "A FUSE filesystem for MTP devices like Android phones"; homepage = https://github.com/JasonFerrara/jmtpfs; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.coconnor ]; + license = licenses.gpl3; + maintainers = [ maintainers.coconnor ]; }; } diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 50242bb6388..23ee5558e14 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { simple drag-and-drop in a file browser. ''; homepage = http://khenriks.github.io/mp3fs/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 44333b519cb..fd7d59774b2 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -45,10 +45,10 @@ buildPythonPackage rec { # tests are currently _heavily_ broken upstream doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; - license = [ "GPLv2+" "LGPLv2.1+" ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 5106af48917..853654c0f79 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://rdfind.pauldreik.se/; description = "Removes or hardlinks duplicate files very swiftly"; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ wmertens ]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index c39f5cba775..7e880ffeeb9 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ]; - meta = { + meta = with stdenv.lib; { description = "Mount an S3 bucket as filesystem through FUSE"; - license = "GPLv2"; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index fcd8a37382e..f8dd35576ff 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optional withTeXLive texLive ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] - ++ lib.optional withQt [ qt.base ] + ++ lib.optional withQt [ qt ] # compiling with wxGTK causes a malloc (double free) error on darwin ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 92dce64dcfd..2619387df8b 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -1,29 +1,28 @@ {stdenv, fetchurl, zlib, libX11, libpng}: stdenv.mkDerivation { - name = "ploticus-2.41"; + name = "ploticus-2.42"; builder = ./builder.sh; src = fetchurl { url = mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz; - sha256 = "ecccb6afcf0008d5b31da2e9e74c448564101eb7b9bbde758a3dca1f2dc8c580"; + sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c"; }; - buildInputs = [zlib libX11 libpng]; + buildInputs = [ zlib libX11 libpng ]; - patches = [./ploticus-install.patch]; + patches = [ ./ploticus-install.patch ]; - meta = { + meta = with stdenv.lib; { description = "A non-interactive software package for producing plots and charts"; - longDescription = ''Ploticus is a free, GPL'd, non-interactive software package for producing plots, charts, and graphics from data. Ploticus is good for automated or just-in-time graph generation, handles date and time data nicely, and has basic statistical capabilities. It allows significant user control over colors, styles, options and details.''; - - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub ]; homepage = http://ploticus.sourceforge.net/; }; } diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix index edd0a96c689..f84780ab3c3 100644 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -11,7 +11,7 @@ let in rec { src = fetchurl { - url = "ftp://ftp.debian.org/debian/pool/main/libd/libdecodeqr/libdecodeqr_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/libd/libdecodeqr/libdecodeqr_${version}.orig.tar.gz"; sha256 = "1kmljwx69h7zq6zlp2j19bbpz11px45z1abw03acrxjyzz5f1f13"; }; diff --git a/pkgs/tools/inputmethods/mozc/default.nix b/pkgs/tools/inputmethods/mozc/default.nix new file mode 100644 index 00000000000..20789a33a0c --- /dev/null +++ b/pkgs/tools/inputmethods/mozc/default.nix @@ -0,0 +1,73 @@ +{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: + +let + japanese_usage_dictionary = fetchsvn { + url = "http://japanese-usage-dictionary.googlecode.com/svn/trunk"; + rev = "10"; + sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; + }; +in clangStdenv.mkDerivation rec { + name = "mozc-${version}"; + version = "2015-05-02"; + + meta = with clangStdenv.lib; { + description = "Japanese input method from Google"; + homepage = http://code.google.com/p/mozc/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.gebner ]; + }; + + nativeBuildInputs = [ gyp which ninja python pkgconfig ]; + buildInputs = [ protobuf ibus gtk zinnia qt4 libxcb ]; + + src = fetchFromGitHub { + owner = "google"; + repo = "mozc"; + rev = "d9783737ecfcb68c3d98d84e7052d716f4d0e0cb"; + sha256 = "52a83658e2e4a7b38e31a4085682be24c9c5f4c51a01578598a30b9833827b72"; + }; + postUnpack = '' + ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary + ''; + + configurePhase = '' + export GYP_DEFINES="ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc ibus_mozc_icon_path=$out/share/ibus-mozc/product_icon.png document_dir=$out/share/doc/mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model use_libprotobuf=1" + python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc + ''; + + buildPhase = '' + python src/build_mozc.py build -c Release \ + unix/ibus/ibus.gyp:ibus_mozc \ + unix/emacs/emacs.gyp:mozc_emacs_helper \ + server/server.gyp:mozc_server \ + gui/gui.gyp:mozc_tool \ + renderer/renderer.gyp:mozc_renderer + ''; + + checkPhase = '' + python src/build_mozc.py runtests -c Release + ''; + + installPhase = '' + install -D -m 755 src/out_linux/Release/mozc_server $out/lib/mozc/mozc_server + install -m 755 src/out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool + + install -d $out/share/doc/mozc + install -m 644 src/data/installer/*.html $out/share/doc/mozc/ + + install -D -m 755 src/out_linux/Release/ibus_mozc $out/lib/ibus-mozc/ibus-engine-mozc + install -D -m 644 src/out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml + install -D -m 644 src/data/images/unix/ime_product_icon_opensource-32.png $out/share/ibus-mozc/product_icon.png + install -m 644 src/data/images/unix/ui-tool.png $out/share/ibus-mozc/tool.png + install -m 644 src/data/images/unix/ui-properties.png $out/share/ibus-mozc/properties.png + install -m 644 src/data/images/unix/ui-dictionary.png $out/share/ibus-mozc/dictionary.png + install -m 644 src/data/images/unix/ui-direct.png $out/share/ibus-mozc/direct.png + install -m 644 src/data/images/unix/ui-hiragana.png $out/share/ibus-mozc/hiragana.png + install -m 644 src/data/images/unix/ui-katakana_half.png $out/share/ibus-mozc/katakana_half.png + install -m 644 src/data/images/unix/ui-katakana_full.png $out/share/ibus-mozc/katakana_full.png + install -m 644 src/data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png + install -m 644 src/data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png + install -D -m 755 src/out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer + ''; +} diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix new file mode 100644 index 00000000000..55cf0945582 --- /dev/null +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "tegaki-zinnia-japanese-${version}"; + version = "0.3"; + + src = fetchurl { + url = "http://www.tegaki.org/releases/0.3/models/tegaki-zinnia-japanese-0.3.zip"; + sha256 = "1nmg9acxhcqly9gwkyb9m0hpy76fll91ywk4b1q4xms0ajxip1h7"; + }; + + meta = with stdenv.lib; { + description = "Japanese handwriting model for the Zinnia engine"; + homepage = http://tegaki.org/; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; + + buildInputs = [ unzip ]; + + makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ]; +} diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix new file mode 100644 index 00000000000..fd8c9bd7c79 --- /dev/null +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "zinnia-${version}"; + version = "2015-03-15"; + + src = fetchFromGitHub { + owner = "taku910"; + repo = "zinnia"; + rev = "d8de1180d5175d7579e6c41b000f1ab4dd9cd697"; + sha256 = "ac09a16c04c5ef9b46626984e627250dc717d85711d14f1bbfa7f1ca0ca713dc"; + }; + + setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)"; + + meta = with stdenv.lib; { + description = "Online hand recognition system with machine learning"; + homepage = "http://taku910.github.io/zinnia/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; +} diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 35b13448b59..ff5e47336d3 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ nasm ]; - buildFlags = [ arch ]; + buildFlags = [ arch ] + ++ stdenv.lib.optionals stdenv.cc.isClang [ "CC=clang" "LD=clang" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 9c32d3c5466..47eacd9bdb0 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { add-on to your favorite shell. ''; homepage = http://www.clex.sk; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch b/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch new file mode 100644 index 00000000000..2f69347ffab --- /dev/null +++ b/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch @@ -0,0 +1,1259 @@ +--- coreutils-8.23/ChangeLog 2014-07-18 15:22:24.000000000 -0700 ++++ coreutils-8.23/ChangeLog 2014-10-13 08:56:50.775188900 -0700 +@@ -1,3 +1,220 @@ ++2014-10-13 U-WIN-RSJ0SJPBR3E\Administrator ++ ++ Cygwin release 8.23-4 ++ * copy.c (copy_internal): Fix typo that broke recursive copy ++ when dealing with directories. ++ ++2014-09-24 Eric Blake ++ ++ Cygwin release 8.23-3 ++ * lib/cygwin.c (cygwin_spelling): Skip .exe magic if .exe is ++ already present. Also honor .exe magic on symlinks. ++ * lib/same.c (same_name): Treat files as same if only difference ++ is .exe magic. ++ * copy.c (copy): Move symlink special casing here. ++ * install.c (strip): Update caller. ++ * ls.c (gobble_file): Likewise. ++ * stat.c (do_statfs, do_stat): Likewise. ++ ++2014-08-12 Eric Blake ++ ++ Cygwin release 8.23-2. ++ Drop hostname. ++ ++2014-08-01 Eric Blake ++ ++ Cygwin release 8.23-1. ++ * configure.ac: Disable stdbuf. ++ * lib/local.mk: Upstream switched to flat make, impacting how ++ we build local cygwin.c code. ++ * lib/canonicalize.c: Accepted upstream. ++ * lib/file-has-acl.c: Likewise. ++ * realpath.c: Likewise. ++ * su.c: Upstream dropped su. ++ * Makefile.am: Drop su changes. ++ * chroot.c: Adapt to new upstream code. ++ ++2012-02-04 Eric Blake ++ ++ Cygwin release 8.15-1. ++ * lib/fts.c: Early gnulib fix is now upstream. ++ * lib/canonicalize.c: Backport gnulib fix for /// -> /. ++ * realpath.c: Backport gnulib fix for --relative-to. ++ ++2011-10-27 Eric Blake ++ ++ Cygwin release 8.14-1. ++ * lib/ftc.c: Backport gnulib fix to make rm close before rmdir. ++ * lib/cygwin.c (cygwin_spelling): Fix logic when 'f' and 'f.exe' ++ exist but are different files. ++ * stat.c: Fix --append-exe. ++ ++2011-02-04 Eric Blake ++ ++ Cygwin release 8.10-1. ++ ++2010-12-24 Eric Blake ++ ++ Cygwin release 8.8-1. ++ * lib/mountlist.c (ME_REMOTE): Restore previous cygwin hack to ++ determine remote drives, lost since 6.11-1. ++ ++2010-04-29 Eric Blake ++ ++ Cygwin release 8.5-1. ++ ++2010-03-11 Eric Blake ++ ++ Cygwin release 8.4-1. ++ * lib/xfreopen.c (xfreopen): Consolidate workaround for broken ++ freopen usage into one place. ++ * copy.c (copy): Reinstate .exe magic handling when copying ++ files with implicit .exe. ++ ++2008-12-13 Eric Blake ++ ++ Cygwin release 7.0-1. ++ ++2008-06-02 Eric Blake ++ ++ Cygwin release 6.12-1. ++ ++2008-05-12 Eric Blake ++ ++ Cygwin release 6.11-1, requires cygwin 1.7.0. ++ * lib/cygwin.h (CYGWIN_APPEND_EXE): Accomodate new PATH_MAX. ++ * lib/cygwin.c (cygwin_spelling): Accomodate new trailing ++ `.' semantics. ++ * lib/same.c (same_name): Accomodate new PATH_MAX. ++ ++2008-01-24 Eric Blake ++ ++ Cygwin release 6.10-1. ++ * lib/hash-triple.c (triple_hash): Hash case-insensitively. ++ * lib/hash-pjw.h (hash_pjw_case): New interface. ++ * lib/hash-pjw.c (hash_pjw_case): New function. ++ * chcon.c (main): Support my root_dev_ino tweaks. ++ ++2007-08-21 Eric Blake ++ ++ Cygwin release 6.9-5. ++ * same.c (same_name): Detect same file differing only by case. ++ * copy.c (same_file_ok): Add parameter to detect when case ++ change is being attempted. ++ (triple_hash): Hash names case-insensitively. ++ (copy_internal): Accommodate case-change attempts. ++ * mv.c (do_move): Allow 'mv foo/ Foo/' as shorthand for ++ 'mv -T foo/ Foo/'. ++ ++2007-07-23 Eric Blake ++ ++ Cygwin release 6.9-4. ++ * dd.c (main): Fix typo in earlier cygwin patch. ++ ++2007-05-29 Eric Blake ++ ++ Cygwin release 6.9-3. ++ * cksum.c (main): Don't lose append mode. ++ * md5sum.c (main): Likewise. ++ * cat.c (main): Likewise. ++ * head.c (main): Likewise. ++ * tac.c (main): Likewise. ++ * tail.c (main): Likewise. ++ * tee.c (main): Likewise. ++ * tr.c (main): Likewise. ++ ++2006-11-24 Eric Blake ++ ++ Cygwin release 6.6-2. ++ * lib/cygwin.c (cygwin_spelling): Work even with old-style ++ symlinks, which lacked .lnk suffix. ++ ++2006-04-14 Eric Blake ++ ++ Cygwin release 5.94-5. Experimental only, depends on cygwin ++ snapshot 20060329 or later. ++ * dd.c (main): Default to binary mode. ++ * system.h (rpl_freopen): Remove this hack, now that cygwin ++ freopen(NULL) works. ++ * lib/quotearg.c (quote_eight_bit): New variable, so I can... ++ (quotearg_buffer_restyled): treat 8-bit characters as printable ++ when outputting to a terminal. ++ * lib/quote.c (quote_n): Use it. ++ ++2006-02-28 Eric Blake ++ ++ Cygwin release 5.94-4. Experimental only, depends on cygwin ++ snapshot 20060227 or later. ++ * lib/root-dev-ino.h (struct root_dev_ino): New struct. ++ (ROOT_DEV_INO_CHECK, ROOT_DEV_INO_WARN): Also track //. ++ * lib/root-dev-ino.c (get_root_dev_ino): Also track //. ++ * chmod.c (root_dev_ino): Use new type. ++ (main): Ditto. ++ * chown-core.h (struct Chown_option): Ditto. ++ * chown.c (main): Ditto. ++ * remove.h (struct rm_options): Ditto. ++ * rm.c (main): Ditto. ++ * pwd.c (robust_getcwd): Ditto. Also fix bug when in / or //. ++ ++2006-01-24 Eric Blake ++ ++ Cygwin release 5.93-3, depends on cygwin-1.5.19-1 or later. ++ * cksum.c (main): Always output binary files. ++ * md5sum.c (main): Likewise. ++ * su.c (correct_password): On NT machines, attempt ++ passwordless login first, and give better error message if ++ password check fails. I still don't know how to distinguish ++ between insufficient privileges vs. incorrect password. ++ * dircolors.c (main): Silence warning from tcsh 6.14.00. ++ ++2005-10-15 Eric Blake ++ ++ Cygwin release 5.90-3, depends on snapshot 20051003 or later (will ++ become cygwin 1.5.19). ++ * doc/coreutils.texi (ls invocation, stat invocation): Document ++ --append-exe. ++ * ls.c (usage): Ditto. ++ (gobble_file): Append .exe as needed when requested. ++ * stat.c (usage): Document --append-exe. ++ (do_stat, do_statfs): Append .exe as needed when requested. ++ ++2005-10-08 Eric Blake ++ ++ Cygwin release 5.90-2, depends on snapshot 20051003 or later (will ++ become cygwin 1.5.19). ++ * lib/mkdir-p.c (make_dir_parents): Fix bug in last patch. ++ * lib/cygwin.h (CYGWIN_APPEND_EXE): Factor into common macro. ++ * copy.c (copy): Use new macro. ++ * install.c (strip): Ditto. ++ * ln.c (do_link): Ditto. ++ ++2005-07-13 Eric Blake ++ ++ * doc/coreutils.texi (ln invocation): Document --disable-exe-magic. ++ * ln.c (usage): Likewise. ++ (do_link): Skip .exe magic when requested. ++ ++2005-07-12 Eric Blake ++ ++ * lib/cygwin.c (cygwin_spelling): Don't append .exe to directories. ++ Make sure .exe exists before returning 1, because otherwise ++ virtual directories such as /cygdrive have problems. ++ ++2005-07-07 Eric Blake ++ ++ * lib/cygwin.h: New file, defining cygwin_spelling. ++ * lib/cygwin.c: New file. ++ * lib/Makefile.am: Compile it. ++ * copy.c (copy_internal, copy): Use new cygwin_spelling() to ++ undo .exe magic. ++ * link.c (do_link): Likewise. ++ * install.c (strip): Likewise. ++ ++2005-01-03 Corinna Vinschen ++ ++ * install.c (strip): Check for .exe here since strip doesn't. ++ ++ + 2014-07-18 Pádraig Brady + + version 8.23 +--- coreutils-8.23/configure.ac 2014-07-17 18:40:57.000000000 -0700 ++++ coreutils-8.23/configure.ac 2014-10-13 08:30:37.165262300 -0700 +@@ -473,7 +473,7 @@ AC_COMPILE_IFELSE( + [stdbuf_supported=yes], + [stdbuf_supported=no]) + AC_MSG_RESULT([$stdbuf_supported]) +-if test "$stdbuf_supported" = "yes"; then ++if test "$stdbuf_supported" = "yes" && test -z "$EXEEXT"; then + gl_ADD_PROG([optional_bin_progs], [stdbuf]) + fi + +--- coreutils-8.23/doc/coreutils.texi 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/doc/coreutils.texi 2014-10-13 08:30:37.180881200 -0700 +@@ -7838,6 +7838,14 @@ These options change how file names them + + @table @samp + ++@item --append-exe ++@opindex --append-exe ++@cindex appending exe on cygwin ++Cygwin only: Cygwin normally performs @samp{.exe} magic, where a ++command line argument typed without an .exe extension transparently ++refers to the existing file with an extension. Specifying this option ++will make the .exe show if cygwin magic was involved. ++ + @item -b + @itemx --escape + @itemx --quoting-style=escape +@@ -11799,6 +11807,14 @@ With this option, @command{stat} acts on + by each symbolic link argument. + Without it, @command{stat} acts on any symbolic link argument directly. + ++@item --append-exe ++@opindex --append-exe ++@cindex appending exe on cygwin ++Cygwin only: Cygwin normally performs .exe magic, where a command line ++argument typed without an .exe extension transparently refers to the ++existing file with an extension. Specifying this option will make ++the .exe show if cygwin magic was involved. ++ + @item -f + @itemx --file-system + @opindex -f +--- coreutils-8.23/lib/cygwin.c 1969-12-31 16:00:00.000000000 -0800 ++++ coreutils-8.23/lib/cygwin.c 2014-10-13 08:30:37.180881200 -0700 +@@ -0,0 +1,67 @@ ++/* cygwin.c - helper functions unique to Cygwin ++ ++ Copyright (C) 2005, 2006, 2008, 2011 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software Foundation, ++ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++ Written by Eric Blake. */ ++ ++#include ++ ++#include "cygwin.h" ++ ++#include ++#include ++#include ++#include ++ ++/* Return -1 if PATH is not found, 0 if PATH will not have .exe ++ appended (it is possible that a PATH that does not exist still ++ returns 0 instead of -1, or fails for a PATH that exists but cannot ++ be stat'ed), and positive if PATH has ".exe" automatically appended ++ by cygwin (1 if PATH is a symlink, 2 otherwise). Won't change errno. */ ++ ++int ++cygwin_spelling (char const *path) ++{ ++ int saved_errno = errno; ++ int result = 0; /* Start with assumption that PATH is okay. */ ++ int len; ++ struct stat st1; ++ struct stat st2; ++ char *path_exe; ++ ++ if (! path || ! *path || len > PATH_MAX) ++ /* PATH will cause EINVAL or ENAMETOOLONG, treat it as non-existing. */ ++ return -1; ++ len = strlen (path); ++ if (path[len - 1] == '/' ++ || (len > 4 && !strcasecmp (&path[len - 4], ".exe"))) ++ /* Don't change spelling if there is a trailing `/' or '.exe'. */ ++ return 0; ++ if (lstat (path, &st1) < 0 || S_ISDIR(st1.st_mode)) ++ { ++ errno = saved_errno; ++ return -1; ++ } ++ path_exe = malloca (len + 5); /* adding ".exe" and NUL. */ ++ strcat (stpcpy (path_exe, path), ".exe"); ++ if (lstat (path_exe, &st2) == 0 && st1.st_ino == st2.st_ino) ++ result = 1 + !S_ISLNK(st1.st_mode); ++ freea (path_exe); ++ ++ errno = saved_errno; ++ return result; ++} +--- coreutils-8.23/lib/cygwin.h 1969-12-31 16:00:00.000000000 -0800 ++++ coreutils-8.23/lib/cygwin.h 2014-10-13 08:30:37.180881200 -0700 +@@ -0,0 +1,38 @@ ++/* cygwin.h - helper functions unique to Cygwin ++ ++ Copyright (C) 2005, 2006, 2008, 2010, 2011 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software Foundation, ++ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++ Written by Eric Blake. */ ++ ++#ifndef CYGWIN_H ++# define CYGWIN_H 1 ++ ++#include "malloca.h" ++ ++int cygwin_spelling (char const *); ++ ++/* Append ".exe" to char *__NAME_ORIG, where __NAME is either NULL or ++ between __NAME_ORIG and the nul terminator. Both params will be ++ evaluated more than once and assigned the new value. The user must ++ later call freea(__NAME). */ ++#define CYGWIN_APPEND_EXE(__name, __name_orig) \ ++ __name_orig = __name = \ ++ strcat (strcpy (malloca (strchr (__name ? __name : __name_orig, '\0') \ ++ - (__name_orig) + 5), \ ++ __name_orig), ".exe") ++ ++#endif /* CYGWIN_H */ +--- coreutils-8.23/lib/hash-pjw.c 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/hash-pjw.c 2014-10-13 08:30:37.180881200 -0700 +@@ -19,6 +19,7 @@ + + #include "hash-pjw.h" + ++#include + #include + + #define SIZE_BITS (sizeof (size_t) * CHAR_BIT) +@@ -38,3 +39,16 @@ hash_pjw (const void *x, size_t tablesiz + + return h % tablesize; + } ++ ++/* Likewise, but case-insensitive. */ ++size_t ++hash_pjw_case (const void *x, size_t tablesize) ++{ ++ const unsigned char *s; ++ size_t h = 0; ++ ++ for (s = x; *s; s++) ++ h = tolower (*s) + ((h << 9) | (h >> (SIZE_BITS - 9))); ++ ++ return h % tablesize; ++} +--- coreutils-8.23/lib/hash-pjw.h 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/hash-pjw.h 2014-10-13 08:30:37.180881200 -0700 +@@ -21,3 +21,4 @@ + The result is platform dependent: it depends on the size of the 'size_t' + type and on the signedness of the 'char' type. */ + extern size_t hash_pjw (void const *x, size_t tablesize) _GL_ATTRIBUTE_PURE; ++extern size_t hash_pjw_case (void const *x, size_t tablesize) _GL_ATTRIBUTE_PURE; +--- coreutils-8.23/lib/hash-triple.c 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/hash-triple.c 2014-10-13 08:30:37.180881200 -0700 +@@ -34,7 +34,13 @@ size_t + triple_hash (void const *x, size_t table_size) + { + struct F_triple const *p = x; ++#if !__CYGWIN__ + size_t tmp = hash_pjw (p->name, table_size); ++#else // cygwin ++ /* Hash case-insensitively, to force collisions on names that differ by ++ case; copy.c can then account for case-insensitive renames. */ ++ size_t tmp = hash_pjw_case (p->name, table_size); ++#endif + + /* Ignoring the device number here should be fine. */ + return (tmp ^ p->st_ino) % table_size; +--- coreutils-8.23/lib/local.mk 2013-12-04 06:48:30.000000000 -0800 ++++ coreutils-8.23/lib/local.mk 2014-10-13 08:30:37.180881200 -0700 +@@ -3,3 +3,6 @@ include lib/gnulib.mk + # Allow "make distdir" to succeed before "make all" has run. + dist-hook: $(noinst_LIBRARIES) + .PHONY: dist-hook ++ ++# Hook in cygwin helper ++lib_libcoreutils_a_SOURCES += lib/cygwin.c lib/cygwin.h +--- coreutils-8.23/lib/root-dev-ino.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/lib/root-dev-ino.c 2014-10-13 08:30:37.180881200 -0700 +@@ -25,13 +25,17 @@ + /* Call lstat to get the device and inode numbers for '/'. + Upon failure, return NULL. Otherwise, set the members of + *ROOT_D_I accordingly and return ROOT_D_I. */ +-struct dev_ino * +-get_root_dev_ino (struct dev_ino *root_d_i) ++struct root_dev_ino * ++get_root_dev_ino (struct root_dev_ino *root_d_i) + { + struct stat statbuf; + if (lstat ("/", &statbuf)) + return NULL; +- root_d_i->st_ino = statbuf.st_ino; +- root_d_i->st_dev = statbuf.st_dev; ++ root_d_i->single_slash.st_ino = statbuf.st_ino; ++ root_d_i->single_slash.st_dev = statbuf.st_dev; ++ if (lstat ("//", &statbuf)) ++ return NULL; ++ root_d_i->double_slash.st_ino = statbuf.st_ino; ++ root_d_i->double_slash.st_dev = statbuf.st_dev; + return root_d_i; + } +--- coreutils-8.23/lib/root-dev-ino.h 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/lib/root-dev-ino.h 2014-10-13 08:30:37.180881200 -0700 +@@ -21,19 +21,26 @@ + # include "dev-ino.h" + # include "same-inode.h" + +-struct dev_ino * +-get_root_dev_ino (struct dev_ino *root_d_i); ++struct root_dev_ino ++{ ++ struct dev_ino single_slash; ++ struct dev_ino double_slash; ++}; ++ ++struct root_dev_ino * ++get_root_dev_ino (struct root_dev_ino *root_d_i); + + /* These macros are common to the programs that support the + --preserve-root and --no-preserve-root options. */ + + # define ROOT_DEV_INO_CHECK(Root_dev_ino, Dir_statbuf) \ +- (Root_dev_ino && SAME_INODE (*Dir_statbuf, *Root_dev_ino)) ++ (Root_dev_ino && (SAME_INODE (*Dir_statbuf, (Root_dev_ino)->single_slash) \ ++ || SAME_INODE (*Dir_statbuf, (Root_dev_ino)->double_slash))) + + # define ROOT_DEV_INO_WARN(Dirname) \ + do \ + { \ +- if (STREQ (Dirname, "/")) \ ++ if (STREQ (Dirname, "/") || STREQ (Dirname, "//")) \ + error (0, 0, _("it is dangerous to operate recursively on %s"), \ + quote (Dirname)); \ + else \ +--- coreutils-8.23/lib/same.c 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/same.c 2014-10-13 08:30:37.180881200 -0700 +@@ -40,6 +40,13 @@ + #include "error.h" + #include "same-inode.h" + ++#if __CYGWIN__ ++# include ++# include "cygwin.h" ++# include "malloca.h" ++# include "memcasecmp.h" ++#endif ++ + #ifndef MIN + # define MIN(a, b) ((a) < (b) ? (a) : (b)) + #endif +@@ -59,6 +66,45 @@ same_name (const char *source, const cha + (source_baselen == dest_baselen + && memcmp (source_basename, dest_basename, dest_baselen) == 0); + bool compare_dirs = identical_basenames; ++#if __CYGWIN__ ++ /* If two names differ case-insensitively by only an '.exe' suffix, ++ do some sleuthing to see if .exe magic matters on the shorter ++ name. Swapping the longer name to dest avoids duplication. */ ++ if (source_baselen == dest_baselen + 4) ++ { ++ char const *tmp_basename = source_basename; ++ size_t tmp_baselen = source_baselen; ++ source_basename = dest_basename; ++ source_baselen = dest_baselen; ++ dest_basename = tmp_basename; ++ dest_baselen = tmp_baselen; ++ } ++ if (source_baselen + 4 == dest_baselen ++ && !memcasecmp (dest_basename - 4, ".exe", 4) ++ && !memcasecmp (source_basename, dest_basename, source_baselen) ++ && 0 < cygwin_spelling(source)) ++ dest_baselen -= 4; ++ /* Some, but not all, files are case-insensitive (depending on mount ++ options, CYGWIN=case settings, and virtual file systems). Do ++ some sleuthing to decide whether case-insensitivity matters. */ ++ if (! compare_dirs && source_baselen == dest_baselen) ++ { ++ ssize_t wsrclen = cygwin_conv_path (CCP_POSIX_TO_WIN_W, ++ source, NULL, 0); ++ ssize_t wdstlen = cygwin_conv_path (CCP_POSIX_TO_WIN_W, ++ dest, NULL, 0); ++ char *wsrc = malloca (wsrclen); ++ char *wdst = malloca (wdstlen); ++ if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, source, wsrc, wsrclen)) ++ error (EXIT_FAILURE, errno, "unable to convert path name %s", source); ++ if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, dest, wdst, wdstlen)) ++ error (EXIT_FAILURE, errno, "unable to convert path name %s", dest); ++ if (wsrclen == wdstlen && memcasecmp (wsrc, wdst, wsrclen) == 0) ++ compare_dirs = true; ++ freea (wsrc); ++ freea (wdst); ++ } ++#endif /* __CYGWIN__ */ + bool same = false; + + #if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX +--- coreutils-8.23/lib/xfreopen.c 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/xfreopen.c 2014-10-13 08:30:37.180881200 -0700 +@@ -18,6 +18,7 @@ + #include "xfreopen.h" + + #include ++#include + #include "error.h" + #include "exitfail.h" + #include "quote.h" +@@ -26,9 +27,17 @@ + #include "gettext.h" + #define _(msgid) gettext (msgid) + ++#define STREQ(s1, s2) (strcmp (s1, s2) == 0) ++ + void + xfreopen (char const *filename, char const *mode, FILE *fp) + { ++ if (!filename && STREQ (mode, "wb")) ++ { ++ int flag = fcntl (fileno (fp), F_GETFL); ++ if (0 <= flag && (flag & O_APPEND)) ++ mode = "ab"; ++ } + if (!freopen (filename, mode, fp)) + { + char const *f = (filename ? filename +--- coreutils-8.23/chcon.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/chcon.c 2014-10-13 08:30:37.180881200 -0700 +@@ -48,7 +48,7 @@ static bool verbose; + + /* Pointer to the device and inode numbers of '/', when --recursive. + Otherwise NULL. */ +-static struct dev_ino *root_dev_ino; ++static struct root_dev_ino *root_dev_ino; + + /* The name of the context file is being given. */ + static char const *specified_context; +@@ -569,7 +569,7 @@ main (int argc, char **argv) + + if (recurse && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/chgrp.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/chgrp.c 2014-10-13 08:30:37.180881200 -0700 +@@ -299,7 +299,7 @@ main (int argc, char **argv) + + if (chopt.recurse && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + chopt.root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (chopt.root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/chmod.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/chmod.c 2014-10-13 08:30:37.180881200 -0700 +@@ -81,7 +81,7 @@ static enum Verbosity verbosity = V_off; + + /* Pointer to the device and inode numbers of '/', when --recursive. + Otherwise NULL. */ +-static struct dev_ino *root_dev_ino; ++static struct root_dev_ino *root_dev_ino; + + /* For long options that have no equivalent short option, use a + non-character as a pseudo short option, starting with CHAR_MAX + 1. */ +@@ -552,7 +552,7 @@ main (int argc, char **argv) + + if (recurse && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/chown-core.h 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/chown-core.h 2014-10-13 08:30:37.196451900 -0700 +@@ -50,7 +50,7 @@ struct Chown_option + + /* Pointer to the device and inode numbers of '/', when --recursive. + Need not be freed. Otherwise NULL. */ +- struct dev_ino *root_dev_ino; ++ struct root_dev_ino *root_dev_ino; + + /* This corresponds to the --dereference (opposite of -h) option. */ + bool affect_symlink_referent; +--- coreutils-8.23/chown.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/chown.c 2014-10-13 08:30:37.196451900 -0700 +@@ -312,7 +312,7 @@ main (int argc, char **argv) + + if (chopt.recurse && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + chopt.root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (chopt.root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/chroot.c 2014-07-13 16:59:20.000000000 -0700 ++++ coreutils-8.23/src/chroot.c 2014-10-13 08:30:37.196451900 -0700 +@@ -163,7 +163,7 @@ parse_additional_groups (char const *gro + static bool + is_root (const char* dir) + { +- struct dev_ino root_ino; ++ struct root_dev_ino root_ino; + if (! get_root_dev_ino (&root_ino)) + error (EXIT_CANCELED, errno, _("failed to get attributes of %s"), + quote ("/")); +@@ -173,7 +173,7 @@ is_root (const char* dir) + error (EXIT_CANCELED, errno, _("failed to get attributes of %s"), + quote (dir)); + +- return SAME_INODE (root_ino, arg_st); ++ return ROOT_DEV_INO_CHECK (&root_ino, &arg_st); + } + + void +--- coreutils-8.23/cksum.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/cksum.c 2014-10-13 08:30:37.196451900 -0700 +@@ -301,6 +301,9 @@ main (int argc, char **argv) + + have_read_stdin = false; + ++ if (O_BINARY) ++ xfreopen (NULL, "wb", stdout); ++ + if (optind == argc) + ok = cksum ("-", false); + else +--- coreutils-8.23/copy.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/copy.c 2014-10-13 08:49:30.450181800 -0700 +@@ -70,6 +70,10 @@ + # include "verror.h" + #endif + ++#if __CYGWIN__ ++# include "cygwin.h" ++#endif ++ + #ifndef HAVE_FCHOWN + # define HAVE_FCHOWN false + # define fchown(fd, uid, gid) (-1) +@@ -1313,7 +1317,11 @@ close_src_desc: + static bool + same_file_ok (char const *src_name, struct stat const *src_sb, + char const *dst_name, struct stat const *dst_sb, +- const struct cp_options *x, bool *return_now, bool *unlink_src) ++ const struct cp_options *x, bool *return_now, bool *unlink_src ++#if __CYGWIN__ ++ , bool *case_change ++#endif ++ ) + { + const struct stat *src_sb_link; + const struct stat *dst_sb_link; +@@ -1461,6 +1469,18 @@ same_file_ok (char const *src_name, stru + if (S_ISLNK (dst_sb_link->st_mode)) + return true; + ++#if __CYGWIN__ ++ /* If the files have the same name, but differ in case, then let ++ rename() change the case. */ ++ if (same_link && x->move_mode && same_name (src_name, dst_name) ++ && memcmp (last_component (src_name), last_component (dst_name), ++ base_len (src_name)) != 0) ++ { ++ *case_change = true; ++ return true; ++ } ++#endif /* __CYGWIN__ */ ++ + if (same_link + && 1 < dst_sb_link->st_nlink + && ! same_name (src_name, dst_name)) +@@ -1813,10 +1833,20 @@ copy_internal (char const *src_name, cha + && ! (x->move_mode || x->symbolic_link || x->hard_link + || x->backup_type != no_backups + || x->unlink_dest_before_opening)); +- if ((use_stat +- ? stat (dst_name, &dst_sb) +- : lstat (dst_name, &dst_sb)) +- != 0) ++ int res = (use_stat ++ ? stat (dst_name, &dst_sb) ++ : lstat (dst_name, &dst_sb)); ++#if __CYGWIN__ ++ /* stat("a") succeeds even if it was really "a.exe". */ ++ if (! res && 0 < cygwin_spelling (dst_name)) ++ { ++ /* Only DST_NAME.exe exists, but we want the non-existant ++ DST_NAME. */ ++ res = -1; ++ errno = ENOENT; ++ } ++#endif /* __CYGWIN__ */ ++ if (res != 0) + { + if (errno != ENOENT) + { +@@ -1833,10 +1863,17 @@ copy_internal (char const *src_name, cha + that it is stat'able or lstat'able. */ + bool return_now; + bool unlink_src; ++#if __CYGWIN__ ++ bool case_change = false; ++#endif /* __CYGWIN__ */ + + have_dst_lstat = !use_stat; + if (! same_file_ok (src_name, &src_sb, dst_name, &dst_sb, +- x, &return_now, &unlink_src)) ++ x, &return_now, &unlink_src ++#if __CYGWIN__ ++ , &case_change ++#endif ++)) + { + error (0, 0, _("%s and %s are the same file"), + quote_n (0, src_name), quote_n (1, dst_name)); +@@ -1895,6 +1932,9 @@ copy_internal (char const *src_name, cha + cp and mv treat -i and -f differently. */ + if (x->move_mode) + { ++#if __CYGWIN__ ++ if (!case_change) ++#endif /* __CYGWIN__ */ + if (abandon_move (x, dst_name, &dst_sb) + || (unlink_src && unlink (src_name) == 0)) + { +@@ -2058,7 +2098,11 @@ copy_internal (char const *src_name, cha + /* Never unlink dst_name when in move mode. */ + && ! x->move_mode + && (x->unlink_dest_before_opening +- || (x->preserve_links && 1 < dst_sb.st_nlink) ++ || (x->preserve_links && 1 < dst_sb.st_nlink ++#if __CYGWIN__ ++ && !case_change ++#endif /* __CYGWIN__ */ ++ ) + || (x->dereference == DEREF_NEVER + && ! S_ISREG (src_sb.st_mode)) + )) +@@ -2816,6 +2860,21 @@ copy (char const *src_name, char const * + { + assert (valid_options (options)); + ++#if __CYGWIN__ ++ /* .exe magic - if src exists with an implicit .exe suffix and is ++ not a symlink, but dst does not exist and was also specified ++ without a suffix, then append .exe to dst. */ ++ int cygwin = cygwin_spelling (src_name); ++ char *p; ++ if (cygwin == 2 ++ && ((p = strchr (dst_name, '\0') - 4) <= dst_name ++ || strcasecmp (p, ".exe") != 0)) ++ { ++ cygwin = 3; ++ CYGWIN_APPEND_EXE (p, dst_name); ++ } ++#endif /* __CYGWIN__ */ ++ + /* Record the file names: they're used in case of error, when copying + a directory into itself. I don't like to make these tools do *any* + extra work in the common case when that work is solely to handle +@@ -2827,10 +2886,15 @@ copy (char const *src_name, char const * + top_level_dst_name = dst_name; + + bool first_dir_created_per_command_line_arg = false; +- return copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL, ++ bool result = copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL, + options, true, + &first_dir_created_per_command_line_arg, + copy_into_self, rename_succeeded); ++#if __CYGWIN__ ++ if (cygwin == 3) ++ freea ((char *) dst_name); ++#endif /* __CYGWIN__ */ ++ return result; + } + + /* Set *X to the default options for a value of type struct cp_options. */ +--- coreutils-8.23/dd.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/dd.c 2014-10-13 08:30:37.196451900 -0700 +@@ -37,6 +37,10 @@ + #include "xstrtol.h" + #include "xtime.h" + ++#if __CYGWIN__ ++# include ++#endif ++ + /* The official name of this program (e.g., no 'g' prefix). */ + #define PROGRAM_NAME "dd" + +@@ -1862,6 +1866,13 @@ copy_with_unblock (char const *buf, size + static void + set_fd_flags (int fd, int add_flags, char const *name) + { ++#if __CYGWIN__ ++ /* Cygwin does not allow fcntl to set the mode. */ ++ int mode_flags = add_flags & (O_BINARY | O_TEXT); ++ add_flags &= ~(O_BINARY | O_TEXT); ++ if (mode_flags && setmode (fd, mode_flags) == -1) ++ error (EXIT_FAILURE, errno, _("setting flags for %s"), quote (name)); ++#endif /* __CYGWIN__ */ + /* Ignore file creation flags that are no-ops on file descriptors. */ + add_flags &= ~ (O_NOCTTY | O_NOFOLLOW); + +@@ -2242,6 +2253,8 @@ main (int argc, char **argv) + } + else + { ++ if ((input_flags & (O_BINARY | O_TEXT)) == 0) ++ input_flags |= O_BINARY; + if (fd_reopen (STDIN_FILENO, input_file, O_RDONLY | input_flags, 0) < 0) + error (EXIT_FAILURE, errno, _("failed to open %s"), quote (input_file)); + } +@@ -2264,6 +2277,8 @@ main (int argc, char **argv) + | (conversions_mask & C_NOCREAT ? 0 : O_CREAT) + | (conversions_mask & C_EXCL ? O_EXCL : 0) + | (seek_records || (conversions_mask & C_NOTRUNC) ? 0 : O_TRUNC)); ++ if ((opts & (O_BINARY | O_TEXT)) == 0) ++ opts |= O_BINARY; + + /* Open the output file with *read* access only if we might + need to read to satisfy a 'seek=' request. If we can't read +--- coreutils-8.23/dircolors.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/dircolors.c 2014-10-13 08:30:37.196451900 -0700 +@@ -494,8 +494,12 @@ main (int argc, char **argv) + } + else + { ++ /* tcsh treats LS_COLORS as a magic shell variable for its ++ builtin ls-F, but does not recognize all the categories ++ that coreutils ls does. Therefore, silence stderr to ++ avoid messages like "Unknown colorls variable `su'.". */ + prefix = "setenv LS_COLORS '"; +- suffix = "'\n"; ++ suffix = "' >&/dev/null\n"; + } + fputs (prefix, stdout); + fwrite (s, 1, len, stdout); +--- coreutils-8.23/install.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/install.c 2014-10-13 08:30:37.196451900 -0700 +@@ -44,6 +44,10 @@ + #include "utimens.h" + #include "xstrtol.h" + ++#if __CYGWIN__ ++# include "cygwin.h" ++#endif ++ + /* The official name of this program (e.g., no 'g' prefix). */ + #define PROGRAM_NAME "install" + +@@ -531,6 +535,16 @@ strip (char const *name) + error (0, errno, _("fork system call failed")); + break; + case 0: /* Child. */ ++#if __CYGWIN__ ++ { ++ /* Check for .exe here, since strip doesn't. */ ++ char *p; ++ if (((p = strchr (name, '\0') - 4) <= name ++ || strcasecmp (p, ".exe") != 0) ++ && 0 < cygwin_spelling (name)) ++ CYGWIN_APPEND_EXE (p, name); ++ } ++#endif /* __CYGWIN__ */ + execlp (strip_program, strip_program, name, NULL); + error (EXIT_FAILURE, errno, _("cannot run %s"), strip_program); + break; +--- coreutils-8.23/ls.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/ls.c 2014-10-13 08:30:37.196451900 -0700 +@@ -117,6 +117,10 @@ + # include + #endif + ++#if __CYGWIN__ ++# include "cygwin.h" ++#endif ++ + #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \ + : (ls_mode == LS_MULTI_COL \ + ? "dir" : "vdir")) +@@ -747,6 +751,11 @@ static char const *long_time_format[2] = + N_("%b %e %H:%M") + }; + ++#if __CYGWIN__ ++/* Whether .exe should be appended to command-line args as needed. */ ++static bool append_exe; ++#endif /* __CYGWIN__ */ ++ + /* The set of signals that are caught. */ + + static sigset_t caught_signals; +@@ -782,6 +791,9 @@ enum + enum + { + AUTHOR_OPTION = CHAR_MAX + 1, ++#if __CYGWIN__ ++ APPEND_EXE_OPTION, ++#endif /* __CYGWIN__ */ + BLOCK_SIZE_OPTION, + COLOR_OPTION, + DEREFERENCE_COMMAND_LINE_SYMLINK_TO_DIR_OPTION, +@@ -843,6 +855,9 @@ static struct option const long_options[ + {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION}, + {"context", no_argument, 0, 'Z'}, + {"author", no_argument, NULL, AUTHOR_OPTION}, ++#if __CYGWIN__ ++ {"append-exe", no_argument, NULL, APPEND_EXE_OPTION}, ++#endif /* __CYGWIN__ */ + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, + {NULL, 0, NULL, 0} +@@ -1954,6 +1969,12 @@ decode_switches (int argc, char **argv) + print_scontext = true; + break; + ++#if __CYGWIN__ ++ case APPEND_EXE_OPTION: ++ append_exe = true; ++ break; ++#endif /* __CYGWIN__ */ ++ + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); +@@ -2924,6 +2945,12 @@ gobble_file (char const *name, enum file + uintmax_t blocks = 0; + struct fileinfo *f; + ++#if __CYGWIN__ ++ char *name_alt = NULL; ++ if (command_line_arg && append_exe && 0 < cygwin_spelling (name)) ++ CYGWIN_APPEND_EXE (name_alt, name); ++#endif /* __CYGWIN__ */ ++ + /* An inode value prior to gobble_file necessarily came from readdir, + which is not used for command line arguments. */ + assert (! command_line_arg || inode == NOT_AN_INODE_NUMBER); +@@ -3035,11 +3062,19 @@ gobble_file (char const *name, enum file + file_failure (command_line_arg, + _("cannot access %s"), absolute_name); + if (command_line_arg) +- return 0; ++ { ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ ++ return 0; ++ } + + f->name = xstrdup (name); + cwd_n_used++; + ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return 0; + } + +@@ -3223,6 +3258,9 @@ gobble_file (char const *name, enum file + f->name = xstrdup (name); + cwd_n_used++; + ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return blocks; + } + +@@ -4923,6 +4961,11 @@ Sort entries alphabetically if none of - + -Z, --context print any security context of each file\n\ + -1 list one file per line\n\ + "), stdout); ++#if __CYGWIN__ ++ fputs (_("\ ++ --append-exe append .exe if cygwin magic was needed\n\ ++"), stdout); ++#endif /* __CYGWIN__ */ + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); + emit_size_note (); +--- coreutils-8.23/md5sum.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/md5sum.c 2014-10-13 08:30:37.212072800 -0700 +@@ -813,6 +813,9 @@ main (int argc, char **argv) + if (optind == argc) + argv[argc++] = bad_cast ("-"); + ++ if (O_BINARY) ++ xfreopen (NULL, "wb", stdout); ++ + for (; optind < argc; ++optind) + { + char *file = argv[optind]; +--- coreutils-8.23/mv.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/mv.c 2014-10-13 08:30:37.212072800 -0700 +@@ -92,7 +92,7 @@ rm_option_init (struct rm_options *x) + x->require_restore_cwd = true; + + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + x->root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (x->root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +@@ -467,6 +467,16 @@ main (int argc, char **argv) + else if (!target_directory) + { + assert (2 <= n_files); ++#if __CYGWIN__ ++ struct stat s1, s2; ++ if (2 == n_files ++ && lstat (file[0], &s1) == 0 && lstat (file[1], &s2) == 0 ++ && s1.st_ino == s2.st_ino) ++ { ++ /* Allow 'mv foo Foo' to change case of the directory foo. */ ++ } ++ else ++#endif /* __CYGWIN__ */ + if (target_directory_operand (file[n_files - 1])) + target_directory = file[--n_files]; + else if (2 < n_files) +--- coreutils-8.23/pwd.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/pwd.c 2014-10-13 08:30:37.212072800 -0700 +@@ -268,8 +268,8 @@ static void + robust_getcwd (struct file_name *file_name) + { + size_t height = 1; +- struct dev_ino dev_ino_buf; +- struct dev_ino *root_dev_ino = get_root_dev_ino (&dev_ino_buf); ++ struct root_dev_ino dev_ino_buf; ++ struct root_dev_ino *root_dev_ino = get_root_dev_ino (&dev_ino_buf); + struct stat dot_sb; + + if (root_dev_ino == NULL) +@@ -282,7 +282,7 @@ robust_getcwd (struct file_name *file_na + while (1) + { + /* If we've reached the root, we're done. */ +- if (SAME_INODE (dot_sb, *root_dev_ino)) ++ if (ROOT_DEV_INO_CHECK (root_dev_ino, &dot_sb)) + break; + + find_dir_entry (&dot_sb, file_name, height++); +@@ -291,6 +291,9 @@ robust_getcwd (struct file_name *file_na + /* See if a leading slash is needed; file_name_prepend adds one. */ + if (file_name->start[0] == '\0') + file_name_prepend (file_name, "", 0); ++ /* If we aren't in `/', we must be in `//'. */ ++ if (! SAME_INODE (root_dev_ino->single_slash, dot_sb)) ++ file_name_prepend (file_name, "", 0); + } + + +--- coreutils-8.23/remove.h 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/remove.h 2014-10-13 08:30:37.212072800 -0700 +@@ -54,7 +54,7 @@ struct rm_options + + /* Pointer to the device and inode numbers of '/', when --recursive + and preserving '/'. Otherwise NULL. */ +- struct dev_ino *root_dev_ino; ++ struct root_dev_ino *root_dev_ino; + + /* If nonzero, stdin is a tty. */ + bool stdin_tty; +--- coreutils-8.23/rm.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/rm.c 2014-10-13 08:30:37.212072800 -0700 +@@ -325,7 +325,7 @@ main (int argc, char **argv) + + if (x.recursive && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + x.root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (x.root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/stat.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/stat.c 2014-10-13 08:30:37.212072800 -0700 +@@ -73,6 +73,13 @@ + #include "find-mount-point.h" + #include "xvasprintf.h" + ++#if __CYGWIN__ ++# include "cygwin.h" ++/* Whether .exe should be appended to command-line args as needed. */ ++static bool append_exe; ++# define APPEND_EXE_OPTION 10000 ++#endif ++ + #if USE_STATVFS + # define STRUCT_STATVFS struct statvfs + # define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATVFS_F_FSID_IS_INTEGER +@@ -189,6 +196,9 @@ static struct option const long_options[ + {"format", required_argument, NULL, 'c'}, + {"printf", required_argument, NULL, PRINTF_OPTION}, + {"terse", no_argument, NULL, 't'}, ++#if __CYGWIN__ ++ {"append-exe", no_argument, NULL, APPEND_EXE_OPTION}, ++#endif /* __CYGWIN__ */ + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, + {NULL, 0, NULL, 0} +@@ -1264,14 +1274,26 @@ do_statfs (char const *filename, char co + return false; + } + ++#if __CYGWIN__ ++ char *name_alt = NULL; ++ if (append_exe && 0 < cygwin_spelling (filename)) ++ CYGWIN_APPEND_EXE (name_alt, filename); ++#endif /* __CYGWIN__ */ ++ + if (STATFS (filename, &statfsbuf) != 0) + { + error (0, errno, _("cannot read file system information for %s"), + quote (filename)); ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return false; + } + + bool fail = print_it (format, -1, filename, print_statfs, &statfsbuf); ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return ! fail; + } + +@@ -1282,6 +1304,7 @@ do_stat (char const *filename, char cons + { + int fd = STREQ (filename, "-") ? 0 : -1; + struct stat statbuf; ++ char *name_alt = NULL; + + if (0 <= fd) + { +@@ -1294,18 +1317,29 @@ do_stat (char const *filename, char cons + /* We can't use the shorter + (follow_links?stat:lstat) (filename, &statbug) + since stat might be a function-like macro. */ +- else if ((follow_links +- ? stat (filename, &statbuf) +- : lstat (filename, &statbuf)) != 0) ++ else + { +- error (0, errno, _("cannot stat %s"), quote (filename)); +- return false; ++ if ((follow_links ++ ? stat (filename, &statbuf) ++ : lstat (filename, &statbuf)) != 0) ++ { ++ error (0, errno, _("cannot stat %s"), quote (filename)); ++ return false; ++ } ++ ++#if __CYGWIN__ ++ if (append_exe && 0 < cygwin_spelling (filename)) ++ CYGWIN_APPEND_EXE (name_alt, filename); ++#endif /* __CYGWIN__ */ + } + + if (S_ISBLK (statbuf.st_mode) || S_ISCHR (statbuf.st_mode)) + format = format2; + + bool fail = print_it (format, fd, filename, print_stat, &statbuf); ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return ! fail; + } + +@@ -1427,6 +1461,11 @@ Display file or file system status.\n\ + if you want a newline, include \\n in FORMAT\n\ + -t, --terse print the information in terse form\n\ + "), stdout); ++#if __CYGWIN__ ++ fputs (_("\ ++ --append-exe append .exe if cygwin magic was needed\n\ ++"), stdout); ++#endif /* __CYGWIN__ */ + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); + +@@ -1547,6 +1586,12 @@ main (int argc, char *argv[]) + terse = true; + break; + ++#if __CYGWIN__ ++ case APPEND_EXE_OPTION: ++ append_exe = true; ++ break; ++#endif /* __CYGWIN__ */ ++ + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1dc5bfaccfb..f8dda538fd7 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, perl, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null +, autoconf, automake114x }: assert aclSupport -> acl != null; @@ -18,6 +19,8 @@ let sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc"; }; + patches = if stdenv.isCygwin then [ ./coreutils-8.23-4.cygwin.patch ] else null; + # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh @@ -26,6 +29,7 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl + ++ optionals stdenv.isCygwin [ autoconf automake114x ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index a6e383df91a..f8925d26bea 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -3,11 +3,11 @@ , perlPackages }: stdenv.mkDerivation rec { - version = "2.15.3"; + version = "2.15.4"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "f589e2e02c5e9a46a77b2516155631ac3ddfd8a39bcfc16c920862583850bc7d"; + sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile FileDesktopEntry libxslt python3 setuptools makeWrapper @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile* sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile* + + # Completion currently spams every shell startup with an error. Disable for now: + sed "/\/bash_completion\.d/d" -i scripts/Makefile ''; postInstall = '' sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/* diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 3b14e46d0d3..9b6c35f41a4 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -14,8 +14,8 @@ let }; patches = [ (fetchurl { - url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-89.diff.gz"; - sha256 = "1zbifw2jkq6471fb67y893nq4lq009xbfbi57jbjwxnhqmrppcy9"; + url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz"; + sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw"; }) ]; # TODO install man @@ -32,13 +32,13 @@ in stdenv.mkDerivation { - name = "debootstrap-1.0.66"; + name = "debootstrap-1.0.67"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) - url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.66.tar.gz; - sha256 = "15gh6pvk7f0fib8ggz2zx53pg2jzqk4x0s8ihkpqxqdf4rlns91k"; + url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.67.tar.gz; + sha256 = "06x5zw6fskw37qh62hvqx006319l4wgnnw8sf53ms67zpfif04ha"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index d6ad7f1d26b..71b4ec338df 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; + buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null; + installPhase = '' mkdir -p $out/bin cp ent $out/bin/ diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index f34ce44633f..aa1fa8f3c6c 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchgit, pandoc } : +{ stdenv, fetchgit } : let - rev = "287af2b80e0829b08dc6329b4fe8d8e5594d64b0"; + rev = "61ce53be996189e1c325916e45a7dc0aa89660e3"; in stdenv.mkDerivation { - name = "fasd-1.0.1"; + name = "fasd-git-2015-03-29"; src = fetchgit { url = "https://github.com/clvv/fasd.git"; inherit rev; - sha256 = "0kv9iyfdf916x0gab9fzs4vmsnkaqmb6kh4xna485nqij89xzkgs"; + sha256 = "1fd36ff065ae73de2d6b1bae2131c18c8c4dea98ca63d96b0396e8b291072b5e"; }; - # seems to be needed non-deterministically (timestamps?) - nativeBuildInputs = [ pandoc ]; - installPhase = '' PREFIX=$out make install ''; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index eb8c026ab0f..188b573efec 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { configureFlags = [ "gl_cv_func_wcwidth_works=yes" ]; }; + preConfigure = if stdenv.isCygwin then '' + sed -i gnulib/lib/fpending.h -e '/include /d' + '' else null; + meta = { homepage = http://www.gnu.org/software/findutils/; description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index cfc1e9ab564..800e1c6f67a 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -13,7 +13,7 @@ bundlerEnv { meta = with lib; { description = "A data collector"; homepage = http://www.fluentd.org/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index e5c814faa4a..dd2798de272 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { while preserving the partition contents. ''; homepage = http://gparted.sourceforge.net; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 501c6820df2..e33290e9852 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -20,7 +20,7 @@ let canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.02-git-2015-04-24"; + version = "2.02-git-2015-05-14"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromSavannah { repo = "grub"; - rev = "70b002de55abbfd6b2d2f2ea4408078d93c9e0de"; - sha256 = "1bhm1yxjmckzn45v70lzmz0qpj5prhb4iyiyqqw8rvyykcixw5qk"; + rev = "5370dcfdae66b60cff3507ad925300a679fe4117"; + sha256 = "1v4a3shcgfxjifwddmn3d0lyg3db1d3k87x5nchy7cyiss55jx1s"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index 37655020062..8adea97ff14 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { - name = "gummiboot-45"; + name = "gummiboot-48"; buildInputs = [ gnu-efi pkgconfig libxslt utillinux ]; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-45.tar.xz/5d4957390e959cb9f325b87712ddd3f1/gummiboot-45.tar.xz; - sha256 = "15227d6abi90vg7rs234fm13af511nsd6dv87c3jvsjhgb9ib0hm"; + url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-48.tar.xz/05ef3951e8322b76c31f2fd14efdc185/gummiboot-48.tar.xz; + sha256 = "1bzygyglgglhb3aj77w2qcb0dz9sxgb7lq5krxf6417431h198rg"; }; meta = { diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 1ed6be071a5..0892061a50d 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, procps, gnugrep, gawk, findutils, gnused }: +, perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { name = "keychain-${version}"; @@ -12,15 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp"; }; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; + buildInputs = [ makeWrapper perl ]; - buildInputs = [ makeWrapper ]; - - patchPhase = "sed -i -e 's,version=.*,version=\"${version}\",g' keychain.sh"; - - buildPhase = '' - mkdir -p $out/bin - cp keychain.sh $out/bin/keychain + installPhase = '' + mkdir -p $out/{bin,share/man/man1} + cp keychain $out/bin/keychain + cp keychain.1 $out/share/man/man1 wrapProgram $out/bin/keychain \ --prefix PATH ":" "${coreutils}/bin" \ --prefix PATH ":" "${openssh}/bin" \ diff --git a/pkgs/tools/misc/lolcat/Gemfile b/pkgs/tools/misc/lolcat/Gemfile new file mode 100644 index 00000000000..63f6c6633b3 --- /dev/null +++ b/pkgs/tools/misc/lolcat/Gemfile @@ -0,0 +1,2 @@ +source "http://rubygems.org" +gem "lolcat" \ No newline at end of file diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock new file mode 100644 index 00000000000..4b318ea1473 --- /dev/null +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -0,0 +1,14 @@ +GEM + remote: http://rubygems.org/ + specs: + lolcat (42.1.0) + paint (~> 0.8.3) + trollop (~> 1.16.2) + paint (0.8.7) + trollop (1.16.2) + +PLATFORMS + ruby + +DEPENDENCIES + lolcat diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix new file mode 100644 index 00000000000..21355652d3e --- /dev/null +++ b/pkgs/tools/misc/lolcat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian +, pkgconfig, which }: + +bundlerEnv { + name = "lolcat-42.1.0"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A rainbow version of cat"; + homepage = https://github.com/busyloop/lolcat; + license = licenses.wtfpl; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix new file mode 100644 index 00000000000..85acf7767a8 --- /dev/null +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -0,0 +1,27 @@ +{ + "lolcat" = { + version = "42.1.0"; + source = { + type = "gem"; + sha256 = "1jp0g7k958dg709dm1qs7nr8dmi4vlgvmcvqcr1zhk8ygx89rwgc"; + }; + dependencies = [ + "paint" + "trollop" + ]; + }; + "paint" = { + version = "0.8.7"; + source = { + type = "gem"; + sha256 = "0nl1x0190d44bfczlxdy16gxsvm95y14kxv3k9n92h9ap2zvdyd8"; + }; + }; + "trollop" = { + version = "1.16.2"; + source = { + type = "gem"; + sha256 = "0frrp90dw266h3kf9g925dppir9l7p8jxknw6dn5nz6fa6c4g5lg"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index e6e7eb505bf..2d2d4e4a741 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.01b"; src = fetchurl { - url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz"; sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Use Debian patched version, as upstream is no longer maintained and it # contains a _lot_ of fixes. (fetchurl { - url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}-15.diff.gz"; + url = "mirror://debian/pool/main/m/mmv/mmv_${version}-15.diff.gz"; sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13"; }) ]; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix new file mode 100644 index 00000000000..81e05a8790e --- /dev/null +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -0,0 +1,39 @@ +{ lib, goPackages, fetchurl, callPackage }: + +with goPackages; + +buildGoPackage rec { + version = "r3.1.2"; + name = "mongodb-tools"; + goPackagePath = "github.com/mongodb/mongo-tools"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/mongodb/mongo-tools/archive/${version}.tar.gz"; + sha256 = "1dag8ar95jlfk6rm99y4p3dymcy2s2qnwd9jwqhw9fxr110mgf5s"; + }; + + buildInputs = [ gopass go-flags crypto mgo openssl spacelog + oglematchers goconvey tomb ]; + + subPackages = [ "bsondump/main" "mongostat/main" "mongofiles/main" + "mongoexport/main" "mongoimport/main" "mongorestore/main" + "mongodump/main" "mongotop/main" "mongooplog/main" ]; + + buildPhase = '' + for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do + echo Building $i + go build -o go/bin/$i go/src/${goPackagePath}/$i/main/$i.go + done + ''; + + dontInstallSrc = true; + + meta = with lib; { + description = "Tools for MongoDB"; + homepage = https://github.com/mongodb/mongo-tools; + license = licenses.asl20; + maintainers = with maintainers; [ mschristiansen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index ff751eb40da..6ea9d71bddc 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0rqc5wpqcbfqpcwxgh3jxwa0yw2py0hv0acpsf0a9g6v9144m6gm"; + sha256 = "0yxv87hpal05p6nii6rlnai5a8958689l9vz020w4qvlwiragbnh"; }; buildInputs = [ ncurses ]; - meta = { + meta = with stdenv.lib; { description = "Ncurses disk usage analyzer"; homepage = http://dev.yorhel.nl/ncdu; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 6f9695ba363..2a91f02ca09 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,11 +1,11 @@ { stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }: with stdenv.lib; stdenv.mkDerivation rec { - name = "opentsdb-2.1.0-rc1"; + name = "opentsdb-2.1.0"; src = fetchurl { - url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0RC1/opentsdb-2.1.0RC1.tar.gz; - sha256 = "1vvhzdl2wgbzy2lvlyx40pks47ma6szs9ka4dwjf123xyixv0rmz"; + url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0/opentsdb-2.1.0.tar.gz; + sha256 = "0msijwzdwisqmdd8ikmrzbcqvrnb6ywz6zyd1vg0s5s4syi3cvmp"; }; buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 27d5e624589..c78bf748296 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20150322"; + name = "parallel-20150522"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1zsj1bd4zbwb4n9i0jgzs7vd5wkyg3xvj6s1q6s5fyn0pff7j01c"; + sha256 = "01pkckrad3d2i7mkw98zxymp22rsngyjknhh18i4m6hq82bijjjc"; }; patchPhase = @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shell tool for executing jobs in parallel"; - longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job is typically a single command or a small script that has to be run @@ -40,11 +39,8 @@ stdenv.mkDerivation rec { it possible to use output from GNU Parallel as input for other programs. ''; - homepage = http://www.gnu.org/software/parallel/; - license = licenses.gpl3Plus; - platforms = platforms.all; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index a3a34d95fb5..663c60d2856 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { experience just a little bit nicer. ''; homepage = http://qjoypad.sourceforge.net; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index efdc21ad9b7..5dde592aade 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, file +, protobufc }: stdenv.mkDerivation rec { name = "riemann-c-client-${version}"; - version = "1.2.1"; + version = "1.7.0"; - src = fetchurl { - url = "https://github.com/algernon/riemann-c-client/archive/${name}.tar.gz"; - sha256 = "132yd1m523inmv17sd48xf7xdqb7jj36v7is1xw7w9nny6qxkzwm"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "riemann-c-client"; + rev = "54f4a656793d6c5ca0bf1ff2388693fb6b2b82a7"; + sha256 = "0jc2bbw7sp2gr4cswx78srs0p1kp81prcarq4ivqpfw4bmzg6xg4"; }; buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -i"; meta = with stdenv.lib; { - homepage = "https://github.com/algernon/riemann-c-client"; + homepage = https://github.com/algernon/riemann-c-client; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 53c1b0de24e..1688c2d329f 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff }: stdenv.mkDerivation rec { - name = "rrdtool-1.4.9"; + name = "rrdtool-1.5.3"; src = fetchurl { url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "1k1506v86nijd9vdljib93z4hrwj786kqnx37lqqbbqasvh2ca1y"; + sha256 = "17qjqq7k50xfahza1gkcfchzss2jjmgr422dzs4kx13lrzsv5rvr"; }; buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index a30f0277ec0..d84d00e2ba2 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, makeWrapper, python, perl, zip +{ stdenv, fetchFromGitHub, makeWrapper, python, perl, zip , rtmpdump, nose, mock, pycrypto, substituteAll }: stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.10.2015.03.25"; + version = "0.10.2015.05.24"; - src = fetchurl { - url = "https://github.com/spaam/svtplay-dl/archive/${version}.tar.gz"; - sha256 = "0j0fg3qrldpaf880v488rr2snw6ghpdln4l9mbvmi70rjzzxv4ap"; + src = fetchFromGitHub { + owner = "spaam"; + repo = "svtplay-dl"; + rev = version; + sha256 = "0dzd5n4zvrplvm3sx017ym7jlngp4pn8nra9qx9n4wq6h4c6n6a5"; }; pythonPaths = [ pycrypto ]; diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index fd64f6694ee..ad9e0949ce8 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -11,7 +11,7 @@ bundlerEnv { meta = with lib; { description = "A command-line power tool for Twitter"; homepage = http://sferik.github.io/t/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 96610c32167..f5ac891d8e6 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -11,7 +11,7 @@ bundlerEnv { meta = with lib; { description = "Manage complex tmux sessions easily"; homepage = https://github.com/tmuxinator/tmuxinator; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ auntie ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix new file mode 100644 index 00000000000..1c90bb842d6 --- /dev/null +++ b/pkgs/tools/misc/ttylog/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "ttylog-0.25"; + + src = fetchurl { + url = "mirror://sourceforge/ttylog/${name}.tar.gz"; + sha256 = "0546mj5gcxi7idvfw82p8qw27lk7wsk6j4b6zw7nb6z2wi517l40"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "http://ttylog.sourceforg.net"; + description = "a serial port logger which can be used to print everything to stdout that comes from a serial device"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix deleted file mode 100644 index 3c7aa5261a2..00000000000 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }: - -let - - sources = - [ (fetchurl { - name = "jigsaw_2.2.6.tar.gz"; - url="http://jigsaw.w3.org/Distrib/jigsaw_2.2.6.tar.gz"; - sha256 = "01cjpqjcs8gbvvzy0f488cb552f9b38hvwr97wydglrzndmcwypd"; - }) - (fetchurl { - name = "commons-collectionurl3.2.1-bin.tar.gz"; - url="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz"; - sha256 = "7843f8307495b2be446353b10c25218793b776fa3e22615a1f50f067d81713ce"; - }) - (fetchurl { - name = "commons-lang-2.4-bin.tar.gz"; - url="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.4-bin.tar.gz"; - sha256 = "0phwlgnvwj3n3j1aka2pkm0biacvgs72qc0ldir6s69i9qbv7rh0"; - }) - (fetchurl { - name = "velocity-1.6.1.tar.gz"; - url="http://www.apache.org/dist/velocity/engine/1.6.1/velocity-1.6.1.tar.gz"; - sha256 = "125s8yp8whx947kahm902wc49ms44knxdj6yfskhpk0a8h0rz9jm"; - }) - (fetchurl { - name = "Xerces-J-bin.2.9.1.tar.gz"; - url="http://www.apache.org/dist/xerces/j/Xerces-J-bin.2.9.1.tar.gz"; - sha256 = "1xlrrznfgdars0a9m9z5k9q8arbqskdfdfjx4s0pp52wn3r0gbns"; - }) - ]; - -in - -stdenv.mkDerivation { - name = "w3c-css-validator"; - - # REGION AUTO UPDATE: { name="w3c-css-validator"; type="cvs"; cvsRoot=":pserver:anonymous:anonymous@dev.w3.org:/sources/public"; module="2002/css-validator"; } - src = sourceFromHead "w3c-css-validator-F_17-52-37.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/w3c-css-validator-F_17-52-37.tar.gz"; sha256 = "b6f05d4812eaa464906d101242689effa8b5516d32d6420315740a77d8ee11fd"; }); - # END - - buildInputs = [ apacheAnt ]; - - # prepare target downloads dependency .tar.gz into tmp - # note: There is a .war as well which could be deployed to tomcat - installPhase = '' - cd css-validator - mkdir tmp - ${ stdenv.lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) } - sed -i -e 's@@@' \ - -e '/dest="tmp\//d' \ - -e '/untar/d' \ - build.xml - ant - mkdir -p $out/{bin,lib} - JAR=$out/lib/css-validator.jar - cat >> $out/bin/css-validator << EOF - #!/bin/sh - exec ${jre}/bin/java -jar $JAR "\$@" - EOF - chmod +x $out/bin/css-validator - cp css-validator.jar $out/lib - cp -r lib $out/lib/lib - ''; - - meta = { - description = "W3C CSS validator"; - homepage = http://dev.w3.org/cvsweb/2002/css-validator/; - # dependencies ship their own license files - # I think all .java files are covered by this license (?) - license = stdenv.lib.licenses.w3c; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 60d31fec8c3..1a513cdaece 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: -with stdenv.lib; stdenv.mkDerivation rec { name = "youtube-dl-${version}"; - version = "2015.04.03"; + version = "2015.05.29"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0ndzswv6vq5ld5p1ny23sh76cx6acf8yli9gi9r21dm94ida2885"; + sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; }; - buildInputs = [ python makeWrapper zip pandoc ]; + nativeBuildInputs = [ pandoc ]; + + buildInputs = [ python makeWrapper zip ]; patchPhase = '' rm youtube-dl @@ -20,12 +21,12 @@ stdenv.mkDerivation rec { makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) ''; + # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. postInstall = '' - # ffmpeg is used for post-processing and fixups wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin" ''; - meta = { + meta = with stdenv.lib; { homepage = "http://rg3.github.com/youtube-dl/"; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index efd04e33d7f..df972a4287b 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.18.10"; + version = "1.19.0"; src = fetchurl { - url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "1vvc3pv1100xb4293bmgqpxvy3pdvivnz415b9q78n7190kag3a5"; + url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.xz"; + sha256 = "0xm4fmap9gp2pz6z01mnnpmazw6pnhzs8qc58181m5ai4gy5ksp2"; }; buildInputs = [ pkgconfig c-ares openssl libxml2 sqlite zlib ]; propagatedBuildInputs = [ cacert ]; - configureFlags = [ "--with-ca-bundle=${cacert}/etc/ca-bundle.crt" ]; + configureFlags = [ "--with-ca-bundle=${cacert}/ca-bundle.crt" ]; meta = with stdenv.lib; { homepage = http://aria2.sourceforge.net/; diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 930d9f4968b..eda7f716876 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }: assert stdenv.isLinux; -assert stdenv.cc.cc.isGNU or false; +assert stdenv.cc.isGNU; let version = "0.7"; debianPatch = fetchurl { @@ -9,7 +9,7 @@ debianPatch = fetchurl { }; in stdenv.mkDerivation { - name = "atftp"; + name = "atftp-${version}"; inherit version; src = fetchurl { url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 62dea1e6cd4..6fa0c20b0ac 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -7,9 +7,12 @@ stdenv.mkDerivation rec { url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1"; }; - + buildInputs = [ ncurses ]; + # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline + NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=gnu89" else null; + meta = with stdenv.lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix index 62be5bf14e5..280d3d9f9fc 100644 --- a/pkgs/tools/networking/connmanui/default.nix +++ b/pkgs/tools/networking/connmanui/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: -stdenv.mkDerivation { - name = "connmanui-b838e640eddb83d296fb6d146ce756066d37c43b"; +stdenv.mkDerivation rec { + name = "connmanui-${version}"; + version = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2"; + src = fetchgit { url = "git://github.com/tbursztyka/connman-ui.git"; - rev = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2"; + rev = version; sha256 = "0rml52v81s7hr0g6qbj5bamli08kn66hay84qicx8sy8679wg443"; }; diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 2b13437d95c..4e533878ec1 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://curl.haxx.se/"; description = "A command line tool for transferring files with URL syntax"; - platforms = stdenv.lib.platforms.all; + platforms = with stdenv.lib.platforms; allBut darwin; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index ad2c9ec6897..8a101e9845a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -8,19 +8,12 @@ , suffix ? "" }: +with stdenv; +with stdenv.lib; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - isLight = suffix == "light"; isFull = suffix == "full"; - nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}"; + nameSuffix = optionalString (suffix != "") "-${suffix}"; # Normal Depedencies optZlib = if isLight then null else shouldUsePkg zlib; @@ -35,7 +28,6 @@ let optOpenldap = if !isFull then null else shouldUsePkg openldap; optLibidn = if !isFull then null else shouldUsePkg libidn; in -with stdenv.lib; stdenv.mkDerivation rec { name = "curl${nameSuffix}-${version}"; version = "7.42.1"; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index af15f6a62e5..ca0c5f5edf1 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libpcap, zlib }: stdenv.mkDerivation rec { - version = "3.0.718"; + version = "3.0.719"; name = "darkstat-${version}"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "1zxd4bxdfk1pjpcxhrcp54l991g0lljl4sr312nsd7p8yi9kwbv8"; + sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf"; }; buildInputs = [ libpcap zlib ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { - Supports IPv6. ''; homepage = http://unix4lyfe.org/darkstat; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 4bf321d1ac0..6b3bf4fcedb 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # due to an uninitialized variable. CFLAGS = "-g -O2 -Wall"; - buildInputs = [ perl makeWrapper openldap ]; + buildInputs = [ perl makeWrapper openldap bind ]; configureFlags = [ "--with-libbind=${bind}" diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 95700cb3806..a89d1e3e888 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.8.1"; + name = "dhcpcd-6.9.0"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "10mg68yxvl4kn1ya8ziifg2dm71c10r12sg7y7k1k0vafazhrdi7"; + sha256 = "0s0a29ml9x108lxv5yz55f3l5kvlx4hcbxigfq3hr245yy7aarhm"; }; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index bdd2c4a0c24..11dadf9dcd8 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for securing communications between a client and a DNS resolver"; homepage = http://dnscrypt.org/; - license = with stdenv.lib.licenses; [ isc ]; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ joachifm ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 54f3e860e0c..d0f2ef54669 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij"; }; - buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper]; + buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av + gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper]; postInstall = '' - wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share" - wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share" + wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share" + wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share" ''; } diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index fcb3e903753..c4f7c8da9d4 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { allowed. ''; homepage = http://code.gerade.org/hans/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 7e4d5fbe5f0..0d9ac7f6475 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, gnutls }: +{ stdenv, fetchFromGitHub, gnutls33, autoreconfHook }: let - ver = "1.99.10"; + version = "1.99.13"; in stdenv.mkDerivation { - name = "inadyn-${ver}"; + name = "inadyn-${version}"; - src = fetchurl { - url = "https://github.com/troglobit/inadyn/archive/${ver}.tar.gz"; - sha256 = "0m3qnnq99siwf1ybcvbzdawk68lxf61vd13fw1f2ssl2m07hfxg3"; + src = fetchFromGitHub { + repo = "inadyn"; + owner = "troglobit"; + rev = version; + sha256 = "19z8si66b2kwb7y29qpd8y45rhg5wrycwkdgjqqp98sg5yq8p7v0"; }; preConfigure = '' export makeFlags=prefix=$out ''; - buildInputs = [ gnutls ]; + buildInputs = [ gnutls33 autoreconfHook ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index a4bde029ca0..251462ecc27 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,23 +1,17 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "inetutils-1.9.2"; + name = "inetutils-1.9.3"; src = fetchurl { url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4"; + sha256 = "06dshajjpyi9sxi7qfki9gnp5r3nxvyvf81r81gx0x2qkqzqcxlj"; }; buildInputs = [ ncurses /* for `talk' */ ]; configureFlags = "--with-ncurses-include-dir=${ncurses}/include"; - preConfigure = '' - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in inetutils is updated. - sed -i '/gets is a security hole/d' lib/stdio.in.h - ''; - # Test fails with "UNIX socket name too long", probably because our # $TMPDIR is too long. #doCheck = true; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 9b676c6b72e..f1abec0faf7 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Now only one utiltity is needed to do a lot. ''; homepage = http://www.deepspace6.net/projects/ipv6calc.html; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 47efe53c0a9..5d05677bb29 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl pkgconfig db cyrus_sasl ]; - meta = { + meta = with stdenv.lib; { homepage = http://isync.sourceforge.net/; description = "Free IMAP and MailDir mailbox synchronizer"; - license = [ "GPLv2+" ]; + license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ the-kenny viric ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ the-kenny viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index 991d75c66ae..fad99bbd7d7 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot - meta = { + meta = with stdenv.lib; { homepage = http://www.courier-mta.org/maildrop/; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; - license = [ "GPLv3" ]; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 0b57a752a37..cbca408f084 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Tests fail since gcc 4.8 doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Rich and powerful protocol-independent mail framework"; longDescription = '' @@ -46,13 +46,16 @@ stdenv.mkDerivation rec { message handling system. ''; - license = [ "LGPLv3+" /* libraries */ "GPLv3+" /* tools */ ]; + license = with licenses; [ + lgpl3Plus /* libraries */ + gpl3Plus /* tools */ + ]; maintainers = [ ]; homepage = http://www.gnu.org/software/mailutils/; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = stdenv.lib.platforms.gnu; + platforms = platforms.gnu; }; } diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 3cd35073be6..22f833f9bdb 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniupnpc-1.7"; + name = "miniupnpc-1.9.20150430"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0dv3mz4yikngmlnrnmh747mlgbbpijryw03wcs8g4jwvprb29p8n"; + sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn"; + name = "${name}.tar.gz"; }; installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; @@ -19,5 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index ef3db0a4a21..11262460e71 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,12 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-1.8.20140401"; + name = "miniupnpd-1.9.20150430"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1gfdbfqcw6ih830si51yzqbyymgcbwkiv9vk5dwnxs78b7xgyv88"; + sha256 = "0ajqs3lf2cgq5fm1v79fa23sbb623i89sqnx7d9cnqbqq5py1k71"; + name = "miniupnpd-1.9.20150430.tar.gz"; }; buildInputs = [ iptables libnfnetlink ]; @@ -27,5 +28,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b16aa46cc75..d0011c66766 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.10"; + name = "nbd-3.11"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1kj772zv6s3rjmvr0gi3yhagzlq2nmv5n5gfhrjphv5bcxx3mibg"; + sha256 = "187jwc43dhxbv9rrszimm3bvwr1hcpyixv82jfd61p0nrds0yhhl"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 967504a0004..44c8bb45b72 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9"; in +let version = "0.5.9-5-g107456c"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "9118e9e8673eb88ebf4f7af33d8ed9856f3ed554"; - sha256 = "0zxwkpaad0mjgkhgnii4bj8sfji3inqqf1zqbv7807nk34bqr6qp"; + rev = "107456c646ab38e5ccb6ee788389faced59c16ff"; + sha256 = "0i0b2595x4cprf9d4crwjn3qvswz2qxr905zpcwxa3qan6hrmnsp"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl @@ -51,7 +51,7 @@ stdenv.mkDerivation { development and analysis, debugging, auditing or network reconnaissance. ''; homepage = http://netsniff-ng.org/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 1ea61b0fea2..51eda2f25fd 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "0liia390bhkl09lvk2rplcwhmfbxpjffa1xszfawc0h00v9fivaz"; + sha256 = "1afri2zln5p59660hqzbwm2r8phx9inrm2bgp5scynzs8ddzh2kn"; }; + configureFlags = [ "--sysconfdir=/etc" ]; + buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib gsettings_desktop_schemas polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring @@ -30,6 +32,11 @@ stdenv.mkDerivation rec { ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; + preInstall = + '' + installFlagsArray=( "sysconfdir=$out/etc" ) + ''; + preFixup = '' wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 899577c6d19..51812ff95b7 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline -, gobjectIntrospection, modemmanager, openresolv, libndp, newt }: +, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz"; - sha256 = "0isrv1875whysnrf3fd1cz96xwd54nvj1rijk3fmx5qccznayris"; + sha256 = "1zq8jm1rc7n7amqa9xz1v93w2jnczg6942gyijsdpgllfiq8b4rm"; }; preConfigure = '' @@ -40,10 +40,11 @@ stdenv.mkDerivation rec { "--with-session-tracking=systemd" "--with-modem-manager-1" "--with-nmtui" + "--with-libsoup=yes" ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp - xz bluez5 gobjectIntrospection modemmanager readline newt ]; + xz bluez5 gobjectIntrospection modemmanager readline newt libsoup ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index a104f321c12..f415b4f3bed 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; + homepage = https://github.com/seriyps/NetworkManager-l2tp; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 79e12244732..9416923c9e1 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "0przs8hzvb6wrf4gc0p9063x67qp9503396aknqq5f79xzw25wq6"; + sha256 = "03k05s3aaxcwrip3g3r13bx80wbg7vh5sssc7mvg27c4cdc0a2hj"; }; buildInputs = [ openconnect networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index e48f4f32bf1..d4e1b50489c 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "1w0v3xah0wg467jy0fd3188zla8q4l1iq0zdy28bcdipin693bfh"; + sha256 = "1c2b74xhkjifc3g6n53gr2aj4s98qf0vydmqvbhl5azxqx5q4hqn"; }; buildInputs = [ openvpn networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index 78293504533..1dfce02981a 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "0xpflw6vp1ahvpz7mnnldqvk455wz2j7dahd9lxqs95frmjmq390"; + sha256 = "05r06f7f990z908jjnmmryrlshy28wcx7fbvnslmx9nicih7rjrp"; }; buildInputs = [ networkmanager pptp ppp libsecret ] diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 8e2bb2bbfc3..1435e5ebf7c 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "154q6lcy99h00kyivjhsv21a2i4cw4ff35cbvh062bfd68wl3l2y"; + sha256 = "0055vshgnva969vb91k8zpdan34r9gy0ck3q3b9b616k0p2vy5ry"; }; buildInputs = [ vpnc networkmanager libsecret ] diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index a63ec2a3d68..150f60f8de4 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { wrapProgram $out/sbin/nslcd --prefix LD_LIBRARY_PATH ":" $out/lib ''; - meta = { + meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; homepage = http://arthurdejong.org/nss-pam-ldapd/; - license = [ "GPLv21" ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 13bd3a87845..8d47ab1e167 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2 -, gnutls, libgcrypt }: +, gnutls, libgcrypt, zlib }: stdenv.mkDerivation rec { - name = "nzbget-14.2"; + name = "nzbget-15.0"; src = fetchurl { url = "mirror://sourceforge/nzbget/${name}.tar.gz"; - sha256 = "0xs620hjxi9fkab6bmgy7zhwd0h035jpabf0wp2nc5y0gnsay95v"; + sha256 = "02nclq97gqr4zwww4j1l9sds2rwrwwvwvh2gkjhwvr0pb4z3zw9y"; }; - buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ]; + buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls + libgcrypt zlib ]; enableParallelBuilding = true; - NIX_LDFLAGS = "-lz"; - meta = with stdenv.lib; { homepage = http://nzbget.sourceforge.net/; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 2a100fd2873..298e2251368 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,13 +1,13 @@ { pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { - version = "6.5.6"; + version = "6.5.7"; name = "offlineimap-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"; - sha256 = "1hr8yxb6r8lmdzzly4hafa1l1z9pfx14rsgc8qiy2zxfpg6ijcn2"; + sha256 = "18whwc4f8nk8gi3mjw9153c9cvwd3i9i7njmpdbhcplrv33m5pmp"; }; doCheck = false; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index ee5241bfcad..4b9f868bf1b 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "openresolv-3.5.7"; + name = "openresolv-3.7.0"; src = fetchurl { url = "mirror://roy/openresolv/${name}.tar.bz2"; - sha256 = "14n51wqnh49zdvx11l79s3fh1jhg7kg9cfny5vk7zsix78spmyx7"; + sha256 = "1pimiipic4m90f832rgw3ayqrh457qfymcpfpj9iidb5c4phnz4b"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 3afa17b0a82..d6f67d065d9 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index cce44325316..e2e0880114f 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ssmtp-2.64"; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; + url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; }; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 231d7e293b8..4edfdf6af1e 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.7.3"; + name = "tcpdump-4.7.4"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1kla3l7lja8cfwimp512x7z176x2dsy03ih6g8gd95p95ijzp1qz"; + sha256 = "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 7fc993338f7..2eb003bacb0 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pre-2015-03-14"; + name = "tinc-1.1pre-2015-05-15"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "6568cffd52d4803effaf52a9bb9c98d69cf7922a"; - sha256 = "1nh0yjv6gf8p5in67kdq68xlai69f34ks0j610i8d8nw2mfm9x4a"; + rev = "613c121cdceec0199dc4d056857be021ed1d21de"; + sha256 = "1l99bvqmb35hwb63fcy9gbjxasxnrgqw3i9f14f26dq3sz2j035l"; }; buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 72a31262e26..282b6666aa4 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libpcap python ]; - meta = { + meta = with stdenv.lib; { homepage = http://vde.sourceforge.net/; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 55a99dd2729..70294820425 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { echo "wpa2-ttls" >> "$out/etc/encryption/templates/active" ''; - meta = { + meta = with stdenv.lib; { homepage = http://wicd.net/; description = "A wiredless and wired network manager"; longDescription='' @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { encryption types, such as WPA and WEP. Wicd will automatically connect at startup to any preferred network within range. ''; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - license="GPLv2"; + maintainers = [ maintainers.roconnor ]; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 624386f34f2..e5be41ed7f6 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: -let version = "1.17.25"; in +let version = "1.18.1"; in stdenv.mkDerivation { name = "dpkg-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1akblsdfblih7879gi5qagqpgy6zz866kcyvg5y11ywqmqw9s087"; + sha256 = "1nlr0djn5zl9cmlcxxmd7dk3fx0zw9gi4qm7cfz0r5qwl9yaj9nb"; }; postPatch = '' @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Debian package manager"; homepage = http://wiki.debian.org/Teams/Dpkg; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mornfall nckx ]; }; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 479915a9cee..bfa23325b39 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.9pre4100_4bbcfaf"; + name = "nix-1.9pre4132_07c69aa"; src = fetchurl { - url = "http://hydra.nixos.org/build/21565942/download/4/${name}.tar.xz"; - sha256 = "1jcy0n8mi17k5vk89vammfh74lvsgnm4gjsk23cq1shspjnbbgxs"; + url = "http://hydra.nixos.org/build/22635534/download/4/${name}.tar.xz"; + sha256 = "adaf272b50fce0d8aec34b38b5b62cb3438eeb379f918f85f76f43a7314d23d6"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 17532039d91..3400d72dea8 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -17,13 +17,13 @@ let in pythonPackages.buildPythonPackage rec { - name = "nixops-1.3pre1362_2a616f8"; + name = "nixops-1.3pre1484_a932a9e"; namePrefix = ""; src = fetchgit { url = https://github.com/NixOS/nixops; - rev = "2a616f8ddc18800c9e1c7013632078a55c06c3e3"; - sha256 = "12arppri2j9sblja73jlfdcbpz1z94cd35n9ypazcsw4irmya3k6"; + rev = "a932a9ecec15336a55f2aa2c2a20f08264adb837"; + sha256 = "010qqpa4yvsra1744afsaj9akqjxzla5p0i4zgan9306m8k3jnpk"; }; buildInputs = [ pythonPackages.nose pythonPackages.coverage ]; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 2fad2fe29e6..aefd6b7500c 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aespipe-${version}"; - version = "2.4c"; + version = "2.4d"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "0pl49jnjczjvfxwm9lw576qsjm1lxh8gc4g776l904cixaz90096"; + sha256 = "03z5i41xv6p3m79lm04d7msda8878lsppv3324zbjjfy19p6bkn5"; }; meta = { diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index ea495145d1a..2aed8df3260 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.67b"; + version = "1.80b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "11763zgwqg2b5hak006rp0jb3w252js067z9ibgl4nj3br2ncmd2"; + sha256 = "008l2qirwlf40yhlrybcpglsil9nw8498qcjmvrnvvq31piwyhp0"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { buildPhase = '' make PREFIX=$out - cd llvm_mode && make && cd .. + cd llvm_mode + make PREFIX=$out CC=${clang}/bin/clang CXX=${clang}/bin/clang++ + cd .. ''; installPhase = '' # Do the normal installation @@ -42,13 +44,6 @@ stdenv.mkDerivation rec { # Patch shebangs before wrapping patchShebangs $out/bin - # Wrap every program with a custom $AFL_PATH; I believe there is a - # bug in afl which causes it to fail to find `afl-qemu-trace` - # relative to `afl-fuzz` or `afl-showmap`, so we instead set - # $AFL_PATH as a workaround, which allows it to be found. - for x in `ls $out/bin/afl-* | grep -v afl-clang-fast`; do - wrapProgram $x --prefix AFL_PATH : "$out/bin" - done # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it # has totally different semantics in that case(?) - and also set a # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out diff --git a/pkgs/tools/security/afl/qemu-patches/afl-config.h b/pkgs/tools/security/afl/qemu-patches/afl-config.h index 0017f9d83f4..cbf48881ade 100644 --- a/pkgs/tools/security/afl/qemu-patches/afl-config.h +++ b/pkgs/tools/security/afl/qemu-patches/afl-config.h @@ -88,10 +88,10 @@ /* Maximum stacking for havoc-stage tweaks. The actual value is calculated like this: - n = random between 0 and HAVOC_STACK_POW2 + n = random between 1 and HAVOC_STACK_POW2 stacking = 2^n - In other words, the default (n = 7) produces 1, 2, 4, 8, 16, 32, 64, or + In other words, the default (n = 7) produces 2, 4, 8, 16, 32, 64, or 128 stacked tweaks: */ #define HAVOC_STACK_POW2 7 @@ -250,9 +250,10 @@ #define RESEED_RNG 10000 -/* Maximum line length passed from GCC to 'as': */ +/* Maximum line length passed from GCC to 'as' and used for parsing + configuration files: */ -#define MAX_AS_LINE 8192 +#define MAX_LINE 8192 /* Environment variable used to pass SHM ID to the called program. */ diff --git a/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch index 29b65e71b9a..75a7ea450ef 100644 --- a/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch +++ b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch @@ -1,15 +1,15 @@ ---- qemu-2.2.0/cpu-exec.c.orig 2014-12-09 14:45:40.000000000 +0000 -+++ qemu-2.2.0/cpu-exec.c 2015-02-20 22:07:02.966000000 +0000 -@@ -25,6 +25,8 @@ - #include "sysemu/qtest.h" - #include "qemu/timer.h" +--- qemu-2.3.0/cpu-exec.c.orig 2014-12-09 14:45:40.000000000 +0000 ++++ qemu-2.3.0/cpu-exec.c 2015-02-20 22:07:02.966000000 +0000 +@@ -28,6 +28,8 @@ + #include "exec/memory-internal.h" + #include "qemu/rcu.h" +#include "afl-qemu-cpu-inl.h" + /* -icount align implementation. */ typedef struct SyncClocks { -@@ -262,8 +264,11 @@ +@@ -296,8 +298,11 @@ } not_found: /* if no translated code available, then translate it now */ @@ -21,7 +21,7 @@ found: /* Move the last found TB to the head of the list */ if (likely(*ptb1)) { -@@ -455,6 +460,9 @@ +@@ -492,6 +497,9 @@ next_tb = 0; tcg_ctx.tb_ctx.tb_invalidated_flag = 0; } diff --git a/pkgs/tools/security/afl/qemu-patches/elfload.patch b/pkgs/tools/security/afl/qemu-patches/elfload.patch index 65f1572e9a7..325c917d15a 100644 --- a/pkgs/tools/security/afl/qemu-patches/elfload.patch +++ b/pkgs/tools/security/afl/qemu-patches/elfload.patch @@ -1,5 +1,5 @@ ---- qemu-2.2.0/linux-user/elfload.c.orig 2014-12-09 14:45:42.000000000 +0000 -+++ qemu-2.2.0/linux-user/elfload.c 2015-01-28 02:51:23.719000000 +0000 +--- qemu-2.3.0/linux-user/elfload.c.orig 2014-12-09 14:45:42.000000000 +0000 ++++ qemu-2.3.0/linux-user/elfload.c 2015-01-28 02:51:23.719000000 +0000 @@ -28,6 +28,8 @@ #define ELF_OSABI ELFOSABI_SYSV @@ -9,7 +9,7 @@ /* from personality.h */ /* -@@ -1886,6 +1888,8 @@ +@@ -1889,6 +1891,8 @@ info->brk = 0; info->elf_flags = ehdr->e_flags; @@ -18,7 +18,7 @@ for (i = 0; i < ehdr->e_phnum; i++) { struct elf_phdr *eppnt = phdr + i; if (eppnt->p_type == PT_LOAD) { -@@ -1919,9 +1923,11 @@ +@@ -1922,9 +1926,11 @@ if (elf_prot & PROT_EXEC) { if (vaddr < info->start_code) { info->start_code = vaddr; diff --git a/pkgs/tools/security/afl/qemu-patches/syscall.patch b/pkgs/tools/security/afl/qemu-patches/syscall.patch index c8ffb61ba2c..75d39386164 100644 --- a/pkgs/tools/security/afl/qemu-patches/syscall.patch +++ b/pkgs/tools/security/afl/qemu-patches/syscall.patch @@ -1,5 +1,5 @@ ---- qemu-2.2.0/linux-user/syscall.c.orig 2014-12-09 14:45:43.000000000 +0000 -+++ qemu-2.2.0/linux-user/syscall.c 2015-03-27 06:33:00.736000000 +0000 +--- qemu-2.3.0/linux-user/syscall.c.orig 2014-12-09 14:45:43.000000000 +0000 ++++ qemu-2.3.0/linux-user/syscall.c 2015-03-27 06:33:00.736000000 +0000 @@ -227,7 +227,21 @@ _syscall3(int,sys_rt_sigqueueinfo,int,pid,int,sig,siginfo_t *,uinfo) _syscall3(int,sys_syslog,int,type,char*,bufp,int,len) diff --git a/pkgs/tools/security/afl/qemu-patches/translate-all.patch b/pkgs/tools/security/afl/qemu-patches/translate-all.patch index 89163b607fd..180b3a55ab2 100644 --- a/pkgs/tools/security/afl/qemu-patches/translate-all.patch +++ b/pkgs/tools/security/afl/qemu-patches/translate-all.patch @@ -1,6 +1,6 @@ ---- qemu-2.2.0/translate-all.c.orig 2014-12-09 14:45:46.000000000 +0000 -+++ qemu-2.2.0/translate-all.c 2015-01-28 22:37:42.383000000 +0000 -@@ -387,8 +387,13 @@ +--- qemu-2.3.0/translate-all.c.orig 2014-12-09 14:45:46.000000000 +0000 ++++ qemu-2.3.0/translate-all.c 2015-01-28 22:37:42.383000000 +0000 +@@ -393,8 +393,13 @@ /* We can't use g_malloc because it may recurse into a locked mutex. */ # define ALLOC(P, SIZE) \ do { \ diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 5b69811d08d..3dd47f50cf7 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -7,7 +7,7 @@ with stdenv.lib; let - n = "qemu-2.2.0"; + n = "qemu-2.3.0"; aflHeaderFile = writeText "afl-qemu-cpu-inl.h" (builtins.readFile ./qemu-patches/afl-qemu-cpu-inl.h); @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; + sha256 = "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn"; }; buildInputs = diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index c9a261ba97a..21de5705e4f 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.18"; + version = "1.4.19"; name = "ccid-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2"; - sha256 = "1aj14lkmfaxkhk5swqfgn2x18j7fijxs0jnxnx9cdc9f5mxaknsz"; + sha256 = "1q9lx5ci8kikwk9mhbjl6m3zk4id209zfna5wgpqjrp5nhmjrjyc"; }; patchPhase = '' diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a8f6ae81e04..ef15967330d 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; - license = with licenses; lgpl3; + license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. Also requires a running pcscd service and compatible card reader. diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index 45a314e13a6..06307263e52 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) viewer"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; - license = with licenses; lgpl3; + license = licenses.lgpl3; longDescription = '' A simple, graphical Java application to view, print and save data from Belgian electronic identity cards. Independent of the eid-mw package, diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 03e193dacc7..184f8a59d28 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pythonPackages, unzip, systemd, gamin }: +{ stdenv, fetchzip, python, pythonPackages, unzip, systemd, gamin }: let version = "0.9.1"; in @@ -6,10 +6,10 @@ pythonPackages.buildPythonPackage { name = "fail2ban-${version}"; namePrefix = ""; - src = fetchurl { - url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; - name = "fail2ban-${version}.zip"; - sha256 = "0lk720r212mbpk1654qihyxcj5wmglzkg7v4pyiy5qq9qy58jmyr"; + src = fetchzip { + name = "fail2ban-${version}-src"; + url = "https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"; + sha256 = "111xvy2gxwn868kn0zy2fmdfa423z6fk57i7wsfrc0l74p1cdvs5"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 71e5282e85b..31a6bd2c460 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,11 +13,11 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.3"; + name = "gnupg-2.1.4"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1vf8fmwcq81abzw2mypz5j7m4xy0vl4z6lri5lxfbd2bsyq7ygi1"; + sha256 = "1c3c89b7ziknz6h1dnwmfjhgyy28g982rcncrhmhylb8v3npw4k4"; }; patches = [ ./socket-activate-2.1.1.patch ]; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 757959f5345..3849c773a3e 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -3,9 +3,6 @@ }: let - mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; - mkEnable = mkFlag "enable" "disable"; - mkWith = mkFlag "with" "without"; hasX = gtk2 != null || qt4 != null; in with stdenv.lib; @@ -20,12 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ libcap gtk2 ncurses qt4 ]; configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkWith (hasX) "x") - (mkEnable (ncurses != null) "pinentry-curses") - (mkEnable true "pinentry-tty") - (mkEnable (gtk2 != null) "pinentry-gtk2") - (mkEnable (qt4 != null) "pinentry-qt4") + (mkWith (libcap != null) "libcap" null) + (mkWith (hasX) "x" null) + (mkEnable (ncurses != null) "pinentry-curses" null) + (mkEnable true "pinentry-tty" null) + (mkEnable (gtk2 != null) "pinentry-gtk2" null) + (mkEnable (qt4 != null) "pinentry-qt4" null) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index 0333e931858..c0951760f4f 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils +{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils +, makeWrapper, coreutils, cacert , apiKey ? "" , deviceKey ? "" }: @@ -35,7 +36,7 @@ in stdenv.mkDerivation rec { cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ - --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 1237890f621..c6a5917640e 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks }: stdenv.mkDerivation rec { - name = "tor-0.2.5.12"; + name = "tor-0.2.6.8"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0j9byw3i2b7ji88vsqwmsxxg2nlxwkk45k5qbc1y7hdlzvzxl3sm"; + sha256 = "0xlsc2pa7i8hm8dyilln6p4rb0pig62b9c31yp1m0hj5jqw3d2xq"; }; # Note: torsocks is specified as a dependency, as the distributed @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # ./configure time check for any of this. buildInputs = [ libevent openssl zlib torsocks ]; - CFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lgcc_s"; + CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; # Patch 'torify' to point directly to torsocks. patchPhase = '' diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 67d8b110568..4ab0cabbcd3 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.5"; + version = "4.5.1"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "15scfjzpbih7pzpqh4jd7jmc9g93sx2myfs6ykr70f5hbc7qhwmg" else - "0lrvhka3z9bh0snplsnxshs8i9iww187ipfn7f96hp5rxgl30p49"; + "0nbjw04xbzb5d4q0j05nq9p8vdpzqxzhbywjxdgpc5mc73jyv8mr" else + "0fkzgdyxi7gl3kyfp0jmbky61a1b2yg9747h75bgkkndnqxnmkqw"; }; patchPhase = '' diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 284f6cbb3d2..374528872e8 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.8.4"; + version = "1.9.1"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz"; - sha256 = "1hcy4f6l9c23aa05yi4mr0zbqp0c6v5zq4c3dim076yfmfrh8z6k"; + sha256 = "a6f975d565723765a4d490ff40cede96833a745f38908def4950a0075f1973f5"; }; prePatch = '' diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index bb3f9d72e82..ef0a6d251a3 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { chmod +x $out/sbin/bootchartd ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.bootchart.org/; description = "Performance analysis and visualization of the GNU/Linux boot process"; - license="GPLv2+"; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix new file mode 100644 index 00000000000..465ae48063b --- /dev/null +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: + +stdenv.mkDerivation rec { + name = "das_watchdog-${version}"; + version = "git-2015-04-02"; + + src = fetchgit { + url = "https://github.com/kmatheussen/das_watchdog.git"; + rev = "1c203d9a55455c4670c164f945ea2dd9fd197ba9"; + sha256 = "c817491d67d31297dcd6177b9c33b5c3977c1c383eac588026631dd6961ba6bf"; + }; + + buildInputs = [ libgtop xmessage which pkgconfig ]; + + installPhase = '' + mkdir -p $out/bin/ + cp das_watchdog $out/bin/ + cp test_rt $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kmatheussen/das_watchdog; + description = "A general watchdog for the linux operating system"; + longDescription = '' + It should run in the background at all times to ensure a realtime process + won't hang the machine."; + ''; + license = licenses.free; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index 9c98da6ac85..ce29fc63553 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { cp dog $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = "http://lwn.net/Articles/421072/"; - description = "a cat replacement"; - license="GPLv2+"; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; all; + description = "cat replacement"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qknight ]; + platforms = with platforms; all; }; } diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index baaa97b4b24..d560fdad51b 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { reliable and faster recovery. ''; homepage = http://foremost.sourceforge.net/; - license = with licenses; publicDomain; + license = licenses.publicDomain; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a9fdcf6fa64..e8abe0ef0d0 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages -, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null +, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -7,9 +7,6 @@ }: with stdenv.lib; -let - mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; -in stdenv.mkDerivation rec { name = "rsyslog-8.9.0"; @@ -20,76 +17,76 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls + libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis ] ++ stdenv.lib.optional stdenv.isLinux systemd; configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-systemdsystemunitdir=\${out}/etc/systemd/system" - (mkFlag true "largefile") - (mkFlag true "regexp") - (mkFlag (krb5 != null) "gssapi-krb5") - (mkFlag true "klog") - (mkFlag true "kmsg") - (mkFlag (systemd != null) "imjournal") - (mkFlag true "inet") - (mkFlag (jemalloc != null) "jemalloc") - (mkFlag true "unlimited-select") - (mkFlag true "usertools") - (mkFlag (libmysql != null) "mysql") - (mkFlag (postgresql != null) "pgsql") - (mkFlag (libdbi != null) "libdbi") - (mkFlag (net_snmp != null) "snmp") - (mkFlag (libuuid != null) "uuid") - (mkFlag (curl != null) "elasticsearch") - (mkFlag (gnutls != null) "gnutls") - (mkFlag (libgcrypt != null) "libgcrypt") - (mkFlag true "rsyslogrt") - (mkFlag true "rsyslogd") - (mkFlag true "mail") - (mkFlag (liblognorm != null) "mmnormalize") - (mkFlag true "mmjsonparse") - (mkFlag true "mmaudit") - (mkFlag true "mmanon") - (mkFlag true "mmutf8fix") - (mkFlag true "mmcount") - (mkFlag true "mmsequence") - (mkFlag true "mmfields") - (mkFlag true "mmpstrucdata") - (mkFlag (openssl != null) "mmrfc5424addhmac") - (mkFlag (librelp != null) "relp") - (mkFlag (libgt != null) "guardtime") - (mkFlag (liblogging != null) "liblogging-stdlog") - (mkFlag (liblogging != null) "rfc3195") - (mkFlag true "imfile") - (mkFlag false "imsolaris") - (mkFlag true "imptcp") - (mkFlag true "impstats") - (mkFlag true "omprog") - (mkFlag (libnet != null) "omudpspoof") - (mkFlag true "omstdout") - (mkFlag (systemd != null) "omjournal") - (mkFlag true "pmlastmsg") - (mkFlag true "pmcisconames") - (mkFlag true "pmciscoios") - (mkFlag true "pmaixforwardedfrom") - (mkFlag true "pmsnare") - (mkFlag true "omruleset") - (mkFlag true "omuxsock") - (mkFlag true "mmsnmptrapd") - (mkFlag (hadoop != null) "omhdfs") - (mkFlag (rdkafka != null) "omkafka") - (mkFlag (libmongo-client != null) "ommongodb") - (mkFlag (czmq != null) "imzmq3") - (mkFlag (czmq != null) "imczmq") - (mkFlag (czmq != null) "omzmq3") - (mkFlag (czmq != null) "omczmq") - (mkFlag (rabbitmq-c != null) "omrabbitmq") - (mkFlag (hiredis != null) "omhiredis") - (mkFlag true "generate-man-pages") + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkWith true "systemdsystemunitdir" "\${out}/etc/systemd/system") + (mkEnable true "largefile" null) + (mkEnable true "regexp" null) + (mkEnable (libkrb5 != null) "gssapi-krb5" null) + (mkEnable true "klog" null) + (mkEnable true "kmsg" null) + (mkEnable (systemd != null) "imjournal" null) + (mkEnable true "inet" null) + (mkEnable (jemalloc != null) "jemalloc" null) + (mkEnable true "unlimited-select" null) + (mkEnable true "usertools" null) + (mkEnable (libmysql != null) "mysql" null) + (mkEnable (postgresql != null) "pgsql" null) + (mkEnable (libdbi != null) "libdbi" null) + (mkEnable (net_snmp != null) "snmp" null) + (mkEnable (libuuid != null) "uuid" null) + (mkEnable (curl != null) "elasticsearch" null) + (mkEnable (gnutls != null) "gnutls" null) + (mkEnable (libgcrypt != null) "libgcrypt" null) + (mkEnable true "rsyslogrt" null) + (mkEnable true "rsyslogd" null) + (mkEnable true "mail" null) + (mkEnable (liblognorm != null) "mmnormalize" null) + (mkEnable true "mmjsonparse" null) + (mkEnable true "mmaudit" null) + (mkEnable true "mmanon" null) + (mkEnable true "mmutf8fix" null) + (mkEnable true "mmcount" null) + (mkEnable true "mmsequence" null) + (mkEnable true "mmfields" null) + (mkEnable true "mmpstrucdata" null) + (mkEnable (openssl != null) "mmrfc5424addhmac" null) + (mkEnable (librelp != null) "relp" null) + (mkEnable (libgt != null) "guardtime" null) + (mkEnable (liblogging != null) "liblogging-stdlog" null) + (mkEnable (liblogging != null) "rfc3195" null) + (mkEnable true "imfile" null) + (mkEnable false "imsolaris" null) + (mkEnable true "imptcp" null) + (mkEnable true "impstats" null) + (mkEnable true "omprog" null) + (mkEnable (libnet != null) "omudpspoof" null) + (mkEnable true "omstdout" null) + (mkEnable (systemd != null) "omjournal" null) + (mkEnable true "pmlastmsg" null) + (mkEnable true "pmcisconames" null) + (mkEnable true "pmciscoios" null) + (mkEnable true "pmaixforwardedfrom" null) + (mkEnable true "pmsnare" null) + (mkEnable true "omruleset" null) + (mkEnable true "omuxsock" null) + (mkEnable true "mmsnmptrapd" null) + (mkEnable (hadoop != null) "omhdfs" null) + (mkEnable (rdkafka != null) "omkafka" null) + (mkEnable (libmongo-client != null) "ommongodb" null) + (mkEnable (czmq != null) "imzmq3" null) + (mkEnable (czmq != null) "imczmq" null) + (mkEnable (czmq != null) "omzmq3" null) + (mkEnable (czmq != null) "omczmq" null) + (mkEnable (rabbitmq-c != null) "omrabbitmq" null) + (mkEnable (hiredis != null) "omhiredis" null) + (mkEnable true "generate-man-pages" null) ]; meta = { diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 87f19640f7f..72c8f8d028e 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in ''; - meta = { - description = "Tools for monitoring the health of hard drivers"; - homepage = "http://smartmontools.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + meta = with stdenv.lib; { + description = "Tools for monitoring the health of hard drives"; + homepage = http://smartmontools.sourceforge.net/; + license = licenses.gpl2Plus; + platforms = with platforms; linux ++ darwin; + maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index f67c556a669..ebe6306120e 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr }: -let version = "0.04.02"; in +let version = "0.04.04"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "1k7h58axycwwxbr5bqqpz1ypsqvv4k2knk2fpw402l4xx9643bqv"; + sha256 = "1rq78s4xrylm63xygakrvjg5g774qmm968p0v69x2c795dv3s8di"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installFlags = [ "DESTDIR=$(out)" ]; + installFlags = "DESTDIR=$(out)"; meta = with stdenv.lib; { inherit version; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = http://kernel.ubuntu.com/~cking/stress-ng; downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index 62f7280a54a..4aba9f48b76 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Setuid-safe wrapper for chroot"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 0a4c1e58fc5..c443dc148f1 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation { sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "terminal mixer - multiplexer for the i/o of terminal applications"; - license="GPLv2"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = licenses.gpl2; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 6d1c6ad5e1f..3bf4cea09f5 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { sha256 = "042r9a09300v4fdrw4r60g5xi25v5m6g12kvvr6pcsm9qnfqyqqs"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "task spooler - batch queue"; - license="GPLv2"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = licenses.gpl2; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index c9cf05373b5..386e80a1376 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { which can also easily be used to show your records on a web page. ''; homepage = https://github.com/rpodgorny/uptimed/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 83b3d49b253..30b546361f2 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "dos2unix-7.2.1"; + name = "dos2unix-7.2.2"; src = fetchurl { url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; - sha256 = "1ws5d66gjs3iqc92d0qxwivixl9092540kxqq2gr6jdzmflqm4jk"; + sha256 = "04i6kkl6l1vp1b81i0wncixwyab2dzmh7vp1cvma8zr6jrr908ww"; }; configurePhase = '' diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 9017025477b..c6eb7ba1101 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }: stdenv.mkDerivation rec { - name = "gawk-4.1.2"; + name = "gawk-4.1.3"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "10glh5amry76v8fzhp4phi4119zwjwzjg9ybzq971qjfhg2m72za"; + sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3"; }; doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 - buildInputs = [ libsigsegv ] + buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv ++ stdenv.lib.optional readlineSupport readline; - configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ] + configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}" # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv) ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline"; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e73458d0aba..d03db13ed42 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { buildInputs = [ pcre libiconv ]; - doCheck = !stdenv.isDarwin; + # cygwin: FAIL: multibyte-white-space + doCheck = !stdenv.isDarwin && !stdenv.isCygwin; # On Mac OS X, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 4b807718baa..92b506aa2c3 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl }: +{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: stdenv.mkDerivation { name = "opensp-1.5.2"; @@ -26,7 +26,11 @@ stdenv.mkDerivation { sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html ''; - buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; + preConfigure = if stdenv.isCygwin then "autoreconf -fi" else null; + + # need autoconf, automake, gettext, and libtool for reconfigure + buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ] + ++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; meta = { description = "A suite of SGML/XML processing tools"; diff --git a/pkgs/tools/text/tidy-html5/default.nix b/pkgs/tools/text/tidy-html5/default.nix new file mode 100644 index 00000000000..e2651e20293 --- /dev/null +++ b/pkgs/tools/text/tidy-html5/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, cmake, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { + + name = "tidy-html5"; + version = "4.9.30"; + + src = fetchFromGitHub { + owner = "htacg"; + repo = "tidy-html5"; + rev = version; + sha256 = "0hd4c23352r5lnh23mx137wb4mkxcjdrl1dy8kgghszik5fprs3s"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "The granddaddy of HTML tools, with support for modern standards"; + homepage = "http://www.html-tidy.org/"; + license = licenses.w3c; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 370f0efb32a..81a457d0d2d 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -255,6 +255,7 @@ stdenv.mkDerivation rec { ''; preInstall = "mkdir -p $out/etc/vim"; + makeFlags = if stdenv.isCygwin then "DESTDIR=/." else null; meta = with stdenv.lib; { description = "Text-based document generation system"; diff --git a/pkgs/tools/typesetting/hevea/builder.sh b/pkgs/tools/typesetting/hevea/builder.sh deleted file mode 100644 index 05c93fe7da7..00000000000 --- a/pkgs/tools/typesetting/hevea/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -set -e - -source $stdenv/setup - -mkdir -p $out/bin $out/lib - -tar xvfz $src -cd hevea-* - -sed s+/usr/local+$out+ Makefile > Makefile.new -mv Makefile.new Makefile - -make -make install diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index dfa8a43974a..1acc395dc06 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,9 +1,23 @@ -{stdenv, fetchurl, ocaml}: stdenv.mkDerivation { - name = "hevea-1.07"; - builder = ./builder.sh; +{ stdenv, fetchurl, ocaml }: + +stdenv.mkDerivation rec { + name = "hevea-2.23"; + src = fetchurl { - url = http://pauillac.inria.fr/~maranget/hevea/distri/hevea-1.07.tar.gz; - md5 = "561d7a2c10ea9e6a5b352c24d9b65998"; + url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; + sha256 = "1f9pj48518ixhjxbviv2zx27v4anp92zgg3x704g1s5cki2w33nv"; + }; + + buildInputs = [ ocaml ]; + + configurePhase = '' + export makeFlags="PREFIX=$out"; + ''; + + meta = with stdenv.lib; { + description = "A quite complete and fast LATEX to HTML translator"; + homepage = http://pauillac.inria.fr/~maranget/hevea/; + license = licenses.qpl; + maintainers = with maintainers; [ pSub ]; }; - buildInputs = [ocaml]; } diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 79f768a086d..24ab02e97d7 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed }: +{ stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }: stdenv.mkDerivation { name = "tetex-3.0"; @@ -20,6 +20,10 @@ stdenv.mkDerivation { sed -i 57d texk/kpathsea/c-std.h ''; + preConfigure = if stdenv.isCygwin then '' + find ./ -name "config.guess" -exec rm {} \; -exec ln -s ${automake}/share/automake-*/config.guess {} \; + '' else null; + patches = [ ./environment.patch ./getline.patch ./clang.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index d4b662c88f1..9cabfe31a18 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,17 +1,18 @@ { stdenv, pkgs, fetchurl }: stdenv.mkDerivation rec { - name = "AtomicParsley"; + name = "${product}-${version}"; + product = "AtomicParsley"; version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/atomicparsley/${name}-source-${version}.zip"; + url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip"; sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; }; buildInputs = with pkgs; [ unzip ]; patches = [ ./casts.patch ]; - setSourceRoot = "sourceRoot=${name}-source-${version}"; + setSourceRoot = "sourceRoot=${product}-source-${version}"; buildPhase = "bash build"; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 552023278b6..29f2a1c448d 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" ++ optional stdenv.isDarwin "SYS=darwin" - ++ optional (stdenv.cc.cc.isClang or false) "CC=clang"; + ++ optional stdenv.cc.isClang "CC=clang"; - buildInputs = [ zlib ] + propagatedBuildInputs = [ zlib ] ++ optional gnutlsSupport gnutls ++ optional opensslSupport openssl; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3f616ad74f..44f919300fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -370,34 +370,43 @@ let fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; }; fetchFromGitHub = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name; + inherit name sha256; url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; - inherit sha256; + meta.homepage = "https://github.com/${owner}/${repo}/"; + }; + + fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name sha256; + url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz"; + meta.homepage = "https://bitbucket.org/${owner}/${repo}/"; }; # gitorious example fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name; + inherit name sha256; url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz"; - inherit sha256; + meta.homepage = "https://gitorious.org/${owner}/${repo}/"; }; # cgit example, snapshot support is optional in cgit fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name sha256; url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; + meta.homepage = "http://git.savannah.gnu.org/cgit/${repo}.git/"; }; # gitlab example fetchFromGitLab = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name sha256; url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}"; + meta.homepage = "https://gitlab.com/${owner}/${repo}/"; }; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name sha256; url = "http://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz"; + meta.homepage = "http://repo.or.cz/${repo}.git/"; }; resolveMirrorURLs = {url}: fetchurl { @@ -544,6 +553,10 @@ let arandr = callPackage ../tools/X11/arandr { }; + arangodb = callPackage ../servers/nosql/arangodb { + inherit (pythonPackages) gyp; + }; + arcanist = callPackage ../development/tools/misc/arcanist {}; arduino = arduino-core.override { withGui = true; }; @@ -613,6 +626,8 @@ let pass = callPackage ../tools/security/pass { }; + oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + setfile = callPackage ../os-specific/darwin/setfile { }; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; @@ -736,6 +751,8 @@ let capstone = callPackage ../development/libraries/capstone { }; + catch = callPackage ../development/libraries/catch { }; + catdoc = callPackage ../tools/text/catdoc { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; @@ -752,17 +769,17 @@ let ccnet = callPackage ../tools/networking/ccnet { }; + cli53 = callPackage ../tools/admin/cli53 { }; + cloud-init = callPackage ../tools/virtualization/cloud-init { }; - consul = callPackage ../servers/consul { - # inherit ruby; - }; + consul = goPackages.consul; - consul_ui = consul.ui; + consul-ui = callPackage ../servers/consul/ui.nix { }; - consul-alerts = callPackage ../servers/consul/alerts.nix { }; + consul-alerts = goPackages.consul-alerts; - consul-template = callPackage ../servers/consul/template.nix { }; + consul-template = goPackages.consul-template; corosync = callPackage ../servers/corosync { }; @@ -832,6 +849,15 @@ let mpdcron = callPackage ../tools/audio/mpdcron { }; + mpdris2 = callPackage ../tools/audio/mpdris2 { + python = pythonFull; + wrapPython = pythonPackages.wrapPython; + mpd = pythonPackages.mpd; + pygtk = pythonPackages.pygtk; + dbus = pythonPackages.dbus; + pynotify = pythonPackages.notify; + }; + syslogng = callPackage ../tools/system/syslog-ng { }; syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; @@ -842,7 +868,7 @@ let }; rsyslog-light = callPackage ../tools/system/rsyslog { - krb5 = null; + libkrb5 = null; systemd = null; jemalloc = null; libmysql = null; @@ -869,6 +895,8 @@ let mcrypt = callPackage ../tools/misc/mcrypt { }; + mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mstflint = callPackage ../tools/misc/mstflint { }; mcelog = callPackage ../os-specific/linux/mcelog { }; @@ -1010,6 +1038,8 @@ let gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; + clementineFree = clementine.free; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; cmst = callPackage ../tools/networking/cmst { }; @@ -1054,6 +1084,10 @@ let anthy = callPackage ../tools/inputmethods/anthy { }; + mozc = callPackage ../tools/inputmethods/mozc { + inherit (pythonPackages) gyp; + }; + ibus = callPackage ../tools/inputmethods/ibus { }; ibus-qt = callPackage ../tools/inputmethods/ibus-qt { }; @@ -1349,6 +1383,8 @@ let plugins = [ ]; }; + fcppt = callPackage ../development/libraries/fcppt/default.nix { }; + fcron = callPackage ../tools/system/fcron { }; fdm = callPackage ../tools/networking/fdm {}; @@ -1530,7 +1566,7 @@ let gnupg = gnupg20; - gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; }; + gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -1549,6 +1585,8 @@ let googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; + google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; + gource = callPackage ../applications/version-management/gource { }; gparted = callPackage ../tools/misc/gparted { }; @@ -1730,6 +1768,8 @@ let icecast = callPackage ../servers/icecast { }; + darkice = callPackage ../tools/audio/darkice { }; + icoutils = callPackage ../tools/graphics/icoutils { }; idutils = callPackage ../tools/misc/idutils { }; @@ -1791,6 +1831,8 @@ let jdiskreport = callPackage ../tools/misc/jdiskreport { }; + jekyll = callPackage ../applications/misc/jekyll { }; + jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; @@ -1845,6 +1887,8 @@ let logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { }; + lolcat = callPackage ../tools/misc/lolcat { }; + lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; kippo = callPackage ../servers/kippo { }; @@ -1891,7 +1935,7 @@ let else nodePackages_0_12; - iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_2; }; + iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_5_0; }; iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; @@ -2190,9 +2234,7 @@ let pa_applet = callPackage ../tools/audio/pa-applet { }; - pasystray = callPackage ../tools/audio/pasystray { - inherit (gnome3) gnome_icon_theme; - }; + pasystray = callPackage ../tools/audio/pasystray { }; pnmixer = callPackage ../tools/audio/pnmixer { }; @@ -2893,6 +2935,8 @@ let t1utils = callPackage ../tools/misc/t1utils { }; + talkfilters = callPackage ../misc/talkfilters {}; + tarsnap = callPackage ../tools/backup/tarsnap { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; @@ -2985,6 +3029,8 @@ let ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; + ttylog = callPackage ../tools/misc/ttylog { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; txt2man = callPackage ../tools/misc/txt2man { }; @@ -3035,6 +3081,8 @@ let vcsh = callPackage ../applications/version-management/vcsh { }; + verilator = callPackage ../applications/science/electronics/verilator {}; + verilog = callPackage ../applications/science/electronics/verilog {}; vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; @@ -3087,6 +3135,8 @@ let tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; + tidy-html5 = callPackage ../tools/text/tidy-html5 { }; + tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; @@ -3188,10 +3238,6 @@ let wavemon = callPackage ../tools/networking/wavemon { }; - w3cCSSValidator = callPackage ../tools/misc/w3c-css-validator { - tomcat = tomcat6; - }; - wdfs = callPackage ../tools/filesystems/wdfs { }; wdiff = callPackage ../tools/text/wdiff { }; @@ -3333,6 +3379,9 @@ let zile = callPackage ../applications/editors/zile { }; + zinnia = callPackage ../tools/inputmethods/zinnia { }; + tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; + zip = callPackage ../tools/archivers/zip { }; zpaq = callPackage ../tools/archivers/zpaq { }; @@ -3347,6 +3396,7 @@ let bash = lowPrio (callPackage ../shells/bash { texinfo = null; + interactive = stdenv.isCygwin; # patch for cygwin requires readline support }); bashInteractive = appendToName "interactive" (callPackage ../shells/bash { @@ -3399,6 +3449,8 @@ let bigloo = callPackage ../development/compilers/bigloo { }; + colm = callPackage ../development/compilers/colm { }; + fetchegg = callPackage ../build-support/fetchegg { }; eggDerivation = callPackage ../development/compilers/chicken/eggDerivation.nix { }; @@ -3433,6 +3485,7 @@ let clangWrapSelf = build: (import ../build-support/cc-wrapper) { cc = build; + isClang = true; stdenv = clangStdenv; libc = glibc; binutils = binutils; @@ -3653,7 +3706,8 @@ let isl = isl_0_14; })); - gfortran = gfortran48; + gfortran = if !stdenv.isDarwin then gfortran48 + else callPackage ../development/compilers/gcc/gfortran-darwin.nix {}; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -3746,15 +3800,6 @@ let }; }; - jhc = callPackage ../development/compilers/jhc { - inherit (haskell.packages.ghc763) ghcWithPackages; - }; - - uhc = callPackage ../development/compilers/uhc/default.nix ({ - stdenv = clangStdenv; - inherit (haskellPackages) ghcWithPackages; - }); - gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { version = "4.7-2013q3-20130916"; releaseType = "update"; @@ -3838,7 +3883,7 @@ let ikarus = callPackage ../development/compilers/ikarus { }; - hugs = callPackage ../development/compilers/hugs { }; + hugs = callPackage ../development/interpreters/hugs { }; path64 = callPackage ../development/compilers/path64 { }; @@ -4025,13 +4070,34 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; in rec { inherit ocaml; + buildOcaml = callPackage ../build-support/ocaml { }; acgtk = callPackage ../applications/science/logic/acgtk { }; + alcotest = callPackage ../development/ocaml-modules/alcotest {}; + ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; + async_extra = callPackage ../development/ocaml-modules/async_extra { }; + + async_find = callPackage ../development/ocaml-modules/async_find { }; + + async_kernel = callPackage ../development/ocaml-modules/async_kernel { }; + + async_shell = callPackage ../development/ocaml-modules/async_shell { }; + + async_ssl = callPackage ../development/ocaml-modules/async_ssl { }; + + async_unix = callPackage ../development/ocaml-modules/async_unix { }; + + async = callPackage ../development/ocaml-modules/async { }; + + atd = callPackage ../development/ocaml-modules/atd { }; + + atdgen = callPackage ../development/ocaml-modules/atdgen { }; + base64 = callPackage ../development/ocaml-modules/base64 { }; bolt = callPackage ../development/ocaml-modules/bolt { }; @@ -4083,8 +4149,14 @@ let }; camlimages = camlimages_4_1; + conduit = callPackage ../development/ocaml-modules/conduit { + lwt = ocaml_lwt; + }; + biniou = callPackage ../development/ocaml-modules/biniou { }; + bin_prot = callPackage ../development/ocaml-modules/bin_prot { }; + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; @@ -4093,6 +4165,10 @@ let cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; + cohttp = callPackage ../development/ocaml-modules/cohttp { + lwt = ocaml_lwt; + }; + config-file = callPackage ../development/ocaml-modules/config-file { }; cpdf = callPackage ../development/ocaml-modules/cpdf { }; @@ -4103,11 +4179,14 @@ let cstruct = callPackage ../development/ocaml-modules/cstruct { lwt = ocaml_lwt; - sexplib = ocaml_sexplib; }; csv = callPackage ../development/ocaml-modules/csv { }; + custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; + + ctypes = callPackage ../development/ocaml-modules/ctypes { }; + deriving = callPackage ../development/tools/ocaml/deriving { }; dolog = callPackage ../development/ocaml-modules/dolog { }; @@ -4118,9 +4197,7 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; - enumerate = callPackage ../development/ocaml-modules/enumerate { - type_conv = ocaml_typeconv; - }; + enumerate = callPackage ../development/ocaml-modules/enumerate { }; erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; @@ -4128,7 +4205,6 @@ let ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { lwt = ocaml_lwt; - sexplib = ocaml_sexplib; }; fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; @@ -4141,8 +4217,12 @@ let functory = callPackage ../development/ocaml-modules/functory { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + javalib = callPackage ../development/ocaml-modules/javalib { extlib = ocaml_extlib_maximal; }; @@ -4161,6 +4241,11 @@ let hex = callPackage ../development/ocaml-modules/hex { }; + jingoo = callPackage ../development/ocaml-modules/jingoo { + batteries = ocaml_batteries; + pcre = ocaml_pcre; + }; + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; jsonm = callPackage ../development/ocaml-modules/jsonm { }; @@ -4207,6 +4292,14 @@ let ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; + comparelib = callPackage ../development/ocaml-modules/comparelib { }; + + core_extended = callPackage ../development/ocaml-modules/core_extended { }; + + core_kernel = callPackage ../development/ocaml-modules/core_kernel { }; + + core = callPackage ../development/ocaml-modules/core { }; + ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; ocaml_data_notation = callPackage ../development/ocaml-modules/odn { }; @@ -4221,8 +4314,6 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; - ocaml_ipaddr = callPackage ../development/ocaml-modules/ocaml-ipaddr { }; - ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; @@ -4270,6 +4361,8 @@ let ounit = callPackage ../development/ocaml-modules/ounit { }; + re2 = callPackage ../development/ocaml-modules/re2 { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; ulex = callPackage ../development/ocaml-modules/ulex { }; @@ -4278,20 +4371,29 @@ let camlp5 = camlp5_transitional; }; - typeconv_108_08_00 = callPackage ../development/ocaml-modules/typeconv/108.08.00.nix { }; - ocaml_typeconv = - if lib.versionOlder "4.00" ocaml_version - then callPackage ../development/ocaml-modules/typeconv { } + textutils = callPackage ../development/ocaml-modules/textutils { }; + + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; + type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; + type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; + type_conv = + if lib.versionOlder "4.02" ocaml_version + then type_conv_112_01_01 + else if lib.versionOlder "4.00" ocaml_version + then type_conv_109_60_01 else if lib.versionOlder "3.12" ocaml_version - then typeconv_108_08_00 + then type_conv_108_08_00 else null; - sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { - typeconv = typeconv_108_08_00; - }; - ocaml_sexplib = - if lib.versionOlder "4.00" ocaml_version - then callPackage ../development/ocaml-modules/sexplib { } + sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { }; + sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; + sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; + + sexplib = + if lib.versionOlder "4.02" ocaml_version + then sexplib_112_24_01 + else if lib.versionOlder "4.00" ocaml_version + then sexplib_111_25_00 else if lib.versionOlder "3.12" ocaml_version then sexplib_108_08_00 else null; @@ -4303,6 +4405,14 @@ let ocurl = callPackage ../development/ocaml-modules/ocurl { }; + pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { }; + + pa_bench = callPackage ../development/ocaml-modules/pa_bench { }; + + pa_test = callPackage ../development/ocaml-modules/pa_test { }; + + pipebang = callPackage ../development/ocaml-modules/pipebang { }; + pprint = callPackage ../development/ocaml-modules/pprint { }; pycaml = callPackage ../development/ocaml-modules/pycaml { }; @@ -4321,6 +4431,8 @@ let twt = callPackage ../development/ocaml-modules/twt { }; + typerep = callPackage ../development/ocaml-modules/typerep { }; + utop = callPackage ../development/tools/ocaml/utop { }; sawja = callPackage ../development/ocaml-modules/sawja { }; @@ -4329,13 +4441,13 @@ let uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = callPackage ../development/ocaml-modules/uri { - sexplib = ocaml_sexplib; - }; + uri = callPackage ../development/ocaml-modules/uri { }; uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; + variantslib = callPackage ../development/ocaml-modules/variantslib { }; + vg = callPackage ../development/ocaml-modules/vg { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; @@ -4387,9 +4499,8 @@ let ocaml = ocaml_3_08_0; }; - rustcBeta = callPackage ../development/compilers/rustc/1.0.0-beta.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - rustc = rustcBeta; + rustc = callPackage ../development/compilers/rustc/1.0.0.nix {}; rustPlatform = rustStable; @@ -4463,6 +4574,10 @@ let omake = omake_rc1; }; + thrust = callPackage ../development/tools/thrust { + gconf = pkgs.gnome.GConf; + }; + tinycc = callPackage ../development/compilers/tinycc { }; urweb = callPackage ../development/compilers/urweb { }; @@ -4487,6 +4602,8 @@ let nativePrefix = stdenv.cc.nativePrefix or ""; cc = baseCC; libc = libc; + isGNU = baseCC.isGNU or false; + isClang = baseCC.isClang or false; inherit stdenv binutils coreutils zlib; }; @@ -4639,10 +4756,12 @@ let nix-exec = callPackage ../development/interpreters/nix-exec { git = gitMinimal; + + nix = nixUnstable; }; octave = callPackage ../development/interpreters/octave { - fltk = fltk13; + fltk = fltk13.override { cfg.xftSupport = true; }; qt = null; ghostscript = null; llvm = null; @@ -4652,7 +4771,7 @@ let jdk = null; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { - fltk = fltk13; + fltk = fltk13.override { cfg.xftSupport = true; }; qt = qt4; })); @@ -4667,7 +4786,7 @@ let fetchurl = fetchurlBoot; }; - perl = if system != "i686-cygwin" then perl520 else sysPerl; + perl = perl520; php = php56; @@ -4697,7 +4816,9 @@ let pure = callPackage ../development/interpreters/pure { llvm = llvm_35; }; - pure-gsl = callPackage ../development/pure-modules/pure-gsl { }; + purePackages = recurseIntoAttrs (import ./pure-packages.nix { + inherit callPackage; + }); python = python2; python2 = python27; @@ -4823,8 +4944,6 @@ let supercollider_scel = supercollider.override { useSCEL = true; }; - sysPerl = callPackage ../development/interpreters/perl/sys-perl { }; - tcl = tcl-8_6; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; @@ -4905,6 +5024,8 @@ let ### DEVELOPMENT / TOOLS + activator = callPackage ../development/tools/activator { }; + alloy = callPackage ../development/tools/alloy { }; augeas = callPackage ../tools/system/augeas { }; @@ -4964,6 +5085,8 @@ let bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; }; + bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; + binutils = if stdenv.isDarwin then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;} else callPackage ../development/tools/misc/binutils { @@ -5063,6 +5186,11 @@ let ctodo = callPackage ../applications/misc/ctodo { }; + cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { + wantPS = stdenv.isDarwin; + ps = if stdenv.isDarwin then darwin.ps else null; + }; + cmake = callPackage ../development/tools/build-managers/cmake { wantPS = stdenv.isDarwin; ps = if stdenv.isDarwin then darwin.ps else null; @@ -5133,6 +5261,8 @@ let binutils = binutils; }; + doclifter = callPackage ../development/tools/misc/doclifter { }; + docutils = pythonPackages.docutils; doxygen = callPackage ../development/tools/documentation/doxygen { @@ -5213,6 +5343,8 @@ let inherit (perlPackages) LocaleGettext; }; + heroku = callPackage ../development/tools/heroku { }; + hyenae = callPackage ../tools/networking/hyenae { }; icmake = callPackage ../development/tools/build-managers/icmake { }; @@ -5361,6 +5493,8 @@ let remake = callPackage ../development/tools/build-managers/remake { }; + rman = callPackage ../development/tools/misc/rman { }; + rr = callPackage ../development/tools/analysis/rr { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; @@ -5651,17 +5785,15 @@ let clutter = callPackage ../development/libraries/clutter { }; - clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix { - cogl = cogl_1_18; - }; - clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix { cogl = cogl_1_20; }; clutter-gst = callPackage ../development/libraries/clutter-gst { }; - clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { }; + clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { + clutter = clutter_1_22; + }; clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { }; @@ -5673,8 +5805,6 @@ let cogl = callPackage ../development/libraries/cogl { }; - cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { }; - cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { }; coin3d = callPackage ../development/libraries/coin3d { }; @@ -5809,7 +5939,7 @@ let libvpx = if stdenv.isDarwin then null else libvpx; openal = if stdenv.isDarwin then null else openal; openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1; - pulseaudio = if stdenv.isDarwin then null else pulseaudio; + libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; @@ -6145,9 +6275,7 @@ let cupsSupport = config.gtk2.cups or stdenv.isLinux; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; - - gtk3_16 = callPackage ../development/libraries/gtk+/3.16.nix { + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { gettext = gettextWithExpat gettext_0_19; }; @@ -6155,9 +6283,6 @@ let gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; - gtkmm3_16 = callPackage ../development/libraries/gtkmm/3.16.nix { - gtk3 = gtk3_16; - }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtksharp = gtk-sharp; @@ -6179,18 +6304,17 @@ let gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; - gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; + gwenhywfar = callPackage ../development/libraries/gwenhywfar { gnutls = gnutls33; }; hamlib = callPackage ../development/libraries/hamlib { }; - # TODO : Add MIT Kerberos and let admin choose. - # TODO : Fix kerberos on Darwin - kerberos = if stdenv.isDarwin then null else heimdal; + # TODO : Add Heimdal Kerberos and let admin choose. + # Modularize heimdal into a library first + kerberos = libkrb5; - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { - openldap = openldap.override { - cyrus_sasl = cyrus_sasl.override { kerberos = null; }; - }; + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; + libheimdal = heimdal.override { + prefix = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; @@ -6263,7 +6387,8 @@ let intltool = callPackage ../development/tools/misc/intltool { }; - irrlicht3843 = callPackage ../development/libraries/irrlicht { }; + irrlicht = callPackage ../development/libraries/irrlicht { }; + irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { }; isocodes = callPackage ../development/libraries/iso-codes { }; @@ -6311,18 +6436,18 @@ let automake = automake111x; }; - kf59 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.9 { }); - kf5_latest = kf59; - kf5_stable = kf59; + kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); + kf5_latest = kf510; + kf5_stable = kf510; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { - openldap = openldap.override { - cyrus_sasl = cyrus_sasl.override { kerberos = null; }; - }; inherit (darwin) bootstrap_cmds; }; + libkrb5 = krb5.override { + prefix = "lib"; + }; LASzip = callPackage ../development/libraries/LASzip { }; @@ -6342,8 +6467,6 @@ let lesstif = callPackage ../development/libraries/lesstif { }; - lesstif93 = callPackage ../development/libraries/lesstif-0.93 { }; - leveldb = callPackage ../development/libraries/leveldb { }; levmar = callPackage ../development/libraries/levmar { }; @@ -6390,6 +6513,8 @@ let libbluedevil = callPackage ../development/libraries/libbluedevil { }; + libbdplus = callPackage ../development/libraries/libbdplus { }; + libbluray = callPackage ../development/libraries/libbluray { }; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; @@ -6500,8 +6625,12 @@ let libdvdcss = callPackage ../development/libraries/libdvdcss { }; libdvdnav = callPackage ../development/libraries/libdvdnav { }; + libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix { + libdvdread = libdvdread_4_9_9; + }; libdvdread = callPackage ../development/libraries/libdvdread { }; + libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { }; libdwarf = callPackage ../development/libraries/libdwarf { }; @@ -6596,7 +6725,11 @@ let libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; - libgcrypt = callPackage ../development/libraries/libgcrypt { }; + libgcrypt = callPackage ../development/libraries/libgcrypt { + # Breaks packages that expect to have elevated privileges + # Ex. Lightdm, cryptsetup + libcap = null; + }; libgdiplus = callPackage ../development/libraries/libgdiplus { }; @@ -6663,7 +6796,11 @@ let libmsgpack = callPackage ../development/libraries/libmsgpack { }; libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; - libnatspec = callPackage ../development/libraries/libnatspec { }; + libnatspec = callPackage ../development/libraries/libnatspec ( + stdenv.lib.optionalAttrs stdenv.isDarwin { + inherit (darwin) libiconv; + } + ); libndp = callPackage ../development/libraries/libndp { }; @@ -6703,7 +6840,9 @@ let # standalone libiconv, just in case you want it libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal; - libiconvReal = callPackage ../development/libraries/libiconv { }; + libiconvReal = callPackage ../development/libraries/libiconv { + fetchurl = fetchurlBoot; + }; # On non-GNU systems we need GNU Gettext for libintl. libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext; @@ -6712,6 +6851,8 @@ let libidn = callPackage ../development/libraries/libidn { }; + idnkit = callPackage ../development/libraries/idnkit { }; + libiec61883 = callPackage ../development/libraries/libiec61883 { }; libinfinity = callPackage ../development/libraries/libinfinity { @@ -6754,8 +6895,9 @@ let libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { - openssl = null; + libmicrohttpd-full = callPackage ../development/libraries/libmicrohttpd { }; + + libmicrohttpd = libmicrohttpd-full.override { gnutls = null; }; @@ -6868,6 +7010,8 @@ let libpfm = callPackage ../development/libraries/libpfm { }; + libpqxx = callPackage ../development/libraries/libpqxx { }; + libproxy = callPackage ../development/libraries/libproxy { stdenv = if stdenv.isDarwin then overrideCC stdenv gcc @@ -7000,7 +7144,7 @@ let automake = automake113x; # fails with 14 }); - libuv = libuvVersions.v1_4_2; + libuv = libuvVersions.v1_5_0; libv4l = lowPrio (v4l_utils.override { alsaLib = null; @@ -7013,6 +7157,10 @@ let libvdpau = callPackage ../development/libraries/libvdpau { }; + libverto = callPackage ../development/libraries/libverto { + glib = null; # Don't include fairly heavy dependency + }; + libvirt = callPackage ../development/libraries/libvirt { }; libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; @@ -7301,9 +7449,9 @@ let oniguruma = callPackage ../development/libraries/oniguruma { }; - openal = callPackage ../development/libraries/openal { }; - - # added because I hope that it has been easier to compile on x86 (for blender) + # openalSoft is 100% ABI compatible to openalLegacy and should be a default + openal = openalSoft; + openalLegacy = callPackage ../development/libraries/openal { }; openalSoft = callPackage ../development/libraries/openal-soft { }; openbabel = callPackage ../development/libraries/openbabel { }; @@ -7349,7 +7497,7 @@ let opal = callPackage ../development/libraries/opal {}; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; - openjpeg_2_0_1 = callPackage ../development/libraries/openjpeg/2.0.1.nix { }; + openjpeg_2_0 = callPackage ../development/libraries/openjpeg/2.0.nix { }; openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; openjpeg = openjpeg_2_1; @@ -7372,6 +7520,14 @@ let }; }; + openssl_1_0_2 = callPackage ../development/libraries/openssl/1.0.2.x.nix { + fetchurl = fetchurlBoot; + cryptodevHeaders = linuxPackages.cryptodev.override { + fetchurl = fetchurlBoot; + onlyHeaders = true; + }; + }; + ortp = callPackage ../development/libraries/ortp { }; p11_kit = callPackage ../development/libraries/p11-kit { }; @@ -7406,7 +7562,9 @@ let physfs = callPackage ../development/libraries/physfs { }; - pipelight = callPackage ../tools/misc/pipelight { }; + pipelight = callPackage ../tools/misc/pipelight { + wineStaging = pkgsi686Linux.wineStaging; + }; pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; @@ -7481,6 +7639,8 @@ let qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; + qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qimageblitz = callPackage ../development/libraries/qimageblitz {}; qjson = callPackage ../development/libraries/qjson { }; @@ -7618,7 +7778,6 @@ let rocksdb = callPackage ../development/libraries/rocksdb { }; rubberband = callPackage ../development/libraries/rubberband { - fftw = fftwSinglePrec; inherit (vamp) vampSDK; }; @@ -7751,6 +7910,8 @@ let sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); + sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { }); + sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }); sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { @@ -8058,6 +8219,8 @@ let zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { }; + zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA @@ -8368,9 +8531,7 @@ let ### SERVERS - "389-ds-base" = callPackage ../servers/ldap/389 { - kerberos = krb5; - }; + "389-ds-base" = callPackage ../servers/ldap/389 { }; rdf4store = callPackage ../servers/http/4store { }; @@ -8423,6 +8584,9 @@ let sabnzbd = callPackage ../servers/sabnzbd { }; bind = callPackage ../servers/dns/bind { }; + dnsutils = bind.override { + suffix = "tools"; + }; bird = callPackage ../servers/bird { }; @@ -8555,6 +8719,8 @@ let mpdscribble = callPackage ../tools/misc/mpdscribble { }; + microHttpd = callPackage ../servers/http/micro-httpd { }; + miniHttpd = callPackage ../servers/http/mini-httpd {}; mlmmj = callPackage ../servers/mail/mlmmj { }; @@ -8605,7 +8771,9 @@ let prefix = "lib"; }; - pulseaudio = pulseaudioFull.override { + # Name is changed to prevent use in packages + # please use libpulseaudio instead + pulseaudioLight = pulseaudioFull.override { # The following are disabled in the default build, because if this # functionality is desired, they are only needed in the PulseAudio # server. @@ -8720,15 +8888,20 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + prom2json = callPackage ../servers/monitoring/prometheus/prom2json { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager { }; prometheus-cli = callPackage ../servers/monitoring/prometheus/cli { }; + prometheus-collectd-exporter = + callPackage ../servers/monitoring/prometheus/collectd_exporter { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos_exporter { }; + prometheus-mysqld-exporter = + callPackage ../servers/monitoring/prometheus/mysqld_exporter { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = @@ -8780,7 +8953,8 @@ let samba4 = callPackage ../servers/samba/4.x.nix { python = python2; - kerberos = heimdal; + # Samba is tightly coupled to kerberos so let it provide its own + kerberos = null; gnutls = gnutls33; cups = if stdenv.isDarwin then null else cups; pam = if stdenv.isDarwin then null else pam; @@ -8985,7 +9159,13 @@ let atop = callPackage ../os-specific/linux/atop { }; - audit = callPackage ../os-specific/linux/audit { }; + audit = callPackage ../os-specific/linux/audit { + python = null; + go = null; + }; + libaudit = audit.override { + prefix = "lib"; + }; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; @@ -9203,6 +9383,8 @@ let kbd = callPackage ../os-specific/linux/kbd { }; + kbdlight = callPackage ../os-specific/linux/kbdlight { }; + kmscon = callPackage ../os-specific/linux/kmscon { }; latencytop = callPackage ../os-specific/linux/latencytop { }; @@ -9610,6 +9792,11 @@ let numactl = callPackage ../os-specific/linux/numactl { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { + inherit (xlibs) libXinerama libXi libXrender libXrandr libXtst; + inherit (gnome) gtk gtkmm; + }; + gocode = callPackage ../development/tools/gocode { }; gotags = callPackage ../development/tools/gotags { }; @@ -9618,6 +9805,8 @@ let godep = callPackage ../development/tools/godep { }; + goimports = callPackage ../development/tools/goimports { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; @@ -9675,7 +9864,7 @@ let watch = callPackage ../os-specific/linux/procps/watch.nix { }; - qemu_kvm = lowPrio (qemu.override { x86Only = true; }); + qemu_kvm = lowPrio (qemu.override { type = "kvm-only"; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; @@ -9714,7 +9903,7 @@ let smem = callPackage ../os-specific/linux/smem { }; - statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; + statifier = callPackage ../os-specific/linux/statifier { }; spl = callPackage ../os-specific/linux/spl { configFile = "user"; @@ -9904,6 +10093,8 @@ let wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; + xbomb = callPackage ../games/xbomb { }; + xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { inherit (xorg) utilmacros xproto inputproto xorgserver; }; @@ -10161,6 +10352,8 @@ let ucsFonts = callPackage ../data/fonts/ucs-fonts { }; + uni-vga = callPackage ../data/fonts/uni-vga { }; + unifont = callPackage ../data/fonts/unifont { }; vistafonts = callPackage ../data/fonts/vista-fonts { }; @@ -10333,6 +10526,8 @@ let bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; + bitmeter = callPackage ../applications/audio/bitmeter { }; + blender = callPackage ../applications/misc/blender { python = python34; }; @@ -10347,6 +10542,8 @@ let bvi = callPackage ../applications/editors/bvi { }; + bviplus = callPackage ../applications/editors/bviplus { }; + calf = callPackage ../applications/audio/calf { inherit (gnome) libglade; }; @@ -10421,7 +10618,7 @@ let bomi = callPackage ../applications/video/bomi { stdenv = overrideCC stdenv gcc49; - pulseSupport = config.pulseaudio or false; + pulseSupport = config.pulseaudio or true; }; cmus = callPackage ../applications/audio/cmus { }; @@ -10441,6 +10638,7 @@ let cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; libpng = libpng12; + cmake = cmake-2_8; }; codeblocks = callPackage ../applications/editors/codeblocks { }; @@ -10488,6 +10686,8 @@ let inherit (gnome) GConf libglade; }; + das_watchdog = callPackage ../tools/system/das_watchdog { }; + dbvisualizer = callPackage ../applications/misc/dbvisualizer {}; dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; @@ -10786,6 +10986,8 @@ let inherit (gnome3) epiphany; + eq10q = callPackage ../applications/audio/eq10q { }; + espeak = callPackage ../applications/audio/espeak { }; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -10828,6 +11030,8 @@ let focuswriter = callPackage ../applications/editors/focuswriter { }; + foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; + fossil = callPackage ../applications/version-management/fossil { }; freewheeling = callPackage ../applications/audio/freewheeling { }; @@ -10957,13 +11161,15 @@ let freepv = callPackage ../applications/graphics/freepv { }; xfontsel = callPackage ../applications/misc/xfontsel { }; - xlsfonts = callPackage ../applications/misc/xlsfonts { }; + inherit (xorg) xlsfonts; freerdp = callPackage ../applications/networking/remote/freerdp { ffmpeg = ffmpeg_1; }; - freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { }; + freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { + cmake = cmake-2_8; + }; freicoin = callPackage ../applications/misc/freicoin { }; @@ -11022,17 +11228,15 @@ let goffice = goffice_0_8; }; - goffice_0_8 = callPackage ../desktops/gnome-3/3.12/misc/goffice/0.8.nix { - inherit (gnome2) libglade libgnomeui; - gconf = gnome2.GConf; - libart = gnome2.libart_lgpl; - }; # latest version: gnome3.goffice + goffice_0_8 = gnome3.goffice_0_8; idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; - linssid = callPackage ../applications/networking/linssid { }; + linssid = callPackage ../applications/networking/linssid { + qt5 = qt53; + }; mi2ly = callPackage ../applications/audio/mi2ly {}; @@ -11045,8 +11249,6 @@ let quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; - qjackctl = callPackage ../applications/audio/qjackctl { }; - gkrellm = callPackage ../applications/misc/gkrellm { }; gmu = callPackage ../applications/audio/gmu { }; @@ -11059,9 +11261,7 @@ let inherit (gnome) GConf; }; - gnumeric = callPackage ../applications/office/gnumeric { - inherit (gnome3) goffice gnome_icon_theme; - }; + gnumeric = callPackage ../applications/office/gnumeric { }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; @@ -11155,10 +11355,14 @@ let helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; + heme = callPackage ../applications/editors/heme { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; + hexcurse = callPackage ../applications/editors/hexcurse { }; + hexedit = callPackage ../applications/editors/hexedit { }; hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; @@ -11167,6 +11371,8 @@ let gtk = gtk3; }; + ht = callPackage ../applications/editors/ht { }; + htmldoc = callPackage ../applications/misc/htmldoc { fltk = fltk13; }; @@ -11318,7 +11524,7 @@ let }; kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 { - kf5 = kf59; + kf5 = kf510; }); kdeApps_stable = kdeApps_15_04; kdeApps_latest = kdeApps_15_04; @@ -11357,14 +11563,18 @@ let lash = callPackage ../applications/audio/lash { }; - ladspaH = callPackage ../applications/audio/ladspa-plugins/ladspah.nix { }; + ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { }; ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { fftw = fftwSinglePrec; }; + ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; + caps = callPackage ../applications/audio/caps { }; + LazyLimiter = callPackage ../applications/audio/LazyLimiter { }; + lastwatch = callPackage ../applications/audio/lastwatch { }; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; @@ -11467,6 +11677,8 @@ let matchbox = callPackage ../applications/window-managers/matchbox { }; + MBdistortion = callPackage ../applications/audio/MBdistortion { }; + mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -11475,6 +11687,8 @@ let mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; + mediathekview = callPackage ../applications/video/mediathekview { }; + meld = callPackage ../applications/version-management/meld { }; mcomix = callPackage ../applications/graphics/mcomix { }; @@ -11503,9 +11717,7 @@ let }; midoriWrapper = wrapFirefox - { browser = midori; browserName = "midori"; desktopName = "Midori"; - icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png"; - }; + { browser = midori; browserName = "midori"; desktopName = "Midori"; }; mikmod = callPackage ../applications/audio/mikmod { }; @@ -11529,6 +11741,8 @@ let moc = callPackage ../applications/audio/moc { }; + mod-distortion = callPackage ../applications/audio/mod-distortion { }; + monero = callPackage ../applications/misc/monero { }; monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; @@ -11558,9 +11772,7 @@ let inherit (xlibs) libX11 xproto; }; - easytag = callPackage ../applications/audio/easytag { - inherit (gnome3) gnome_icon_theme dconf; - }; + easytag = callPackage ../applications/audio/easytag { }; mp3gain = callPackage ../applications/audio/mp3gain { }; @@ -11584,6 +11796,7 @@ let mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; + libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); MPlayerPlugin = browser: @@ -11593,7 +11806,7 @@ let # !!! should depend on MPlayer }; - mpv = callPackage ../applications/video/mpv { + mpv = callPackage ../applications/video/mpv rec { lua = lua5_1; lua5_sockets = lua5_1_sockets; bs2bSupport = config.mpv.bs2bSupport or true; @@ -11681,7 +11894,7 @@ let maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; mupdf = callPackage ../applications/misc/mupdf { - openjpeg = openjpeg_2_0_1; + openjpeg = openjpeg_2_0; }; mypaint = callPackage ../applications/graphics/mypaint { }; @@ -11890,7 +12103,18 @@ let eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; - qemu = callPackage ../applications/virtualization/qemu { }; + qemu = callPackage ../applications/virtualization/qemu { + gtk = gtk3; + bluez = bluez5; + libusb = libusb1; + mesa = mesa_noglu; + }; + + qemu-nix = qemu.override { type = "nix"; }; + + qjackctl = callPackage ../applications/audio/qjackctl { }; + + QmidiNet = callPackage ../applications/audio/QmidiNet { }; qmmp = callPackage ../applications/audio/qmmp { }; @@ -11978,6 +12202,8 @@ let automake = automake114x; }; + rofi-pass = callPackage ../applications/misc/rofi/pass.nix { }; + rstudio = callPackage ../applications/editors/rstudio { }; rsync = callPackage ../applications/networking/sync/rsync { @@ -12012,7 +12238,7 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; sakura = callPackage ../applications/misc/sakura { - inherit (gnome3) vte; + vte = gnome3.vte_290; }; sbagen = callPackage ../applications/misc/sbagen { }; @@ -12268,11 +12494,13 @@ let termite = callPackage ../applications/misc/termite { gtk = gtk3; - vte = gnome3_16.vte-select-text; + vte = gnome3.vte-select-text; }; tesseract = callPackage ../applications/graphics/tesseract { }; + tetraproc = callPackage ../applications/audio/tetraproc { }; + thinkingRock = callPackage ../applications/misc/thinking-rock { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { @@ -12291,7 +12519,7 @@ let tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte; + vte = gnome3.vte_290; gtk = gtk3; }; @@ -12370,7 +12598,9 @@ let vanitygen = callPackage ../applications/misc/vanitygen { }; - vanubi = callPackage ../applications/editors/vanubi { vala = vala_0_26; }; + vanubi = callPackage ../applications/editors/vanubi { + vala = vala_0_26; + }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -12496,6 +12726,8 @@ let vnstat = callPackage ../applications/networking/vnstat { }; + VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { }; + vorbisTools = callPackage ../applications/audio/vorbis-tools { }; vue = callPackage ../applications/misc/vue { }; @@ -12568,7 +12800,7 @@ let wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" - , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }: + , icon ? browserName }: let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false; @@ -12709,7 +12941,7 @@ let xchm = callPackage ../applications/misc/xchm { }; - xcompmgr = callPackage ../applications/window-managers/xcompmgr { }; + inherit (xorg) xcompmgr; compton = callPackage ../applications/window-managers/compton { }; @@ -12815,7 +13047,8 @@ let roxterm = callPackage ../applications/misc/roxterm { inherit (pythonPackages) lockfile; - inherit (gnome3) vte gsettings_desktop_schemas; + inherit (gnome3) gsettings_desktop_schemas; + vte = gnome3.vte_290; }; xtrace = callPackage ../tools/X11/xtrace { }; @@ -12849,7 +13082,7 @@ let ykpers = callPackage ../applications/misc/ykpers {}; yoshimi = callPackage ../applications/audio/yoshimi { - fltk = fltk13; + fltk = fltk13.override { cfg.xftSupport = true; }; }; zam-plugins = callPackage ../applications/audio/zam-plugins { inherit (xlibs) libX11; }; @@ -13009,6 +13242,8 @@ let gtypist = callPackage ../games/gtypist { }; + gzdoom = callPackage ../games/gzdoom { }; + hedgewars = callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -13132,6 +13367,7 @@ let spring = callPackage ../games/spring { boost = boost155; + cmake = cmake-2_8; }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -13212,6 +13448,10 @@ let vessel = callPackage_i686 ../games/vessel { }; + voxelands = callPackage ../games/voxelands { + libpng = libpng12; + }; + warmux = callPackage ../games/warmux { }; warsow = callPackage ../games/warsow { @@ -13295,16 +13535,12 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 { - callPackage = pkgs.newScope pkgs.gnome3_12; - }); - gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { callPackage = pkgs.newScope pkgs.gnome3_16; self = pkgs.gnome3_16; }); - gnome3 = gnome3_12; + gnome3 = gnome3_16; gnome = recurseIntoAttrs gnome2; @@ -13544,7 +13780,7 @@ let numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { - kf5 = kf59; + kf5 = kf510; }); plasma5_latest = plasma53; plasma5_stable = plasma53; @@ -13566,8 +13802,8 @@ let guile = guile_1_8; }; - tetgen = callPackage ../applications/science/geometry/tetgen { }; - + tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ + tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT ### SCIENCE/BIOLOGY @@ -13575,10 +13811,6 @@ let motif = lesstif; }; - arb = callPackage ../applications/science/biology/arb { - lesstif = lesstif93; - }; - archimedes = callPackage ../applications/science/electronics/archimedes { }; emboss = callPackage ../applications/science/biology/emboss { }; @@ -13610,7 +13842,7 @@ let # great feature, but it's of limited use with pre-built binaries # coming from a central build farm. tolerateCpuTimingInaccuracy = true; - liblapack = liblapack_3_5_0; + liblapack = liblapack_3_5_0WithoutAtlas; withLapack = false; }; @@ -13626,8 +13858,17 @@ let jags = callPackage ../applications/science/math/jags { }; - liblapack = callPackage ../development/libraries/science/math/liblapack { }; - liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { }; + + # We have essentially 4 permutations of liblapack: version 3.4.1 or 3.5.0, + # and with or without atlas as a dependency. The default `liblapack` is 3.4.1 + # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 + # without atlas. Etc. + liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; + liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; + liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; + liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; + liblapack = liblapackWithAtlas; + liblapack_3_5_0 = liblapack_3_5_0WithAtlas; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -13765,6 +14006,8 @@ let }; }; + gappa = callPackage ../applications/science/logic/gappa { }; + ginac = callPackage ../applications/science/math/ginac { }; hol = callPackage ../applications/science/logic/hol { }; @@ -13947,7 +14190,9 @@ let stellarium = callPackage ../applications/science/astronomy/stellarium { }; - tulip = callPackage ../applications/science/misc/tulip { }; + tulip = callPackage ../applications/science/misc/tulip { + cmake = cmake-2_8; + }; vite = enableDebugging (callPackage ../applications/science/misc/vite { }); @@ -14407,18 +14652,12 @@ let }; wineStable = wine.override { wineRelease = "stable"; }; wineUnstable = wine.override { wineRelease = "unstable"; }; + wineStaging = wine.override { wineRelease = "staging"; }; winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome2) zenity; }; - ### FIXME integrate wineStaging into 64bit - wineStaging = callPackage_i686 ../misc/emulators/wine/staging.nix { - wine = pkgsi686Linux.wineUnstable; - # Patent issues - libtxc_dxtn = pkgsi686Linux.libtxc_dxtn_s2tc; - }; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; @@ -14524,6 +14763,7 @@ let rssglx = rss-glx; #added 2015-03-25 haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 + inherit (haskell.compiler) jhc uhc; # 2015-05-15 opentsdb = callPackage ../tools/misc/opentsdb {}; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 2e8d68414a4..d74d1840449 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -198,6 +198,19 @@ let self = _self // overrides; }; }; + autotetris = melpaBuild { + pname = "autotetris-mode"; + version = "20141114.846"; + src = fetchFromGitHub { + owner = "skeeto"; + repo = "autotetris-mode"; + rev = "7d348d33829bc89ddbd2b4d5cfe5073c3b0cbaaa"; + sha256 = "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc"; + }; + files = [ "autotetris-mode.el" ]; + meta = { license = unlicense; }; + }; + bind-key = melpaBuild { pname = "bind-key"; version = "20150317"; @@ -902,12 +915,12 @@ let self = _self // overrides; projectile = melpaBuild rec { pname = "projectile"; - version = "20141020"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bbatsov"; repo = pname; - rev = "13580d83374e0c17c55b3a680b816dfae407657e"; - sha256 = "10c28h2g53sg68lwamhak0shdhh26h5xaipipz3n4281sr1fwg58"; + rev = "v${version}"; + sha256 = "1bl5wpkyv9xlf5v5hzkj8si1z4hjn3yywrjs1mx0g4irmq3mk29m"; }; packageRequires = [ dash helm s pkg-info epl ]; meta = { license = gpl3Plus; }; @@ -1093,14 +1106,14 @@ let self = _self // overrides; swiper = melpaBuild rec { pname = "swiper"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = pname; rev = version; - sha256 = "1skgw84j5a59ds86bpdcaf3c8iq2m0fz720chjh91ixhkavvdd87"; + sha256 = "1a28vignwpcn62xk46w5p5wjfrbcmvs0gz1jgn4ba7ibmn4cmnnm"; }; - fileSpecs = [ "swiper.el" "ivy.el" "colir.el" ]; + fileSpecs = [ "swiper.el" "ivy.el" "colir.el" "counsel.el" ]; meta = { license = gpl3Plus; }; }; @@ -1201,6 +1214,22 @@ let self = _self // overrides; }; }; + web-mode = melpaBuild rec { + pname = "web-mode"; + version = "11.1.12"; + src = fetchFromGitHub { + owner = "fxbois"; + repo = pname; + rev = "67259f16bfaec5c006a53533b8feeba7771e1365"; + sha256 = "16zcnwm7wnbl1xbsx7rr5rr697ax141akfx2lknwirx18vqmkijj"; + }; + + meta = { + description = "Web template editing mode for emacs"; + license = gpl2; + }; + }; + weechat = melpaBuild rec { pname = "weechat.el"; version = "0.2.2"; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 8c2f090e0c1..9af04081000 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1,30 +1,37 @@ /* This file defines the composition for Go packages. */ { overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb -, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr, pkgs }: +, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchFromBitbucket, fetchbzr, pkgs }: -let self = _self // overrides; _self = with self; { +let + isGo13 = go.meta.branch == "1.3"; + isGo14 = go.meta.branch == "1.4"; + self = _self // overrides; _self = with self; { inherit go buildGoPackage; ## OFFICIAL GO PACKAGES crypto = buildGoPackage rec { - rev = "1351f936d976c60a0a48d728281922cf63eafb8d"; - name = "go-crypto-${rev}"; + rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02"; + name = "crypto-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "golang.org/x/crypto"; + goPackageAliases = [ "code.google.com/p/go.crypto" ]; + disabled = isGo13; + src = fetchFromGitHub { inherit rev; owner = "golang"; repo = "crypto"; - sha256 = "1vf4z97y7xnhzjizik0lghr7ip77hhdj9kbb35rr4c9sn108f20j"; + sha256 = "0plvjv56afb02p7l3c2zfwffnhscmc3f0ckj1gls9ay6vj85y7l8"; }; }; glog = buildGoPackage rec { rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; - name = "glog-${rev}"; + name = "glog-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/golang/glog"; + src = fetchFromGitHub { inherit rev; owner = "golang"; @@ -34,79 +41,204 @@ let self = _self // overrides; _self = with self; { }; image = buildGoPackage rec { - rev = "490b1ad139b3"; - name = "go.image-${rev}"; - goPackagePath = "code.google.com/p/go.image"; - src = fetchhg { + rev = "d8e202c6ce59fad0017414839b6648851d10767e"; + name = "image-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/image"; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "02m6ifwby2fi88njarbbb6dimwg0pd2b6llkgyadh4b9wzp2vy4r"; + owner = "golang"; + repo = "image"; + sha256 = "0cxymm28rgbzsk76d19wm8fwp40dkwxhzmmdjnbkw5541272339l"; }; }; net = buildGoPackage rec { - rev = "3338d5f109e9"; - name = "go.net-${rev}"; - goPackagePath = "code.google.com/p/go.net"; - src = fetchhg { + rev = "d1d694760b7a3a9fa32e4d1c49e08b2d672221d8"; + name = "net-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/net"; + goPackageAliases = [ + "code.google.com/p/go.net" + "github.com/hashicorp/go.net" + ]; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0yz807y3ac07x3nf0qlaw1w1i6asynrpyssjl8jyv3pplww0qj7i"; + owner = "golang"; + repo = "net"; + sha256 = "1fk62vjxsyca8hmlpca9rkgy8wqg9zw920d56ib442sjn9ys3zic"; }; + propagatedBuildInputs = [ text ]; }; + oauth2 = buildGoPackage rec { + rev = "f98d0160877ab4712b906626425ed8b0b320907c"; + name = "oauth2-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/oauth2"; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "oauth2"; + sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i"; + }; + + extraSrcs = [ + { inherit (gcloud-golang) src goPackagePath; } + ]; + + propagatedBuildInputs = [ net ]; + }; + + protobuf = buildGoPackage rec { - rev = "5677a0e3d5e89854c9974e1256839ee23f8233ca"; - name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "39e27fc0f226450c58e11eda145b542bc5dff3fe"; + name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/golang/protobuf"; + goPackageAliases = [ "code.google.com/p/goprotobuf" ]; + src = fetchFromGitHub { inherit rev; owner = "golang"; repo = "protobuf"; - sha256 = "18dzxmy0gfjnwa9x8k3hv9calvmydv0dnz1iibykkzd20gw4l85v"; + sha256 = "12l036ix0dc8hg35xrqmdcr3bpwncrdkgqkhp3s90w6a3qpva3gs"; }; - subPackages = [ "proto" "protoc-gen-go" ]; }; text = buildGoPackage rec { - rev = "024681b033be"; - name = "go.text-${rev}"; - goPackagePath = "code.google.com/p/go.text"; - src = fetchhg { + rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e"; + name = "text-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/text"; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "19px5pw5mvwjb7ymivfkkkr6cyl2npv834jxlr6y0x5ca1djhsci"; + owner = "golang"; + repo = "text"; + sha256 = "1yvmllriqjm0k97vnxycz9q0likvh18a68xbyg1k6ddkvn9sy03y"; }; - doCheck = false; }; + tools = buildGoPackage rec { - rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8"; - name = "go.tools-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "code.google.com/p/go.tools"; - src = fetchhg { + rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9"; + name = "tools-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/tools"; + + preConfigure = '' + # Make the builtin tools available here + mkdir -p $out/bin + eval $(go env | grep GOTOOLDIR) + find $GOTOOLDIR -type f | while read x; do + ln -sv "$x" "$out/bin" + done + export GOTOOLDIR=$out/bin + ''; + + excludedPackages = "testdata"; + + src = fetchFromGitHub { inherit rev; - url = "http://code.google.com/p/go.tools"; - sha256 = "1vgz4kxy0p56qh6pfbs2c68156hakgx4cmrci9jbg7lnrdaz4y56"; + owner = "golang"; + repo = "tools"; + sha256 = "0vq0l3pjhgsp97v6ndlr3jcs029r5zilwai30snwfq74s580sriq"; }; - subPackages = [ "go/vcs" ]; + + buildInputs = [ net ]; }; ## THIRD PARTY - asn1-ber = buildGoPackage rec { - rev = "ec51d5ed21377b4023ca7b1e70ae4cb296ee6047"; - name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/nmcclain/asn1-ber"; + airbrake-go = buildGoPackage rec { + rev = "5b5e269e1bc398d43f67e43dafff3414a59cd5a2"; + name = "airbrake-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/tobi/airbrake-go"; + src = fetchFromGitHub { inherit rev; - owner = "nmcclain"; - repo = "asn1-ber"; - sha256 = "0a2d38k7zpcnf148zlxq2rm7s1s1hzybb3w5ygxilipz0m7qkdsb"; + owner = "tobi"; + repo = "airbrake-go"; + sha256 = "1bps4y3vpphpj63mshjg2aplh579cvqac0hz7qzvac0d1fqcgkdz"; }; }; + ansicolor = buildGoPackage rec { + rev = "8368d3b31cf6f2c2464c7a91675342c9a0ac6658"; + name = "ansicolor-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/shiena/ansicolor"; + + src = fetchFromGitHub { + inherit rev; + owner = "shiena"; + repo = "ansicolor"; + sha256 = "1fyn06vxm44s0ph8pr7r9gkab1f4x851zlyy3p6jbbwsa6an8g9w"; + }; + }; + + asn1-ber = buildGoPackage rec { + rev = "295c7b21db5d9525ad959e3382610f3aff029663"; + name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/vanackere/asn1-ber"; + goPackageAliases = [ + "github.com/nmcclain/asn1-ber" + ]; + + src = fetchFromGitHub { + inherit rev; + owner = "vanackere"; + repo = "asn1-ber"; + sha256 = "1zamvcbk2xk3vznvckgqmdag32nlv7ip0fr1cc0z9ggai22ddh8n"; + }; + }; + + assertions = buildGoPackage rec { + version = "1.5.0"; + name = "assertions-${version}"; + goPackagePath = "github.com/smartystreets/assertions"; + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/smartystreets/assertions/archive/${version}.tar.gz"; + sha256 = "1s4b0v49yv7jmy4izn7grfqykjrg7zg79dg5hsqr3x40d5n7mk02"; + }; + buildInputs = [ oglematchers ]; + propagatedBuildInputs = [ goconvey ]; + # subPackages = []; + doCheck = false; + }; + + aws-sdk-go = buildGoPackage rec { + rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503"; + name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/awslabs/aws-sdk-go"; + goPackageAliases = [ + "github.com/hashicorp/aws-sdk-go" + ]; + + src = fetchFromGitHub { + inherit rev; + owner = "awslabs"; + repo = "aws-sdk-go"; + sha256 = "1725y3aic53l8ms0583gdn0s915y1b783hs339qll0mmx7v09in5"; + }; + + buildInputs = [ go-ini gucumber testify ]; + }; + + hashicorp.aws-sdk-go = buildGoPackage rec { + rev = "e6ea0192eee4640f32ec73c0cbb71f63e4f2b65a"; + name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/aws-sdk-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "aws-sdk-go"; + sha256 = "1qrc2jl38marbarnl31sag7s0h18j2wx1cxkcqin5m1pqg62p4cn"; + }; + + buildInputs = [ go-ini net sandblast ]; + }; + binarydist = buildGoPackage rec { rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}"; @@ -120,6 +252,19 @@ let self = _self // overrides; _self = with self; { }; }; + bolt = buildGoPackage rec { + rev = "957d850b5158a4eebf915476058e720f43459584"; + name = "bolt-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/boltdb/bolt"; + + src = fetchFromGitHub { + inherit rev; + owner = "boltdb"; + repo = "bolt"; + sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"; + }; + }; + bufio = buildGoPackage rec { rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; name = "bufio-${stdenv.lib.strings.substring 0 7 rev}"; @@ -132,6 +277,38 @@ let self = _self // overrides; _self = with self; { }; }; + bugsnag-go = buildGoPackage rec { + rev = "v1.0.3"; + name = "bugsnag-go-${rev}"; + goPackagePath = "github.com/bugsnag/bugsnag-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "bugsnag"; + repo = "bugsnag-go"; + sha256 = "1ymi5hrvd2nyfwfd12xll43gn00ii3bjb5ma9dfhaaxv2asi3ajx"; + }; + + propagatedBuildInputs = [ panicwrap revel ]; + }; + + cascadia = buildGoPackage rec { + rev = "54abbbf07a45a3ef346ebe903e0715d9a3c19352"; #master + name = "cascadia-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/andybalholm/cascadia"; + goPackageAliases = [ "code.google.com/p/cascadia" ]; + propagatedBuildInputs = [ net ]; + buildInputs = propagatedBuildInputs; + doCheck = true; + + src = fetchFromGitHub { + inherit rev; + owner = "andybalholm"; + repo = "cascadia"; + sha256 = "1z21w6p5bp7mi2pvicvcqc871k9s8a6262pkwyjm2qfc859c203m"; + }; + }; + check-v1 = buildGoPackage rec { rev = "871360013c92e1c715c2de6d06b54899468a8a2d"; name = "check-v1-${stdenv.lib.strings.substring 0 7 rev}"; @@ -147,6 +324,7 @@ let self = _self // overrides; _self = with self; { rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; name = "circbuf-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/armon/circbuf"; + src = fetchFromGitHub { inherit rev; owner = "armon"; @@ -156,15 +334,18 @@ let self = _self // overrides; _self = with self; { }; cli = buildGoPackage rec { - rev = "8262fe3f76f0da53b5674eb35c8c6436430794c3"; + rev = "6cc8bc522243675a2882b81662b0b0d2e04b99c9"; name = "cli-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/mitchellh/cli"; + src = fetchFromGitHub { inherit rev; owner = "mitchellh"; repo = "cli"; - sha256 = "0pqkxh1q49kkxihggrfjs8174d927g4c5qqx00ggw8sqqsgrw6vn"; + sha256 = "05w9ypliva9lyn3h4rahznj04mh0fws7vaqlwhxfs5nnd5g03dma"; }; + + propagatedBuildInputs = [ crypto ]; }; cobra = buildGoPackage rec { @@ -181,17 +362,33 @@ let self = _self // overrides; _self = with self; { }; columnize = buildGoPackage rec { - rev = "785d943a7b6886e0bb2f139a60487b823dd8d9de"; + rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; name = "columnize-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/ryanuber/columnize"; + src = fetchFromGitHub { inherit rev; owner = "ryanuber"; repo = "columnize"; - sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f"; + sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"; }; }; + copystructure = buildGoPackage rec { + rev = "6fc66267e9da7d155a9d3bd489e00dad02666dc6"; + name = "copystructure-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/copystructure"; + + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "copystructure"; + sha256 = "193s5vhw68d8npjyf5yvc5j24crazvy7d5dk316hl7590qrmbxrd"; + }; + + buildInputs = [ reflectwalk ]; + }; + confd = buildGoPackage rec { rev = "v0.9.0"; name = "confd-${rev}"; @@ -206,31 +403,174 @@ let self = _self // overrides; _self = with self; { subPackages = [ "./" ]; }; + config = buildGoPackage rec { + rev = "0f78529c8c7e3e9a25f15876532ecbc07c7d99e6"; + name = "config-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/robfig/config"; + + src = fetchFromGitHub { + inherit rev; + owner = "robfig"; + repo = "config"; + sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0"; + }; + }; + + consul = buildGoPackage rec { + rev = "v0.5.2"; + name = "consul-${rev}"; + goPackagePath = "github.com/hashicorp/consul"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "consul"; + sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7"; + }; + + buildInputs = [ + circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint + ugorji.go go-multierror go-syslog golang-lru hcl logutils memberlist + net-rpc-msgpackrpc raft raft-boltdb raft-mdb scada-client serf yamux + muxado dns cli mapstructure columnize crypto + ]; + + # Keep consul.ui for backward compatability + passthru.ui = pkgs.consul-ui; + }; + + consul-alerts = buildGoPackage rec { + rev = "7dff28aa4c8c883a65106f8ec22796e1a589edab"; + name = "consul-alerts-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/AcalephStorage/consul-alerts"; + + renameImports = '' + # Remove all references to included dependency store + rm -rf go/src/${goPackagePath}/Godeps + govers -d -m github.com/AcalephStorage/consul-alerts/Godeps/_workspace/src/ "" + + # Fix references to consul-api + govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api + sed -i 's,consulapi,api,g' go/src/${goPackagePath}/consul/client.go + sed -i 's,consulapi,api,g' go/src/${consul-skipper.goPackagePath}/skipper.go + ''; + + src = fetchFromGitHub { + inherit rev; + owner = "AcalephStorage"; + repo = "consul-alerts"; + sha256 = "1vwybkvjgyilxk3l6avzivd31l8gnk8d0v7bl10qll0cd068fabq"; + }; + + # We just want the consul api not all of consul + extraSrcs = [ + { inherit (consul) src goPackagePath; } + { inherit (influxdb8) src goPackagePath; } + { inherit (consul-skipper) src goPackagePath; } + ]; + + buildInputs = [ logrus docopt-go hipchat-go gopherduty ]; + }; + + consul-migrate = buildGoPackage rec { + rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c"; + name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/consul-migrate"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "consul-migrate"; + sha256 = "0kjziwhz1ifj4wpy5viba6z17sfgjjibdhnn73ffp7q5q8abg8w3"; + }; + + buildInputs = [ raft raft-boltdb raft-mdb ]; + }; + + consul-skipper = buildGoPackage rec { + rev = "729b4fdcc7f572f7c083673595f939256b80b76f"; + name = "consul-skipper-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/darkcrux/consul-skipper"; + + renameImports = '' + govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api + sed -i 's,consulapi,api,g' go/src/${goPackagePath}/skipper.go + ''; + + src = fetchFromGitHub { + inherit rev; + owner = "darkcrux"; + repo = "consul-skipper"; + sha256 = "0shqvihbmq1w5ddnkn62qd4k6gs5zalq6k4alacjz92bwf6d2x6x"; + }; + + # We just want the consul api not all of consul + extraSrcs = [ + { inherit (consul) src goPackagePath; } + ]; + + buildInputs = [ logrus ]; + }; + + consul-template = buildGoPackage rec { + rev = "v0.9.0"; + name = "consul-template-${rev}"; + goPackagePath = "github.com/hashicorp/consul-template"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "consul-template"; + sha256 = "1k64rjskzn7cxn7rxab978847jq8gr4zj4cnzgznhn44nzasgymj"; + }; + + # We just want the consul api not all of consul and vault + extraSrcs = [ + { inherit (consul) src goPackagePath; } + { inherit (vault) src goPackagePath; } + ]; + + buildInputs = [ go-multierror go-syslog hcl logutils mapstructure ]; + }; + dbus = buildGoPackage rec { - rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133"; + rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea"; name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/godbus/dbus"; - preBuild = '' - cd "go/src/$goPackagePath" - rm -r _examples - ''; + + excludedPackages = "examples"; + src = fetchFromGitHub { inherit rev; owner = "godbus"; repo = "dbus"; - sha256 = "0k80wzdx8091y3012nd4giwgc08n1pj6lcr9i44dsapcjnb80jkn"; + sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf"; }; }; dns = buildGoPackage rec { - rev = "fd694e564b3ceaf34a8bbe9ef18f65c64df8ed03"; + rev = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1"; name = "dns-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/miekg/dns"; + src = fetchFromGitHub { inherit rev; owner = "miekg"; repo = "dns"; - sha256 = "1g15l00jypjac0fd2j39lifw1j3md49vk6fq35mv8kc8ighhvxaq"; + sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq"; + }; + }; + + docopt-go = buildGoPackage rec { + rev = "854c423c810880e30b9fecdabb12d54f4a92f9bb"; + name = "docopt-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/docopt/docopt-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "docopt"; + repo = "docopt-go"; + sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1"; }; }; @@ -245,15 +585,43 @@ let self = _self // overrides; _self = with self; { }; }; - fsnotify = buildGoPackage rec { - rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2"; - name = "fsnotify-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/howeyc/fsnotify"; + errwrap = buildGoPackage rec { + rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55"; + name = "errwrap-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/errwrap"; + src = fetchFromGitHub { inherit rev; - owner = "howeyc"; + owner = "hashicorp"; + repo = "errwrap"; + sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf"; + }; + }; + + fsnotify.v0 = buildGoPackage rec { + rev = "v0.9.3"; + name = "fsnotify.v0-${rev}"; + goPackagePath = "gopkg.in/fsnotify.v0"; + goPackageAliases = [ "github.com/howeyc/fsnotify" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "go-fsnotify"; repo = "fsnotify"; - sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn"; + sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"; + }; + }; + + fsnotify.v1 = buildGoPackage rec { + rev = "v1.2.0"; + name = "fsnotify.v1-${rev}"; + goPackagePath = "gopkg.in/fsnotify.v1"; + + src = fetchFromGitHub { + inherit rev; + owner = "go-fsnotify"; + repo = "fsnotify"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; }; }; @@ -269,6 +637,21 @@ let self = _self // overrides; _self = with self; { }; }; + gcloud-golang = buildGoPackage rec { + rev = "de1c38e5af44da22abe7c3b14a1edcf6264dae55"; + name = "gcloud-golang-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "google.golang.org/cloud"; + + src = fetchFromGitHub { + inherit rev; + owner = "GoogleCloudPlatform"; + repo = "gcloud-golang"; + sha256 = "0n6sh1zblixwyc9ykbsknmadsx2dmn3b5rsyrs30id1f96pgh4l0"; + }; + + buildInputs = [ net oauth2 protobuf google-api-go-client grpc ]; + }; + ginkgo = buildGoPackage rec { rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2"; name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}"; @@ -282,6 +665,32 @@ let self = _self // overrides; _self = with self; { subPackages = [ "./" ]; # don't try to build test fixtures }; + gls = buildGoPackage rec { + rev = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690"; + name = "gls-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/jtolds/gls"; + src = fetchFromGitHub { + inherit rev; + owner = "jtolds"; + repo = "gls"; + sha256 = "1gvgkx7llklz6plapb95fcql7d34i6j7anlvksqhdirpja465jnm"; + }; + }; + + ugorji.go = buildGoPackage rec { + rev = "821cda7e48749cacf7cad2c6ed01e96457ca7e9d"; + name = "ugorji-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/ugorji/go"; + goPackageAliases = [ "github.com/hashicorp/go-msgpack" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "ugorji"; + repo = "go"; + sha256 = "1ay1l6gijxjgc7j0093drp5mjm93fmrp7r20qbqz4k05l43mqb3j"; + }; + }; + goamz = buildGoPackage rec { rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; name = "goamz-${rev}"; @@ -321,6 +730,19 @@ let self = _self // overrides; _self = with self; { }; }; + gocolorize = buildGoPackage rec { + rev = "v1.0.0"; + name = "gocolorize-${rev}"; + goPackagePath = "github.com/agtorre/gocolorize"; + + src = fetchFromGitHub { + inherit rev; + owner = "agtorre"; + repo = "gocolorize"; + sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p"; + }; + }; + goconvey = buildGoPackage rec { version = "1.5.0"; name = "goconvey-${version}"; @@ -334,10 +756,24 @@ let self = _self // overrides; _self = with self; { doCheck = false; # please check again }; + gomdb = buildGoPackage rec { + rev = "151f2e08ef45cb0e57d694b2562f351955dff572"; + name = "gomdb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/armon/gomdb"; + + src = fetchFromGitHub { + inherit rev; + owner = "armon"; + repo = "gomdb"; + sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61"; + }; + }; + govers = buildGoPackage rec { rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; name = "govers-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/rogpeppe/govers"; + dontRenameImports = true; src = fetchFromGitHub { inherit rev; owner = "rogpeppe"; @@ -346,16 +782,31 @@ let self = _self // overrides; _self = with self; { }; }; + golang-lru = buildGoPackage rec { + rev = "995efda3e073b6946b175ed93901d729ad47466a"; + name = "golang-lru-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/golang-lru"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "golang-lru"; + sha256 = "0ilnzg9qq2pfa8qb9yd25s5afi0fvsm78kqzqy39kgg8zsx70xyj"; + }; + }; + golang_protobuf_extensions = buildGoPackage rec { - rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchFromGitHub { inherit rev; owner = "matttproud"; repo = "golang_protobuf_extensions"; - sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; }; + buildInputs = [ protobuf ]; }; @@ -372,6 +823,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ginkgo gomega gosnappy ]; }; + gollectd = buildGoPackage rec { + rev = "cf6dec97343244b5d8a5485463675d42f574aa2d"; + name = "gollectd-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/kimor79/gollectd"; + + src = fetchFromGitHub { + inherit rev; + owner = "kimor79"; + repo = "gollectd"; + sha256 = "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa"; + }; + }; + gomega = buildGoPackage rec { rev = "8adf9e1730c55cdc590de7d49766cb2acc88d8f2"; name = "gomega-${stdenv.lib.strings.substring 0 7 rev}"; @@ -384,6 +848,64 @@ let self = _self // overrides; _self = with self; { }; }; + gomemcache = buildGoPackage rec { + rev = "72a68649ba712ee7c4b5b4a943a626bcd7d90eb8"; + name = "gomemcache-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bradfitz/gomemcache"; + + src = fetchFromGitHub { + inherit rev; + owner = "bradfitz"; + repo = "gomemcache"; + sha256 = "1r8fpzwhakq8fsppc33n4iivq1pz47xhs0h6bv4x5qiip5mswwvg"; + }; + }; + + google-api-go-client = buildGoPackage rec { + rev = "34c5554e6406f7f715ede3616b39034247545ce0"; + name = "google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "google.golang.org/api"; + + preBuild = '' + rm -rf go/src/${goPackagePath}/examples + ''; + + src = fetchFromGitHub { + inherit rev; + owner = "google"; + repo = "google-api-go-client"; + sha256 = "1496h0xc7vjklr4m4j7vy1764k1qk2grpcwz5zssgplpfs9s9wfz"; + }; + + buildInputs = [ net ]; + }; + + gopass = buildGoPackage rec { + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + name = "gopass-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/howeyc/gopass"; + src = fetchFromGitHub { + inherit rev; + owner = "howeyc"; + repo = "gopass"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + buildInputs = [ crypto ]; + }; + + gopherduty = buildGoPackage rec { + rev = "f4906ce7e59b33a50bfbcba93e2cf58778c11fb9"; + name = "gopherduty-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/darkcrux/gopherduty"; + + src = fetchFromGitHub { + inherit rev; + owner = "darkcrux"; + repo = "gopherduty"; + sha256 = "11w1yqc16fxj5q1y5ha5m99j18fg4p9lyqi542x2xbrmjqqialcf"; + }; + }; + gosnappy = buildGoPackage rec { rev = "ce8acff4829e0c2458a67ead32390ac0a381c862"; name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}"; @@ -455,15 +977,59 @@ let self = _self // overrides; _self = with self; { }; }; - go-codec = buildGoPackage rec { - rev = "71c2886f5a673a35f909803f38ece5810165097b"; - name = "go-codec-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/ugorji/go"; + pmylund.go-cache = buildGoPackage rec { + rev = "93d85800f2fa6bd0a739e7bd612bfa3bc008b72d"; + name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/pmylund/go-cache"; + goPackageAliases = [ + "github.com/robfig/go-cache" + "github.com/influxdb/go-cache" + ]; + src = fetchFromGitHub { inherit rev; - owner = "ugorji"; - repo = "go"; - sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + owner = "pmylund"; + repo = "go-cache"; + sha256 = "08wfwm7nk381lv6a95p0hfgqwaksn0vhzz1xxdncjdw6w71isyy7"; + }; + }; + + robfig.go-cache = buildGoPackage rec { + rev = "9fc39e0dbf62c034ec4e45e6120fc69433a3ec51"; + name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/robfig/go-cache"; + + src = fetchFromGitHub { + inherit rev; + owner = "robfig"; + repo = "go-cache"; + sha256 = "032nh3y43bpzpcm7bdkxfh55aydvzc2jzhigvy5gd9f648m4j9ha"; + }; + }; + + go-checkpoint = buildGoPackage rec { + rev = "88326f6851319068e7b34981032128c0b1a6524d"; + name = "go-checkpoint-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/go-checkpoint"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "go-checkpoint"; + sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4"; + }; + }; + + go-colortext = buildGoPackage rec { + rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57"; + name = "go-colortext-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/daviddengcn/go-colortext"; + + src = fetchFromGitHub { + inherit rev; + owner = "daviddengcn"; + repo = "go-colortext"; + sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"; }; }; @@ -480,6 +1046,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.etcd ]; }; + go-flags = buildGoPackage rec { + rev = "5e118789801496c93ba210d34ef1f2ce5a9173bd"; + name = "go-flags-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/jessevdk/go-flags"; + src = fetchFromGitHub { + inherit rev; + owner = "jessevdk"; + repo = "go-flags"; + sha256 = "1davr5h936fhc8zy7digp5yqxr216d1mshksr7iiad5xb3r8r9ja"; + }; + }; + go-fuse = buildGoPackage rec { rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58"; name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}"; @@ -493,6 +1071,21 @@ let self = _self // overrides; _self = with self; { subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ]; }; + go-github = buildGoPackage rec { + rev = "9eb187bac4eba6fff5a54f80550b2df73b651523"; + name = "go-github-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/google/go-github"; + + src = fetchFromGitHub { + inherit rev; + owner = "google"; + repo = "go-github"; + sha256 = "123ck9nf5ggdrndg2gs1bhr4ysh4z0izph9sp7ciisxpgjkaycxq"; + }; + + buildInputs = [ go-querystring oauth2 ]; + }; + go-homedir = buildGoPackage rec { rev = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52"; name = "go-homedir-${stdenv.lib.strings.substring 0 7 rev}"; @@ -533,13 +1126,15 @@ let self = _self // overrides; _self = with self; { rev = "70d039bee4b0e389e5be560491d8291708506f59"; name = "go-log-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/coreos/go-log"; + src = fetchFromGitHub { inherit rev; owner = "coreos"; repo = "go-log"; sha256 = "1s95xmmhcgw4ascf4zr8c4ij2n4s3mr881nxcpmc61g0gb722b13"; }; - buildInputs = [ go-systemd osext ]; + + propagatedBuildInputs = [ osext go-systemd ]; }; rcrowley.go-metrics = buildGoPackage rec { @@ -553,30 +1148,34 @@ let self = _self // overrides; _self = with self; { sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f"; }; - buildInputs = [ influxdb-go stathat ]; + buildInputs = [ influxdb stathat ]; }; armon.go-metrics = buildGoPackage rec { - rev = "02567bbc4f518a43853d262b651a3c8257c3f141"; + rev = "a54701ebec11868993bc198c3f315353e9de2ed6"; name = "armon.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/armon/go-metrics"; + src = fetchFromGitHub { inherit rev; owner = "armon"; repo = "go-metrics"; - sha256 = "08fk3zmw0ywmdfp2qhrpv0vrk1y97hzqczrgr3y2yip3x8sr37ar"; + sha256 = "0ia9i96nac7vnmf5qb98rs74npf3vg55kdsvmql8cwgfpmqqcfdh"; }; + + propagatedBuildInputs = [ prometheus.client_golang ]; }; - go-msgpack = buildGoPackage rec { - rev = "75092644046c5e38257395b86ed26c702dc95b92"; - name = "go-msgpack-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/ugorji/go-msgpack"; + go-multierror = buildGoPackage rec { + rev = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e"; + name = "go-multierror-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/go-multierror"; + src = fetchFromGitHub { inherit rev; - owner = "ugorji"; - repo = "go-msgpack"; - sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + owner = "hashicorp"; + repo = "go-multierror"; + sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz"; }; }; @@ -605,6 +1204,32 @@ let self = _self // overrides; _self = with self; { }; }; + go-querystring = buildGoPackage rec { + rev = "547ef5ac979778feb2f760cdb5f4eae1a2207b86"; + name = "go-querystring-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/google/go-querystring"; + + src = fetchFromGitHub { + inherit rev; + owner = "google"; + repo = "go-querystring"; + sha256 = "00ani7fhydcmlsm3n93nmj1hcqp2wmzvihnb1gdzynif1hw0530y"; + }; + }; + + go-radix = buildGoPackage rec { + rev = "0bab926c3433cfd6490c6d3c504a7b471362390c"; + name = "go-radix-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/armon/go-radix"; + + src = fetchFromGitHub { + inherit rev; + owner = "armon"; + repo = "go-radix"; + sha256 = "0llq96lxh7p9426hjii8k42kq0cp1hflawh1kjwhbmi5g0jrq04d"; + }; + }; + go-runit = buildGoPackage rec { rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}"; @@ -643,28 +1268,32 @@ let self = _self // overrides; _self = with self; { }; go-syslog = buildGoPackage rec { - rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c"; + rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; name = "go-syslog-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/hashicorp/go-syslog"; + src = fetchFromGitHub { inherit rev; owner = "hashicorp"; repo = "go-syslog"; - sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81"; + sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; }; }; go-systemd = buildGoPackage rec { - rev = "2d21675230a81a503f4363f4aa3490af06d52bb8"; + rev = "2688e91251d9d8e404e86dd8f096e23b2f086958"; name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/coreos/go-systemd"; + + excludedPackages = "examples"; + src = fetchFromGitHub { inherit rev; owner = "coreos"; repo = "go-systemd"; - sha256 = "07g5c8khlcjnr86gniw3zr7l8jwrb9fhrj18zm5n6ccj24nidwam"; + sha256 = "0c1k3y5msc1xplhx0ksa7g08yqjaavns8s5zrfg4ig8az30gwlpa"; }; - subPackages = [ "activation" "daemon" "dbus" "journal" "login1" ]; + buildInputs = [ dbus ]; }; @@ -695,6 +1324,34 @@ let self = _self // overrides; _self = with self; { }; }; + go-zookeeper = buildGoPackage rec { + rev = "d0e0d8e11f318e000a8cc434616d69e329edc374"; + name = "go-zookeeper-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/samuel/go-zookeeper"; + + src = fetchFromGitHub { + inherit rev; + owner = "samuel"; + repo = "go-zookeeper"; + sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d"; + }; + }; + + goquery = buildGoPackage rec { + rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2 + name = "goquery-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/PuerkitoBio/goquery"; + propagatedBuildInputs = [ cascadia net ]; + buildInputs = [ cascadia net ]; + doCheck = true; + src = fetchFromGitHub { + inherit rev; + owner = "PuerkitoBio"; + repo = "goquery"; + sha256 = "0bskm3nja1v3pmg7g8nqjkmpwz5p72h1h81y076x1z17zrjaw585"; + }; + }; + grafana = buildGoPackage rec { version = "2.0.0-beta1"; name = "grafana-v${version}"; @@ -709,17 +1366,94 @@ let self = _self // overrides; _self = with self; { subPackages = [ "./" ]; }; + grpc = buildGoPackage rec { + rev = "f5ebd86be717593ab029545492c93ddf8914832b"; + name = "grpc-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "google.golang.org/grpc"; + + src = fetchFromGitHub { + inherit rev; + owner = "grpc"; + repo = "grpc-go"; + sha256 = "07dfpwwk68rrhxmqj69gq2ncsf3kfmn0zhlwscda0gc5gb57n5x1"; + }; + + propagatedBuildInputs = [ http2 glog net protobuf oauth2 ]; + }; + + gucumber = buildGoPackage rec { + rev = "fba94dc5a9077fa81eb85199fa9dfdaa8af82ab5"; + name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/lsegal/gucumber"; + + src = fetchFromGitHub { + inherit rev; + owner = "lsegal"; + repo = "gucumber"; + sha256 = "028wczwpicwmggk3221pz8ffzh30l47x8217gvdzcqq6h9iiaczr"; + }; + + buildInputs = [ testify ]; + propagatedBuildInputs = [ ansicolor ]; + }; + + hcl = buildGoPackage rec { + rev = "513e04c400ee2e81e97f5e011c08fb42c6f69b84"; + name = "hcl-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/hcl"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "hcl"; + sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c"; + }; + + buildInputs = [ go-multierror ]; + }; + + hipchat-go = buildGoPackage rec { + rev = "1dd13e154219c15e2611fe46adbb6bf65db419b7"; + name = "hipchat-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/tbruyelle/hipchat-go"; + + excludedPackages = "examples"; + + src = fetchFromGitHub { + inherit rev; + owner = "tbruyelle"; + repo = "hipchat-go"; + sha256 = "060wg5yjlh28v03mvm80kwgxyny6cyj7zjpcdg032b8b1sz9z81s"; + }; + }; + hologram = buildGoPackage rec { rev = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/AdRoll/hologram"; + src = fetchFromGitHub { inherit rev; owner = "copumpkin"; repo = "hologram"; sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4"; }; - buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir vanackere.ldap g2s gox ]; + }; + + http2 = buildGoPackage rec { + rev = "f8202bc903bda493ebba4aa54922d78430c2c42f"; + name = "http2-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bradfitz/http2"; + + src = fetchFromGitHub { + inherit rev; + owner = "bradfitz"; + repo = "http2"; + sha256 = "0cza2126jbji5vijwk4dxs05hifnff04xcr0vhxvafs6hz3sacvr"; + }; + + buildInputs = [ crypto ]; }; httprouter = buildGoPackage rec { @@ -734,16 +1468,40 @@ let self = _self // overrides; _self = with self; { }; }; - influxdb-go = buildGoPackage rec { - rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7"; - name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/influxdb/influxdb-go"; + influxdb = buildGoPackage rec { + rev = "d80ef2286d476d9e306548305e47c3ba967f5bc2"; + name = "influxdb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/influxdb/influxdb"; + goPackageAliases = [ + "github.com/influxdb/influxdb-go" + ]; + src = fetchFromGitHub { inherit rev; owner = "influxdb"; - repo = "influxdb-go"; - sha256 = "16in1xhx94pir06aw166inn0hzpb7836xbws16laabs1p2np7bld"; + repo = "influxdb"; + sha256 = "0p3s0pbn5x294qg2r0qgysb5wmspsvjxhccxh2hs6hc24dl6y93b"; }; + + propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd ]; + }; + + influxdb8 = buildGoPackage rec { + rev = "v0.8.8"; + name = "influxdb-${rev}"; + goPackagePath = "github.com/influxdb/influxdb"; + goPackageAliases = [ + "github.com/influxdb/influxdb-go" + ]; + + src = fetchFromGitHub { + inherit rev; + owner = "influxdb"; + repo = "influxdb"; + sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv"; + }; + + buildInputs = [ statik crypto protobuf log4go toml pmylund.go-cache ]; }; eckardt.influxdb-go = buildGoPackage rec { @@ -757,6 +1515,18 @@ let self = _self // overrides; _self = with self; { }; }; + flagfile = buildGoPackage rec { + rev = "871ce569c29360f95d7596f90aa54d5ecef75738"; + name = "flagfile-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/spacemonkeygo/flagfile"; + src = fetchFromGitHub { + inherit rev; + owner = "spacemonkeygo"; + repo = "flagfile"; + sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc"; + }; + }; + iochan = buildGoPackage rec { rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; name = "iochan-${stdenv.lib.strings.substring 0 7 rev}"; @@ -769,84 +1539,129 @@ let self = _self // overrides; _self = with self; { }; }; - ldap = buildGoPackage rec { - rev = "469fe5a802d61523b40dbb29bb8012a6b99b06b5"; + vanackere.ldap = buildGoPackage rec { + rev = "e29b797d1abde6567ccb4ab56236e033cabf845a"; name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/nmcclain/ldap"; + goPackagePath = "github.com/vanackere/ldap"; + goPackageAliases = [ + "github.com/nmcclain/ldap" + ]; + src = fetchFromGitHub { inherit rev; - owner = "nmcclain"; + owner = "vanackere"; repo = "ldap"; - sha256 = "0xq5dc03ym0wlg9mvf4gbrmj74l4c8bgkls8fd7c98a128qw2srk"; + sha256 = "069n242wszl04z0cyrwfzpdf64ziw5c3ps4czrsdsx7h4msmvr1x"; }; + propagatedBuildInputs = [ asn1-ber ]; - subPackages = [ "./" ]; + }; + + liner = buildGoPackage rec { + rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced"; + name = "liner-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/peterh/liner"; + + src = fetchFromGitHub { + inherit rev; + owner = "peterh"; + repo = "liner"; + sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48"; + }; }; log4go = buildGoPackage rec { - rev = "48"; - name = "log4go-${rev}"; - goPackagePath = "code.google.com/p/log4go"; + rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8"; + name = "log4go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/ccpaging/log4go"; + goPackageAliases = [ + "github.com/alecthomas/log4go" + "code.google.com/p/log4go" + ]; - src = fetchhg { + excludedPackages = "examples"; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; + owner = "ccpaging"; + repo = "log4go"; + sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"; }; - subPackages = [ "./" ]; # don't build examples + propagatedBuildInputs = [ go-colortext ]; + }; + + logrus = buildGoPackage rec { + rev = "v0.8.2"; + name = "logrus-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/Sirupsen/logrus"; + + excludedPackages = "examples"; + + src = fetchFromGitHub { + inherit rev; + owner = "Sirupsen"; + repo = "logrus"; + sha256 = "0isihf185bw54yc72mbkf3cgfh7xj0x8ky04fs52xpj6vrmd72bv"; + }; + + propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ]; }; logutils = buildGoPackage rec { - rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; + rev = "367a65d59043b4f846d179341d138f01f988c186"; name = "logutils-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/hashicorp/logutils"; + src = fetchFromGitHub { inherit rev; owner = "hashicorp"; repo = "logutils"; - sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz"; + sha256 = "0rjag8c6fn3f51nysrq62r46ma6gzyvijxba47q7cdfjq35mydb8"; }; }; mapstructure = buildGoPackage rec { - rev = "6fb2c832bcac61d01212ab1d172f7a14a8585b07"; + rev = "f7d28d5aeab42b9b95d2e6d6b956f73a290077fc"; name = "mapstructure-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/mitchellh/mapstructure"; + src = fetchFromGitHub { inherit rev; owner = "mitchellh"; repo = "mapstructure"; - sha256 = "0mx855lwhv0rk461wmbnbzbpkhmq5p2ipmrm5bhzimagrr1w17hw"; + sha256 = "1l9bxx0lrxdb75bxgy3jq2f6sgin2xd5ll70z5797vi96mlz8ydb"; }; }; mdns = buildGoPackage rec { - rev = "70462deb060d44247356ee238ebafd7699ddcffe"; + rev = "2b439d37011456df8ff83a70ffd1cd6046410113"; name = "mdns-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/armon/mdns"; + goPackagePath = "github.com/hashicorp/mdns"; + src = fetchFromGitHub { inherit rev; - owner = "armon"; + owner = "hashicorp"; repo = "mdns"; - sha256 = "0xkm3d0hsixdm1yrkx9c39723kfjkb3wvrzrmx3np9ylcwn6h5p5"; + sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"; }; - propagatedBuildInputs = [ dns net ]; + propagatedBuildInputs = [ net dns ]; }; memberlist = buildGoPackage rec { - rev = "17d39b695094be943bfb98442a80b082e6b9ac47"; + rev = "6025015f2dc659ca2c735112d37e753bda6e329d"; name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/hashicorp/memberlist"; + src = fetchFromGitHub { inherit rev; owner = "hashicorp"; repo = "memberlist"; - sha256 = "0nvgjnwmfqhv2wvr77d2q5mq1bfw4xbpil6wgyj4fyrmhsfzrv3g"; + sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"; }; - propagatedBuildInputs = [ go-codec armon.go-metrics ]; + propagatedBuildInputs = [ ugorji.go armon.go-metrics ]; }; mesos-stats = buildGoPackage rec { @@ -859,19 +1674,20 @@ let self = _self // overrides; _self = with self; { repo = "mesos_stats"; sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; }; - - propagatedBuildInputs = [ prometheus.client_golang glog ]; }; mgo = buildGoPackage rec { - rev = "2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; name = "mgo-${rev}"; - goPackagePath = "launchpad.net/mgo"; - src = fetchbzr { + goPackagePath = "gopkg.in/mgo.v2"; + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; + owner = "go-mgo"; + repo = "mgo"; + sha256 ="0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; }; + + buildInputs = [ pkgs.cyrus_sasl ]; }; mousetrap = buildGoPackage rec { @@ -887,17 +1703,59 @@ let self = _self // overrides; _self = with self; { }; msgpack = buildGoPackage rec { - rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; + rev = "9dbd4ac30c0b67927f0fb5557fb8341047bd35f7"; name = "msgpack-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/vmihailenco/msgpack"; + goPackagePath = "gopkg.in/vmihailenco/msgpack.v2"; + src = fetchFromGitHub { inherit rev; owner = "vmihailenco"; repo = "msgpack"; - sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + sha256 = "0nq9yb85hi3c35kwyl38ywv95vd8n7aywmj78wwylglld22nfmw2"; }; }; + muxado = buildGoPackage rec { + rev = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848"; + name = "muxado-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/inconshreveable/muxado"; + + src = fetchFromGitHub { + inherit rev; + owner = "inconshreveable"; + repo = "muxado"; + sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs"; + }; + }; + + mysql = buildGoPackage rec { + rev = "0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b"; + name = "mysql-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/go-sql-driver/mysql"; + + src = fetchFromGitHub { + inherit rev; + owner = "go-sql-driver"; + repo = "mysql"; + sha256 = "0ydvd0mk53793sj3hgycsx926zvzxipxvppld1i175g3pn4d41xp"; + }; + }; + + net-rpc-msgpackrpc = buildGoPackage rec { + rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2"; + name = "net-rpc-msgpackrpc-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/net-rpc-msgpackrpc"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "net-rpc-msgpackrpc"; + sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969"; + }; + + propagatedBuildInputs = [ ugorji.go ]; + }; + ntp = buildGoPackage rec { rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; name = "ntp-${stdenv.lib.strings.substring 0 7 rev}"; @@ -910,6 +1768,19 @@ let self = _self // overrides; _self = with self; { }; }; + objx = buildGoPackage rec { + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + name = "objx-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/stretchr/objx"; + + src = fetchFromGitHub { + inherit rev; + owner = "stretchr"; + repo = "objx"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + }; + oglematchers = buildGoPackage rec { rev = "4fc24f97b5b74022c2a3f4ca7eed57ca29083d3e"; name = "oglematchers-${stdenv.lib.strings.substring 0 7 rev}"; @@ -950,15 +1821,75 @@ let self = _self // overrides; _self = with self; { doCheck = false; # check this again }; - osext = buildGoPackage rec { - rev = "10"; - name = "osext-${rev}"; - goPackagePath = "bitbucket.org/kardianos/osext"; - src = fetchhg { + openssl = buildGoPackage rec { + rev = "84b5df477423634115e53fb171a66007cece19f5"; + name = "openssl-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/spacemonkeygo/openssl"; + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "1sj9r5pm28l9sqx6354fwp032n53znx9k8495k3dfnyqjrkvlw6n"; + owner = "spacemonkeygo"; + repo = "openssl"; + sha256 = "1l0cyazxp8bwmi151djyr6pknj9jv8n53lgfhgj6l0zj32p5kh1v"; }; + buildInputs = [ spacelog pkgconfig pkgs.openssl ]; + }; + + osext = buildGoPackage rec { + rev = "8fef92e41e22a70e700a96b29f066cda30ea24ef"; + name = "osext-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/kardianos/osext"; + goPackageAliases = [ + "github.com/bugsnag/osext" + "bitbucket.org/kardianos/osext" + ]; + + src = fetchFromGitHub { + inherit rev; + owner = "kardianos"; + repo = "osext"; + sha256 = "1md9c0qlmfhwcwgqg92vfykcy95snci4n815plb15mgj5cf8dm7d"; + }; + }; + + pat = buildGoPackage rec { + rev = "b8a35001b773c267eb260a691f4e5499a3531600"; + name = "pat-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bmizerany/pat"; + + src = fetchFromGitHub { + inherit rev; + owner = "bmizerany"; + repo = "pat"; + sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"; + }; + }; + + pathtree = buildGoPackage rec { + rev = "41257a1839e945fce74afd070e02bab2ea2c776a"; + name = "pathtree-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/robfig/pathtree"; + + src = fetchFromGitHub { + inherit rev; + owner = "robfig"; + repo = "pathtree"; + sha256 = "087hvskjx1zw815h1617i135vwsn5288v579mz6yral91wbn0kvi"; + }; + }; + + panicwrap = buildGoPackage rec { + rev = "e5f9854865b9778a45169fc249e99e338d4d6f27"; + name = "panicwrap-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bugsnag/panicwrap"; + + src = fetchFromGitHub { + inherit rev; + owner = "bugsnag"; + repo = "panicwrap"; + sha256 = "01afviklmgm25i82c0z9xkjgbrh0j1fm9a1adqfd2jqv0cm41k9d"; + }; + + propagatedBuildInputs = [ osext ]; }; perks = buildGoPackage rec { @@ -977,6 +1908,7 @@ let self = _self // overrides; _self = with self; { rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/beorn7/perks"; + src = fetchFromGitHub { inherit rev; owner = "beorn7"; @@ -998,6 +1930,19 @@ let self = _self // overrides; _self = with self; { doCheck = false; # bad import path in tests }; + pq = buildGoPackage rec { + rev = "93e9980741c9e593411b94e07d5bad8cfb4809db"; + name = "pq-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/lib/pq"; + + src = fetchFromGitHub { + inherit rev; + owner = "lib"; + repo = "pq"; + sha256 = "1q0zlizsk3xn7jn0skbvbhcxsfhq7z3dva96cm72n2r5vs5ld783"; + }; + }; + pretty = buildGoPackage rec { rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; name = "pretty-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1013,21 +1958,23 @@ let self = _self // overrides; _self = with self; { prometheus.client_golang = buildGoPackage rec { name = "prometheus-client-${version}"; - version = "0.3.2"; + version = "0.5.0"; goPackagePath = "github.com/prometheus/client_golang"; + src = fetchFromGitHub { owner = "prometheus"; repo = "client_golang"; rev = "${version}"; - sha256 = "1fn56zp420hxpm0prr76yyhh62zq3sqj3ppl2r4qxjc78f8ckbj4"; + sha256 = "0aaf20iv797dj2vr5lnqk006aw7n0cclmxlpk8xy6c6nrn6fm3nv"; }; + propagatedBuildInputs = [ + goautoneg protobuf golang_protobuf_extensions prometheus.client_model prometheus.procfs beorn7.perks - goautoneg ]; }; @@ -1045,14 +1992,15 @@ let self = _self // overrides; _self = with self; { }; prometheus.procfs = buildGoPackage rec { - rev = "92faa308558161acab0ada1db048e9996ecec160"; + rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d"; name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/prometheus/procfs"; + src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "procfs"; - sha256 = "0kaw81z2yi45f6ll6n2clr2zz60bdgdxzqnxvd74flynz4sr0p1v"; + sha256 = "0hxssp6h1cs7l2cvnxj1hyacy3328hhpi1pd123f2a57aikha9ff"; }; }; @@ -1080,6 +2028,51 @@ let self = _self // overrides; _self = with self; { }; }; + raft = buildGoPackage rec { + rev = "a8065f298505708bf60f518c09178149f3c06f21"; + name = "raft-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/raft"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "raft"; + sha256 = "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn"; + }; + + propagatedBuildInputs = [ armon.go-metrics ugorji.go ]; + }; + + raft-boltdb = buildGoPackage rec { + rev = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee"; + name = "raft-boltdb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/raft-boltdb"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "raft-boltdb"; + sha256 = "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia"; + }; + + propagatedBuildInputs = [ bolt ugorji.go raft ]; + }; + + raft-mdb = buildGoPackage rec { + rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0"; + name = "raft-mdb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/raft-mdb"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "raft-mdb"; + sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i"; + }; + + propagatedBuildInputs = [ gomdb ugorji.go raft ]; + }; + raw = buildGoPackage rec { rev = "724aedf6e1a5d8971aafec384b6bde3d5608fba4"; name = "raw-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1092,6 +2085,64 @@ let self = _self // overrides; _self = with self; { }; }; + raven-go = buildGoPackage rec { + rev = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7"; + name = "raven-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/getsentry/raven-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "getsentry"; + repo = "raven-go"; + sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh"; + }; + }; + + redigo = buildGoPackage rec { + rev = "535138d7bcd717d6531c701ef5933d98b1866257"; + name = "redigo-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/garyburd/redigo"; + + src = fetchFromGitHub { + inherit rev; + owner = "garyburd"; + repo = "redigo"; + sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; + }; + }; + + reflectwalk = buildGoPackage rec { + rev = "242be0c275dedfba00a616563e6db75ab8f279ec"; + name = "reflectwalk-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/reflectwalk"; + + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "reflectwalk"; + sha256 = "0xjyjs7ci7yaslk0rcgdw99ys2kq0p14cx6c90pmdzl0m9pcc9v4"; + }; + }; + + revel = buildGoPackage rec { + rev = "v0.12.0"; + name = "revel-${rev}"; + goPackagePath = "github.com/revel/revel"; + + src = fetchFromGitHub { + inherit rev; + owner = "revel"; + repo = "revel"; + sha256 = "1g88fw5lqh3a9qmx182s64zk3h1s1mx8bljyghissmd9z505pbzf"; + }; + + # Using robfig's old go-cache due to compilation errors. + # Try to switch to pmylund.go-cache after v0.12.0 + propagatedBuildInputs = [ + gocolorize config net pathtree fsnotify.v1 robfig.go-cache redigo gomemcache + ]; + }; + rgbterm = buildGoPackage rec { rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1104,6 +2155,54 @@ let self = _self // overrides; _self = with self; { }; }; + sandblast = buildGoPackage rec { + rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555"; + name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/aarzilli/sandblast"; + + src = fetchFromGitHub { + inherit rev; + owner = "aarzilli"; + repo = "sandblast"; + sha256 = "1pj0bic3x89v44nr8ycqxwnafkiz3cr5kya4wfdfj5ldbs5xnq9l"; + }; + + buildInputs = [ net text ]; + }; + + scada-client = buildGoPackage rec { + rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae"; + name = "scada-client-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/scada-client"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "scada-client"; + sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b"; + }; + + buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ]; + }; + + serf = buildGoPackage rec { + rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; + name = "serf-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/serf"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "serf"; + sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; + }; + + buildInputs = [ + circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist + cli mapstructure columnize + ]; + }; + sets = buildGoPackage rec { rev = "6c54cb57ea406ff6354256a4847e37298194478f"; name = "sets-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1141,6 +2240,19 @@ let self = _self // overrides; _self = with self; { }; }; + spacelog = buildGoPackage rec { + rev = "ae95ccc1eb0c8ce2496c43177430efd61930f7e4"; + name = "spacelog-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/spacemonkeygo/spacelog"; + src = fetchFromGitHub { + inherit rev; + owner = "spacemonkeygo"; + repo = "spacelog"; + sha256 = "1i1awivsix0ch0vg6rwvx0536ziyw6phcx45b1rmrclp6b6dyacy"; + }; + buildInputs = [ flagfile ]; + }; + stathat = buildGoPackage rec { rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; name = "stathat-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1153,6 +2265,21 @@ let self = _self // overrides; _self = with self; { }; }; + statik = buildGoPackage rec { + rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465"; + name = "statik-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/rakyll/statik"; + + excludedPackages = "example"; + + src = fetchFromGitHub { + inherit rev; + owner = "rakyll"; + repo = "statik"; + sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"; + }; + }; + termbox-go = buildGoPackage rec { rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; name = "termbox-go-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1167,6 +2294,21 @@ let self = _self // overrides; _self = with self; { subPackages = [ "./" ]; # prevent building _demos }; + testify = buildGoPackage rec { + rev = "dab07ac62d4905d3e48d17dc549c684ac3b7c15a"; + name = "testify-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/stretchr/testify"; + + src = fetchFromGitHub { + inherit rev; + owner = "stretchr"; + repo = "testify"; + sha256 = "0r24v9ly3g68ywqyri14fn8smvkw8zvrzbivxw3ndd6jxcvi84b7"; + }; + + buildInputs = [ objx ]; + }; + kr.text = buildGoPackage rec { rev = "6807e777504f54ad073ecef66747de158294b639"; name = "kr.text-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1180,15 +2322,28 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pty ]; }; + tomb = buildGoPackage rec { + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + name = "tomb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "gopkg.in/tomb.v2"; + src = fetchFromGitHub { + inherit rev; + owner = "go-tomb"; + repo = "tomb"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + }; + toml = buildGoPackage rec { - rev = "f87ce853111478914f0bcffa34d43a93643e6eda"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; name = "toml-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/BurntSushi/toml"; + src = fetchFromGitHub { inherit rev; owner = "BurntSushi"; repo = "toml"; - sha256 = "0g8203y9ycf34j2q3ymxb8nh4habgwdrjn9vdgrginllx73yq565"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; }; }; @@ -1205,6 +2360,31 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgconfig libusb ]; }; + vault = buildGoPackage rec { + rev = "v0.1.2"; + name = "vault-${rev}"; + goPackagePath = "github.com/hashicorp/vault"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "vault"; + sha256 = "0q6wlw0s9dig11mzcfg25fh2wz7g70zxkqm7c5f58fncxdby2nqj"; + }; + + # We just want the consul api not all of consul + extraSrcs = [ + { inherit (consul) src goPackagePath; } + ]; + + buildInputs = [ + armon.go-metrics go-radix mysql go-querystring hashicorp.aws-sdk-go + errwrap go-multierror go-syslog golang-lru hcl logutils pq cli + copystructure go-homedir mapstructure reflectwalk columnize go-zookeeper + asn1-ber vanackere.ldap go-ini crypto net oauth2 osext go-github + ]; + }; + vulcand = buildGoPackage rec { rev = "v0.8.0-beta.3"; name = "vulcand-${rev}"; @@ -1243,4 +2423,17 @@ let self = _self // overrides; _self = with self; { }; }; + yamux = buildGoPackage rec { + rev = "b2e55852ddaf823a85c67f798080eb7d08acd71d"; + name = "yamux-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/yamux"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "yamux"; + sha256 = "0mr87my5m8lgc0byjcddlclxg34d07cpi9p78ps3rhzq7p37g533"; + }; + }; + }; in self diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix deleted file mode 100644 index 73c0abd4726..00000000000 --- a/pkgs/top-level/haskell-ng.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ pkgs, callPackage, stdenv }: - -rec { - - lib = import ../development/haskell-modules/lib.nix { inherit pkgs; }; - - compiler = { - - ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; - ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ - gmp = pkgs.gmp4; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ - gmp = pkgs.gmp4; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - - ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; }; - ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; }; - ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc = compiler.ghc784; - - ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs { - ghc = compiler.ghc7101; - }; - }; - - packages = { - - ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; }; - ghc6123 = callPackage ../development/haskell-modules { - ghc = compiler.ghc6123; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; - }; - ghc704 = callPackage ../development/haskell-modules { - ghc = compiler.ghc704; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; - }; - ghc722 = callPackage ../development/haskell-modules { - ghc = compiler.ghc722; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; - }; - ghc742 = callPackage ../development/haskell-modules { - ghc = compiler.ghc742; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; - }; - ghc763 = callPackage ../development/haskell-modules { - ghc = compiler.ghc763; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; - }; - ghc784 = callPackage ../development/haskell-modules { - ghc = compiler.ghc784; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; - }; - ghc7101 = callPackage ../development/haskell-modules { - ghc = compiler.ghc7101; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - }; - ghcHEAD = callPackage ../development/haskell-modules { - ghc = compiler.ghcHEAD; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; - }; - ghcjs = callPackage ../development/haskell-modules { - ghc = compiler.ghcjs; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; - }; - - }; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0051c2b3e21..6b37718afea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -37,11 +37,20 @@ rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); - ghc = compiler.ghc784; ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs { ghc = compiler.ghc7101; }; + + jhc = callPackage ../development/compilers/jhc { + inherit (packages.ghc763) ghcWithPackages; + }; + + uhc = callPackage ../development/compilers/uhc/default.nix ({ + stdenv = pkgs.clangStdenv; + inherit (pkgs.haskellPackages) ghcWithPackages; + }); + }; packages = { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 773ddd29521..84befe7f652 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,9 +5,9 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool +{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib +, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook }: let @@ -55,9 +55,9 @@ let name = "luaevent-${version}"; disabled = isLua52; - src = fetchurl { + src = fetchzip { url = "https://github.com/harningt/luaevent/archive/v${version}.tar.gz"; - sha256 = "1ifr949j9xaas0jk0nxpilb44dqvk4c5h4m7ccksz5da3iksfgls"; + sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik"; }; preBuild = '' @@ -107,9 +107,9 @@ let luafilesystem = buildLuaPackage rec { name = "filesystem-1.6.2"; - src = fetchurl { + src = fetchzip { url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; - sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz"; + sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; }; meta = { homepage = "https://github.com/keplerproject/luafilesystem"; @@ -144,9 +144,9 @@ let luasec = buildLuaPackage rec { version = "0.5"; name = "sec-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"; - sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034"; + sha256 = "1zl6wwcyd4dfcw01qan7dkcw0rgzm69w819qbaddcr2ik147ccmq"; }; buildInputs = [ openssl ]; @@ -190,9 +190,9 @@ let luazip = buildLuaPackage rec { name = "zip-${version}"; version = "1.2.3"; - src = fetchurl { + src = fetchzip { url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip"; - sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50"; + sha256 = "0zrrwhmzny5zbpx91bjbl77gzkvvdi3qhhviliggp0aj8w3faxsr"; }; buildInputs = [ unzip zziplib ]; patches = [ ../development/lua-modules/zip.patch ]; @@ -209,9 +209,9 @@ let name = "zlib-${version}"; version = "0.4"; - src = fetchurl { + src = fetchzip { url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz"; - sha256 = "1l32nwyh8b4vicxvlhbv9qhkhklbhvjfn8wd72bjk7ac9kz172rd"; + sha256 = "1pgxnjc0gvk25wsr69nsm60y5ad86z1nlq7mzj3ckygzkgi782dd"; }; buildInputs = [ zlib ]; @@ -238,11 +238,11 @@ let luastdlib = buildLuaPackage { name = "stdlib"; - src = fetchurl { + src = fetchzip { url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; - sha256 = "1v3158g5050sdqfrqi6d2bjh0lmi1v01a6m2nwqpr527a2dqcf0c"; + sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; }; - buildInputs = [ unzip ]; + buildInputs = [ autoreconfHook unzip ]; meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; hydraPlatforms = stdenv.lib.platforms.linux; @@ -253,9 +253,9 @@ let lrexlib = buildLuaPackage rec { name = "lrexlib-${version}"; version = "2.7.2"; - src = fetchurl { + src = fetchzip { url = "https://github.com/rrthomas/lrexlib/archive/150c251be57c4e569da0f48bf6b01fbca97179fe.zip"; - sha256 = "0i5brqbykc2nalp8snlq1r0wmf8y2wqp6drzr2xmq5phvj8913xh"; + sha256 = "0acb3258681bjq61piz331r99bdff6cnkjaigq5phg3699iz5h75"; }; buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ]; @@ -288,9 +288,9 @@ let luasqlite3 = buildLuaPackage rec { name = "sqlite3-${version}"; version = "2.1.1"; - src = fetchurl { + src = fetchzip { url = "https://github.com/LuaDist/luasql-sqlite3/archive/2acdb6cb256e63e5b5a0ddd72c4639d8c0feb52d.zip"; - sha256 = "1yy1n1l1801j48rlf3bhxpxqfgx46ixrs8jxhhbf7x1hn1j4axlv"; + sha256 = "17zsa0jzciildil9k4lb0rjn9s1nj80dy16pzx9bxqyi75pjf2d4"; }; buildInputs = [ unzip sqlite ]; @@ -356,9 +356,9 @@ let luaMessagePack = buildLuaPackage rec { name = "lua-MessagePack-${version}"; version = "0.3.1"; - src = fetchurl { + src = fetchzip { url = "https://github.com/fperrad/lua-MessagePack/archive/${version}.tar.gz"; - sha256 = "185mrd6bagwwm94jxzanq01l72ama3x4hf160a7yw7hgim2y5h9c"; + sha256 = "1xlif8fkwd8bb78wrvf2z309p7apms350lbg6qavylsvz57lkjm6"; }; buildInputs = [ unzip ]; @@ -373,9 +373,9 @@ let name = "lgi-${version}"; version = "0.7.2"; - src = fetchurl { + src = fetchzip { url = "https://github.com/pavouk/lgi/archive/${version}.tar.gz"; - sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; + sha256 = "10i2ssfs01d49fdmmriqzxc8pshys4rixhx30wzd9p1m1q47a5pn"; }; meta = with stdenv.lib; { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 56bffa0bc51..6a007242487 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -33,12 +33,12 @@ let self = _self // overrides; _self = with self; { # use gnused so that the preCheck command passes buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; propagatedBuildInputs = [ FileNext ]; - meta = { + meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; homepage = http://betterthangrep.com/; - license = "free"; # Artistic 2.0 + license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; # tests fails on nixos and hydra because of different purity issues doCheck = false; @@ -607,7 +607,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the cairo 2d vector graphics library"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -2565,6 +2565,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; + doCheck = false; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; @@ -3721,9 +3722,9 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ListMoreUtils ModulePluggable Moose MooseXParamsValidate MooseXSemiAffordanceAccessor namespaceautoclean ] ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; - meta = { + meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; - license = "artistic_2"; + license = licenses.artistic2; }; }; @@ -3977,16 +3978,16 @@ let self = _self // overrides; _self = with self; { }; FinanceQuote = buildPerlPackage rec { - name = "Finance-Quote-1.35"; + name = "Finance-Quote-1.37"; src = fetchurl { url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; - sha256 = "0mxfhi1ndckj4w7fw20rwy6ymalg2yncnp9xn0v2bnk5ibqj439w"; + sha256 = "1b6pbh7f76fb5sa4f0lhx085xy55pprz5v7z7li7pqiyw7i4f4bf"; }; - propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ]; - meta = { + propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc DateTime JSON ]; + meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; - license = "gpl"; + license = licenses.gpl2; }; }; @@ -4105,7 +4106,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl3Plus ]; + license = stdenv.lib.licenses.lgpl3Plus; }; }; @@ -4158,9 +4159,9 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.graphviz ]; propagatedBuildInputs = [ IPCRun TestMore ]; - meta = { + meta = with stdenv.lib; { description = "Perl interface to the GraphViz graphing tool"; - license = [ "Artistic" ]; + license = licenses.artistic2; maintainers = [ ]; }; }; @@ -4185,7 +4186,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -4861,7 +4862,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c"; }; - meta = { + meta = with stdenv.lib; { description = "ExifTool, a tool to read, write and edit EXIF meta information"; homepage = http://www.sno.phy.queensu.ca/~phil/exiftool/; @@ -4877,10 +4878,10 @@ let self = _self // overrides; _self = with self; { Sigma/Foveon and Sony. ''; - license = [ "GPLv1+" /* or */ "Artistic" ]; + license = with licenses; [ gpl1Plus /* or */ artistic2 ]; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; }; @@ -5184,8 +5185,8 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; - buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.gettext; - NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lintl" else null; + buildInputs = stdenv.lib.optional (stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext; + NIX_CFLAGS_LINK = if (stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; @@ -7273,7 +7274,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Layout and render international text"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -7810,10 +7811,10 @@ let self = _self // overrides; _self = with self; { sha256 = "c5da0e390b58655934e1df57937d29d7de13b99f5638fe44833832a5b39c8aa5"; }; propagatedBuildInputs = [ FileFindIterator IPCRun constantdefer libintlperl ]; - meta = { + meta = with stdenv.lib; { homepage = http://user42.tuxfamily.org/podlinkcheck/index.html; description = "Check POD L<> link references"; - license = "gpl"; + license = licenses.gpl3Plus; }; }; @@ -7921,9 +7922,9 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2013031301.tar.gz; sha256 = "729a8198d264aa64ecbb233ff990507f97fbb66bda746b95f3286f50f5f25c84"; }; - meta = { + meta = with stdenv.lib; { description = "Provide commonly requested regular expressions"; - license = "mit"; + license = licenses.mit; }; }; @@ -8433,9 +8434,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; propagatedBuildInputs = [ ParamsUtil SubExporter ]; - meta = { + meta = with stdenv.lib; { description = "Build sprintf-like functions of your own"; - license = "gpl"; + license = licenses.gpl2; }; }; @@ -9333,11 +9334,11 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ClassInspector TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase FatalException Moose namespaceclean TestAssert ]; - meta = { + meta = with stdenv.lib; { description = "Simulating other classes"; - license = "lgpl"; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; }; @@ -10673,6 +10674,9 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz; sha256 = "1sadi505g5qmxr36lgcbrcrqh3a5gcdg32b405gnr8k54b6rg0dl"; }; + patchPhase = if stdenv.isCygwin then '' + sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm + '' else null; makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include"; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9187d560602..fe06043a859 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -90,9 +90,8 @@ let self = with self; { }; redis = buildPecl { - name = "redis-2.2.5"; - - sha256 = "0hrk0lf8h6l30zrjld29csl186zb1cl2rz1gfn9dma33np4iisyw"; + name = "redis-2.2.7"; + sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm"; }; composer = pkgs.stdenv.mkDerivation rec { diff --git a/pkgs/top-level/pure-packages.nix b/pkgs/top-level/pure-packages.nix new file mode 100644 index 00000000000..005e09cc003 --- /dev/null +++ b/pkgs/top-level/pure-packages.nix @@ -0,0 +1,33 @@ +{ callPackage }: + +rec { + audio = callPackage ../development/pure-modules/audio { }; + avahi = callPackage ../development/pure-modules/avahi { }; + csv = callPackage ../development/pure-modules/csv { }; + doc = callPackage ../development/pure-modules/doc { }; + fastcgi = callPackage ../development/pure-modules/fastcgi { }; + faust = callPackage ../development/pure-modules/faust { }; + ffi = callPackage ../development/pure-modules/ffi { }; + gen = callPackage ../development/pure-modules/gen { }; + gl = callPackage ../development/pure-modules/gl { }; + glpk = callPackage ../development/pure-modules/glpk { }; + gplot = callPackage ../development/pure-modules/gplot { }; + gsl = callPackage ../development/pure-modules/gsl { }; + gtk = callPackage ../development/pure-modules/gtk { pure-ffi = ffi; }; + liblo = callPackage ../development/pure-modules/liblo { }; + lilv = callPackage ../development/pure-modules/lilv { }; + lv2 = callPackage ../development/pure-modules/lv2 { }; + midi = callPackage ../development/pure-modules/midi { }; + mpfr = callPackage ../development/pure-modules/mpfr { }; + octave = callPackage ../development/pure-modules/octave { }; + odbc = callPackage ../development/pure-modules/odbc { }; + pandoc = callPackage ../development/pure-modules/pandoc { }; + rational = callPackage ../development/pure-modules/rational { }; + readline = callPackage ../development/pure-modules/readline { }; + sockets = callPackage ../development/pure-modules/sockets { }; + sql3 = callPackage ../development/pure-modules/sql3 { }; + stldict = callPackage ../development/pure-modules/stldict { }; + stllib = callPackage ../development/pure-modules/stllib { }; + tk = callPackage ../development/pure-modules/tk { }; + xml = callPackage ../development/pure-modules/xml { }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1803625f6f4..ab452a562d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -96,12 +96,12 @@ let discid = buildPythonPackage rec { name = "discid-1.1.0"; - meta = with stdenv.lib; { + meta = { description = "Python binding of libdiscid"; homepage = "https://python-discid.readthedocs.org/"; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainer = with maintainers; [ iyzsong ]; + maintainers = with maintainers; [ iyzsong ]; }; src = pkgs.fetchurl { @@ -209,12 +209,12 @@ let sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py ''; - meta = with stdenv.lib; { + meta = { description = "ASCII art to image converter"; homepage = https://launchpad.net/aafigure/; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -235,12 +235,12 @@ let # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -276,7 +276,7 @@ let meta = { homepage = https://github.com/teythoon/afew; description = "An initial tagging script for notmuch mail"; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -292,7 +292,7 @@ let meta = { homepage = https://github.com/bitprophet/alabaster; description = "a Sphinx theme"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -311,7 +311,7 @@ let meta = { homepage = http://bitbucket.org/zzzeek/alembic; description = "A database migration tool for SQLAlchemy"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -362,8 +362,8 @@ let ''; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -398,7 +398,7 @@ let meta = { homepage = https://github.com/pazz/alot; description = "Terminal MUA using notmuch mail"; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -472,7 +472,7 @@ let meta = { description = "namespace control and lazy-import mechanism"; homepage = "http://bitbucket.org/hpk42/apipkg"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -484,7 +484,7 @@ let md5 = "1d17b4c9694ab84794e228f28dc3275b"; }; - meta = with stdenv.lib; { + meta = { description = "A python module for determining appropriate platform-specific dirs"; homepage = http://github.com/ActiveState/appdirs; license = licenses.mit; @@ -570,14 +570,14 @@ let meta = { description = "Twitter API library"; license = "apache"; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; async = buildPythonPackage rec { name = "async-0.6.1"; disabled = isPy3k; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; buildInputs = with self; [ pkgs.zlib ]; doCheck = false; @@ -619,7 +619,7 @@ let meta = { homepage = http://code.google.com/p/argparse/; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "argparse: Python command line parser"; @@ -656,7 +656,7 @@ let meta = { description = "A dict with attribute-style access"; homepage = https://github.com/bcj/AttrDict; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -671,7 +671,7 @@ let meta = { description = "Cross-platform audio decoding"; homepage = "https://github.com/sampsyo/audioread"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -688,7 +688,7 @@ let meta = { description = "Utilities and Python modules for handling audio"; homepage = "http://audiotools.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }; @@ -706,12 +706,12 @@ let # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; homepage = https://pypi.python.org/pypi/autopep8/; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }); @@ -725,7 +725,7 @@ let md5 = "7f4893205e5ad69ac86f6b44efb7df72"; }; - meta = with stdenv.lib; { + meta = { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro/"; }; @@ -743,29 +743,29 @@ let doCheck = false; # No such file or directory: './run_tests.py - meta = with stdenv.lib; { + meta = { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro3k/"; }; })); azure = buildPythonPackage rec { - version = "0.10.2"; + version = "0.11.0"; name = "azure-${version}"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/azure/${name}.zip"; - md5 = "8eaa0f8e649b21b6527a5ee801cef33a"; + md5 = "5499efd85c54c757c0e757b5407ee47f"; }; propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; - meta = with stdenv.lib; { + meta = { description = "Microsoft Azure SDK for Python"; homepage = "http://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; - maintainers = [ maintainers.olcai ]; + maintainers = with maintainers; [ olcai ]; }; }; @@ -797,7 +797,7 @@ let meta = { describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; homepage = https://github.com/peterjc/backports.lzma; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -814,7 +814,7 @@ let meta = { homepage = http://pypi.python.org/pypi/babelfish; description = "A module to work with countries and languages"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -827,28 +827,28 @@ let sha256 = "1kmrdr1c2ivpqgp2csln7vbanga3sh3nvaqmgbsg96z6fbg7f7w8"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/nicolargo/batinfo; description = "A simple Python lib to retrieve battery information"; license = licenses.lgpl3; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; bcdoc = buildPythonPackage rec { - name = "bcdoc-0.13.0"; + name = "bcdoc-0.14.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.13.0.tar.gz"; - md5 = "819882458be7b642e00ddc9846073d89"; + url = "https://pypi.python.org/packages/source/b/bcdoc/${name}.tar.gz"; + sha256 = "1s2kdqs1n2mj7wq3w0pq30zs7vxq0l3abik2clqnc4hm2j7crbk8"; }; - buildInputs = with self; [ self.docutils self.six ]; + buildInputs = with self; [ docutils six ]; meta = { homepage = https://github.com/botocore/bcdoc; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "ReST document generation tools for botocore"; }; }; @@ -886,8 +886,8 @@ let meta = { homepage = http://crummy.com/software/BeautifulSoup/bs4/; description = "HTML and XML parser"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -914,11 +914,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -969,11 +966,11 @@ let are incremental and low-impact. ''; homepage = https://github.com/g2p/bedup; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + maintainers = with maintainers; [ bluescreen303 ]; }; }; @@ -1015,7 +1012,7 @@ let }; doCheck = false; buildInputs = with pkgs; [ liblapack blas ]; - meta = with stdenv.lib; { + meta = { homepage = "http://cvxopt.org/"; description = "Python Software for Convex Optimization"; maintainers = with maintainers; [ edwtjo ]; @@ -1053,7 +1050,7 @@ let md5 = "f49ca7766fe4a67e03a731e575614f87"; }; - meta = with stdenv.lib; { + meta = { description = "Platform-independent module for I/O completion events"; homepage = https://launchpad.net/python-iowait; }; @@ -1081,7 +1078,7 @@ let md5 = "50ce3f3fdb9196a00059a5ea7b3739fd"; }; - meta = with stdenv.lib; { + meta = { description = "rarfile - RAR archive reader for Python"; homepage = https://github.com/markokr/rarfile; }; @@ -1098,7 +1095,7 @@ let propagatedBuildInputs = with pythonPackages; [ nose ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG"; homepage = https://github.com/rackspace/python-proboscis; license = licenses.asl20; @@ -1113,7 +1110,7 @@ let md5 = "5586fe8ece7af4e24f71ea740185127e"; }; - meta = with stdenv.lib; { + meta = { description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; homepage = https://github.com/echonest/pyechonest; }; @@ -1173,10 +1170,10 @@ let pythonPath = [ self.requests ]; - meta = with stdenv.lib; { + meta = { description = "Bitbucket command line interface"; homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; - maintainers = [ maintainers.refnil ]; + maintainers = with maintainers; [ refnil ]; }; }; @@ -1192,12 +1189,12 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Module for binary data manipulation"; homepage = https://code.google.com/p/python-bitstring/; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -1212,7 +1209,7 @@ let propagatedBuildInputs = with self; [ six html5lib ]; - meta = with stdenv.lib; { + meta = { description = "An easy, HTML5, whitelisting HTML sanitizer"; longDescription = '' Bleach is an HTML sanitizing library that escapes or strips markup and @@ -1242,7 +1239,7 @@ let md5 = "66e9688f2d287593a0e698cd8a5fbc57"; }; - meta = with stdenv.lib; { + meta = { homepage = http://pythonhosted.org/blinker/; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; @@ -1267,12 +1264,12 @@ let # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -1290,20 +1287,18 @@ let meta = { description = "UNKNOWN"; homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.iElectric - ]; + maintainers = with maintainers; [ iElectric ]; }; }; boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.36.0"; + version = "2.38.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "1zrlmri89q2090yh9ylx798q4yk54y39v7w7xj101fnwc1r6jlqr"; + sha256 = "0l7m3lmxmnknnz9svzc7z26rklwckzwqgz6hgackl62gkndryrgj"; }; checkPhase = '' @@ -1313,8 +1308,6 @@ let buildInputs = [ self.nose self.mock ]; propagatedBuildInputs = [ self.requests self.httpretty ]; - patches = [ ../development/python-modules/boto/content-length-str.patch ]; - meta = { homepage = https://github.com/boto/boto; @@ -1331,12 +1324,12 @@ let }; botocore = buildPythonPackage rec { - version = "0.102.0"; + version = "1.0.0a1"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "1266hwkcchzr9r2z1q1150zmk20p3d4a75p6nppi6w9bhsywxhnr"; + sha256 = "0fybr48l0fvpc57n71khynpb4j0ibzn35bzybw6g1q9063xfwnxm"; }; propagatedBuildInputs = @@ -1366,12 +1359,12 @@ let propagatedBuildInputs = with self; [ setuptools ]; - meta = with stdenv.lib; { + meta = { homepage = http://bottlepy.org; description = "A fast and simple micro-framework for small web-applications"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -1389,7 +1382,7 @@ let propagatedBuildInputs = [ pkgs.swig pkgs.box2d ]; - meta = with stdenv.lib; { + meta = { homepage = https://code.google.com/p/pybox2d/; description = '' A 2D game physics library for Python under @@ -1397,7 +1390,7 @@ let ''; license = licenses.zlib; platforms = platforms.all; - maintainers = [ maintainers.sepi ]; + maintainers = with maintainers; [ sepi ]; }; }; @@ -1420,12 +1413,12 @@ let # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://github.com/ralphbean/bugwarrior; description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -1467,12 +1460,12 @@ let export HOME=$(pwd)/check-phase ''; - meta = with stdenv.lib; { + meta = { homepage = https://fedorahosted.org/python-bugzilla/; description = "Bugzilla XMLRPC access module"; license = licenses.gpl2; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -1497,7 +1490,7 @@ let homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = licenses.zpt21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -1515,7 +1508,7 @@ let homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = licenses.zpt21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -1539,7 +1532,7 @@ let homepage = "http://www.buildout.org"; description = "A software build and configuration system"; license = licenses.zpt21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -1568,7 +1561,7 @@ let bunch = buildPythonPackage (rec { name = "bunch-1.0.1"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bunch/${name}.tar.gz"; @@ -1655,11 +1648,11 @@ let sha256 = "0s8vxzfz6s4m6fvxc7z25k9j35w0rh6jkw3wwcd1az1mssncn6qy"; }; - meta = with stdenv.lib; { + meta = { homepage = http://certifi.io/; description = "Python package for providing Mozilla's CA Bundle"; license = licenses.isc; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -1727,7 +1720,7 @@ let sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3"; }; - meta = with stdenv.lib; { + meta = { description = "A very fast JSON encoder/decoder for Python"; homepage = "http://ag-projects.com/"; license = licenses.lgpl2; @@ -1748,11 +1741,11 @@ let # No local packages or download links found for requests doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/ncrocfer/clf; description = "Command line tool to search snippets on Commandlinefu.com"; license = licenses.mit; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -1764,14 +1757,14 @@ let sha256 = "1rfn8ml80rw3hkgpm1an5p3vdyhh7hzx4zynr8dhfl7bsw28r77p"; }; - meta = with stdenv.lib; { + meta = { homepage = http://click.pocoo.org/; description = "Create beautiful command line interfaces in Python"; longDescription = '' A Python package for creating beautiful command line interfaces in a composable way, with as little code as necessary. ''; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -1824,7 +1817,7 @@ let # there are no tests doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A code generator for executing Python snippets in source files"; homepage = http://nedbatchelder.com/code/cog; license = licenses.mit; @@ -1893,11 +1886,8 @@ let propagatedBuildInputs = with self; [ self.translationstring self.iso8601 ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -1917,7 +1907,7 @@ let meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -1961,7 +1951,7 @@ let description = "Config file reading, writing and validation"; homepage = http://pypi.python.org/pypi/configobj; license = licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -1984,7 +1974,7 @@ let meta = { description = "A Python library for building configuration shells"; homepage = "https://github.com/agrover/configshell-fb"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }; @@ -1999,12 +1989,12 @@ let propagatedBuildInputs = with self; [ six ]; - meta = with stdenv.lib; { + meta = { description = "Powerful declarative parser (and builder) for binary data"; homepage = http://construct.readthedocs.org/; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -2054,7 +2044,7 @@ let meta = { description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; homepage = http://crcmod.sourceforge.net/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -2072,7 +2062,7 @@ let meta = { description = "An interpreter to help writing C extensions for Python 2"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -2091,7 +2081,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2125,7 +2115,7 @@ let sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/alex/pretend; license = licenses.bsd3; }; @@ -2142,7 +2132,7 @@ let md5 = "b52588ec61cd4c2d33e419677a5eac8c"; }; - meta = with stdenv.lib; { + meta = { description = "What is detox?"; homepage = http://bitbucket.org/hpk42/detox; }; @@ -2161,7 +2151,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2176,7 +2166,7 @@ let buildInputs = with self; [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2191,7 +2181,7 @@ let propagatedBuildInputs = with self; [ pkgs.libffi pycparser ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2210,12 +2200,12 @@ let # (upstream packaging issue) doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Python library for reading and writing collada documents"; homepage = http://pycollada.github.io/; license = "BSD"; # they don't specify which BSD variant platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -2231,7 +2221,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -2254,7 +2244,7 @@ let pkgs.config.pythonPackages.pytest.selenium or false self.selenium; - meta = with stdenv.lib; { + meta = { maintainers = with maintainers; [ iElectric lovek323 madjar ]; platforms = platforms.unix; }; @@ -2270,7 +2260,7 @@ let propagatedBuildInputs = with self ; [ pytest execnet ]; meta = { - license = stdenv.lib.licenses.mit; + license = licenses.mit; website = "https://pypi.python.org/pypi/pytest-cache/"; description = "pytest plugin with mechanisms for caching across test runs"; }; @@ -2286,7 +2276,7 @@ let propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ]; meta = { - license = stdenv.lib.licenses.mit; + license = licenses.mit; website = "https://pypi.python.org/pypi/pytest-flakes"; description = "pytest plugin to check source code with pyflakes"; }; @@ -2302,7 +2292,7 @@ let propagatedBuildInputs = with self ; [ pytest pytestcache pep8 ]; meta = { - license = stdenv.lib.licenses.mit; + license = licenses.mit; website = "https://pypi.python.org/pypi/pytest-pep8"; description = "pytest plugin to check PEP8 requirements"; }; @@ -2319,7 +2309,7 @@ let propagatedBuildInputs = with self ; [ pytest pytestflakes pytestpep8 tox ]; meta = { - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; website = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; }; @@ -2340,7 +2330,7 @@ let homepage = https://github.com/schlamar/pytest-cov; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -2389,7 +2379,7 @@ let homepage = http://code.google.com/p/cssutils/; - license = stdenv.lib.licenses.lgpl3Plus; + license = licenses.lgpl3Plus; }; }); @@ -2538,11 +2528,8 @@ let ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -2568,11 +2555,8 @@ let ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -2588,8 +2572,8 @@ let propagatedBuildInputs = with self; [ deform ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -2612,9 +2596,9 @@ let meta = { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; homepage = http://deron.meranda.us/python/demjson/; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; }; }; @@ -2833,12 +2817,12 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; homepage = https://code.google.com/p/dpkt/; license = licenses.bsd3; - maintainers = [ maintainers.bjornfor ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; }; }; @@ -2860,7 +2844,7 @@ let buildInputs = with self; [ coverage tornado mock nose ]; - meta = with stdenv.lib; { + meta = { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = https://www.dropbox.com/developers/core/docs; license = licenses.mit; @@ -2879,7 +2863,7 @@ let propagatedBuildInputs = with self; [ urllib3 mock setuptools ]; - meta = with stdenv.lib; { + meta = { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = https://www.dropbox.com/developers/core/docs; license = licenses.mit; @@ -2904,7 +2888,7 @@ let homepage = https://github.com/elasticsearch/elasticsearch-py; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }); @@ -2927,7 +2911,7 @@ let homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }); @@ -2948,12 +2932,12 @@ let doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Provides bindings to the generic input event interface in Linux"; homepage = http://pythonhosted.org/evdev; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ goibhniu ]; + platforms = platforms.linux; }; }; @@ -2969,7 +2953,7 @@ let propagatedBuildInputs = with self; [ greenlet ]; - meta = with stdenv.lib; { + meta = { description = "Eventlib bindings for python"; homepage = "http://ag-projects.com/"; license = licenses.lgpl2; @@ -2996,7 +2980,7 @@ let done ''; - meta = with stdenv.lib; { + meta = { description = "A Python module and command line program for processing ID3 tags"; homepage = http://eyed3.nicfit.net/; license = licenses.gpl2; @@ -3025,7 +3009,7 @@ let meta = { description = "rapid multi-Python deployment"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; }; }; @@ -3054,7 +3038,7 @@ let sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1"; }; buildInputs = with self; [ nose ]; - meta = with stdenv.lib; { + meta = { description = "A Python library for generating fake user data"; homepage = http://pypi.python.org/pypi/Faker; license = licenses.mit; @@ -3069,7 +3053,7 @@ let url = https://pypi.python.org/packages/source/f/fake-factory/fake-factory-0.2.tar.gz; sha256 = "0qdmk8p4anrj9mf95dh9v7bkhv1pz69hvhlw380kj4iz7b44b6zn"; }; - meta = with stdenv.lib; { + meta = { description = "A Python package that generates fake data for you"; homepage = https://pypi.python.org/pypi/fake-factory; license = licenses.mit; @@ -3093,7 +3077,7 @@ let fedora_cert = stdenv.mkDerivation (rec { name = "fedora-cert-0.5.9.2"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; @@ -3109,7 +3093,7 @@ let fedpkg = buildPythonPackage (rec { name = "fedpkg-1.14"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedpkg/fedpkg-1.14.tar.bz2"; @@ -3139,7 +3123,7 @@ let md5 = "3aba546bdad5d0826596910551ce37c0"; }; - meta = with stdenv.lib; { + meta = { description = "Recursive descent parsing library based on functional combinators"; homepage = https://code.google.com/p/funcparserlib/; license = licenses.mit; @@ -3157,14 +3141,14 @@ let md5 = "af2fc6a3d6cc5a02d0bf54d909785fcb"; }; - meta = with stdenv.lib; { + meta = { homepage = http://docs.python.org/3/library/functools.html; }; }; gcutil = buildPythonPackage rec { name = "gcutil-1.16.1"; - meta.maintainers = [ stdenv.lib.maintainers.phreedom ]; + meta.maintainers = with maintainers; [ phreedom ]; src = pkgs.fetchurl { url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz; @@ -3203,7 +3187,7 @@ let ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "An unofficial API for Google Play Music"; homepage = http://pypi.python.org/pypi/gmusicapi/; license = licenses.bsd3; @@ -3222,7 +3206,7 @@ let gitdb = buildPythonPackage rec { name = "gitdb-0.5.4"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; doCheck = false; src = pkgs.fetchurl { @@ -3235,7 +3219,7 @@ let GitPython = buildPythonPackage rec { name = "GitPython-0.3.2"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/G/GitPython/GitPython-0.3.2.RC1.tar.gz"; @@ -3256,7 +3240,7 @@ let sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha"; }; - meta = with stdenv.lib; { + meta = { description = "Brings Google services to the command line"; homepage = https://code.google.com/p/googlecl/; license = licenses.asl20; @@ -3299,11 +3283,11 @@ let ''; - meta = with stdenv.lib; { + meta = { description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; homepage = http://mg.pov.lt/gtimelog/; license = licenses.gpl2Plus; - maintainers = [ maintainers.ocharles ]; + maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; }; }; @@ -3328,7 +3312,7 @@ let description = "A tool to make impress.js presentations from reStructuredText"; homepage = https://github.com/regebro/hovercraft; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -3340,7 +3324,7 @@ let sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb"; }; - meta = with stdenv.lib; { + meta = { description = "helpers to pass trusted data to untrusted environments and back"; homepage = "https://pypi.python.org/pypi/itsdangerous/"; }; @@ -3359,8 +3343,8 @@ let meta = { description = "Apply JSON-Patches (RFC 6902)"; homepage = "https://github.com/stefankoegl/python-json-patch"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; }; }; @@ -3377,8 +3361,8 @@ let meta = { description = "Identify specific nodes in a JSON document (RFC 6901)"; homepage = "https://github.com/stefankoegl/python-json-pointer"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; }; }; @@ -3405,8 +3389,8 @@ let for plain-text data. ''; homepage = "https://github.com/dbohdan/jsonwatch"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + platforms = platforms.all; }; }; @@ -3442,7 +3426,7 @@ let meta = { description = "A CLI client and Python API library for the MailChimp email platform"; homepage = "http://apidocs.mailchimp.com/api/2.0/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -3488,7 +3472,7 @@ let meta = { description = "Library for parsing MediaWiki articles and converting them to different output formats"; homepage = "http://pediapress.com/code/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -3505,7 +3489,7 @@ let meta = { description = "dependencies for mwlib markup"; homepage = "http://pediapress.com/code/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -3528,7 +3512,31 @@ let meta = { description = "generate pdfs from mediawiki markup"; homepage = "http://pediapress.com/code/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + }; + }; + + natsort = buildPythonPackage rec { + name = "natsort-4.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/natsort/${name}.tar.gz"; + md5 = "38cc0bb27c95bf549fe737d9f267f453"; + }; + + buildInputs = with self; + [ + hypothesis + pytestcov + pytestflakes + pytestpep8 + covCore + ]; + + meta = { + description = "Natural sorting for python"; + homepage = https://github.com/SethMMorton/natsort; + license = licenses.mit; }; }; @@ -3557,7 +3565,7 @@ let meta = { description = "Python API and tools to manipulate OpenDocument files"; homepage = "https://joinup.ec.europa.eu/software/odfpy/home"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -3574,7 +3582,7 @@ let description = "Pattern matching and various utilities for file systems paths"; homepage = http://github.com/gorakhargosh/pathtools; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -3594,7 +3602,7 @@ let # the tests do not pass doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A Python-based build/distribution/deployment scripting tool"; homepage = http://github.com/paver/paver; matinainers = with maintainers; [ lovek323 ]; @@ -3613,7 +3621,7 @@ let buildInputs = with self; [ nose pybcrypt]; - meta = with stdenv.lib; { + meta = { description = "A password hashing library for Python"; homepage = https://code.google.com/p/passlib/; }; @@ -3629,11 +3637,8 @@ let }; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -3650,14 +3655,54 @@ let propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ]; - meta = with stdenv.lib; { + meta = { description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.berdario ]; + maintainers = with maintainers; [ berdario ]; }; }; + pies = buildPythonPackage rec { + name = "pies-2.6.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pies/${name}.tar.gz"; + md5 = "caba1ce15d312bf68d65a5d2cf9ccff2"; + }; + + deps = if !isPy3k then [ self.pies2overrides self.enum34 ] + else if isPy33 then [ self.enum34 ] + else []; + + propagatedBuildInputs = deps; + + meta = { + description = "The simplest way to write one program that runs on both Python 2 and Python 3"; + homepage = https://github.com/timothycrosley/pies; + license = licenses.mit; + }; + }; + + pies2overrides = pythonPackages.buildPythonPackage rec { + name = "pies2overrides-2.6.5"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pies2overrides/${name}.tar.gz"; + md5 = "e73716454a2560341edf99d8f6fe5135"; + }; + + propagatedBuildInputs = with self; [ ipaddress ]; + + meta = { + description = "Defines override classes that should be included with pies only if running on Python2"; + homepage = https://github.com/timothycrosley/pies; + license = licenses.mit; + }; + }; + + poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; version = "0.18.1"; @@ -3674,14 +3719,14 @@ let preBuild = "${python}/bin/${python.executable} setup.py build_ext" + " --include-dirs=${pkgs.poppler_qt4}/include/poppler/"; - meta = with stdenv.lib; { + meta = { description = "A Python binding to Poppler-Qt4"; longDescription = '' A Python binding to Poppler-Qt4 that aims for completeness and for being actively maintained. ''; license = licenses.lgpl21Plus; - maintainers = [ maintainers.sepi ]; + maintainers = with maintainers; [ sepi ]; platforms = platforms.all; }; }; @@ -3696,7 +3741,7 @@ let propagatedBuildInputs = with self; [ self.pygments self.urwid ]; - meta = with stdenv.lib; { + meta = { description = "A full-screen, console-based Python debugger"; license = licenses.mit; platforms = platforms.all; @@ -3737,11 +3782,8 @@ let ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -3757,8 +3799,8 @@ let propagatedBuildInputs = with self; [ beaker pyramid ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -3778,8 +3820,8 @@ let setuptools ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -3796,8 +3838,8 @@ let propagatedBuildInputs = with self; [ jinja2 pyramid ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -3839,11 +3881,8 @@ let propagatedBuildInputs = with self; [ pyramid ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -3856,17 +3895,10 @@ let md5 = "89a293488093d6c30036345fa46184d2"; }; - # tests are failing in version 0.7 but are fixed in trunk - doCheck = false; - propagatedBuildInputs = with self; [ transaction pyramid ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - stdenv.lib.maintainers.matejc - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric matejc ]; + platforms = platforms.all; }; }; @@ -3882,7 +3914,7 @@ let propagatedBuildInputs = with self; [ pyramid ]; - meta = with stdenv.lib; { + meta = { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; homepage = https://github.com/mozilla-services/pyramid_multiauth; }; @@ -3928,8 +3960,8 @@ let policies. They can be viewed and edited by calendar and contact clients on mobile phones or computers. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ edwtjo ]; }; }; @@ -3946,7 +3978,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -3966,7 +3998,7 @@ let meta = { description = "Integer to Roman numerals converter"; homepage = "https://pypi.python.org/pypi/roman"; - license = stdenv.lib.licenses.psfl; + license = licenses.psfl; }; }; @@ -3982,7 +4014,7 @@ let buildInputs = with self; [ zope_interface zodb ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -3998,7 +4030,7 @@ let buildInputs = with self; [ zope_interface zope_location zope_schema ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4014,7 +4046,7 @@ let buildInputs = with self; [ ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4026,7 +4058,7 @@ let }; propagatedBuildInputs = with self; [ requests2 ]; meta = { - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -4045,7 +4077,7 @@ let propagatedBuildInputs = with self; [ zodb zodburi ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4062,7 +4094,7 @@ let propagatedBuildInputs = with self; [ repoze_sendmail ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4078,12 +4110,12 @@ let sed "s|driver_files =.*|driver_files = ['${pkgs.rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py ''; - meta = with stdenv.lib; { + meta = { description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)"; homepage = https://github.com/roger-/pyrtlsdr; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -4099,7 +4131,7 @@ let buildInputs = with self; [ transaction ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4115,7 +4147,7 @@ let buildInputs = with self; [ zodb mock ZEO ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4129,7 +4161,7 @@ let md5 = "494d8320549185097ba4a6b6b76017d6"; }; - meta = with stdenv.lib; { + meta = { homepage = https://pypi.python.org/pypi/ZEO; }; }; @@ -4180,8 +4212,8 @@ let ZEO ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4199,7 +4231,7 @@ let description = "SVG path objects and parser"; homepage = https://github.com/regebro/svg.path; license = licenses.cc0; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -4213,11 +4245,8 @@ let }; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -4234,8 +4263,8 @@ let propagatedBuildInputs = with self; [ zope_interface sphinx ]; meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -4255,11 +4284,11 @@ let buildInputs = with self; [ pkgs.alsaLib pkgs.jack2 ]; - meta = with stdenv.lib; { + meta = { description = "A Python wrapper for the RtMidi C++ library written with Cython"; homepage = http://trac.chrisarndt.de/code/wiki/python-rtmidi; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -4301,7 +4330,7 @@ let description = "Python API and shell utilities to monitor file system events"; homepage = http://github.com/gorakhargosh/watchdog; license = licenses.asl20; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -4329,11 +4358,8 @@ let buildInputs = with self; [ zope_testing ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -4348,7 +4374,7 @@ let propagatedBuildInputs = with pythonPackages; [ ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Validate dicts against a schema"; homepage = http://github.com/sunlightlabs/validictory; license = licenses.mit; @@ -4367,11 +4393,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -4390,11 +4413,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -4411,7 +4431,7 @@ let homepage = https://github.com/txels/ddt; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -4450,9 +4470,9 @@ let meta = { homepage = http://deluge-torrent.org; description = "Torrent client"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.iElectric ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.all; }; }; @@ -4470,8 +4490,8 @@ let meta = { homepage = http://freedesktop.org/wiki/Software/pyxdg; description = "Contains implementations of freedesktop.org standards"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4486,8 +4506,8 @@ let meta = { homepage = https://github.com/erikrose/chardet; description = "Universal encoding detector"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -4687,10 +4707,10 @@ let # tests appear to be broken on 0.6.1 at least doCheck = ( version != "0.6.1" ); - meta = with stdenv.lib; { + meta = { description = "Class based template tags for Django"; homepage = https://github.com/ojii/django-classy-tags; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -4708,10 +4728,10 @@ let propagatedBuildInputs = with self; [ django_1_7 ] ++ (optionals (pythonOlder "2.7") [ importlib ordereddict ]); - meta = with stdenv.lib; { + meta = { description = "An extension to the Django web framework that provides comprehensive version control facilities"; homepage = https://github.com/etianen/django-reversion; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -4745,11 +4765,11 @@ let # Only test dependencies buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ]; - meta = with stdenv.lib; { + meta = { description = "Simple Python implementation of the Git file formats and protocols"; homepage = http://samba.org/~jelmer/dulwich/; license = licenses.gpl2Plus; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -4765,10 +4785,10 @@ let propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ]; - meta = with stdenv.lib; { + meta = { description = "Push and pull from a Git server using Mercurial"; homepage = http://hg-git.github.com/; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -4837,8 +4857,8 @@ let meta = { description = "ECDSA cryptographic signature library"; homepage = "https://github.com/warner/python-ecdsa"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.aszlig ]; + license = licenses.mit; + maintainers = with maintainers; [ aszlig ]; }; }; @@ -4945,10 +4965,10 @@ let sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d"; }; - meta = with stdenv.lib; { + meta = { homepage = https://launchpad.net/python-fastimport; description = "VCS fastimport/fastexport parser"; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; license = licenses.gpl2Plus; }; }; @@ -4986,8 +5006,8 @@ let meta = { homepage = http://code.google.com/p/feedparser/; description = "Universal feed parser"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.bsd2; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -5027,7 +5047,7 @@ let meta = { homepage = http://www.fig.sh/; description = "Fast, isolated development environments using Docker"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -5040,7 +5060,7 @@ let md5 = "12a1ad3a1ed6a9377e758c4fa7fee570"; }; - meta = with stdenv.lib; { + meta = { description = "A snapshot of django-filebrowser for the Mezzanine CMS"; longDescription = '' filebrowser_safe was created to provide a snapshot of the FileBrowser @@ -5078,7 +5098,7 @@ let description = "Code checking using pep8 and pyflakes"; homepage = http://pypi.python.org/pypi/flake8; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -5161,8 +5181,8 @@ let meta = { homepage = http://flexget.com/; description = "Multipurpose automation tool for content like torrents"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -5179,7 +5199,7 @@ let md5 = "5c8c681a0b1df94ecd6dc0b3a8b80892"; }; - meta = with stdenv.lib; { + meta = { description = "A snapshot of django-grappelli for the Mezzanine CMS"; longDescription = '' grappelli_safe was created to provide a snapshot of the Grappelli admin @@ -5214,8 +5234,8 @@ let meta = { homepage = https://github.com/ckreutzer/python-tvrage; description = "Client interface for tvrage.com's XML-based api feeds"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.bsd3; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -5241,8 +5261,8 @@ let meta = { homepage = https://github.com/Julian/jsonschema; description = "An implementation of JSON Schema validation for Python"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -5261,7 +5281,7 @@ let homepage = http://falconframework.org; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }); @@ -5323,7 +5343,7 @@ let ''; # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = [ ]; }; @@ -5337,7 +5357,7 @@ let sha256 = "144f4yn2nvnxh2vrnmiabpwx3s637np0d1j1w95zym790d66shir"; }; - meta = with stdenv.lib; { + meta = { description = "Filesystem abstraction"; homepage = http://pypi.python.org/pypi/fs; license = licenses.bsd3; @@ -5364,7 +5384,7 @@ let meta = { description = "Python bindings for FUSE"; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; }; }); @@ -5383,14 +5403,14 @@ let "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'" ''; - meta = with stdenv.lib; { + meta = { description = "Simple ctypes bindings for FUSE"; longDescription = '' Python module that provides a simple interface to FUSE and MacFUSE. It's just one file and is implemented using ctypes. ''; homepage = http://github.com/terencehonles/fusepy; - license = with licenses; isc; + license = licenses.isc; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; @@ -5408,7 +5428,7 @@ let propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Clean single-source support for Python 3 and 2"; longDescription = '' python-future is the missing compatibility layer between Python 2 and @@ -5479,7 +5499,7 @@ let --replace "==" ">=" ''; - meta = with stdenv.lib; { + meta = { description = "Mount Google Drive as a local file system"; longDescription = '' GDriveFS is a FUSE wrapper for Google Drive developed. Design goals: @@ -5491,7 +5511,7 @@ let - Allow for the same file at multiple paths. ''; homepage = https://github.com/dsoprea/GDriveFS; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; @@ -5525,25 +5545,23 @@ let }; gevent = buildPythonPackage rec { - name = "gevent-1.0.1"; + name = "gevent-1.0.2"; disabled = isPy3k || isPyPy; # see https://github.com/surfly/gevent/issues/248 src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz"; - sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6"; + sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s"; }; - patches = [ ../development/python-modules/gevent_sslwrap.patch ]; - buildInputs = with self; [ pkgs.libev ]; propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; - meta = with stdenv.lib; { + meta = { description = "Coroutine-based networking library"; homepage = http://www.gevent.org/; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -5558,11 +5576,11 @@ let propagatedBuildInputs = with self; [ gevent certifi backports_ssl_match_hostname_3_4_0_2 ]; - meta = with stdenv.lib; { + meta = { homepage = http://github.com/gwik/geventhttpclient; description = "HTTP client library for gevent"; license = licenses.mit; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -5633,7 +5651,7 @@ let propagatedBuildInputs = with self; [ gevent ]; - meta = with stdenv.lib; { + meta = { description = "gevent-cooperative child processes and IPC"; longDescription = '' Usage of Python's multiprocessing package in a gevent-powered @@ -5644,7 +5662,7 @@ let anywhere within your gevent-powered application. ''; homepage = http://gehrcke.de/gipc; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ nckx ]; }; }; @@ -5714,7 +5732,7 @@ let sed -i '/distribute/d' setup.py ''; - meta = with stdenv.lib; { + meta = { description = "Search your google contacts from the command-line or mutt"; homepage = https://pypi.python.org/pypi/goobook; license = licenses.gpl3; @@ -5735,7 +5753,7 @@ let propagatedBuildInputs = with self; [ httplib2 ]; - meta = with stdenv.lib; { + meta = { description = "The core Python library for accessing Google APIs"; homepage = "https://code.google.com/p/google-api-python-client/"; license = licenses.asl20; @@ -5764,7 +5782,7 @@ let doCheck = true; - meta = with stdenv.lib; { + meta = { description = "Google Application Utilities for Python"; homepage = http://code.google.com/p/google-apputils-python; }; @@ -5773,15 +5791,20 @@ let greenlet = buildPythonPackage rec { name = "greenlet-${version}"; - version = "0.4.5"; + version = "0.4.7"; disabled = isPyPy; # builtin for pypy src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/greenlet/${name}.zip"; - sha256 = "1gidivqcpn6i6k01bf3hgcn0m68h4b9srhpff9kgnk0c287z145r"; + sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k"; }; - meta = with stdenv.lib; { + # see https://github.com/python-greenlet/greenlet/issues/85 + preCheck = '' + rm tests/test_leaks.py + ''; + + meta = { homepage = http://pypi.python.org/pypi/greenlet; description = "Module for lightweight in-process concurrent programming"; license = licenses.lgpl2; @@ -5806,6 +5829,30 @@ let }; gyp = buildPythonPackage rec { + name = "gyp-${version}"; + version = "2015-05-15"; + + src = pkgs.fetchgit { + url = "https://chromium.googlesource.com/external/gyp.git"; + rev = "9f594095c5b14f8bc518081a660e77890c294861"; + sha256 = "1xqi44alnw9c31jg2hz7flz5nabq003b4jyin12h3s9zl82y6vd5"; + }; + + patches = optionals pkgs.stdenv.isDarwin [ + ../development/python-modules/gyp/no-darwin-cflags.patch + ]; + + meta = { + description = "A tool to generate native build files"; + homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md; + license = licenses.bsd3; + maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; + }; + }; + + # Needed to build Chromium until #7402 is fixed. + gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec { rev = "1977"; name = "gyp-r${rev}"; @@ -5821,10 +5868,10 @@ let meta = { homepage = http://code.google.com/p/gyp; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; description = "Generate Your Projects"; }; - }; + }); guessit = buildPythonPackage rec { version = "0.9.4"; @@ -5845,7 +5892,7 @@ let meta = { homepage = http://pypi.python.org/pypi/guessit; - license = stdenv.lib.licenses.lgpl3; + license = licenses.lgpl3; description = "A library for guessing information from video files"; }; }; @@ -5892,7 +5939,7 @@ let buildInputs = with self; [ six pkgs.glibcLocales ]; - meta = with stdenv.lib; { + meta = { description = "Library collecting some useful snippets"; homepage = https://pypi.python.org/pypi/hcs_utils/1.3; license = licenses.isc; @@ -5918,8 +5965,8 @@ let meta = { homepage = "https://github.com/RedMoonStudios/hetzner"; description = "High-level Python API for accessing the Hetzner robot"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.aszlig ]; + license = licenses.bsd3; + maintainers = with maintainers; [ aszlig ]; }; }; @@ -5941,7 +5988,7 @@ let meta = { description = "Simple HTML cleanup utilities"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -5962,7 +6009,7 @@ let checkPhase = "nosetests"; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/html5lib/html5lib-python; downloadPage = https://github.com/html5lib/html5lib-python/releases; description = "HTML parser based on WHAT-WG HTML5 specification"; @@ -5990,7 +6037,7 @@ let meta = { homepage = https://github.com/atl/py-http-signature; description = ""; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -6024,7 +6071,7 @@ let homepage = http://code.google.com/p/httplib2; description = "A comprehensive HTTP client library"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -6038,7 +6085,7 @@ let md5 = "0c4112bab04b71979286387b033921b5"; }; - meta = with stdenv.lib; { + meta = { description = "A Python library for property based testing"; homepage = https://github.com/DRMacIver/hypothesis; license = licenses.mpl20; @@ -6091,11 +6138,11 @@ let buildInputs = with self; [ setuptools ]; propagatedBuildInputs = with self; [ dateutil pytz ]; - meta = with stdenv.lib; { + meta = { description = "A parser/generator of iCalendar files"; homepage = "http://icalendar.readthedocs.org/"; license = licenses.bsd2; - maintainers = [ maintainers.olcai ]; + maintainers = with maintainers; [ olcai ]; }; }; @@ -6180,6 +6227,21 @@ let }; }; + ipaddress = buildPythonPackage rec { + name = "ipaddress-1.0.7"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/ipaddress/${name}.tar.gz"; + md5 = "5d9ecf415cced476f7781cf5b9ef70c4"; + }; + + meta = { + description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; + homepage = https://github.com/phihag/ipaddress; + license = licenses.psfl; + }; + }; + ipdb = buildPythonPackage rec { name = "ipdb-0.8"; disabled = isPyPy; # setupterm: could not find terminfo database @@ -6209,7 +6271,26 @@ let meta = { homepage = https://bitbucket.org/micktwomey/pyiso8601/; description = "Simple module to parse ISO 8601 dates"; - maintainers = [ stdenv.lib.maintainers.phreedom ]; + maintainers = with maintainers; [ phreedom ]; + }; + }; + + isort = buildPythonPackage rec { + name = "isort-3.9.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/isort/${name}.tar.gz"; + md5 = "c0f4a7b16fde265f2ff4842c3e1cdd05"; + }; + + buildInputs = with self; [ mock pytest ]; + + propagatedBuildInputs = with self; [ natsort pies ]; + + meta = { + description = "A Python utility / library to sort Python imports"; + homepage = https://github.com/timothycrosley/isort; + license = licenses.mit; }; }; @@ -6225,7 +6306,7 @@ let homepage = https://github.com/davidhalter/jedi; description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -6240,10 +6321,10 @@ let buildInputs = with self; [ pytest unicodecsv ]; - meta = with stdenv.lib; { + meta = { homepage = http://github.com/sunlightlabs/jellyfish; description = "Approximate and phonetic matching of strings"; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -6268,23 +6349,23 @@ let an optional sandboxed environment. ''; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; jmespath = buildPythonPackage rec { - name = "jmespath-0.6.1"; + name = "jmespath-0.7.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jmespath/${name}.tar.gz"; - sha256 = "1f7nxk62yifh6zwhf34w4fgwxvyls8x2daphljgrg4lh0i2sgwgr"; + sha256 = "1lazbx65imassd7h24z49za001rvx1lmx8r0l21h4izs7pp14nnd"; }; propagatedBuildInputs = with self; [ ply ]; meta = { - homepage = "https://github.com/boto/jmespath"; + homepage = https://github.com/boto/jmespath; description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; license = "BSD"; }; @@ -6305,7 +6386,7 @@ let parsedatetime ]; - meta = with stdenv.lib; { + meta = { homepage = http://maebert.github.io/jrnl/; description = "A simple command line journal application that stores your journal in a plain text file"; license = licenses.mit; @@ -6324,7 +6405,7 @@ let buildInputs = with self; [ fs gdata python_keyczar mock pyasn1 pycrypto pytest six ]; - meta = with stdenv.lib; { + meta = { description = "Store and access your passwords safely"; homepage = "https://pypi.python.org/pypi/keyring"; license = licenses.psfl; @@ -6354,7 +6435,7 @@ let # tests also appear to depend on anyjson, which has Py3k problems doCheck = (pythonAtLeast "2.7") && !isPy3k ; - meta = with stdenv.lib; { + meta = { description = "Messaging library for Python"; homepage = "http://github.com/celery/kombu"; license = licenses.bsd3; @@ -6377,7 +6458,7 @@ let propagatedBuildInputs = with self; [ configparser argparse ]; - meta = with stdenv.lib; { + meta = { description = "Yet Another Config Parser"; homepage = "https://github.com/mozilla-services/konfig"; license = licenses.mpl20; @@ -6388,7 +6469,7 @@ let name = "kitchen-1.1.1"; disabled = isPy3k; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/k/kitchen/kitchen-1.1.1.tar.gz"; @@ -6473,11 +6554,11 @@ let doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A modified version of Supybot, an IRC bot"; homepage = http://supybot.fr.cr; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }); @@ -6493,11 +6574,11 @@ let propagatedBuildInputs = with self; [ requests2 ]; - meta = with stdenv.lib; { + meta = { homepage = "https://github.com/ghickman/linode"; description = "A thin python wrapper around Linode's API"; license = licenses.mit; - maintainers = [ maintainers.nslqqq ]; + maintainers = with maintainers; [ nslqqq ]; }; }; @@ -6511,12 +6592,12 @@ let buildInputs = [ pkgs.pkgconfig pkgs.fuse pkgs.attr ]; - meta = with stdenv.lib; { + meta = { description = "Python bindings for the low-level FUSE API"; homepage = https://code.google.com/p/python-llfuse/; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -6578,7 +6659,7 @@ let propagatedBuildInputs = with self; [ wxPython modules.readline ]; postInstall = "mv $out/bin/loxodo.py $out/bin/loxodo"; - meta = with stdenv.lib; { + meta = { description = "A Password Safe V3 compatible password vault"; homepage = http://www.christoph-sommer.de/loxodo/; license = licenses.gpl2Plus; @@ -6686,8 +6767,8 @@ let meta = { description = "Super-fast templating language"; homepage = http://www.makotemplates.org; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -6704,7 +6785,7 @@ let description = "Implements a XML/HTML/XHTML Markup safe string"; homepage = http://dev.pocoo.org; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -6722,7 +6803,7 @@ let meta = { description = "A documentation builder"; homepage = http://pypi.python.org/pypi/manuel; - license = stdenv.lib.licenses.zpt20; + license = licenses.zpt20; }; }; @@ -6771,7 +6852,7 @@ let description = "McCabe checker, plugin for flake8"; homepage = "https://github.com/flintwork/mccabe"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -6810,7 +6891,7 @@ let meta = { description = "An HTML/XML templating engine used by supervisor"; homepage = https://github.com/supervisor/meld3; - license = stdenv.lib.licenses.free; + license = licenses.free; }; }; @@ -6875,7 +6956,7 @@ let export LC_ALL="en_US.UTF-8" ''; - meta = with stdenv.lib; { + meta = { description = '' A content management platform built using the Django framework ''; @@ -6951,7 +7032,7 @@ let description = "Streaming command-line twitter client"; homepage = "http://www.rainbowstream.org/"; license = licenses.mit; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; @@ -7019,7 +7100,7 @@ let homepage = http://moinmo.in/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -7034,7 +7115,7 @@ let buildInputs = with self; [ six pathpy setuptools ]; propagatedBuildInputs = with self; [ decorator ]; - meta = with stdenv.lib; { + meta = { description = "Many more basic tools for python 2/3 extending itertools, functools, operator and collections"; homepage = https://bitbucket.org/userzimmermann/python-moretools; license = licenses.gpl3Plus; @@ -7091,7 +7172,7 @@ let sha256 = "1blgzwq4irzaf8abb4z0d2r48903n9zxf51fhnv3gv09bgxjqzxh"; }; - meta = with stdenv.lib; { + meta = { homepage = http://mpmath.googlecode.com; description = "A pure-Python library for multiprecision floating arithmetic"; license = licenses.bsd3; @@ -7186,7 +7267,7 @@ let homepage = http://bmc.github.com/munkres/; description = "Munkres algorithm for the Assignment Problem"; license = licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -7209,7 +7290,7 @@ let homepage = http://alastair/python-musicbrainz-ngs; description = "Python bindings for musicbrainz NGS webservice"; license = licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -7226,8 +7307,8 @@ let meta = { homepage = https://github.com/aroig/mutag; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + license = licenses.gpl3; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -7245,7 +7326,7 @@ let meta = { description = "Python multimedia tagging library"; homepage = http://code.google.com/p/mutagen; - license = stdenv.lib.licenses.lgpl2; + license = licenses.lgpl2; }; }); @@ -7265,7 +7346,7 @@ let meta = { description = "Utilities for use with console mail clients, like mutt"; homepage = http://www.blacktrash.org/hg/muttils; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -7331,11 +7412,8 @@ let }; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.linux; }; }; @@ -7357,12 +7435,12 @@ let meta = { homepage = http://namebench.googlecode.com/; description = "Find fastest DNS servers available"; - license = [ - "Apache-2.0" + license = with licenses; [ + asl20 # third-party program licenses (embedded in the sources) "LGPL" # Crystal_Clear - "free" # dns - "Apache-2.0" # graphy + free # dns + asl20 # graphy "BSD" # jinja2 ]; longDescription = '' @@ -7388,7 +7466,7 @@ let meta = { description = "A simple Python module for parsing human names into their individual components"; homepage = https://github.com/derek73/python-nameparser; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; }; }; @@ -7404,7 +7482,7 @@ let meta = { homepage = "https://python-nbxmpp.gajim.org/"; description = "Non-blocking Jabber/XMPP module"; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; }; }; @@ -7577,7 +7655,7 @@ let meta = { description = "Coverage 3.x support for Nose"; homepage = https://github.com/ask/nosecover3; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; }; }; @@ -7596,7 +7674,7 @@ let homepage = http://github.com/cmheisel/nose-xcover/; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }); @@ -7668,7 +7746,7 @@ let meta = { description = "A Python wrapper around notmuch"; homepage = http://notmuchmail.org/; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -7722,12 +7800,18 @@ let }; }; - numpy = buildPythonPackage ( rec { - name = "numpy-1.8.2"; + numpy = let + support = import ./python-support/numpy-scipy-support.nix { + inherit python; + atlas = pkgs.atlasWithLapack; + pkgName = "numpy"; + }; + in buildPythonPackage ( rec { + name = "numpy-1.9.2"; src = pkgs.fetchurl { url = "mirror://sourceforge/numpy/${name}.tar.gz"; - sha256 = "1gcxlk3mf43pzpxvbw8kcfg173g4105j9szsfc1kxwablail6myf"; + sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij"; }; disabled = isPyPy; # WIP @@ -7737,17 +7821,12 @@ let sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; - preBuild = '' - export BLAS=${pkgs.openblas} LAPACK=${pkgs.openblas} - ''; + inherit (support) preBuild checkPhase; setupPyBuildFlags = ["--fcompiler='gnu95'"]; - # error: invalid command 'test' - doCheck = false; - - buildInputs = with self; [ pkgs.gfortran ]; - propagatedBuildInputs = with self; [ pkgs.openblas ]; + buildInputs = [ pkgs.gfortran self.nose ]; + propagatedBuildInputs = [ pkgs.atlas ]; meta = { description = "Scientific tools for Python"; @@ -7771,23 +7850,23 @@ let # tests fail doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; livestreamer = buildPythonPackage rec { - version = "1.11.1"; + version = "1.12.2"; name = "livestreamer-${version}"; disabled = isPyPy; src = pkgs.fetchurl { url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz"; - sha256 = "1hic3z5any64gn2b0gs1b7m34bzgzv71inr8wgjq59pwf8mbrqk9"; + sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"; }; buildInputs = with self; [ pkgs.makeWrapper ]; @@ -7802,7 +7881,8 @@ let Livestreamer is CLI program that extracts streams from various services and pipes them into a video player of choice. ''; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ fuuzetsu ]; }; }; @@ -7818,7 +7898,7 @@ let homepage = http://code.google.com/p/oauth; description = "Library for OAuth version 1.0a"; license = licenses.mit; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }); @@ -7842,8 +7922,8 @@ let homepage = "https://github.com/simplegeo/python-oauth2"; description = "library for OAuth version 1.0"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.linux; }; }); @@ -7858,7 +7938,7 @@ let propagatedBuildInputs = with pythonPackages; [ httplib2 pyasn1 pyasn1-modules rsa ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A client library for OAuth 2.0"; homepage = http://github.com/google/oauth2client/; license = licenses.bsd2; @@ -7904,13 +7984,13 @@ let description = "a pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; - maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ]; + maintainers = with maintainers; [ phreedom thoughtpolice ]; }; }); offtrac = buildPythonPackage rec { name = "offtrac-0.1.0"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/offtrac/${name}.tar.gz"; @@ -7977,7 +8057,7 @@ let not a large parsing framework or a component of some larger system. ''; - license = "revised-BSD"; + license = licenses.bsd3; maintainers = [ ]; }; @@ -8029,9 +8109,9 @@ let meta = { homepage = "http://pandas.pydata.org/"; description = "Python Data Analysis Library"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; }; @@ -8067,8 +8147,8 @@ let meta = { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ aszlig ]; longDescription = '' This is a library for making SSH2 connections (client or server). @@ -8114,7 +8194,7 @@ let meta = { description = "Load, configure, and compose WSGI applications and servers"; homepage = http://pythonpaste.org/deploy/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -8134,7 +8214,7 @@ let meta = { description = "A pluggable command-line frontend, including commands to setup package file layouts"; homepage = http://pythonpaste.org/script/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -8151,7 +8231,7 @@ let meta = { description = "Object-oriented filesystem paths"; homepage = "https://pathlib.readthedocs.org/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -8163,7 +8243,7 @@ let sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq"; }; - meta = with stdenv.lib; { + meta = { description = "A module wrapper for os.path"; homepage = http://github.com/jaraco/path.py; license = licenses.mit; @@ -8238,7 +8318,7 @@ let homepage = http://getpelican.com/; description = "A tool to generate a static blog from reStructuredText or Markdown input files"; license = licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ offline prikhi ]; + maintainers = with maintainers; [ offline prikhi ]; }; }; @@ -8255,7 +8335,7 @@ let homepage = "http://pep8.readthedocs.org/"; description = "Python style guide checker"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -8275,7 +8355,7 @@ let homepage = https://github.com/mooz/percol; description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; license = licenses.mit; - maintainers = with stdenv.lib.maintainers; [ koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -8294,7 +8374,7 @@ let meta = { homepage = http://www.noah.org/wiki/Pexpect; description = "Automate interactive console applications such as ssh, ftp, etc"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; longDescription = '' Pexpect is similar to the Don Libes "Expect" system, but Pexpect @@ -8326,20 +8406,17 @@ let propagatedBuildInputs = with self; [ pytz ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.linux; }; }; pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.16.3"; + version = "0.17.0"; src = pkgs.fetchFromGitHub { - sha256 = "12zizpj3fqbf90kj43zylpaqi3hhlihfg9xpzqa0aysiqri0ydx2"; + sha256 = "0fnzhsir1m7a2rlh3iqinrz5i38ssfg9p7s60bkyy55614l146yg"; rev = "v${version}"; repo = "pgcli"; owner = "amjith"; @@ -8347,14 +8424,14 @@ let propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; - meta = with stdenv.lib; { + meta = { description = "Command-line interface for PostgreSQL"; longDescription = '' Rich command-line interface for PostgreSQL with auto-completion and syntax highlighting. ''; homepage = http://pgcli.com; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -8472,7 +8549,7 @@ let buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] - ++ optionals (isPy26 || isPy33 || isPyPy) [ pkgs.lcms2 ] + ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. @@ -8506,7 +8583,7 @@ let license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with stdenv.lib.maintainers; [ goibhniu prikhi ]; + maintainers = with maintainers; [ goibhniu prikhi ]; }; }; @@ -8591,7 +8668,7 @@ let install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" ''; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/powerline/powerline; description = "The ultimate statusline/prompt utility"; license = licenses.mit; @@ -8615,7 +8692,7 @@ let # can't find the tests module? doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Python Reddit API wrapper"; homepage = http://praw.readthedocs.org/; license = licenses.gpl3; @@ -8645,17 +8722,17 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.26"; + version = "0.38"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; - sha256 = "1rd9gy3bcwp08agw5hiqckhaxbsz1i1kgkhjqw6vwhjdfgdjiq9l"; + sha256 = "0rjy5n79h8sc6wpw6nwys52rin7i4qlfy51y7vws303mficjkvkc"; }; buildInputs = with self; [ jedi ipython pygments ]; propagatedBuildInputs = with self; [ docopt six wcwidth ]; - meta = with stdenv.lib; { + meta = { description = "Python library for building powerful interactive command lines"; longDescription = '' prompt_toolkit could be a replacement for readline, but it can be @@ -8664,7 +8741,7 @@ let with a nice interactive Python shell (called ptpython) built on top. ''; homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -8744,7 +8821,7 @@ let meta = { description = "PostgreSQL database adapter for the Python programming language"; - license = with stdenv.lib.licenses; [ gpl2 zpt20 ]; + license = with licenses; [ gpl2 zpt20 ]; }; }; @@ -8797,7 +8874,7 @@ let meta = { description = "Bindings for Chromaprint acoustic fingerprinting"; homepage = "https://github.com/sampsyo/pyacoustid"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -8815,7 +8892,7 @@ let meta = { description = "Python Algorithmic Trading"; homepage = http://gbeced.github.io/pyalgotrade/; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -8832,7 +8909,7 @@ let description = "ASN.1 tools for Python"; homepage = http://pyasn1.sourceforge.net/; license = "mBSD"; - platforms = stdenv.lib.platforms.unix; # arbitrary choice + platforms = platforms.unix; # arbitrary choice }; }); @@ -8851,8 +8928,8 @@ let meta = { description = "A collection of ASN.1-based protocols modules"; homepage = https://pypi.python.org/pypi/pyasn1-modules; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; # same as pyasn1 + license = licenses.bsd3; + platforms = platforms.unix; # same as pyasn1 }; }; @@ -8878,7 +8955,7 @@ let meta = { description = "Python bindings for PortAudio"; homepage = "http://people.csail.mit.edu/hubert/pyaudio/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -8895,11 +8972,11 @@ let propagatedBuildInputs = with self; [ dateutil ]; - meta = with stdenv.lib; { + meta = { description = "Module for reading vCard and vCalendar files"; homepage = http://vobject.skyhouseconsulting.com/; license = licenses.asl20; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -8916,11 +8993,11 @@ let propagatedBuildInputs = with self; [ sqlite3 vobject lxml requests urwid pyxdg ]; - meta = with stdenv.lib; { + meta = { description = "Command-line interface carddav client"; homepage = http://lostpackets.de/pycarddav; license = licenses.mit; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -8934,7 +9011,7 @@ let sha256 = "02sdn2998jlrm35smn1530hix3kzwyc1jv49cjdcnvfvrqqi3rww"; }; - meta = with stdenv.lib; { + meta = { description = ''PicoSAT is a popular SAT solver written by Armin Biere in pure C. This package provides efficient Python bindings to picosat on the C level, i.e. when importing pycosat, the @@ -8969,8 +9046,8 @@ let meta = { homepage = https://pypi.python.org/pypi/pygit2; description = "A set of Python bindings to the libgit2 shared library"; - license = with stdenv.lib.licenses; gpl2; - platforms = with stdenv.lib.platforms; all; + license = licenses.gpl2; + platforms = with platforms; all; }; }; @@ -8989,8 +9066,8 @@ let homepage = http://babel.edgewall.org; description = "A collection of tools for internationalizing Python applications"; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.linux; }; }); @@ -9021,7 +9098,7 @@ let --prefix="$out" ''; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/Groundworkstech/pybfd; description = "A Python interface to the GNU Binary File Descriptor (BFD) library"; license = licenses.gpl2; @@ -9053,7 +9130,7 @@ let meta = { description = "Interface for working with block devices"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }; @@ -9073,6 +9150,28 @@ let }; }; + pyblosxom = buildPythonPackage rec { + name = "pyblosxom-${version}"; + disabled = isPy3k; + version = "1.5.3"; + # FAIL:test_generate_entry and test_time + # both tests fail due to time issue that doesn't seem to matter in practice + doCheck = false; + src = pkgs.fetchurl { + url = "https://github.com/pyblosxom/pyblosxom/archive/v${version}.tar.gz"; + sha256 = "0de9a7418f4e6d1c45acecf1e77f61c8f96f036ce034493ac67124626fd0d885"; + }; + + propagatedBuildInputs = with self; [ pygments markdown ]; + + meta = { + homepage = "http://pyblosxom.github.io"; + description = "File-based blogging engine"; + license = licenses.mit; + }; + }; + + pycapnp = buildPythonPackage rec { name = "pycapnp-0.5.1"; disabled = isPyPy || isPy3k; @@ -9089,10 +9188,10 @@ let sed -i '3iimport setuptools' setup.py ''; - meta = with stdenv.lib; { + meta = { maintainers = with maintainers; [ cstrahan ]; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd2; + platforms = platforms.all; homepage = "http://jparyani.github.io/pycapnp/index.html"; }; }; @@ -9124,7 +9223,7 @@ let nosetests ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.gnu.org/software/libcdio/; description = "Wrapper around libcdio (CD Input and Control library)"; maintainers = with maintainers; [ rycee ]; @@ -9154,10 +9253,10 @@ let description = "Python wrappers for the Crypto++ library"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }); @@ -9184,7 +9283,7 @@ let meta = { homepage = http://pycurl.sourceforge.net/; description = "Python wrapper for libcurl"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }); @@ -9207,7 +9306,7 @@ let meta = { homepage = https://pypi.python.org/pypi/pycurl2; description = "A fork from original PycURL library that no maintained from 7.19.0"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }); @@ -9247,13 +9346,39 @@ let # dictionaries needed for tests doCheck = false; - meta = with stdenv.lib; { + meta = { description = "pyenchant: Python bindings for the Enchant spellchecker"; homepage = https://pythonhosted.org/pyenchant/; license = licenses.lgpl21; }; }; + + pyev = buildPythonPackage rec { + name = "pyev-0.9.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyev/${name}.tar.gz"; + sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; + }; + + buildInputs = [ pkgs.libev ]; + + postPatch = '' + libev_so=${pkgs.libev}/lib/libev.so.4 + test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; } + sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py + ''; + + meta = { + description = "Python bindings for libev"; + homepage = https://code.google.com/p/pyev/; + license = licenses.gpl3; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + pyfeed = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; @@ -9286,7 +9411,7 @@ let meta = { description = "FIGlet in pure Python"; license = licenses.gpl2Plus; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; @@ -9306,7 +9431,7 @@ let homepage = https://launchpad.net/pyflakes; description = "A simple program which checks Python source files for errors"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -9321,7 +9446,7 @@ let propagatedBuildInputs = with pythonPackages; [ ]; - meta = with stdenv.lib; { + meta = { description = "Pure Python GeoIP API"; homepage = https://github.com/appliedsec/pygeoip; license = licenses.lgpl3Plus; @@ -9346,8 +9471,8 @@ let meta = { homepage = "http://www.pyglet.org/"; description = "A cross-platform windowing and multimedia library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.mesaPlatforms; + license = licenses.bsd3; + platforms = platforms.mesaPlatforms; }; }; @@ -9360,10 +9485,10 @@ let sha256 = "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k"; }; - meta = with stdenv.lib; { + meta = { homepage = http://pygments.org/; description = "A generic syntax highlighter"; - license = with licenses; [ bsd2 ]; + license = licenses.bsd2; maintainers = with maintainers; [ nckx ]; }; }; @@ -9388,7 +9513,7 @@ let homepage = "https://launchpad.net/pygpgme"; description = "A Python wrapper for the GPGME library"; license = licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -9404,11 +9529,11 @@ let disabled = isPyPy || isPy3k; - meta = with stdenv.lib; { + meta = { description = "Media Meta Data retrieval framework"; homepage = http://sourceforge.net/projects/mmpython/; license = licenses.gpl2; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -9447,11 +9572,11 @@ let runHook postInstall ''; - meta = with stdenv.lib; { + meta = { description = "Generic application framework, providing the foundation for other modules"; homepage = https://github.com/freevo/kaa-base; license = licenses.lgpl21; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -9494,11 +9619,11 @@ let propagatedBuildInputs = with self; [ kaa-base ]; - meta = with stdenv.lib; { + meta = { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; homepage = https://github.com/freevo/kaa-metadata; license = licenses.gpl2; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -9536,7 +9661,7 @@ let propagatedBuildInputs = with self; [ pycrypto ecdsa ]; - meta = with stdenv.lib; { + meta = { description = "JSON Web Token implementation in Python"; longDescription = "A Python implementation of JSON Web Token draft 01"; homepage = https://github.com/progrium/pyjwt; @@ -9588,12 +9713,12 @@ let buildInputs = with self; [ pkgs.libiodbc ]; - meta = with stdenv.lib; { + meta = { description = "Python ODBC module to connect to almost any database"; homepage = https://code.google.com/p/pyodbc/; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -9679,8 +9804,8 @@ let meta = { homepage = "https://fedorahosted.org/pyparted/"; description = "Python interface for libparted"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; }; @@ -9698,7 +9823,7 @@ let }; meta = { description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; }; }); @@ -9715,12 +9840,12 @@ let propagatedBuildInputs = with self; [ scipy numpy pyqt4 pyopengl ]; - meta = with stdenv.lib; { + meta = { description = "Scientific Graphics and GUI Library for Python"; homepage = http://www.pyqtgraph.org/; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -9732,7 +9857,7 @@ let md5 = "46ee623eeeba5a7cc0d95cbfa7e18abd"; }; - meta = with stdenv.lib; { + meta = { description = "Snowball stemming algorithms, for information retrieval"; homepage = http://snowball.tartarus.org/; license = licenses.mit; @@ -9749,12 +9874,12 @@ let md5 = "59d4d3f4a8786776c9d7f9051b8f1a69"; }; - meta = with stdenv.lib; { + meta = { description = "Distributed object middleware for Python (IPC/RPC)"; homepage = http://pythonhosted.org/Pyro/; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }); @@ -9769,8 +9894,8 @@ let meta = { homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html; description = "Library for generating RSS 2.0 feeds"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.bsd2; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -9785,12 +9910,12 @@ let propagatedBuildInputs = with self; [ pyasn1 pycrypto ]; - meta = with stdenv.lib; { + meta = { homepage = http://pysnmp.sf.net; description = "A pure-Python SNMPv1/v2c/v3 library"; license = licenses.bsd2; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -9808,13 +9933,13 @@ let meta = { description = "SOCKS module for Python"; license = licenses.bsd3; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; python_fedora = buildPythonPackage (rec { name = "python-fedora-0.3.33"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz"; @@ -9844,7 +9969,7 @@ let sha256 = "18mhiwqq6vp65ykmi8x3i5l3gvrvrrr8z2kv11z1rpixmyr7sw1p"; }; - meta = with stdenv.lib; { + meta = { description = "Toolkit for safe and simple cryptography"; homepage = https://pypi.python.org/pypi/python-keyczar; license = licenses.asl20; @@ -9875,8 +10000,8 @@ let meta = { homepage = "http://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21Plus; + platforms = platforms.linux; }; }; @@ -9892,8 +10017,8 @@ let meta = { homepage = http://github.com/ericflo/pynzb; description = "Unified API for parsing NZB files"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.bsd3; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -9911,8 +10036,8 @@ let meta = { homepage = http://code.google.com/p/python-progressbar/; description = "Text progressbar library for python"; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ iElectric ]; }; }); @@ -9946,7 +10071,7 @@ let meta = { description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; }; }); @@ -9973,11 +10098,11 @@ let doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Emacs Lisp to Python interface"; homepage = http://pymacs.progiciels-bpi.ca; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -9994,7 +10119,7 @@ let meta = { description = "Pure-Python PDF toolkit"; homepage = "http://pybrary.net/pyPdf/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -10023,7 +10148,7 @@ let liberal BSD-style Open-Source license. ''; license = "BSD-style"; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = platforms.mesaPlatforms; }; }; @@ -10064,7 +10189,7 @@ let meta = { homepage = "https://github.com/rackspace/pyrax"; - license = "MIT"; + license = licenses.mit; description = "Python API to interface with Rackspace"; }; @@ -10107,7 +10232,7 @@ let meta = { description = "A Scss compiler for Python"; homepage = http://pyscss.readthedocs.org/en/latest/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -10123,7 +10248,7 @@ let meta = { homepage = "http://pyserial.sourceforge.net/"; - license = stdenv.lib.licenses.psfl; + license = licenses.psfl; description = "Python serial port extension"; }; }; @@ -10140,7 +10265,7 @@ let meta = { homepage = "http://github.com/mongodb/mongo-python-driver"; - license = [ "Apache-2.0" ]; + license = licenses.asl20; description = "Python driver for MongoDB "; }; }; @@ -10208,7 +10333,7 @@ let in Python. ''; - license = "revised BSD"; + license = licenses.bsd3; maintainers = [ ]; }; @@ -10304,7 +10429,7 @@ let homepage = http://allmydata.org/trac/pyutil; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -10326,7 +10451,7 @@ let meta = { homepage = "https://code.google.com/p/pywebkitgtk/"; description = "Python bindings for the WebKit GTK+ port"; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; }; }; @@ -10346,7 +10471,7 @@ let meta = { description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; }; }); @@ -10383,7 +10508,7 @@ let meta = { description = "The next generation YAML parser and emitter for Python"; homepage = http://pyyaml.org; - license = stdenv.lib.licenses.free; # !? + license = licenses.free; # !? }; }); @@ -10502,7 +10627,7 @@ let }; meta = { homepage = https://github.com/pnpnpn/retry-decorator; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -10520,7 +10645,7 @@ let meta = { description = "job queue server"; homepage = "https://github.com/pediapress/qserve"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -10600,7 +10725,7 @@ let meta = { description = "Check the status of code repositories under a root directory"; homepage = https://github.com/kynikos/repocheck; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; }; }; @@ -10633,12 +10758,12 @@ let propagatedBuildInputs = with self; [ docutils mock pygments ]; - meta = with stdenv.lib; { + meta = { description = "ReStructuredText viewer"; homepage = http://mg.pov.lt/restview/; license = licenses.gpl2; platforms = platforms.all; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -10686,7 +10811,7 @@ let md5 = "9a267e9327feb3d021cae26002ba6e0e"; }; - meta = with stdenv.lib; { + meta = { description = "ISO 8601 date/time parser"; homepage = http://cheeseshop.python.org/pypi/isodate; }; @@ -10707,11 +10832,11 @@ let rm "$out/bin/"*.bat ''; - meta = with stdenv.lib; { + meta = { description = "Test data generator for Robot Framework"; homepage = https://github.com/mkorpela/RoboMachine; license = licenses.asl20; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -10728,12 +10853,12 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generic test automation framework"; homepage = http://robotframework.org/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -10752,7 +10877,7 @@ let propagatedBuildInputs = with self; [ robotframework selenium docutils decorator ]; - meta = with stdenv.lib; { + meta = { description = ""; homepage = http://robotframework.org/; license = licenses.asl20; @@ -10771,7 +10896,7 @@ let propagatedBuildInputs = with self; [ robotframework moretools pathpy six setuptools ]; - meta = with stdenv.lib; { + meta = { description = "Python Tools for Robot Framework and Test Libraries"; homepage = http://bitbucket.org/userzimmermann/robotframework-tools; license = licenses.gpl3; @@ -10795,7 +10920,7 @@ let buildInputs = with self; [ unittest2 ]; propagatedBuildInputs = with self; [ robotframework lxml ]; - meta = with stdenv.lib; { + meta = { description = "Python unittest test suite for Robot Framework"; homepage = http://github.com/collective/robotsuite/; license = licenses.gpl3; @@ -10825,12 +10950,12 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Light-weight and intuitive editor for Robot Framework test case files"; homepage = https://code.google.com/p/robotframework-ride/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -10846,10 +10971,10 @@ let sha256 = "0rdlvp8h74qs49wz1hx6qy8mgp2ddwlfs7z13h9139ynq04a3z7z"; }; - meta = with stdenv.lib; { + meta = { description = "python refactoring library"; homepage = http://rope.sf.net; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; }; }; @@ -10865,10 +10990,10 @@ let propagatedBuildInputs = with self; [ ropemode ]; - meta = with stdenv.lib; { + meta = { description = "a plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net/ropemacs.html; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; }; }; @@ -10884,10 +11009,10 @@ let propagatedBuildInputs = with self; [ rope ]; - meta = with stdenv.lib; { + meta = { description = "a plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; }; }; @@ -10912,7 +11037,7 @@ let rpkg = buildPythonPackage (rec { name = "rpkg-1.14"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/r/p/rpkg/rpkg-1.14.tar.gz"; @@ -10928,6 +11053,23 @@ let }); + rpy2 = buildPythonPackage rec { + name = "rpy2-2.5.6"; + disabled = isPyPy; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/rpy2/${name}.tar.gz"; + md5 = "a36e758b633ce6aec6a5f450bfee980f"; + }; + buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ]; + propagatedBuildInputs = [ self.singledispatch ]; + meta = { + homepage = http://rpy.sourceforge.net/rpy2; + description = "Python interface to R"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ joelmo ]; + }; + }; + rpyc = buildPythonPackage rec { name = "rpyc-${version}"; version = "3.3.0"; @@ -10942,7 +11084,7 @@ let meta = { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; homepage = http://rpyc.readthedocs.org; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -10958,7 +11100,7 @@ let meta = { homepage = http://stuvel.eu/rsa; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; description = "A pure-Python RSA implementation"; }; }; @@ -10972,7 +11114,7 @@ let md5 = "e36a453baddb97c19af6f79d5ba51f38"; }; - meta = with stdenv.lib; { + meta = { description = "Hierarchic visualization control for wxPython"; homepage = https://launchpad.net/squaremap; license = licenses.bsd3; @@ -10990,7 +11132,7 @@ let propagatedBuildInputs = [ self.squaremap self.wxPython28 ]; - meta = with stdenv.lib; { + meta = { description = "GUI Viewer for Python profiling runs"; homepage = http://www.vrplumber.com/programming/runsnakerun/; license = licenses.bsd3; @@ -11009,7 +11151,7 @@ let meta = { description = "A Python object API for managing the Linux LIO kernel target"; homepage = "https://github.com/agrover/rtslib-fb"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }; @@ -11030,12 +11172,12 @@ let # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -11052,37 +11194,40 @@ let propagatedBuildInputs = [ modules.readline ]; - meta = with stdenv.lib; { + meta = { description = "Powerful interactive network packet manipulation program"; homepage = http://www.secdev.org/projects/scapy/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; - scipy = buildPythonPackage rec { - name = "scipy-0.14.0"; + scipy = let + support = import ./python-support/numpy-scipy-support.nix { + inherit python; + atlas = pkgs.atlasWithLapack; + pkgName = "numpy"; + }; + in buildPythonPackage rec { + name = "scipy-0.15.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz"; - md5 = "d7c7f4ccf8b07b08d6fe49d5cd51f85d"; + sha256 = "16i5iksaas3m0hgbxrxpgsyri4a9ncbwbiazlhx5d6lynz1wn4m2"; }; - buildInputs = [ pkgs.gfortran ]; - propagatedBuildInputs = with self; [ numpy ]; + buildInputs = [ pkgs.gfortran self.nose ]; + propagatedBuildInputs = [ self.numpy ]; - # TODO: add ATLAS=${pkgs.atlas} preConfigure = '' - export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + inherit (support) preBuild checkPhase; - # error: invalid command 'test' - doCheck = false; + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; @@ -11114,7 +11259,7 @@ let meta = { description = "A set of python modules for machine learning and data mining"; homepage = http://scikit-learn.org; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -11230,7 +11375,7 @@ let homepage = http://code.google.com/p/simplejson/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -11245,11 +11390,11 @@ let sha256 = "1n8msk71lpl3kv086xr2sv68ppgz6228575xfnbszc6p1mwr64rg"; }; - meta = with stdenv.lib; { + meta = { description = "A Parser Generator for Python"; homepage = https://pypi.python.org/pypi/SimpleParse; platforms = platforms.all; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -11263,11 +11408,11 @@ let propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint argh pytest ]; - meta = with stdenv.lib; { + meta = { description = "Yet another simple static gallery generator"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.mit; - maintainers = [ maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11281,7 +11426,7 @@ let propagatedBuildInputs = with self; [ PyStemmer ]; - meta = with stdenv.lib; { + meta = { description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.bsd3; @@ -11300,10 +11445,10 @@ let buildInputs = with self; [ modules.sqlite3 ]; - meta = with stdenv.lib; { + meta = { description = "sqlite-backed dictionary"; homepage = "http://github.com/Yelp/sqlite3dbm"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -11315,7 +11460,7 @@ let md5 = "040a451c8e63de3e61fc5b66efa7fca5"; }; - meta = with stdenv.lib; { + meta = { description = "Python library for parsing PGP packets"; homepage = https://github.com/toofishes/python-pgpdump; license = licenses.bsd3; @@ -11332,7 +11477,7 @@ let propagatedBuildInputs = with self; [ pydns lockfile ]; - meta = with stdenv.lib; { + meta = { description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; homepage = http://spambayes.sourceforge.net/; }; @@ -11358,7 +11503,7 @@ let doCheck = false; # won't suceed for unknown reasons that look harmless, though - meta = with stdenv.lib; { + meta = { description = "Geometric objects, predicates, and operations"; homepage = "https://pypi.python.org/pypi/Shapely/"; }; @@ -11396,7 +11541,7 @@ let meta = { description = "parse english textual date descriptions"; homepage = "https://github.com/pediapress/timelib/"; - license = stdenv.lib.licenses.zlib; + license = licenses.zlib; }; }; @@ -11428,7 +11573,7 @@ let export LANG="en_US.UTF-8" ''; - meta = with stdenv.lib; { + meta = { description = "A Python library for symbolic mathematics"; homepage = http://www.sympy.org/; license = licenses.bsd3; @@ -11454,8 +11599,8 @@ let buildInputs = with self; [ pillow nose_progressive nose mock blessings ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11473,8 +11618,8 @@ let buildInputs = with self; [ pillow nose_progressive nose mock blessings nose ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11493,8 +11638,8 @@ let buildInputs = with self; [ pytest py mock pkgs.glibcLocales ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11509,8 +11654,8 @@ let buildInputs = with self; [ pillow blessings nose ]; propagatedBuildInputs = with self; [ modules.curses ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11527,8 +11672,8 @@ let buildInputs = with self; [ nose modules.curses ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + meta = { + maintainers = with maintainers; [ iElectric ]; }; }; @@ -11685,7 +11830,7 @@ let meta = { homepage = http://code.google.com/p/socksipy-branch/; description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -11703,7 +11848,7 @@ let meta = { homepage = http://sorl-thumbnail.readthedocs.org/en/latest/; description = "Thumbnails for Django"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -11759,7 +11904,7 @@ let meta = { homepage = https://pypi.python.org/pypi/subprocess32; description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -11774,7 +11919,7 @@ let propagatedBuildInputs = with self; [ docutils jinja2 pygments sphinx_rtd_theme alabaster Babel snowballstemmer six ]; - meta = with stdenv.lib; { + meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = http://sphinx.pocoo.org/; license = licenses.bsd3; @@ -11796,7 +11941,7 @@ let touch requirements.txt ''; - meta = with stdenv.lib; { + meta = { description = "ReadTheDocs.org theme for Sphinx, 2013 version"; homepage = https://github.com/snide/sphinx_rtd_theme/; license = licenses.bsd3; @@ -11995,13 +12140,13 @@ let sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5"; }; - meta = with stdenv.lib; { + meta = { description = "Non-validating SQL parser for Python"; longDescription = '' Provides support for parsing, splitting and formatting SQL statements. ''; homepage = https://github.com/andialbrecht/sqlparse; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -12098,11 +12243,11 @@ let echo '${setup}' > $sourceRoot/setup.py ''; - meta = with stdenv.lib; { + meta = { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; homepage = http://www.subdownloader.net; license = licenses.gpl3; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -12193,7 +12338,7 @@ let meta = { description = "A command shell for managing the Linux LIO kernel target"; homepage = "https://github.com/agrover/targetcli-fb"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }; @@ -12217,12 +12362,12 @@ let ''; - meta = with stdenv.lib; { + meta = { description = " GTK3 & python based GUI for Syncthing "; - maintainers = [ maintainers.DamienCassou ]; + maintainers = with maintainers; [ DamienCassou ]; platforms = pkgs.syncthing.meta.platforms; homepage = "https://github.com/syncthing/syncthing-gtk"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; }; }; @@ -12271,7 +12416,7 @@ let meta = { homepage = http://taskcoach.org/; description = "Todo manager to keep track of personal tasks and todo lists"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; }; }; @@ -12298,7 +12443,7 @@ let description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -12407,7 +12552,7 @@ let md5 = "4fe37704f16ecf424b91e122defedd7e"; }; - meta = with stdenv.lib; { + meta = { description = "A module to generate a formatted text table, using ASCII characters"; homepage = http://foutaise.org/code/; license = licenses.lgpl2; @@ -12426,7 +12571,7 @@ let meta = { description = "A pure Python implementation of SSL and TLS"; homepage = https://pypi.python.org/pypi/tlslite; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -12444,7 +12589,7 @@ let meta = { description = "Quick Response code generation for Python"; home = "https://pypi.python.org/pypi/qrcode"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -12460,7 +12605,7 @@ let meta = { description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; homepage = http://pypi.python.org/pypi/tmdb3; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -12480,7 +12625,7 @@ let smmap = buildPythonPackage rec { name = "smmap-0.8.2"; disabled = isPy3k || isPyPy; # next release will have py3k/pypy support - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/smmap/${name}.tar.gz"; @@ -12526,7 +12671,7 @@ let meta = { description = "Transaction management"; homepage = http://pypi.python.org/pypi/transaction; - license = stdenv.lib.licenses.zpt20; + license = licenses.zpt20; }; }; @@ -12544,7 +12689,7 @@ let meta = { description = "Python implementation of the Transmission bittorent client RPC protocol"; homepage = http://pypi.python.org/pypi/transmissionrpc/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -12564,7 +12709,7 @@ let meta = { description = "A tool which computes a dependency graph between active Python eggs"; homepage = http://thomas-lotze.de/en/software/eggdeps/; - license = stdenv.lib.licenses.zpt20; + license = licenses.zpt20; }; }; @@ -12587,8 +12732,8 @@ let homepage = https://github.com/alejandrogomez/turses; description = "A Twitter client for the console"; license = licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.linux; }; }); @@ -12605,8 +12750,8 @@ let homepage = "https://github.com/tweepy/tweepy"; description = "Twitter library for python"; license = licenses.mit; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.linux; }; }); @@ -12628,7 +12773,7 @@ let description = "Twiggy is the first totally new design for a logger since log4j"; license = licenses.bsd3; platforms = platforms.all; - maintainers = [ maintainers.pierron ]; + maintainers = with maintainers; [ pierron ]; }; }; @@ -12646,7 +12791,7 @@ let meta = { description = "Twitter API library"; license = licenses.mit; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; }; @@ -12736,10 +12881,10 @@ let #buildInputs = with self; [ unittest2 ]; doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; homepage = https://github.com/jdunck/python-unicodecsv; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -12781,7 +12926,7 @@ let doCheck = false; - meta = with stdenv.lib; { + meta = { description = "A python module that will check for package updates"; homepage = https://github.com/bboe/update_checker; license = licenses.bsd2; @@ -12804,9 +12949,9 @@ let meta = { homepage = "urlgrabber.baseurl.org"; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; description = "Python module for downloading files"; - maintainers = [ stdenv.lib.maintainers.qknight ]; + maintainers = with maintainers; [ qknight ]; }; }; @@ -12827,7 +12972,7 @@ let homepage = http://excess.org/urwid; repositories.git = git://github.com/wardi/urwid.git; license = licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }); @@ -12869,11 +13014,11 @@ let # XXX: Ran 0 tests in 0.003s - meta = with stdenv.lib; { + meta = { description = "a tool to create isolated Python environments"; homepage = http://www.virtualenv.org; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -12891,7 +13036,7 @@ let # needs tox to run the tests doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Script to clone virtualenvs"; license = licenses.mit; platforms = platforms.all; @@ -12974,11 +13119,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -12994,7 +13136,7 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Library for working with color names/values defined by the HTML and CSS specifications"; homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; license = licenses.bsd3; @@ -13016,7 +13158,7 @@ let meta = { description = "Ctypes-based simple MagickWand API binding for Python"; homepage = http://wand-py.org/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -13033,7 +13175,7 @@ let # Checks fail due to missing tox.ini file: doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Measures number of Terminal column cells of wide-character codes"; longDescription = '' This API is mainly for Terminal Emulator implementors -- any Python @@ -13042,7 +13184,7 @@ let no 3rd-party dependencies. ''; homepage = https://github.com/jquast/wcwidth; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ nckx ]; }; }; @@ -13061,7 +13203,7 @@ let meta = { description = "WSGI request and response object"; homepage = http://pythonpaste.org/webob/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -13100,7 +13242,7 @@ let # XXX: skipping two tests fails in python2.6 doCheck = ! isPy26; - buildInputs = optionals isPy26 [ self.ordereddict unittest2 ]; + buildInputs = with self; optionals isPy26 [ ordereddict unittest2 ]; propagatedBuildInputs = with self; [ nose @@ -13118,7 +13260,7 @@ let meta = { description = "Helper to test WSGI applications"; homepage = http://webtest.readthedocs.org/en/latest/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -13154,7 +13296,7 @@ let propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; - meta = with stdenv.lib; { + meta = { description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python"; homepage = http://willie.dftba.net/; license = licenses.efl20; @@ -13174,7 +13316,7 @@ let meta = { description = "Some (mainly XMPP-related) additions to twisted"; homepage = "http://wokkel.ik.nu/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }); @@ -13190,11 +13332,8 @@ let propagatedBuildInputs = with self; [ six webob ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -13255,7 +13394,7 @@ let homepage = http://python-xlib.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -13296,8 +13435,8 @@ let meta = { description = "Structured Configuration Library"; homepage = http://pypi.python.org/pypi/ZConfig; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13314,8 +13453,8 @@ let meta = { description = "Inter-process locks"; homepage = http://www.python.org/pypi/zc.lockfile; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13337,8 +13476,8 @@ let meta = { description = "A daemon process control library and tools for Unix-based systems"; homepage = http://pypi.python.org/pypi/zdaemon; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13369,7 +13508,7 @@ let and Haskell API. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; }); @@ -13388,8 +13527,8 @@ let meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB3; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13415,8 +13554,8 @@ let meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13432,7 +13571,7 @@ let # fails.. doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://pypi.python.org/pypi/zodbpickle; }; }; @@ -13450,7 +13589,7 @@ let md5 = "7f5df4cf8dd50fb0c584c0929a406c92"; }; - meta = with stdenv.lib; { + meta = { description = "scalable persistent components"; homepage = http://packages.python.org/BTrees; }; @@ -13467,7 +13606,7 @@ let md5 = "2942f1ca7764b1bef8d48fa0d9a236b7"; }; - meta = with stdenv.lib; { + meta = { description = "automatic persistence for Python objects"; homepage = http://www.zope.org/Products/ZODB; }; @@ -13483,7 +13622,7 @@ let propagatedBuildInputs = with self; [ pygtk pygobject pkgs.graphviz ]; - meta = with stdenv.lib; { + meta = { description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; homepage = https://github.com/jrfonseca/xdot.py; license = licenses.lgpl3Plus; @@ -13501,7 +13640,7 @@ let buildInputs = with self; [ zope_interface ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13517,7 +13656,7 @@ let propagatedBuildInputs = with self; [ zope_interface ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13557,7 +13696,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13573,7 +13712,7 @@ let propagatedBuildInputs = with self; [ zope_i18nmessageid zope_schema ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13596,7 +13735,7 @@ let ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13610,7 +13749,7 @@ let }; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13623,7 +13762,7 @@ let md5 = "62d639f75b31d2d864fe5982cb23959c"; }; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13640,8 +13779,8 @@ let meta = { description = "An event publishing system"; homepage = http://pypi.python.org/pypi/zope.event; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13660,8 +13799,8 @@ let meta = { description = "Exception interfaces and implementations"; homepage = http://pypi.python.org/pypi/zope.exceptions; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13677,7 +13816,7 @@ let propagatedBuildInputs = with self; [ zope_schema ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13693,7 +13832,7 @@ let propagatedBuildInputs = with self; [ pytz zope_component ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13707,7 +13846,7 @@ let }; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13723,7 +13862,7 @@ let propagatedBuildInputs = with self; [ zope_event zope_component ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13746,7 +13885,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13762,7 +13901,7 @@ let propagatedBuildInputs = with self; [ zope_interface ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13780,7 +13919,7 @@ let ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13796,7 +13935,7 @@ let propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13815,7 +13954,7 @@ let ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13831,7 +13970,7 @@ let propagatedBuildInputs = with self; [ zope_i18nmessageid zope_interface ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13850,11 +13989,8 @@ let propagatedBuildInputs = with self; [ sqlalchemy9 transaction ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -13875,8 +14011,8 @@ let meta = { description = "Zope testing helpers"; homepage = http://pypi.python.org/pypi/zope.testing; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13897,8 +14033,8 @@ let meta = { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13917,7 +14053,7 @@ let doCheck = false; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13935,8 +14071,8 @@ let meta = { description = "Zope.Interface"; homepage = http://zope.org/Products/ZopeInterface; - license = stdenv.lib.licenses.zpt20; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; }; }; @@ -13975,7 +14111,7 @@ let meta = { homepage = http://liw.fi/cliapp/; description = "Python framework for Unix command line programs"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14030,7 +14166,7 @@ let meta = { description = "A Toolkit for the Tornado Web Framework"; homepage = http://github.com/multoncore/tornadokick; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -14057,11 +14193,11 @@ let sha256 = "eb754917e98e03cb9d528eb5f57a08c88fa7a8172f92325a9fe796b2daf14db0"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/scs3jb/screenkey; description = "A screencast tool to show your keys"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ maintainers.DamienCassou ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ DamienCassou ]; platforms = platforms.linux; }; }; @@ -14114,7 +14250,7 @@ let buildInputs = with self; [ mock unittest2 ]; propagatedBuildInputs = with self; [ requests ]; - meta = with stdenv.lib; { + meta = { description = "Python library for the BrowserID Protocol"; homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; @@ -14150,7 +14286,7 @@ let meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -14165,11 +14301,8 @@ let propagatedBuildInputs = with self; [ pep8 ]; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -14191,7 +14324,7 @@ let meta = { homepage = http://liw.fi/tracing/; description = "Python debug logging helper"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14204,11 +14337,8 @@ let }; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -14231,7 +14361,7 @@ let meta = { homepage = http://liw.fi/ttystatus/; description = "Progress and status updates on terminals for Python"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14253,7 +14383,7 @@ let meta = { homepage = http://liw.fi/larch/; description = "Python B-tree library"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14290,11 +14420,8 @@ let doCheck = false; meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ garbas iElectric ]; + platforms = platforms.all; }; }; @@ -14310,7 +14437,7 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://graphite.wikidot.com/; description = "Fixed size round-robin style database"; maintainers = with maintainers; [ rickynils offline ]; @@ -14331,7 +14458,7 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://graphite.wikidot.com/; description = "Backend data caching and persistence daemon for Graphite"; maintainers = with maintainers; [ rickynils offline ]; @@ -14369,7 +14496,7 @@ let homepage = http://pypi.python.org/pypi/Unidecode/; description = "ASCII transliterations of Unicode text"; license = licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric ]; }; }; @@ -14389,11 +14516,11 @@ let sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py ''; - meta = with stdenv.lib; { + meta = { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends homepage = http://pyusb.sourceforge.net/; license = "BSD"; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -14413,7 +14540,7 @@ let description = "Python implementation of the USBTMC instrument control protocol"; homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; license = licenses.mit; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }; @@ -14432,7 +14559,7 @@ let meta = { homepage = https://launchpad.net/txamqp; description = "Library for communicating with AMQP peers and brokers using Twisted"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14473,7 +14600,7 @@ let # error: invalid command 'test' doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://graphite.wikidot.com/; description = "Enterprise scalable realtime graphing"; maintainers = with maintainers; [ rickynils offline ]; @@ -14561,7 +14688,7 @@ let meta = { description = "A simple alerting application for Graphite metrics"; homepage = https://github.com/seatgeek/graphite-pager; - maintainers = [ maintainers.offline ]; + maintainers = with maintainers; [ offline ]; license = licenses.bsd2; }; }; @@ -14596,7 +14723,7 @@ let # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://pyspotify.mopidy.com; description = "A Python interface to Spotify’s online music streaming service"; license = licenses.unfree; @@ -14619,10 +14746,10 @@ let # There are no tests doCheck = false; - meta = with stdenv.lib; { + meta = { homepage = http://www.pykka.org; description = "A Python implementation of the actor model"; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14648,7 +14775,7 @@ let meta = { homepage = https://ws4py.readthedocs.org; description = "A WebSocket package for Python"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils ]; }; }; @@ -14731,7 +14858,7 @@ let meta = { homepage = http://www.libvirt.org/; description = "libvirt Python bindings"; - license = pkgs.lib.licenses.lgpl2; + license = licenses.lgpl2; }; }; @@ -14749,8 +14876,8 @@ let meta = { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = [ stdenv.lib.maintainers.matejc ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ matejc ]; }; }; @@ -14769,7 +14896,7 @@ let description = "Asynchronous HTTP requests"; homepage = https://github.com/kennethreitz/grequests; license = "bsd"; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with maintainers; [ matejc ]; }; }; @@ -14787,7 +14914,7 @@ let description = "Adds i18n/l10n support to Flask applications"; homepage = https://github.com/mitsuhiko/flask-babel; license = "bsd"; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with maintainers; [ matejc ]; }; }; @@ -14803,7 +14930,7 @@ let description = "implements a lazy string for python useful for use with gettext"; homepage = https://github.com/mitsuhiko/speaklater; license = "bsd"; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with maintainers; [ matejc ]; }; }; @@ -14830,7 +14957,7 @@ let meta = { description = "Cross-platform system power status information"; homepage = https://github.com/Kentzo/Power; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; }; @@ -14857,31 +14984,31 @@ let # tests require dbusmock doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Removable disk automounter for udisks"; license = licenses.mit; homepage = https://github.com/coldfix/udiskie; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; }; }; - pythonefl_1_13 = buildPythonPackage rec { + pythonefl_1_14 = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.13.0"; + version = "1.14.0"; src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.bz2"; - sha256 = "0yy4v0f04dgdz21wd2c09x9w6lzsbq6g12s8895laln44l5aqd82"; + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; + sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0"; }; preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" ''; buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; meta = { description = "Python bindings for EFL and Elementary"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; + platforms = platforms.linux; + license = licenses.gpl3; }; }; @@ -14895,9 +15022,9 @@ let meta = { description = "A topological sort algorithm"; homepage = https://pypi.python.org/pypi/toposort/1.1; - maintainers = [ stdenv.lib.maintainers.tstrobel ]; - platforms = stdenv.lib.platforms.linux; - #license = stdenv.lib.licenses.apache; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.linux; + #license = licenses.apache; }; }; @@ -14919,7 +15046,7 @@ let homepage = https://github.com/ricardomv/snapper-gui; description = "Graphical frontend for snapper"; license = licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; }; }; @@ -14941,7 +15068,7 @@ let homepage = http://rednotebook.sourceforge.net/index.html; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; license = licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; }; }; @@ -14992,10 +15119,10 @@ let sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; }; - meta = with stdenv.lib; { + meta = { description = "Collection of fancy functional tools focused on practicality"; homepage = "http://funcy.readthedocs.org/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; }; }; @@ -15026,7 +15153,7 @@ let meta = { homepage = https://developers.google.com/storage/docs/gspythonlibrary; description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; }; @@ -15037,7 +15164,7 @@ let homepage = https://developers.google.com/storage/docs/gsutil; description = "Google Cloud Storage Tool"; maintainers = [ "Russell O'Connor " ]; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; }; doCheck = false; @@ -15066,7 +15193,7 @@ let meta = { homepage = https://github.com/garbas/pypi2nix; description = ""; - maintainers = [ pkgs.stdenv.lib.maintainers.garbas ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -15085,8 +15212,8 @@ let meta = { homepage = https://github.com/kjellmf/svg2tikz; description = "An SVG to TikZ converter"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with pkgs.stdenv.lib.maintainers; [gal_bolle]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gal_bolle ]; }; }; @@ -15109,7 +15236,7 @@ let meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }; @@ -15201,12 +15328,12 @@ let sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py ''; - meta = with stdenv.lib; { + meta = { description = "Python Wrapper for Mac OS 10.8 Notification Center"; homepage = https://pypi.python.org/pypi/pync/1.4; license = licenses.mit; platforms = platforms.darwin; - maintainers = [ maintainers.lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; }; }; @@ -15226,8 +15353,8 @@ let meta = { homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; - license = stdenv.lib.licenses.agpl3; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + license = licenses.agpl3; + maintainers = with maintainers; [ DamienCassou ]; }; }; @@ -15242,7 +15369,7 @@ let buildInputs = with self; [ nose ]; - meta = with stdenv.lib; { + meta = { description = "DataDiff"; homepage = http://sourceforge.net/projects/datadiff/; license = licenses.asl20; @@ -15258,7 +15385,7 @@ let md5 = "043e89644f8909d462fbbfa511c768df"; }; - meta = with stdenv.lib; { + meta = { description = "Termcolor"; homepage = http://pypi.python.org/pypi/termcolor; license = licenses.mit; @@ -15276,7 +15403,7 @@ let propagatedBuildInputs = with pythonPackages; [ ]; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/Alir3z4/html2text/; }; }; @@ -15290,7 +15417,7 @@ let sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e"; }; - meta = with stdenv.lib; { + meta = { description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts"; homepage = http://home.gna.org/pychart/; license = licenses.gpl2; @@ -15366,7 +15493,7 @@ let coastlines, lakes, rivers and political boundaries. See http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. ''; - licences = [ licenses.mit licenses.gpl2 ]; + license = with licenses; [ mit gpl2 ]; }; }; @@ -15380,7 +15507,7 @@ let propagatedBuildInputs = with self; [ ]; - meta = with stdenv.lib; { + meta = { description = "Summary"; homepage = https://github.com/quandyfactory/dicttoxml; }; @@ -15396,7 +15523,7 @@ let sha256 = "073zyx3caqa9zlzxa82k9k2nhhn8c5imqpgp5nwqnh0fgaj9pqn8"; }; propagatedBuildInputs = with self; []; - meta = with stdenv.lib; { + meta = { description = "A fast and complete Python implementation of Markdown"; homepage = https://github.com/trentm/python-markdown2; license = licenses.mit; @@ -15417,7 +15544,7 @@ let propagatedBuildInputs = with self; [ oauth2 ]; - meta = with stdenv.lib; { + meta = { description = "Evernote SDK for Python"; homepage = http://dev.evernote.com; license = licenses.asl20; @@ -15434,7 +15561,7 @@ let sha256 = "1yla6wg18x2a0l0lrvkp1v464hqhff98ck8pnv8d5j9kn3j6bxh8"; }; - meta = with stdenv.lib; { + meta = { description = "Python bindings for the Apache Thrift RPC system"; homepage = http://thrift.apache.org/; license = licenses.asl20; @@ -15468,7 +15595,7 @@ let evernote ]; - meta = with stdenv.lib; { + meta = { description = "Work with Evernote from command line"; homepage = http://www.geeknote.me; license = licenses.gpl1; diff --git a/pkgs/top-level/python-support/numpy-scipy-support.nix b/pkgs/top-level/python-support/numpy-scipy-support.nix new file mode 100644 index 00000000000..6cca704dcda --- /dev/null +++ b/pkgs/top-level/python-support/numpy-scipy-support.nix @@ -0,0 +1,53 @@ +{ + # Python package expression + python, + # Name of package (e.g. numpy or scipy) + pkgName, + # Atlas math library + atlas +}: + +{ + + # First "install" the package, then import what was installed, and call the + # .test() function, which will run the test suite. + checkPhase = '' + runHook preCheck + + _python=${python}/bin/${python.executable} + + # We will "install" into a temp directory, so that we can run the + # tests (see below). + install_dir="$TMPDIR/test_install" + install_lib="$install_dir/lib/${python.libPrefix}/site-packages" + mkdir -p $install_dir + $_python setup.py install \ + --install-lib=$install_lib \ + --old-and-unmanageable \ + --prefix=$install_dir > /dev/null + + # Create a directory in which to run tests (you get an error if you try to + # import the package when you're in the current directory). + mkdir $TMPDIR/run_tests + pushd $TMPDIR/run_tests > /dev/null + # Temporarily add the directory we installed in to the python path + # (not permanently, or this pythonpath will wind up getting exported), + # and run the test suite. + PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \ + 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' + popd > /dev/null + + runHook postCheck + ''; + + # Creates a site.cfg telling the setup script where to find depended-on + # math libraries. + preBuild = '' + echo "Creating site.cfg file..." + cat << EOF > site.cfg + [atlas] + include_dirs = ${atlas}/include + library_dirs = ${atlas}/lib + EOF + ''; +} diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 1f324de8544..2f272ced4af 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -22,6 +22,7 @@ rec { else if system == "x86_64-freebsd" then pkgs_x86_64_freebsd else if system == "i686-freebsd" then pkgs_i686_freebsd else if system == "i686-cygwin" then pkgs_i686_cygwin + else if system == "x86_64-cygwin" then pkgs_x86_64_cygwin else abort "unsupported system type: ${system}"; pkgs_x86_64_linux = allPackages { system = "x86_64-linux"; }; @@ -30,6 +31,7 @@ rec { pkgs_x86_64_freebsd = allPackages { system = "x86_64-freebsd"; }; pkgs_i686_freebsd = allPackages { system = "i686-freebsd"; }; pkgs_i686_cygwin = allPackages { system = "i686-cygwin"; }; + pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; }; /* The working or failing mails for cross builds will be sent only to diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b2f1fb15262..8d26d08a2c9 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -214,6 +214,7 @@ let }; haskell.compiler = packagePlatforms pkgs.haskell-ng.compiler; + haskellPackages = packagePlatforms pkgs.haskellPackages; strategoPackages = { sdf = linux; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index a408ae9e36c..0de95d59c8e 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-05-13"; - rev = "8d879d4e998db3c1fad106503638d318e10fdba6"; + version = "2015-05-19"; + rev = "6280837d21e5a241d961daf968f5379e6e2e392f"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "1100vcgxy3ddl1ih3ljd3nig4a2k44ajhawsql1lmcj9783aykav"; + sha256 = "1y5zhpd9l0zsknjnhk1ris45y5jka6d6fklzwwhss39h48vymf91"; }; in