diff options
Diffstat (limited to 'pkgs/development')
13 files changed, 53 insertions, 40 deletions
diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 73152fb9d2c..7c7e11e3d2b 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -34,6 +29,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgcrypt ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + doCheck = true; meta = with lib; { description = "Bindings to Libgcrypt for GNU Guile"; diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 0b3dfefcbe8..5487116b53a 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -34,9 +29,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; + # Skipping proxy tests since it requires network access. + postConfigure = '' + sed -i -e '94i (test-skip 1)' ./tests/proxy.scm + ''; + meta = with lib; { description = "Bindings to Libgit2 for GNU Guile"; homepage = "https://gitlab.com/guile-git/guile-git"; diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 1698614c426..dee81f2baeb 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -15,19 +15,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-lCq37FtAhWeZwMqfuBkhrxf8Q2CuvvHMjLH2rZIg1Rk="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site/json%' json/Makefile; - sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache/json%' json/Makefile; - ''; - nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ guile ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; meta = with lib; { description = "JSON Bindings for GNU Guile"; diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix index 0e0da6a94bb..14869477077 100644 --- a/pkgs/development/ocaml-modules/caqti/async.nix +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-async"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 510437f1c3b..5edb68d30cf 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -1,19 +1,16 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , cppo, logs, ptime, uri, bigstringaf , re, cmdliner, alcotest }: buildDunePackage rec { pname = "caqti"; - version = "1.8.0"; - useDune2 = true; + version = "1.9.1"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; - src = fetchFromGitHub { - owner = "paurkedal"; - repo = "ocaml-${pname}"; - rev = "v${version}"; - sha256 = "sha256-8uKlrq9j1Z3QzkCyoRIn2j6wCdGyo7BY7XlbFHN1xVE="; + src = fetchurl { + url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz"; + sha256 = "sha256-PQBgJBNx3IcE6/vyNIf26a2xStU22LBhff8eM6UPaJ4="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix index 5f4f681540e..bff515eff38 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-mariadb"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti mariadb ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix index a1b427a5edf..f33e38fab8d 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-postgresql"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti postgresql ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index 5282ba5ef50..822c002a8de 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-sqlite3"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix index 6ed86683728..8e6a30a1a31 100644 --- a/pkgs/development/ocaml-modules/caqti/dynload.nix +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-dynload"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti ]; diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix index f02fa377f80..d0642113628 100644 --- a/pkgs/development/ocaml-modules/caqti/lwt.nix +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-lwt"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti logs lwt ]; diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix index d2050e2cf47..26b0887f20e 100644 --- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -2,9 +2,7 @@ buildDunePackage { pname = "caqti-type-calendar"; - version = "1.2.0"; - useDune2 = true; - inherit (caqti) src; + inherit (caqti) src version; propagatedBuildInputs = [ calendar caqti ]; diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 602b0d86f44..1cbbdf0bf29 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -29,6 +24,9 @@ stdenv.mkDerivation rec { guile ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + meta = with lib; { description = "Structured access to bytevector contents"; homepage = "https://github.com/TaylanUB/scheme-bytestructures"; diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix new file mode 100644 index 00000000000..69e45f44eb8 --- /dev/null +++ b/pkgs/development/web/ihp-new/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, git, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "ihp-new"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "digitallyinduced"; + repo = "ihp"; + rev = "v${version}"; + sha256 = "sha256-fvFRBnMnFGsPleVv5aPfuoP1UzjnBel0NiNULFP+GkI="; + }; + + dontConfigure = true; + sourceRoot = "source/ProjectGenerator"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm755 bin/ihp-new -t $out/bin + wrapProgram $out/bin/ihp-new \ + --suffix PATH ":" "${lib.makeBinPath [ git ]}"; + ''; + + meta = with lib; { + description = "Project generator for the IHP (Integrated Haskell Platform) web framework"; + homepage = "https://ihp.digitallyinduced.com"; + license = licenses.mit; + maintainers = [ maintainers.mpscholten ]; + platforms = platforms.unix; + }; +} |