From 006a69fd6c62f8f8df7245bdc56bdabb3c25881e Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 15 Mar 2024 18:37:39 -0700 Subject: [PATCH] Update sources (#1324) * Update sources * rm upstreamed --------- Co-authored-by: UpdateBot --- flake.lock | 8 ++++---- flake.nix | 2 +- ocaml/overlay-ocaml-packages.nix | 6 ------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 8a5721ad7..661b8c829 100644 --- a/flake.lock +++ b/flake.lock @@ -20,17 +20,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710474764, - "narHash": "sha256-M43DDaPLL04HBLfh7XBZ8ROiujeL9IvnWsEKUnG2/yU=", + "lastModified": 1710513883, + "narHash": "sha256-MKYur1pNCrk8bU7agCpMRi3dCCEbv3GwH3pS0XuM1Ps=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bcf18c64c66b95e17d9c8755104d33bc5103c63", + "rev": "bda93c2221bc4185056723795c62e1b4cc661c4b", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bcf18c64c66b95e17d9c8755104d33bc5103c63", + "rev": "bda93c2221bc4185056723795c62e1b4cc661c4b", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 810da86ec..bae820d8b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?rev=2bcf18c64c66b95e17d9c8755104d33bc5103c63"; + nixpkgs.url = "github:NixOS/nixpkgs?rev=bda93c2221bc4185056723795c62e1b4cc661c4b"; flake-utils.url = "github:numtide/flake-utils"; }; diff --git a/ocaml/overlay-ocaml-packages.nix b/ocaml/overlay-ocaml-packages.nix index e1daa0333..962821839 100644 --- a/ocaml/overlay-ocaml-packages.nix +++ b/ocaml/overlay-ocaml-packages.nix @@ -30,12 +30,6 @@ let (if !(ocaml-ng ? "ocamlPackages_trunk") then { ocamlPackages_4_14 = ocaml-ng.ocamlPackages_4_14.overrideScope (oself: osuper: { ocaml = osuper.ocaml.overrideAttrs (_: { - src = super.fetchFromGitHub { - owner = "ocaml"; - repo = "ocaml"; - rev = "4.14.2-rc1"; - hash = "sha256-QZiPaYY66kkhn9xO60LFHDaT76kAvkNIgNT+G17YJrM="; - }; hardeningDisable = [ "strictoverflow" ]; }); });