kfm/to-hen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flake: remove flake-utils

Browse Source
This commit is contained in:
Kierán Meinhardt
2025-12-13 21:28:18 +01:00
parent e71d09ba89
commit aeea5b4cda
2 changed files with 78 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flake.lock generated
View File

@@ -33,10 +33,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": [
"rust-overlay",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"rust-overlay", "rust-overlay",
"nixpkgs" "nixpkgs"

55
flake.nix
View File

@@ -3,22 +3,36 @@
inputs = { inputs = {
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
flake-utils.follows = "rust-overlay/flake-utils";
nixpkgs.follows = "rust-overlay/nixpkgs"; nixpkgs.follows = "rust-overlay/nixpkgs";
}; };
outputs = inputs@{self, nixpkgs, flake-utils, ...}: outputs =
flake-utils.lib.eachDefaultSystem (system: {
self,
nixpkgs,
rust-overlay,
}:
let let
pkgs = import nixpkgs { pkgsFor =
system:
import nixpkgs {
inherit system; inherit system;
overlays = [ overlays = [
inputs.rust-overlay.overlays.default rust-overlay.overlays.default
]; ];
}; };
lib = nixpkgs.lib;
eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
in in
{ {
packages.bvg = let packages = eachSupportedSystem (
system:
let
pkgs = pkgsFor system;
in
{
bvg =
let
env = pkgs.bundlerEnv { env = pkgs.bundlerEnv {
name = "bvg-env"; name = "bvg-env";
ruby = pkgs.ruby; ruby = pkgs.ruby;
@@ -26,19 +40,26 @@
lockfile = bvg/Gemfile.lock; lockfile = bvg/Gemfile.lock;
gemset = bvg/gemset.nix; gemset = bvg/gemset.nix;
}; };
in pkgs.stdenv.mkDerivation { in
pkgs.stdenv.mkDerivation {
name = "bvg"; name = "bvg";
buildInput = [env.wrappedRuby]; buildInput = [ env.wrappedRuby ];
script = bvg/bvg.rb; script = bvg/bvg.rb;
buildCommand = '' buildCommand = ''
install -D -m755 $script $out/bin/bvg install -D -m755 $script $out/bin/bvg
patchShebangs $out/bin/bvg patchShebangs $out/bin/bvg
''; '';
}; };
packages.onomap = pkgs.haskellPackages.callCabal2nix "onomap" ./onomastics-ng {}; onomap = pkgs.haskellPackages.callCabal2nix "onomap" ./onomastics-ng { };
packages.alarm = pkgs.writers.writeDashBin "alarm" '' alarm = pkgs.writers.writeDashBin "alarm" ''
set -efu set -efu
export PATH=${nixpkgs.lib.makeBinPath [pkgs.coreutils pkgs.bc self.packages.${system}.rusty-jeep]} export PATH=${
nixpkgs.lib.makeBinPath [
pkgs.coreutils
pkgs.bc
self.packages.${system}.rusty-jeep
]
}
for i in `seq 8000 1000 10000`; do for i in `seq 8000 1000 10000`; do
echo $i 100 echo $i 100
done | rusty-jeep done | rusty-jeep
@@ -52,18 +73,20 @@
echo $(echo "($(od -tu -An -N 2 /dev/urandom)%1000)+500"|bc) $(echo "($(od -tu -An -N 2 /dev/urandom)%500)+100"|bc) echo $(echo "($(od -tu -An -N 2 /dev/urandom)%1000)+500"|bc) $(echo "($(od -tu -An -N 2 /dev/urandom)%500)+100"|bc)
done | rusty-jeep 1 done | rusty-jeep 1
''; '';
packages.rusty-jeep = pkgs.rustPlatform.buildRustPackage rec { rusty-jeep = pkgs.rustPlatform.buildRustPackage rec {
name = "rusty-jeep"; name = "rusty-jeep";
version = "1.0.0"; version = "1.0.0";
src = ./rusty-jeep; src = ./rusty-jeep;
nativeBuildInputs = [pkgs.pkg-config]; nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [pkgs.alsa-lib]; buildInputs = [ pkgs.alsa-lib ];
cargoHash = "sha256-L3lpWEb2y9+45jWnpWNBsYU4nNDx0reSxjw1eKYb+6A="; cargoHash = "sha256-L3lpWEb2y9+45jWnpWNBsYU4nNDx0reSxjw1eKYb+6A=";
meta = with nixpkgs.lib; { meta = with nixpkgs.lib; {
description = "A beeping program inspired by K_belwagen"; description = "A beeping program inspired by K_belwagen";
license = licenses.wtfpl; license = licenses.wtfpl;
maintainers = [maintainers.kmein]; maintainers = [ maintainers.kmein ];
}; };
}; };
}); }
);
};
} }