LibreSoC experiment work

flake.lock

@@ -16,6 +16,22 @@
         "url": "https://gitlab.lip6.fr/vlsi-eda/alliance-check-toolkit.git"
       }
     },
+    "c4m-pdk-freepdk45": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1615733320,
+        "narHash": "sha256-EFBYtNi9ZgLkaPrdM0lNVvfGp+/BMRH52Pm92GWcbPo=",
+        "owner": "Chips4Makers",
+        "repo": "c4m-pdk-freepdk45",
+        "rev": "985af7afbcfc3ae7c8fc7e78f688d4c5c78cab5e",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "Chips4Makers",
+        "repo": "c4m-pdk-freepdk45",
+        "type": "gitlab"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1630612789,
@@ -32,10 +48,28 @@
         "type": "github"
       }
     },
+    "pinmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1623433602,
+        "narHash": "sha256-+YHxekMG3rC4FYRmreVjJ7AFPbB5vVPG+99votPEzl4=",
+        "ref": "master",
+        "rev": "d96f737c0a53dde983060522816bbef016b449ce",
+        "revCount": 837,
+        "type": "git",
+        "url": "https://git.libre-soc.org/git/pinmux.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.libre-soc.org/git/pinmux.git"
+      }
+    },
     "root": {
       "inputs": {
         "alliance-check-toolkit": "alliance-check-toolkit",
+        "c4m-pdk-freepdk45": "c4m-pdk-freepdk45",
         "nixpkgs": "nixpkgs",
+        "pinmux": "pinmux",
         "soclayout": "soclayout"
       }
     },
@@ -48,11 +82,11 @@
         "rev": "81d267598a931153815db6cbf0e44f86973575aa",
         "revCount": 507,
         "type": "git",
-        "url": "git://git.libre-soc.org/soclayout.git"
+        "url": "https://git.libre-soc.org/git/soclayout.git"
       },
       "original": {
         "type": "git",
-        "url": "git://git.libre-soc.org/soclayout.git"
+        "url": "https://git.libre-soc.org/git/soclayout.git"
       }
     }
   },

flake.nix

@@ -7,10 +7,18 @@
   inputs.nixpkgs.url = "github:L-as/nixpkgs?ref=alliance"; # for alliance
   inputs.alliance-check-toolkit.url = "git+https://gitlab.lip6.fr/vlsi-eda/alliance-check-toolkit.git";
   inputs.alliance-check-toolkit.flake = false;
-  inputs.soclayout.url = git://git.libre-soc.org/soclayout.git;
+  inputs.soclayout.url = "git+https://git.libre-soc.org/git/soclayout.git";
   inputs.soclayout.flake = false;
+  inputs.pinmux.url = "git+https://git.libre-soc.org/git/pinmux.git";
+  inputs.pinmux.flake = false;
+  inputs.c4m-pdk-freepdk45 = {
+    type = "gitlab";
+    owner = "Chips4Makers";
+    repo = "c4m-pdk-freepdk45";
+    flake = false;
+  };
 
-  outputs = { self, nixpkgs, alliance-check-toolkit, soclayout }@inputs:
+  outputs = { self, nixpkgs, alliance-check-toolkit, soclayout, pinmux, c4m-pdk-freepdk45 }:
     let
 
       # Generate a user-friendly version numer.
@@ -66,10 +74,10 @@
         "lefdef" "bootstrap" "coloquinte"
         "equinox" "knik" "ispd" "karakaze" "nimbus"
         "metis" "mauka" "solstice" "stratus1"
-        "documentation" "combined" "libresoc-experiments9"
+        "documentation" "combined"
       ];
 
-      commonArgs = { inherit version meta generic inputs; };
+      commonArgs = { inherit version meta generic; };
 
     in
 
@@ -95,6 +103,10 @@
           import ./nix/alliance-check-toolkit.nix { inherit alliance-check-toolkit; }
         ) {};
 
+        libresoc = nixpkgsFor.${system}.callPackage (
+          import ./nix/libresoc.nix { inherit soclayout pinmux; }
+        ) {};
+
         unittests = override (nixpkgsFor.${system}.callPackage (
           import ./nix/unittests.nix { inherit version meta; }
         ) {});

nix/libresoc-experiments9.nix

@@ -1,9 +0,0 @@
-{ inputs, ... }:
-
-{ stdenv }:
-stdenv.mkDerivation {
-  name = "libresoc-experiments9";
-  src = inputs.soclayout;
-
-  meta.isBroken = true;
-}

nix/libresoc.nix

@@ -0,0 +1,14 @@
+{ soclayout, pinmux, ... }:
+
+{ stdenv }:
+stdenv.mkDerivation {
+  name = "libresoc-check";
+  src = soclayout;
+
+  prePatch = ''
+    rm pinmux
+    ln -s ${pinmux} pinmux
+  '';
+
+  meta.isBroken = true;
+}