diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-09-23 23:51:50 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-09-23 23:52:18 +0200 |
commit | 3b2ba0ae42b30f37464ffdffeefe1a476f34458a (patch) | |
tree | 88b961802f3861e7a5cbadd25b9fc4060f25f568 | |
parent | c7b73b2b124fc8fada6a89b8126930fb94edf585 (diff) |
falcon: update to lastest git revision as the lastest release does not build
-rw-r--r-- | pkgs/development/interpreters/falcon/default.nix | 41 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 15 insertions, 30 deletions
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 0b4bfacb6de5..d9ce07f16f76 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,34 +1,21 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: - version = a.lib.attrByPath ["version"] "0.9.2" a; - buildInputs = with a; [ - cmake - ]; -in -rec { - src = fetchurl { - url = "http://www.falconpl.org/project_dl/_official_rel/Falcon-${version}.tar.gz"; - sha256 = "0p32syiz2nc6lmmzi0078g4nzariw5ymdjkmhw6iamc0lkkb9x3i"; - }; - - inherit buildInputs; - configureFlags = []; +stdenv.mkDerivation rec { + name = "faclon-${version}"; + version = "2013-09-19"; - /* doConfigure should be removed if not needed */ - phaseNames = ["doDeploy"]; + src = fetchFromGitHub { + owner = "falconpl"; + repo = "falcon"; + rev = "095141903c4ebab928ce803055f9bda363215c37"; + sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; + }; - doDeploy = a.fullDepEntry ('' - ./build.sh -i -p $out - '') ["minInit" "addInputs" "doFixInterpreter" "defEnsureDir"]; - - doFixInterpreter = a.fullDepEntry ('' - sed -e "s@/bin/bash@$shell@" -i build.sh - '') ["minInit" "doUnpack"]; + buildInputs = [ cmake pkgconfig pcre zlib sqlite ]; - name = "falcon-" + version; - meta = { + meta = with stdenv.lib; { description = "Programming language with macros and syntax at once"; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65b9c7252d95..5226563b63b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3135,9 +3135,7 @@ let hhvm = callPackage ../development/compilers/hhvm { }; hiphopvm = hhvm; /* Compatibility alias */ - falcon = builderDefsPackage (import ../development/interpreters/falcon) { - inherit cmake; - }; + falcon = callPackage ../development/interpreters/falcon { }; fsharp = callPackage ../development/compilers/fsharp {}; |