public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.sedlex_2: 2.1 -> 2.2

Browse Source 
* use dune 2
* refactor fetching of dependencies (reduce duplication)
* remove dune rule for data files before building since dune 2 doesn't
  like the symlinked data files if the rule is present
This commit is contained in:
sternenseemann 2021-01-01 15:55:15 +01:00 committed by Vincent Laporte
parent 84c3e129cc
commit 1c52824fed
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/ocaml-modules/sedlex/2.nix
View File

@ -14,28 +14,33 @@ then throw "sedlex is not available for OCaml ${ocaml.version}"
else else
let let
unicodeVersion = "12.1.0";
baseUrl = "https://www.unicode.org/Public/${unicodeVersion}";
DerivedCoreProperties = fetchurl { DerivedCoreProperties = fetchurl {
url = "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt"; url = "${baseUrl}/ucd/DerivedCoreProperties.txt";
sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6"; sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6";
}; };
DerivedGeneralCategory = fetchurl { DerivedGeneralCategory = fetchurl {
url = "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt"; url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt";
sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q"; sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q";
}; };
PropList = fetchurl { PropList = fetchurl {
url = "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt"; url = "${baseUrl}/ucd/PropList.txt";
sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"; sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk";
}; };
in in
buildDunePackage rec { buildDunePackage rec {
pname = "sedlex"; pname = "sedlex";
version = "2.1"; version = "2.2";
useDune2 = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocaml-community"; owner = "ocaml-community";
repo = "sedlex"; repo = "sedlex";
rev = "v${version}"; rev = "v${version}";
sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"; sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -43,6 +48,7 @@ buildDunePackage rec {
]; ];
preBuild = '' preBuild = ''
rm src/generator/data/dune
ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt
ln -s ${DerivedGeneralCategory} src/generator/data/DerivedGeneralCategory.txt ln -s ${DerivedGeneralCategory} src/generator/data/DerivedGeneralCategory.txt
ln -s ${PropList} src/generator/data/PropList.txt ln -s ${PropList} src/generator/data/PropList.txt