public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
This commit is contained in:
Vladimír Čunát
2013-04-13 12:21:31 +02:00
parent 96dd66bf25 a3fce096af
commit 17ae1617dc
49 changed files with 1190 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/haskell/cabal-dev/default.nix
View File

@@ -1,19 +1,15 @@
{ cabal, fetchurl, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
, transformers, zlib, setenv
{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, setenv
, tar, transformers, zlib
}:
cabal.mkDerivation (self: {
pname = "cabal-dev";
version = "0.9.1-git";
src = fetchurl {
url = "https://github.com/creswick/cabal-dev/archive/54e7d93d5b309c56192c146c7a807ac3591bc464.tar.gz";
sha256 = "1isi02jik0vrg48l7r2mj4cf9ms6hpxxz1mmhl7s3kkxx775cxj9";
name = "${self.name}.tar.gz";
};
version = "0.9.2";
sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath HTTP mtl network tar transformers zlib setenv
Cabal filepath HTTP mtl network setenv tar transformers zlib
];
buildTools = [ cabalInstall ];
meta = {

4
pkgs/development/tools/neoload/default.nix
View File

@@ -80,12 +80,12 @@ in stdenv.mkDerivation rec {
'';
meta = {
description = "load testing software for Web applications to realistically simulate user activity and analyze server behavior.";
description = "load testing software for Web applications to realistically simulate user activity and analyze server behavior";
homepage = https://www.neotys.com/product/overview-neoload.html;
# https://www.neotys.com/documents/legal/eula/neoload/eula_en.html
license = stdenv.lib.licenses.proprietary;
license = stdenv.lib.licenses.unfree;
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
platforms = [ "i686-linux" "x86_64-linux" ];