Skip to content

Commit 12cb899

Browse files
authored
various: migrate ocaml packages to finalAttrs #3 (NixOS#482737)
2 parents 8c18498 + 10bf0cd commit 12cb899

82 files changed

Lines changed: 272 additions & 273 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

pkgs/development/ocaml-modules/genspio/default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
fmt,
77
}:
88

9-
buildDunePackage rec {
9+
buildDunePackage (finalAttrs: {
1010
pname = "genspio";
1111
version = "0.0.3";
1212

1313
duneVersion = "3";
1414

1515
src = fetchFromGitHub {
1616
owner = "hammerlab";
17-
repo = pname;
18-
rev = "${pname}.${version}";
17+
repo = "genspio";
18+
rev = "genspio.${finalAttrs.version}";
1919
sha256 = "sha256:1788cnn10idp5i1hggg4pys7k0w8m3h2p4xa42jipfg4cpj7shaf";
2020
};
2121

@@ -35,4 +35,4 @@ buildDunePackage rec {
3535
license = lib.licenses.asl20;
3636
maintainers = [ ];
3737
};
38-
}
38+
})

pkgs/development/ocaml-modules/get-activity/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
alcotest,
1212
}:
1313

14-
buildDunePackage rec {
14+
buildDunePackage (finalAttrs: {
1515
pname = "get-activity";
1616
inherit (get-activity-lib) version src;
1717

@@ -42,7 +42,7 @@ buildDunePackage rec {
4242
homepage = "https://github.com/tarides/get-activity";
4343
description = "Collect activity and format as markdown for a journal";
4444
license = lib.licenses.mit;
45-
changelog = "https://github.com/tarides/get-activity/releases/tag/${version}";
45+
changelog = "https://github.com/tarides/get-activity/releases/tag/${finalAttrs.version}";
4646
maintainers = with lib.maintainers; [ zazedd ];
4747
};
48-
}
48+
})

pkgs/development/ocaml-modules/get-activity/lib.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
alcotest,
1414
}:
1515

16-
buildDunePackage rec {
16+
buildDunePackage (finalAttrs: {
1717
pname = "get-activity-lib";
1818
version = "2.0.1";
1919

2020
src = fetchFromGitHub {
2121
owner = "tarides";
2222
repo = "get-activity";
23-
rev = version;
23+
rev = finalAttrs.version;
2424
hash = "sha256-QU/LPIxcem5nFvSxcNApOuBu6UHqLHIXVSOJ2UT0eKA=";
2525
};
2626

@@ -48,7 +48,7 @@ buildDunePackage rec {
4848
homepage = "https://github.com/tarides/get-activity";
4949
description = "Collect activity and format as markdown for a journal (lib)";
5050
license = lib.licenses.mit;
51-
changelog = "https://github.com/tarides/get-activity/releases/tag/${version}";
51+
changelog = "https://github.com/tarides/get-activity/releases/tag/${finalAttrs.version}";
5252
maintainers = with lib.maintainers; [ zazedd ];
5353
};
54-
}
54+
})

pkgs/development/ocaml-modules/getopt/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
buildDunePackage,
55
}:
66

7-
buildDunePackage rec {
7+
buildDunePackage (finalAttrs: {
88
pname = "getopt";
99
version = "20230213";
1010

@@ -13,7 +13,7 @@ buildDunePackage rec {
1313
src = fetchFromGitHub {
1414
owner = "scemama";
1515
repo = "ocaml-getopt";
16-
rev = version;
16+
rev = finalAttrs.version;
1717
hash = "sha256-oYDm945LgjIW+8x7UrO4FlbHywnu8480aiEVvnjBxc8=";
1818
};
1919

@@ -25,4 +25,4 @@ buildDunePackage rec {
2525
license = lib.licenses.mit;
2626
maintainers = [ lib.maintainers.ulrikstrid ];
2727
};
28-
}
28+
})

pkgs/development/ocaml-modules/git/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
cmdliner,
3838
}:
3939

40-
buildDunePackage rec {
40+
buildDunePackage (finalAttrs: {
4141
pname = "git";
4242
version = "3.18.0";
4343

4444
minimalOCamlVersion = "4.08";
4545

4646
src = fetchurl {
47-
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
47+
url = "https://github.com/mirage/ocaml-git/releases/download/${finalAttrs.version}/git-${finalAttrs.version}.tbz";
4848
hash = "sha256-kleVYn5tquC0vRaqUGh53xHLIB5l/v446BN48Y1RfUs=";
4949
};
5050

@@ -99,4 +99,4 @@ buildDunePackage rec {
9999
];
100100
homepage = "https://github.com/mirage/ocaml-git";
101101
};
102-
}
102+
})

pkgs/development/ocaml-modules/github/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
stringext,
1212
}:
1313

14-
buildDunePackage rec {
14+
buildDunePackage (finalAttrs: {
1515
pname = "github";
1616
version = "4.5.1";
1717

1818
src = fetchFromGitHub {
1919
owner = "mirage";
2020
repo = "ocaml-github";
21-
rev = version;
21+
rev = finalAttrs.version;
2222
sha256 = "sha256-nxHXOdZAvFe5/lKNw7tTJmY86xzfdFT+fW+lnKioyPM=";
2323
};
2424

@@ -40,4 +40,4 @@ buildDunePackage rec {
4040
license = lib.licenses.mit;
4141
maintainers = with lib.maintainers; [ niols ];
4242
};
43-
}
43+
})

pkgs/development/ocaml-modules/gitlab/default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
stringext,
1212
}:
1313

14-
buildDunePackage rec {
14+
buildDunePackage (finalAttrs: {
1515
pname = "gitlab";
1616
version = "0.1.8";
1717

1818
src = fetchFromGitHub {
1919
owner = "tmcgilchrist";
2020
repo = "ocaml-gitlab";
21-
rev = version;
21+
rev = finalAttrs.version;
2222
hash = "sha256-7pUpH1SoP4eW8ild5j+Tcy+aTXq0+eSkhKUOXJ6Z30k=";
2323
};
2424

@@ -46,7 +46,7 @@ buildDunePackage rec {
4646
homepage = "https://github.com/tmcgilchrist/ocaml-gitlab";
4747
description = "Native OCaml bindings to Gitlab REST API v4";
4848
license = lib.licenses.bsd3;
49-
changelog = "https://github.com/tmcgilchrist/ocaml-gitlab/releases/tag/${version}";
49+
changelog = "https://github.com/tmcgilchrist/ocaml-gitlab/releases/tag/${finalAttrs.version}";
5050
maintainers = with lib.maintainers; [ zazedd ];
5151
};
52-
}
52+
})

pkgs/development/ocaml-modules/gluon/default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
uri,
1111
}:
1212

13-
buildDunePackage rec {
13+
buildDunePackage (finalAttrs: {
1414
pname = "gluon";
1515
version = "0.0.9";
1616

1717
minimalOCamlVersion = "5.1";
1818

1919
src = fetchurl {
20-
url = "https://github.com/riot-ml/gluon/releases/download/${version}/gluon-${version}.tbz";
20+
url = "https://github.com/riot-ml/gluon/releases/download/${finalAttrs.version}/gluon-${finalAttrs.version}.tbz";
2121
hash = "sha256-YWJCPokY1A7TGqCGoxJl14oKDVeMNybEEB7KiK92WSo=";
2222
};
2323

@@ -40,8 +40,8 @@ buildDunePackage rec {
4040
meta = {
4141
description = "Minimal, portable, and fast API on top of the operating-system's evented I/O API";
4242
homepage = "https://github.com/riot-ml/gluon";
43-
changelog = "https://github.com/riot-ml/gluon/blob/${version}/CHANGES.md";
43+
changelog = "https://github.com/riot-ml/gluon/blob/${finalAttrs.version}/CHANGES.md";
4444
license = lib.licenses.mit;
4545
maintainers = [ ];
4646
};
47-
}
47+
})

pkgs/development/ocaml-modules/gluten/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
lib,
77
}:
88

9-
buildDunePackage rec {
9+
buildDunePackage (finalAttrs: {
1010
pname = "gluten";
1111
version = "0.5.2";
1212

1313
src = fetchurl {
14-
url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz";
14+
url = "https://github.com/anmonteiro/gluten/releases/download/${finalAttrs.version}/gluten-${finalAttrs.version}.tbz";
1515
hash = "sha256-se7Yn59ggLtL0onMjSUsa88B8D05Vybmb6YGcgfnAV8=";
1616
};
1717

@@ -30,4 +30,4 @@ buildDunePackage rec {
3030
homepage = "https://github.com/anmonteiro/gluten";
3131
maintainers = with lib.maintainers; [ anmonteiro ];
3232
};
33-
}
33+
})

pkgs/development/ocaml-modules/gmap/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
fmt,
88
}:
99

10-
buildDunePackage rec {
10+
buildDunePackage (finalAttrs: {
1111
pname = "gmap";
1212
version = "0.3.0";
1313

1414
duneVersion = "3";
1515

1616
src = fetchurl {
17-
url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz";
17+
url = "https://github.com/hannesm/gmap/releases/download/${finalAttrs.version}/gmap-${finalAttrs.version}.tbz";
1818
sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84";
1919
};
2020

@@ -33,4 +33,4 @@ buildDunePackage rec {
3333
license = lib.licenses.isc;
3434
maintainers = [ lib.maintainers.vbgl ];
3535
};
36-
}
36+
})

0 commit comments

Comments
 (0)