From e65e8983d943425f2069dcf53221e0f2987d1ee8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 10 Feb 2015 09:48:41 -0500 Subject: nim: initial package at 0.10.2 --- pkgs/development/compilers/nim/default.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/development/compilers/nim/default.nix (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix new file mode 100644 index 000000000000..3b8f46eb6881 --- /dev/null +++ b/pkgs/development/compilers/nim/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "nim-0.10.2"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "http://nim-lang.org/download/${name}.zip"; + sha256 = "1jkrf8wgva7kfl0vqs1f3scidi6a85r6bkz2zf90k8gdpin9idrg"; + }; + + buildPhase = "sh build.sh"; + installPhase = + '' + substituteInPlace install.sh --replace '$1/nim' "$out" + sh install.sh $out + ''; + + meta = with stdenv.lib; + { description = "Statically typed, imperative programming language"; + homepage = http://nim-lang.org/; + license = licenses.mit; + maintainers = with maintainers; [ emery ]; + platforms = platforms.linux; # arbitrary + }; +} -- cgit 1.4.1 From 52c8d7c4ab0b2b2c97faa848b98dfc0ae9b69d7b Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Wed, 11 Feb 2015 14:30:37 -0800 Subject: Build GHC HEAD from git checkout --- pkgs/development/compilers/ghc/head.nix | 20 ++++++++++++++------ pkgs/top-level/haskell-ng.nix | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index cd1c89886291..9d7cd4482d2f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: +{ stdenv, fetchgit, ghc, perl, gmp, ncurses, autoconf, automake, happy, alex }: let @@ -15,13 +15,21 @@ in stdenv.mkDerivation rec { version = "7.11.20150118"; name = "ghc-${version}"; + rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4"; - src = fetchurl { - url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2"; - sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20"; + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + inherit rev; + sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6"; }; - buildInputs = [ ghc perl ]; + postUnpack = '' + pushd ghc-${builtins.substring 0 7 rev} + ./boot + popd + ''; + + buildInputs = [ ghc perl autoconf automake happy alex ]; preConfigure = '' echo >mk/build.mk "${buildMK}" @@ -39,7 +47,7 @@ stdenv.mkDerivation rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" "--keep-file-symbols" ]; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; meta = { homepage = "http://haskell.org/ghc"; diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix index 220fca90a53f..cdf96879d6ac 100644 --- a/pkgs/top-level/haskell-ng.nix +++ b/pkgs/top-level/haskell-ng.nix @@ -18,7 +18,7 @@ rec { ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; + ghcHEAD = callPackage ../development/compilers/ghc/head.nix { inherit (packages.ghc784) ghc happy alex; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc = compiler.ghc784; }; -- cgit 1.4.1 From 15416dd2eca1bc3d214649b0f034e40a1daee2ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Feb 2015 20:15:09 +0100 Subject: Revert "Build GHC HEAD from git checkout". This reverts commit 52c8d7c4ab0b2b2c97faa848b98dfc0ae9b69d7b. The new expression doesn't compile: http://hydra.nixos.org/build/19594431/nixlog/1/raw. --- pkgs/development/compilers/ghc/head.nix | 20 ++++++-------------- pkgs/top-level/haskell-ng.nix | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 9d7cd4482d2f..cd1c89886291 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ghc, perl, gmp, ncurses, autoconf, automake, happy, alex }: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: let @@ -15,21 +15,13 @@ in stdenv.mkDerivation rec { version = "7.11.20150118"; name = "ghc-${version}"; - rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4"; - src = fetchgit { - url = "git://git.haskell.org/ghc.git"; - inherit rev; - sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6"; + src = fetchurl { + url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2"; + sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20"; }; - postUnpack = '' - pushd ghc-${builtins.substring 0 7 rev} - ./boot - popd - ''; - - buildInputs = [ ghc perl autoconf automake happy alex ]; + buildInputs = [ ghc perl ]; preConfigure = '' echo >mk/build.mk "${buildMK}" @@ -47,7 +39,7 @@ stdenv.mkDerivation rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" "--keep-file-symbols" ]; meta = { homepage = "http://haskell.org/ghc"; diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix index cdf96879d6ac..220fca90a53f 100644 --- a/pkgs/top-level/haskell-ng.nix +++ b/pkgs/top-level/haskell-ng.nix @@ -18,7 +18,7 @@ rec { ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghcHEAD = callPackage ../development/compilers/ghc/head.nix { inherit (packages.ghc784) ghc happy alex; gmp = pkgs.gmp.override { withStatic = true; }; }; + ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc = compiler.ghc784; }; -- cgit 1.4.1 From 8afa77cb0729187196b8a9efb0715d66c2e00c1f Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 12 Feb 2015 20:39:09 +0100 Subject: vala-0.26: minor update to fix CVE-2014-8154 @lethalman: it seems strange to me to have the 0.23.* version as the default, as it's even an unstable release. --- pkgs/development/compilers/vala/0.26.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix index 48b5476fe1d0..0cf54ea347ce 100644 --- a/pkgs/development/compilers/vala/0.26.nix +++ b/pkgs/development/compilers/vala/0.26.nix @@ -4,8 +4,8 @@ let major = "0.26"; - minor = "1"; - sha256 = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b"; + minor = "2"; + sha256 = "37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4"; in stdenv.mkDerivation rec { name = "vala-${major}.${minor}"; -- cgit 1.4.1 From b43fc565f16324b416bf13c6bbb14083bcf853d9 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Thu, 12 Feb 2015 12:14:35 -0800 Subject: linker flags for sbcl --- pkgs/development/compilers/sbcl/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index ea61940e8d4e..94a17c483aba 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { # Use whatever `cc` the stdenv provides substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc + + substituteInPlace src/runtime/Config.x86-64-darwin \ + --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 ''; preBuild = '' -- cgit 1.4.1 From 68c6ca44e6cf2f2a28b6d409ab4df8ae1983edb5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 12 Feb 2015 15:05:06 -0600 Subject: sbcl_1_2_0: port over joelteon's change to 1.2.8 --- pkgs/development/compilers/sbcl/1.2.0.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix index a12e8c5ae9da..d19edce2c105 100644 --- a/pkgs/development/compilers/sbcl/1.2.0.nix +++ b/pkgs/development/compilers/sbcl/1.2.0.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { # Use whatever `cc` the stdenv provides substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc + + substituteInPlace src/runtime/Config.x86-64-darwin \ + --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 ''; preBuild = '' -- cgit 1.4.1 From dcafdf47eab0249699749e8b77dd1d0b0fecd7d7 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Thu, 12 Feb 2015 12:18:06 -0800 Subject: Revert "Revert "Build GHC HEAD from git checkout"." This reverts commit 15416dd2eca1bc3d214649b0f034e40a1daee2ab. --- pkgs/development/compilers/ghc/head.nix | 20 ++++++++++++++------ pkgs/top-level/haskell-ng.nix | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index cd1c89886291..9d7cd4482d2f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: +{ stdenv, fetchgit, ghc, perl, gmp, ncurses, autoconf, automake, happy, alex }: let @@ -15,13 +15,21 @@ in stdenv.mkDerivation rec { version = "7.11.20150118"; name = "ghc-${version}"; + rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4"; - src = fetchurl { - url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2"; - sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20"; + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + inherit rev; + sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6"; }; - buildInputs = [ ghc perl ]; + postUnpack = '' + pushd ghc-${builtins.substring 0 7 rev} + ./boot + popd + ''; + + buildInputs = [ ghc perl autoconf automake happy alex ]; preConfigure = '' echo >mk/build.mk "${buildMK}" @@ -39,7 +47,7 @@ stdenv.mkDerivation rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" "--keep-file-symbols" ]; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; meta = { homepage = "http://haskell.org/ghc"; diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix index 220fca90a53f..cdf96879d6ac 100644 --- a/pkgs/top-level/haskell-ng.nix +++ b/pkgs/top-level/haskell-ng.nix @@ -18,7 +18,7 @@ rec { ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; - ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; + ghcHEAD = callPackage ../development/compilers/ghc/head.nix { inherit (packages.ghc784) ghc happy alex; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc = compiler.ghc784; }; -- cgit 1.4.1 From 2a5dacbf6bef9c00e042f05ebc269bcaacbf1354 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Thu, 12 Feb 2015 12:18:30 -0800 Subject: patch shebangs in boot script --- pkgs/development/compilers/ghc/head.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 9d7cd4482d2f..5ffe421f08cd 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { postUnpack = '' pushd ghc-${builtins.substring 0 7 rev} + patchShebangs . ./boot popd ''; -- cgit 1.4.1