diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-09 00:11:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-09 00:11:53 +0000 |
| commit | 54e3ad544249ba9aea3ea7e7918738becd673923 (patch) | |
| tree | 554f739a4a62ee6d295c1fde2c0fc493414d317c /pkgs/development/misc | |
| parent | a32bb438c0219345fc535b4f910da21fa4c4aaa2 (diff) | |
| parent | 6b3b8bb7e779be721d5c8515d0077a706eeab0a3 (diff) | |
| download | nixlib-54e3ad544249ba9aea3ea7e7918738becd673923.tar nixlib-54e3ad544249ba9aea3ea7e7918738becd673923.tar.gz nixlib-54e3ad544249ba9aea3ea7e7918738becd673923.tar.bz2 nixlib-54e3ad544249ba9aea3ea7e7918738becd673923.tar.lz nixlib-54e3ad544249ba9aea3ea7e7918738becd673923.tar.xz nixlib-54e3ad544249ba9aea3ea7e7918738becd673923.tar.zst nixlib-54e3ad544249ba9aea3ea7e7918738becd673923.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/misc')
| -rw-r--r-- | pkgs/development/misc/resholve/oildev.nix | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 2098ec80f5ae..767cedee3913 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -4,34 +4,17 @@ , callPackage , fetchFromGitHub , makeWrapper -, # re2c deps - autoreconfHook , # py-yajl deps git , # oil deps - file -, pkgsBuildBuild + pkgsBuildBuild +, re2c +, file , six , typing }: rec { - re2c = stdenv.mkDerivation rec { - pname = "re2c"; - version = "1.0.3"; - sourceRoot = "${src.name}/re2c"; - src = fetchFromGitHub { - owner = "skvadrik"; - repo = "re2c"; - rev = version; - sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi"; - }; - nativeBuildInputs = [ autoreconfHook ]; - preCheck = '' - patchShebangs run_tests.sh - ''; - }; - py-yajl = python27.pkgs.buildPythonPackage rec { pname = "oil-pyyajl-unstable"; version = "2022-09-01"; @@ -103,7 +86,9 @@ rec { "--without-readline" ]; - nativeBuildInputs = [ re2c file makeWrapper ]; + depsBuildBuild = [ re2c ]; + + nativeBuildInputs = [ file makeWrapper ]; propagatedBuildInputs = [ six typing py-yajl ]; |