Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

falcon: update to lastest git revision as the lastest release does not build

+15 -30
+14 -27
pkgs/development/interpreters/falcon/default.nix
··· 1 - a : 2 - let 3 - fetchurl = a.fetchurl; 1 + { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "faclon-${version}"; 5 + version = "2013-09-19"; 4 6 5 - version = a.lib.attrByPath ["version"] "0.9.2" a; 6 - buildInputs = with a; [ 7 - cmake 8 - ]; 9 - in 10 - rec { 11 - src = fetchurl { 12 - url = "http://www.falconpl.org/project_dl/_official_rel/Falcon-${version}.tar.gz"; 13 - sha256 = "0p32syiz2nc6lmmzi0078g4nzariw5ymdjkmhw6iamc0lkkb9x3i"; 7 + src = fetchFromGitHub { 8 + owner = "falconpl"; 9 + repo = "falcon"; 10 + rev = "095141903c4ebab928ce803055f9bda363215c37"; 11 + sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; 14 12 }; 15 13 16 - inherit buildInputs; 17 - configureFlags = []; 18 - 19 - /* doConfigure should be removed if not needed */ 20 - phaseNames = ["doDeploy"]; 21 - 22 - doDeploy = a.fullDepEntry ('' 23 - ./build.sh -i -p $out 24 - '') ["minInit" "addInputs" "doFixInterpreter" "defEnsureDir"]; 25 - 26 - doFixInterpreter = a.fullDepEntry ('' 27 - sed -e "s@/bin/bash@$shell@" -i build.sh 28 - '') ["minInit" "doUnpack"]; 14 + buildInputs = [ cmake pkgconfig pcre zlib sqlite ]; 29 15 30 - name = "falcon-" + version; 31 - meta = { 16 + meta = with stdenv.lib; { 32 17 description = "Programming language with macros and syntax at once"; 18 + license = licenses.gpl2; 19 + maintainers = with maintainers; [ pSub ]; 33 20 }; 34 21 }
+1 -3
pkgs/top-level/all-packages.nix
··· 3135 3135 hhvm = callPackage ../development/compilers/hhvm { }; 3136 3136 hiphopvm = hhvm; /* Compatibility alias */ 3137 3137 3138 - falcon = builderDefsPackage (import ../development/interpreters/falcon) { 3139 - inherit cmake; 3140 - }; 3138 + falcon = callPackage ../development/interpreters/falcon { }; 3141 3139 3142 3140 fsharp = callPackage ../development/compilers/fsharp {}; 3143 3141