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

Merge branch 'master' into x-updates

Browse Source 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
This commit is contained in:
Vladimír Čunát
2013-05-08 13:46:46 +02:00
parent d4561be1cb 0c020c98f9
commit 1278859d31
153 changed files with 1505 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/go/1.1.nix
View File

@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation {
name = "go-1.1beta2";
name = "go-1.1rc1";
src = fetchurl {
url = http://go.googlecode.com/files/go1.1beta2.src.tar.gz;
sha1 = "70d7642a6ea065a23458b9ea28e370b19912e52d";
url = http://go.googlecode.com/files/go1.1rc1.src.tar.gz;
sha1 = "c999c36e7bb5c9ef05d309b0bb4275feb62c44e3";
};
buildInputs = [ bison glibc bash makeWrapper ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
# Disable a failing icmp test
sed -i '/ip[46]:icmp.*nil/d' src/pkg/net/ipraw_test.go
sed -i '/ip[46]:.*icmp.*nil/d' src/pkg/net/ipraw_test.go
'';
patches = [ ./cacert.patch ];

6
pkgs/development/compilers/llvm/clang.nix
View File

@@ -1,6 +1,9 @@
{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }:
let version = "3.2"; in
let
version = "3.2";
gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc;
in
stdenv.mkDerivation {
name = "clang-${version}";
@@ -13,6 +16,7 @@ stdenv.mkDerivation {
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_TARGETS_TO_BUILD=all"
"-DGCC_INSTALL_PREFIX=${gccReal}"
] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
"-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
];

8
pkgs/development/compilers/sbcl/default.nix
View File

@@ -4,11 +4,11 @@ let
s= # Generated upstream information
rec {
baseName="sbcl";
version="1.1.6";
version="1.1.7";
name="${baseName}-${version}";
hash="1idrbjqi4m5p4dmxzwwx3rgsdq887njzi67gr1f4b26v56a3qnx2";
url="mirror://sourceforge/project/sbcl/sbcl/1.1.6/sbcl-1.1.6-source.tar.bz2";
sha256="1idrbjqi4m5p4dmxzwwx3rgsdq887njzi67gr1f4b26v56a3qnx2";
hash="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8";
url="mirror://sourceforge/project/sbcl/sbcl/1.1.7/sbcl-1.1.7-source.tar.bz2";
sha256="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8";
};
buildInputs = with a; [
clisp makeWrapper