From 45a8fd463015596bbce25bca285aa34be1fbaf7e Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Tue, 18 Jul 2023 17:07:06 +0200
Subject: [PATCH] [nix] Update commit
---
nix/pkgs.nix | 1 -
nix/ppx_deriving_yaml.nix | 8 ++------
nix/sources.json | 6 +++---
nix/yaml.nix | 32 --------------------------------
4 files changed, 5 insertions(+), 42 deletions(-)
delete mode 100644 nix/yaml.nix
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
index 86265235776..8f08f15e2ed 100644
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@@ -7,7 +7,6 @@ let
headache = oself.callPackage ./headache.nix {};
mlmpfr = oself.callPackage ./mlmpfr.nix {};
why3 = oself.callPackage ./why3.nix {};
- yaml = oself.callPackage ./yaml.nix {};
ppx_deriving_yaml = oself.callPackage ./ppx_deriving_yaml.nix {};
# Helpers
diff --git a/nix/ppx_deriving_yaml.nix b/nix/ppx_deriving_yaml.nix
index 44b6e980ae6..4b1e177f30b 100644
--- a/nix/ppx_deriving_yaml.nix
+++ b/nix/ppx_deriving_yaml.nix
@@ -1,12 +1,11 @@
-{ lib, buildDunePackage, fetchurl, ppxlib, alcotest, mdx
-, ppx_deriving, yaml
-}:
+{ lib, buildDunePackage, fetchurl, ppxlib, alcotest, ppx_deriving, yaml }:
buildDunePackage rec {
pname = "ppx_deriving_yaml";
version = "0.2.1";
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
src = fetchurl {
url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz";
@@ -15,9 +14,6 @@ buildDunePackage rec {
propagatedBuildInputs = [ ppxlib ppx_deriving yaml ];
- doCheck = true;
- checkInputs = [ alcotest mdx ];
-
meta = {
description = "A YAML codec generator for OCaml";
homepage = "https://github.com/patricoferris/ppx_deriving_yaml";
diff --git a/nix/sources.json b/nix/sources.json
index 52d18208892..f3366def722 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -29,10 +29,10 @@
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d231d18e4aa5e1d00f86b4f484f9e4344538e3ea",
- "sha256": "1ks9h2m6ns6b0wbw6x4cqaqwgfac1n51v3a8vygnm7ynq34ka2l1",
+ "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b",
+ "sha256": "01yzrkrb60dd2y2y3fh4939z374hf5pa92q8axfcygqlnbk3jpb4",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/d231d18e4aa5e1d00f86b4f484f9e4344538e3ea.tar.gz",
+ "url": "https://github.com/NixOS/nixpkgs/archive/f292b4964cb71f9dfbbd30dc9f511d6165cd109b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"why3": {
diff --git a/nix/yaml.nix b/nix/yaml.nix
deleted file mode 100644
index bc8c7af164e..00000000000
--- a/nix/yaml.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, fetchurl, buildDunePackage
-, dune-configurator
-, bos, ctypes, fmt, logs
-, mdx, alcotest, crowbar, junit_alcotest, ezjsonm
-}:
-
-buildDunePackage rec {
- pname = "yaml";
- version = "3.0.1";
-
- src = fetchurl {
- url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-${version}.tbz";
- sha256 = "ku0bpClVmhS2tF4XDzSCGReR+ZrFGJpfIGEuFb+99pU=";
- };
-
- minimalOCamlVersion = "4.05.0";
-
- buildInputs = [ dune-configurator ];
- propagatedBuildInputs = [ bos ctypes ];
-
- doCheck = true;
- nativeCheckInputs = [ mdx.bin ];
- checkInputs = [ fmt logs alcotest crowbar junit_alcotest ezjsonm ];
-
- meta = {
- description = "Parse and generate YAML 1.1 files";
- homepage = "https://github.com/avsm/ocaml-yaml";
- license = lib.licenses.isc;
- maintainers = [ lib.maintainers.vbgl ];
- };
-
-}
--
GitLab