提交: 31ace2b778170927210dabdaf436e7bd40a7fdb1 - rpypkgs (git)

Nix flake for RPython interpreters

Commit MetaInfo

• 修订版: 31ace2b778170927210dabdaf436e7bd40a7fdb1 (tree)
• 时间: 2024-04-17 01:20:37
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Don't re-export Typhon.

Instead, let Monte users (all 2 of them!) import it from the downstream
flake. This lets us focus on providing generic RPython builders here.

更改概述

• modified: README.md
• modified: flake.lock
• modified: flake.nix

差异

--- a/README.md
+++ b/README.md
@@ -7,13 +7,18 @@ Language | Attribute
 Brainfuck | `bf`
 DIVSPL | `divspl`
 Game Boy LR35902 | `pygirl`
-Monte | `typhon`
 Prolog | `pyrolog`
 Python 2.7 | `pypy27`
 Python 3.8 | `pypy38`
 Python 3.9 | `pypy39`
 Ruby | `topaz`
 
+And its helpers are used by the following flakes:
+
+Language | Downstream
+---|---
+Monte | [`typhon`](https://github.com/monte-language/typhon/)
+
 These implementations have one thing in common: they are written with RPython,
 a restricted subset of Python 2.7 which is amenable to static analysis. Using
 the RPython toolchain, they may be translated to efficient native interpreters

--- a/flake.lock
+++ b/flake.lock
@@ -37,8 +37,7 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "typhon": "typhon"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
@@ -55,29 +54,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "typhon": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1707184108,
-        "narHash": "sha256-641r2pA5/mAGX0Dx6/zEP4UtnbS0S0bfOIrJW37ygvA=",
-        "owner": "monte-language",
-        "repo": "typhon",
-        "rev": "fac865f75da5cba9802d2fe7442bec611bd54af4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "monte-language",
-        "repo": "typhon",
-        "type": "github"
-      }
     }
   },
   "root": "root",

--- a/flake.nix
+++ b/flake.nix
@@ -4,16 +4,9 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/release-23.05";
     flake-utils.url = "github:numtide/flake-utils";
-    typhon = {
-      url = "github:monte-language/typhon";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, typhon }:
+  outputs = { self, nixpkgs, flake-utils }:
     let
       # RPython's list of supported systems: https://www.pypy.org/features.html
       # Tested systems have had at least one package built and manually
@@ -313,7 +306,6 @@
         packages = {
           inherit (pkgs) pypy2 pypy27 pypy3 pypy38 pypy39;
           inherit bf divspl hippyvm topaz pygirl pysom pyrolog;
-          typhon = typhon.packages.${system}.typhonVm;
           rpythonPackages = {
             inherit appdirs macropy rply rsdl; 
           };