radicle/radicle.xyz
1
0
Fork 0
mirror of https://seed.radicle.dev/rad:z371PVmDHdjJucejRoRYJcDEvD5pp.git synced 2026-10-18 19:10:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

flake: Rewrite and update to NixOS 25.11

Browse Source 
The flake is quite complex, using bundix to capture Ruby dependencies
with Nix and a custom Ruby via an overlay. This is nice, but overkill
for a simple website. Greatly simplify the flake and update it.
This commit is contained in:
Lorenz Leutgeb
2026-01-12 17:03:51 +01:00
parent a5907c5f74
commit ed069c4a64
2 changed files with 10 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+5 -48
View File
@@ -1,26 +1,5 @@
{
"nodes": {
"bundix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1721093334,
"narHash": "sha256-5FghZ0HIETbc0TGcBV8uyixq5z4w/9PF5Puhujz3D1o=",
"owner": "inscapist",
"repo": "bundix",
"rev": "42c08846f7e5d91ef121239fd364feaeb22c0bbc",
"type": "github"
},
"original": {
"owner": "inscapist",
"ref": "main",
"repo": "bundix",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -41,46 +20,24 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1748874392,
"narHash": "sha256-eQBfZgtcRTdZIcoguK569f7PdjC0KfNcIdHl3QXPesk=",
"lastModified": 1768028080,
"narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "02718908003315c70867d41621c8829ee16809b6",
"rev": "d03088749a110d52a4739348f39a63f84bb0be14",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-25.05",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"bundix": "bundix",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"ruby-nix": "ruby-nix"
}
},
"ruby-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1744623277,
"narHash": "sha256-0HWA2YD9v71SHyMF11PKnVJcHnrHhRLHDCldlUbzYII=",
"owner": "inscapist",
"repo": "ruby-nix",
"rev": "43964ced23803f49e2d307fbbfd4e03ed23760c0",
"type": "github"
},
"original": {
"owner": "inscapist",
"repo": "ruby-nix",
"type": "github"
"nixpkgs": "nixpkgs"
}
},
"systems": {
flake.nix
+5 -57
View File
@@ -2,78 +2,26 @@
description = "The Radicle Website";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
flake-utils.url = "github:numtide/flake-utils";
bundix = {
url = "github:inscapist/bundix/main";
inputs.nixpkgs.follows = "nixpkgs";
};
ruby-nix = {
url = "github:inscapist/ruby-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
self,
nixpkgs,
flake-utils,
bundix,
ruby-nix,
...
}:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs {
inherit system;
overlays = [ruby-nix.overlays.ruby];
};
rubyNix = ruby-nix.lib pkgs;
bundixcli = bundix.packages.${system}.default;
deps = with pkgs; [env ruby bundixcli wrangler];
inherit
(rubyNix {
name = "seroperson.gitlab.io";
gemset = ./gemset.nix;
gemConfig = pkgs.defaultGemConfig;
})
env
ruby
;
in {
packages = let
bundlecli = pkgs.writeShellApplication {
name = "bundle";
runtimeInputs = deps;
text = ''
export BUNDLE_PATH=vendor/bundle
bundle "$@"
'';
};
jekyll = pkgs.writeShellApplication {
name = "jekyll";
runtimeInputs = deps;
text = ''
if [ $# -eq 0 ]; then
jekyll build
else
jekyll "$@"
fi
'';
};
in {
jekyll = jekyll;
bundle = bundlecli;
bundix = bundixcli;
default = jekyll;
};
devShells.default = pkgs.mkShell {
shellHook = ''
export BUNDLE_PATH=vendor/bundle
'';
buildInputs = deps;
buildInputs = with pkgs; [
ruby
wrangler
];
};
});
}