script

commit 10e260597212cfe9c5e61889334ea8ea171592b2
parent e96127c428ba28568a69e390d63db3d221225ab7
Author: Jared Tobin <jared@jtobin.io>
Date:   Sun, 19 Jan 2025 18:50:19 +0400

meta: use nixpkgs and flake-utils from ppad-nixpkgs

Diffstat:
M
flake.lock
 | 
76
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
M
flake.nix
 | 
11
++++++++---

2 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -18,6 +18,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1725910328,
@@ -34,6 +52,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1725910328,
+        "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "ppad-base16": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -54,17 +88,38 @@
         "url": "git://git.ppad.tech/base16.git"
       }
     },
+    "ppad-nixpkgs": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1737297101,
+        "narHash": "sha256-EnXnq+JLflbWt+DvaGGnY2gfAqsGNOm5vPgHh3hkfwQ=",
+        "ref": "master",
+        "rev": "f29823875250bc99b3891f7373535ccde9a29a44",
+        "revCount": 1,
+        "type": "git",
+        "url": "git://git.ppad.tech/nixpkgs.git"
+      },
+      "original": {
+        "ref": "master",
+        "type": "git",
+        "url": "git://git.ppad.tech/nixpkgs.git"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": [
-          "ppad-base16",
+          "ppad-nixpkgs",
           "flake-utils"
         ],
         "nixpkgs": [
-          "ppad-base16",
+          "ppad-nixpkgs",
           "nixpkgs"
         ],
-        "ppad-base16": "ppad-base16"
+        "ppad-base16": "ppad-base16",
+        "ppad-nixpkgs": "ppad-nixpkgs"
       }
     },
     "systems": {
@@ -81,6 +136,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
@@ -2,16 +2,21 @@
   description = "Primitive Script support for Haskell.";
 
   inputs = {
+    ppad-nixpkgs = {
+      type = "git";
+      url  = "git://git.ppad.tech/nixpkgs.git";
+      ref  = "master";
+    };
     ppad-base16 = {
       type = "git";
       url  = "git://git.ppad.tech/base16.git";
       ref  = "master";
     };
-    flake-utils.follows = "ppad-base16/flake-utils";
-    nixpkgs.follows = "ppad-base16/nixpkgs";
+    flake-utils.follows = "ppad-nixpkgs/flake-utils";
+    nixpkgs.follows = "ppad-nixpkgs/nixpkgs";
   };
 
-  outputs = {   self, nixpkgs, flake-utils
+  outputs = {   self, nixpkgs, flake-utils, ppad-nixpkgs
               , ppad-base16
             }:
     flake-utils.lib.eachDefaultSystem (system: