Switch to nixpkgs unstable; fix reduce-algebra darwin compilation (#10)

* save

* minor

* missing

* fix

* save

* save

* save

* save

* minor

* fix version string

Author: mistzzt

.github/workflows/build.yml

@@ -19,7 +19,8 @@ jobs:
         cachixName:
           - mistzzt
         nixPath:
-          - nixpkgs=channel:nixos-24.05
+          - 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
     runs-on: ubuntu-latest
     env:
       NIXPKGS_ALLOW_UNFREE: '1'

ci.nix

@@ -12,7 +12,14 @@
 with builtins; let
   isReserved = n: n == "lib" || n == "overlays" || n == "modules";
   isDerivation = p: isAttrs p && p ? type && p.type == "derivation";
-  isBuildable = p: !(p.meta.broken or false) && p.meta.license.free or true;
+  isBuildable = p: let
+    licenseFromMeta = p.meta.license or [];
+    licenseList =
+      if builtins.isList licenseFromMeta
+      then licenseFromMeta
+      else [licenseFromMeta];
+  in
+    !(p.meta.broken or false) && builtins.all (license: license.free or true) licenseList;
   isCacheable = p: !(p.preferLocalBuild or false);
   shouldRecurseForDerivations = p: isAttrs p && p.recurseForDerivations or false;
 

default.nix

@@ -1,17 +1,10 @@
-{pkgs ? import <nixpkgs> {}}: let
-  darwinStdenv = let
-    inherit (pkgs) stdenv overrideSDK;
-  in
-    if stdenv.isDarwin
-    then overrideSDK stdenv "11.0"
-    else stdenv;
-in {
+{pkgs ? import <nixpkgs> {}}: {
   lib = import ./lib {inherit pkgs;};
   modules = import ./modules;
   overlays = import ./overlays;
 
-  sketch = pkgs.callPackage ./pkgs/sketch {stdenv = darwinStdenv;};
-  reduce-algebra = pkgs.callPackage ./pkgs/reduce-algebra {stdenv = darwinStdenv;};
+  sketch = pkgs.callPackage ./pkgs/sketch {};
+  reduce-algebra = pkgs.callPackage ./pkgs/reduce-algebra {};
   AutoLifter = pkgs.callPackage ./pkgs/AutoLifter {};
   parsynt = pkgs.callPackage ./pkgs/parsynt {};
   Synduce = pkgs.callPackage ./pkgs/Synduce {};

flake.lock

@@ -1,21 +1,18 @@
 {
   description = "NUR repository of program synthesis tools";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   outputs = {
     self,
     nixpkgs,
   }: let
-    systems = [
-      "x86_64-linux"
-      "aarch64-linux"
-      "x86_64-darwin"
-      "aarch64-darwin"
-    ];
-    forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
+    forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
   in {
     legacyPackages = forAllSystems (system:
       import ./default.nix {
-        pkgs = import nixpkgs {inherit system; config.allowUnfree = true;};
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        };
       });
     packages = forAllSystems (system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system});
   };

flake.nix

@@ -13,7 +13,7 @@
 }:
 stdenv.mkDerivation rec {
   name = "AutoLifter";
-  version = "1.0.0";
+  version = "0-unstable-2024-01-08";
   src =
     fetchFromGitHub
     {

pkgs/AutoLifter/default.nix

@@ -31,7 +31,7 @@
 in
   ocamlPackages.buildDunePackage rec {
     pname = "Synduce";
-    version = "0.2";
+    version = "0-unstable-2023-08-12";
     duneVersion = "3";
     src =
       fetchFromGitHub

pkgs/Synduce/default.nix

@@ -8,7 +8,7 @@
 }:
 ocamlPackages.buildDunePackage rec {
   pname = "Parsynt";
-  version = "0.3";
+  version = "0-unstable-2021-12-15";
   duneVersion = "3";
   src =
     fetchFromGitHub

pkgs/parsynt/default.nix

@@ -1,4 +1,5 @@
 {
+  autoPatchelfHook,
   fetchurl,
   lib,
   makeWrapper,
@@ -11,7 +12,6 @@
   bzip2,
   libiconv,
   which,
-  darwin,
   brotli,
   fontconfig,
   freetype,
@@ -26,52 +26,48 @@
 }:
 stdenv.mkDerivation {
   name = "reduce-algebra";
-  version = "r6860";
+  version = "6860";
   src = fetchurl {
     url = "https://sourceforge.net/projects/reduce-algebra/files/snapshot_2024-08-12/Reduce-svn6860-src.tar.gz";
     sha1 = "q81l4MA2h+4ky4Rwt26Vl0QPf5c=";
   };
   patches = [./fox.patch];
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      ccache
-      coreutils
-      libtool
-      perl
-      ncurses
-      zlib
-      bzip2
-      libiconv
-      which
-      makeWrapper
-
-      # homebrew package
-      expat
-      brotli
-      fontconfig
-      freetype
-      gettext
-      libffi
-      libpng
-      xorg.libX11
-      xorg.libXau
-      xorg.libxcb
-      xorg.libXcursor
-      xorg.libXdmcp
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXft
-      xorg.libXi
-      xorg.libXrandr
-      xorg.libXrender
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.Carbon
-      darwin.stubs.rez
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    ccache
+    coreutils
+    libtool
+    perl
+    ncurses
+    zlib
+    bzip2
+    libiconv
+    which
+    makeWrapper
+
+    # homebrew package
+    expat
+    brotli
+    fontconfig
+    freetype
+    gettext
+    libffi
+    libpng
+    xorg.libX11
+    xorg.libXau
+    xorg.libxcb
+    xorg.libXcursor
+    xorg.libXdmcp
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXft
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    autoPatchelfHook
+  ];
 
   preConfigure = ''
     # Configuration: Rewrite CSL hard-coded paths to use dynamic libraries
@@ -133,18 +129,46 @@ stdenv.mkDerivation {
     substituteInPlace csl/configure csl/configure.ac \
       --replace 'LIBS="-lncurses  $LIBS"' 'LIBS="-lncurses -lz $LIBS"'
 
-    ./autogen.sh --fast --with-csl --with-psl
+    # reduce includes precompiled bpsl binaries
+    # need to patch them to use the Nix dynamic linker
+    find psl/dist/kernel -type f -name "bpsl" | while read -r file; do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+    done
+    # Note: bpsl is broken on Darwin
+
+    substituteInPlace csl/cslbase/Makefile csl/cslbase/Makefile.am csl/cslbase/Makefile.in \
+                      configure configure.ac \
+      --replace 'g++' '$(CXX)' \
+      --replace 'gcc' '$(CC)'
+
+    ./autogen.sh --fast --with-csl ${
+      if stdenv.isDarwin
+      then ""
+      else "--with-psl"
+    }
   '';
 
-  configureFlags = [
-    "--disable-libtool-lock"
-    "--disable-option-checking"
-    "--with-ccache"
-    "--with-csl"
-    "--with-lto"
-    "--with-psl"
-    "--without-autogen"
-  ];
+  configureFlags =
+    [
+      "--disable-libtool-lock"
+      "--disable-option-checking"
+      "--with-ccache"
+      "--with-csl"
+      "--with-lto"
+      "--without-autogen"
+    ]
+    ++ (
+      if stdenv.isDarwin
+      then [
+        "CXXFLAGS=-std=c++20"
+        "--without-fox"
+        "--disable-universal"
+        "--with-clang"
+      ]
+      else [
+        "--with-psl"
+      ]
+    );
   dontDisableStatic = true;
 
   installPhase =
@@ -169,17 +193,11 @@ stdenv.mkDerivation {
       cp cslbuild/*/redfront/rfpsl $out/psl/rfpsl
       chmod +x $out/psl/rfpsl
 
-      makeWrapper $out/csl/redcsl $out/bin/reduce \
-        --argv0 "reduce" \
-        --chdir $out
-
       makeWrapper $out/csl/redcsl $out/bin/redcsl \
-        --argv0 "redcsl" \
-        --chdir $out
+        --argv0 "redcsl"
 
       makeWrapper $out/psl/redpsl $out/bin/redpsl \
-        --argv0 "redpsl" \
-        --chdir $out
+        --argv0 "redpsl"
     ''
     else ''
       BUILD=$(scripts/findhost.sh $(./config.guess))
@@ -207,17 +225,11 @@ stdenv.mkDerivation {
       chmod +x $out/redcsl $out/bin/rfcsl
       chmod +x $out/redpsl $out/bin/rfpsl
 
-      makeWrapper $out/redcsl $out/bin/reduce \
-        --argv0 "reduce" \
-        --chdir $out
-
       makeWrapper $out/redcsl $out/bin/redcsl \
-        --argv0 "redcsl" \
-        --chdir $out
+        --argv0 "redcsl"
 
       makeWrapper $out/redpsl $out/bin/redpsl \
-        --argv0 "redpsl" \
-        --chdir $out
+        --argv0 "redpsl"
     '';
 
   meta = with lib; {