コミット: 647dff389c3c5a8e7a21847cbccb934ac2289560 - cammy (git)

A categorical programming language

コミットメタ情報

• リビジョン: 647dff389c3c5a8e7a21847cbccb934ac2289560 (tree)
• 日時: 2024-10-01 02:24:20
• 作者: Corbin <cds@corb...>
• コミッター: Corbin

ログメッセージ

Use rpypkgs.

変更サマリ

• modified: flake.lock
• modified: flake.nix
• modified: sampler/default.nix

差分

--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1682303062,
-        "narHash": "sha256-x+KAADp27lbxeoPXLUMxKcRsUUHDlg+qVjt5PjgBw9A=",
+        "lastModified": 1727540905,
+        "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f5364316e314436f6b9c8fd50592b18920ab18f9",
+        "rev": "fbca5e745367ae7632731639de5c21f29c8744ed",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -52,17 +52,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1713582112,
-        "narHash": "sha256-/ceQxM6T0G1hH+mnvvkYEarhkKVTTfRun8xJduGvnLY=",
-        "ref": "refs/heads/master",
-        "rev": "80c99cc8a914a06c83177bc3ae6ddf2432b6175f",
-        "revCount": 30,
-        "type": "git",
-        "url": "git://git.pf.osdn.net/gitroot/c/co/corbin/rpypkgs.git"
+        "lastModified": 1723911733,
+        "narHash": "sha256-WtRxxafvuO+jIK/kKgr5gcnWOFt1QrpqGDlR/C1s97c=",
+        "owner": "rpypkgs",
+        "repo": "rpypkgs",
+        "rev": "1b4340ccbe2ddcca1feaa83ea61f5221407e7542",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "git://git.pf.osdn.net/gitroot/c/co/corbin/rpypkgs.git"
+        "owner": "rpypkgs",
+        "repo": "rpypkgs",
+        "type": "github"
       }
     },
     "systems": {

--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Reference toolchain for Cammy";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     flake-utils.url = "github:numtide/flake-utils";
     zaha = {
       url = "github:mostawesomedude/zaha";
@@ -11,7 +11,7 @@
       };
     };
     rpypkgs = {
-      url = "git://git.pf.osdn.net/gitroot/c/co/corbin/rpypkgs.git";
+      url = "github:rpypkgs/rpypkgs";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -26,7 +26,10 @@
         };
         schemata = ./schemata;
         jelly = import ./jelly { inherit pkgs; };
-        sampler = import ./sampler { inherit pkgs; };
+        sampler = import ./sampler {
+          inherit pkgs;
+          inherit (rpypkgs.lib.${system}) mkRPythonDerivation;
+        };
         bk = import ./bk { inherit pkgs schemata; };
         cammy = pkgs.stdenv.mkDerivation {
           name = "cammy";
@@ -52,7 +55,7 @@
             # cp -R hive/ $lib/lib/cammy/
           '';
         };
-        py = pkgs.python39.withPackages (ps: [
+        py = pkgs.python311.withPackages (ps: [
           # maintaining cammy-rpy/
           ps.pyflakes
           # Honey

--- a/sampler/default.nix
+++ b/sampler/default.nix
@@ -1,56 +1,15 @@
-{ pkgs ? import <nixpkgs> {} }:
-let
-  inherit (pkgs)
-  fetchhg stdenv
-  pkg-config libffi stb libcaca
-  python2 python2Packages;
-  # https://foss.heptapod.net/pypy/pypy/
-  pypySrc = fetchhg {
-    url = "https://foss.heptapod.net/pypy/pypy";
-    # tag release-pypy3.8-v7.3.11
-    rev = "release-pypy3.8-v7.3.11";
-    sha256 = "sha256-yHIY4cuCpfB0Nl1Odutc9w2QUPhWK+rxaSGfbBV+ZUg=";
-  };
-in
-  let
-    opt = if false then "jit" else "2";
-  in stdenv.mkDerivation {
-    name = "sampler";
+{ pkgs, mkRPythonDerivation }:
+mkRPythonDerivation {
+  entrypoint = "main.py";
+  binName = "cammy-sample";
+  optLevel = "2";
+} {
+  pname = "sampler";
+  version = "2024";
 
-    # src = builtins.filterSource
-    #   (path: type: baseNameOf path == ./main.py
-    #    || builtins.match ".*cammylib.*" path != null)
-    #   ./.;
-    srcs = builtins.filterSource
-      (path: type: type == "directory"
-        || builtins.match ".*\.py" (baseNameOf path) != null)
-      ./.;
+  src = ./.;
 
-    buildInputs = [
-      # always required
-      pkg-config stb libcaca
-      python2 python2Packages.py
-      # only required for JIT
-      python2Packages.pytest libffi
-    ];
-
-    prePatch = ''
-      mkdir -p ./rpython/_cache
-      cp -r ${pypySrc}/rpython .
-      chmod -R u+w rpython/
-    '';
-
-    buildPhase = ''
-      source $stdenv/setup
-      # Do the actual translation.
-      ${python2}/bin/python2 -mrpython -O${opt} ./main.py
-      '';
-
-    installPhase = ''
-      mkdir -p $out/bin/
-      cp ./cammy-sample $out/bin/
-      '';
-
-    separateDebugInfo = true;
-  }
+  buildInputs = with pkgs; [ stb libcaca ];
 
+  separateDebugInfo = true;
+}