From af7014c08f2b529cb8def79e5b5f12f72ef379a5 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Tue, 20 May 2025 15:11:09 +0200 Subject: [PATCH] flake: Add input radicle-nix and enable overlay --- flake.lock | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 15 ++++ 2 files changed, 259 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 3aa1b23..20272b1 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,22 @@ "type": "github" } }, + "advisory-db_2": { + "flake": false, + "locked": { + "lastModified": 1723137097, + "narHash": "sha256-Q/TeuIV610BJ39UkP4zRm6pG6BWEaOCih/WXNR2V9rk=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "1d209d3f18c740f104380e988b5aa8eb360190d1", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "authentik": { "inputs": { "authentik-src": "authentik-src", @@ -106,6 +122,67 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "radicle", + "radicle-tui", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "dream2nix": { + "inputs": { + "nixpkgs": [ + "radicle", + "nixpkgs" + ], + "purescript-overlay": "purescript-overlay", + "pyproject-nix": "pyproject-nix_2" + }, + "locked": { + "lastModified": 1735160684, + "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -409,6 +486,30 @@ "type": "github" } }, + "purescript-overlay": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "radicle", + "dream2nix", + "nixpkgs" + ], + "slimlock": "slimlock" + }, + "locked": { + "lastModified": 1728546539, + "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "type": "github" + } + }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -463,6 +564,58 @@ "type": "github" } }, + "pyproject-nix_2": { + "flake": false, + "locked": { + "lastModified": 1702448246, + "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=", + "owner": "davhau", + "repo": "pyproject.nix", + "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb", + "type": "github" + }, + "original": { + "owner": "davhau", + "ref": "dream2nix", + "repo": "pyproject.nix", + "type": "github" + } + }, + "radicle": { + "inputs": { + "dream2nix": "dream2nix", + "flake-utils": [ + "utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixpkgs-stable" + ], + "pre-commit-hooks": [ + "pre-commit-hooks" + ], + "radicle-tui": "radicle-tui_2", + "sops-nix": [ + "sops" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1747745859, + "narHash": "sha256-G/8INFhg3XUpN6vrrBKm88B1PoIVECitBe6I/f/ZoAQ=", + "owner": "radicle-nix", + "repo": "radicle-nix", + "rev": "78eb3138a3a5971580f8a9f7a09a5fed7a3075f0", + "type": "github" + }, + "original": { + "owner": "radicle-nix", + "repo": "radicle-nix", + "type": "github" + } + }, "radicle-tui": { "inputs": { "advisory-db": "advisory-db", @@ -492,6 +645,35 @@ "url": "https://seed.radicle.xyz/z39mP9rQAaGmERfUMPULfPUi473tY.git" } }, + "radicle-tui_2": { + "inputs": { + "advisory-db": "advisory-db_2", + "crane": "crane_2", + "flake-utils": [ + "radicle", + "flake-utils" + ], + "nixpkgs": [ + "radicle", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1744642603, + "narHash": "sha256-XG4qsL9aSPNJ/raXbcRwTqdOK4ZjGhe0maPi8FgL7Kc=", + "ref": "main", + "rev": "227bd3b15b6dbbdcf64408240f50f3db37853453", + "revCount": 825, + "type": "git", + "url": "https://seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY.git" + }, + "original": { + "ref": "main", + "type": "git", + "url": "https://seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY.git" + } + }, "root": { "inputs": { "compat": "compat", @@ -505,6 +687,7 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "pre-commit-hooks": "pre-commit-hooks", + "radicle": "radicle", "sops": "sops", "utils": "utils" } @@ -552,6 +735,28 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "radicle", + "radicle-tui", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723170066, + "narHash": "sha256-SFkQfOA+8AIYJsPlQtxNP+z5jRLfz91z/aOrV94pPmw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "fecfe4d7c96fea2982c7907997b387a6b52c1093", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sbt": { "inputs": { "flake-utils": [ @@ -577,6 +782,29 @@ "type": "github" } }, + "slimlock": { + "inputs": { + "nixpkgs": [ + "radicle", + "dream2nix", + "purescript-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688756706, + "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", + "owner": "thomashoneyman", + "repo": "slimlock", + "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "slimlock", + "type": "github" + } + }, "sops": { "inputs": { "nixpkgs": [ @@ -627,9 +855,24 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 9f004ff..0c8c8ec 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,17 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + radicle = { + url = "github:radicle-nix/radicle-nix"; + inputs = { + sops-nix.follows = "sops"; + flake-utils.follows = "utils"; + nixpkgs-stable.follows = "nixpkgs-stable"; + nixpkgs.follows = "nixpkgs"; + pre-commit-hooks.follows = "pre-commit-hooks"; + }; + }; + compat.url = "github:edolstra/flake-compat"; sops = { url = "github:Mic92/sops-nix"; @@ -60,6 +71,7 @@ nixpkgs, nixpkgs-unstable, pre-commit-hooks, + radicle, sops, ... }: let @@ -121,6 +133,9 @@ }; }; nixpkgs = { + overlays = [ + radicle.overlays.master + ]; config.allowUnfree = true; };