Revert to 24.11; use OCaml 5.1 for legacy packages (#11)

mistzzt · web-flow · commit 1da2372c206c · 2025-05-22T16:18:43.000-07:00
* revert to 24.11

* ci ver

* ocaml ver

* parsynt ocaml ver
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,8 +19,7 @@ jobs:
         cachixName:
           - mistzzt
         nixPath:
-          - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixpkgs-unstable.tar.gz
-          - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-unstable.tar.gz
+          - nixpkgs=channel:nixos-24.11
     runs-on: ubuntu-latest
     env:
       NIXPKGS_ALLOW_UNFREE: '1'
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   description = "NUR repository of program synthesis tools";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
   outputs = {
     self,
     nixpkgs,
diff --git a/pkgs/Synduce/default.nix b/pkgs/Synduce/default.nix
@@ -2,11 +2,13 @@
   fetchFromGitHub,
   lib,
   makeWrapper,
-  ocamlPackages,
+  ocaml-ng,
   z3,
   cvc4,
   cvc5,
 }: let
+  ocamlPackages = ocaml-ng.ocamlPackages_5_1;
+
   parsexp_io = ocamlPackages.buildDunePackage rec {
     pname = "parsexp_io";
     version = "v0.17.0";
diff --git a/pkgs/parsynt/default.nix b/pkgs/parsynt/default.nix
@@ -2,10 +2,13 @@
   fetchFromGitHub,
   lib,
   makeWrapper,
-  ocamlPackages,
+  ocaml-ng,
   z3,
   racket,
 }:
+let
+  ocamlPackages = ocaml-ng.ocamlPackages_5_1;
+in
 ocamlPackages.buildDunePackage rec {
   pname = "Parsynt";
   version = "0-unstable-2021-12-15";

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`description = "NUR repository of program synthesis tools";`
`3`		`- inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";`
	`3`	`+ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";`
`4`	`4`	`outputs = {`
`5`	`5`	`self,`
`6`	`6`	`nixpkgs,`