Flake Inputs: • Updated input 'astal': 'github:Aylur/astal' (2025-01-12) rev: 6fd7ae514af36ff9baf1209a2eeebd3a26cf94ce → 'github:Aylur/astal' (2025-01-13) rev: cac0fc63bfe098b26753db8262f5d95ac42b281b • Updated input 'custom-sidebar-src': 'github:elchininet/custom-sidebar' (2025-01-12) rev: dd69b17b383e6135a8198248292786b7839aef85 → 'github:elchininet/custom-sidebar' (2025-01-14) rev: 2861df235213e2cdbabddd41ecdf41b57ab5f33c • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2025-01-10) rev: 3a200a4c9f74c93c7fa97d013613db60a3290538 → 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2025-01-13) rev: 4211dfa2f8649d724f4d08f382dba7ffc7af59f9 • Updated input 'home-manager': 'github:nix-community/home-manager' (2025-01-10) rev: 2532b500c3ed2b8940e831039dcec5a5ea093afc → 'github:nix-community/home-manager' (2025-01-13) rev: fc52a210b60f2f52c74eac41a8647c1573d2071d • Updated input 'hyprgrass': 'github:horriblename/hyprgrass' (2025-01-09) rev: dcf43737772490f9dc755983f5c8ddda5f83ec5b → 'github:horriblename/hyprgrass' (2025-01-13) rev: d324904d70e8c9710bcf772227f364262baf3820 • Updated input 'nh': 'github:viperML/nh' (2025-01-02) rev: b7a857066e726dafe9c5f00a8af6ab3f25036ee1 → 'github:viperML/nh' (2025-01-13) rev: f4da5cf5af09e01a0177e889aa6fc682c6176a67 • Updated input 'nix-gaming': 'github:fufexan/nix-gaming' (2025-01-12) rev: f0bba32370e38a6ed18d7c5c741d23fe53e2d265 → 'github:fufexan/nix-gaming' (2025-01-14) rev: 1a9c52cd7517137c9cc74d4b73dfd63678e17c5f • Updated input 'nixpkgs': 'github:NixOS/nixpkgs' (2025-01-10) rev: 130595eba61081acde9001f43de3248d8888ac4a → 'github:NixOS/nixpkgs' (2025-01-12) rev: ed4a395ea001367c1f13d34b1e01aa10290f67d6 • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland' (2025-01-12) rev: 2cb439411d17eb145a99536196f5ab11685268b8 → 'github:nix-community/nixpkgs-wayland' (2025-01-13) rev: 6dd8c0145109a9b9aff360eb6c4319ba65a890cf • Updated input 'sops-nix': 'github:Mic92/sops-nix' (2025-01-10) rev: f214c1b76c347a4e9c8fb68c73d4293a6820d125 → 'github:Mic92/sops-nix' (2025-01-13) rev: 553c7cb22fed19fd60eb310423fdc93045c51ba8 • Updated input 'spotifywebapi-src': 'github:thlucas1/SpotifyWebApiPython' (2025-01-11) rev: 0f7dc906b5a0c7e4e960ff0a87a51d050aec45b7 → 'github:thlucas1/SpotifyWebApiPython' (2025-01-14) rev: a6deed7acda1c4df0009fb1aacfdc1c4dd203ac1 • Updated input 'tuya-local-src': 'github:make-all/tuya-local' (2025-01-12) rev: 627e07e5627da27ccc474bfe9cdb61f3126e0adb → 'github:make-all/tuya-local' (2025-01-13) rev: 85f3c17a9b4a0fd4f799c7223d7b87496dcd0b4f Docker Images: • nginx latest: sha256:42e917aaa1b5bb40dd0f6f7f4f857490ac7747d7ef73b391c774a41a8b994f15 → sha256:2300fb715ab3a2595a3e6956db7379d25b2815973416e6261dde607ca3a86370 Node modules: @stylistic/eslint-plugin: 2.12.1 -> 2.13.0 typescript-eslint: 8.19.1 -> 8.20.0 @types/node: 22.10.5 -> 22.10.6
This commit is contained in:
parent
be9774e63b
commit
e44065588d
17 changed files with 14 additions and 231 deletions
|
@ -5,12 +5,12 @@
|
|||
"exports": "./index.ts",
|
||||
"devDependencies": {
|
||||
"@eslint/js": "9.18.0",
|
||||
"@stylistic/eslint-plugin": "2.12.1",
|
||||
"@stylistic/eslint-plugin": "2.13.0",
|
||||
"eslint": "9.18.0",
|
||||
"eslint-plugin-jsdoc": "50.6.1",
|
||||
"jiti": "2.4.2",
|
||||
"pkg-types": "1.3.0",
|
||||
"typescript": "5.7.3",
|
||||
"typescript-eslint": "8.19.1"
|
||||
"typescript-eslint": "8.20.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
buildApp {
|
||||
src = ./.;
|
||||
npmDepsHash = "sha256-x4xfn5NiIfNwL0NSHX5j4hj3g1N/Lv5qhgaKMCcu7x0=";
|
||||
npmDepsHash = "sha256-rDDf8IUW18Pbt0KDZrMoReO0Su1DsQ8eJKAF3NYQXu0=";
|
||||
|
||||
runtimeInputs = [
|
||||
ffmpeg-full
|
||||
|
|
BIN
apps/extract-subs/package-lock.json
generated
BIN
apps/extract-subs/package-lock.json
generated
Binary file not shown.
|
@ -12,7 +12,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"eslint-conf": "file:../config",
|
||||
"@types/node": "22.10.5",
|
||||
"@types/node": "22.10.6",
|
||||
"esbuild": "0.24.2",
|
||||
"eslint": "9.18.0",
|
||||
"jiti": "2.4.2",
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
}:
|
||||
buildApp {
|
||||
src = ./.;
|
||||
npmDepsHash = "sha256-jriJB5WgUtrXG1X4W0Gp/vF2bH4d1ZkU5LUBWJ1o46Y=";
|
||||
npmDepsHash = "sha256-VZhn8R8SC4XnWbY8sb6982Q4RY4pBfD+p6/cu9M5xho=";
|
||||
|
||||
runtimeInputs = [
|
||||
go
|
||||
|
|
BIN
apps/update-sources/package-lock.json
generated
BIN
apps/update-sources/package-lock.json
generated
Binary file not shown.
|
@ -8,7 +8,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"eslint-conf": "file:../config",
|
||||
"@types/node": "22.10.5",
|
||||
"@types/node": "22.10.6",
|
||||
"esbuild": "0.24.2",
|
||||
"eslint": "9.18.0",
|
||||
"jiti": "2.4.2",
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage rec {
|
||||
imageName = "nginx";
|
||||
imageDigest = "sha256:42e917aaa1b5bb40dd0f6f7f4f857490ac7747d7ef73b391c774a41a8b994f15";
|
||||
hash = "sha256-/cRsGy2N0RDeNigyUqOEDQbuExEKAnLPF+3XzV+We14=";
|
||||
imageDigest = "sha256:2300fb715ab3a2595a3e6956db7379d25b2815973416e6261dde607ca3a86370";
|
||||
hash = "sha256-ffnlb1m2YeAr9Nj4oSYINmGTrvcazCuEMQaws6jCjpA=";
|
||||
finalImageName = imageName;
|
||||
finalImageTag = "latest";
|
||||
}
|
||||
|
|
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
|
@ -20,8 +20,7 @@ inputs: rec {
|
|||
inherit cudaSupport;
|
||||
allowUnfree = true;
|
||||
|
||||
# FIXME: Roslyn-ls uses dotnet6
|
||||
# https://github.com/NixOS/nixpkgs/blob/d3c42f187194c26d9f0309a8ecc469d6c878ce33/pkgs/by-name/ro/roslyn-ls/package.nix#L21
|
||||
# FIXME: Roslyn-ls uses dotnet6 https://pr-tracker.nelim.org/?pr=373293
|
||||
permittedInsecurePackages =
|
||||
[
|
||||
"dotnet-core-combined"
|
||||
|
|
|
@ -21,7 +21,7 @@ in
|
|||
pname = "${pname}-types";
|
||||
version = "0.0.0";
|
||||
|
||||
npmDepsHash = "sha256-Ory8Ia4BYgHzmftcSQm6k4P14IRgqYDYGmckxTiuGLs=";
|
||||
npmDepsHash = "sha256-SRk3DD/CyvS2QgOaA2jCExvkDIBMTSorLIA4jtn5Nls=";
|
||||
|
||||
src = ./.;
|
||||
dontNpmBuild = true;
|
||||
|
|
BIN
lib/pkgs/mk-types/package-lock.json
generated
BIN
lib/pkgs/mk-types/package-lock.json
generated
Binary file not shown.
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
npmDepsHash = "sha256-Kv9I+qf1b40FhV1orDFUIhURw1rvA8ggU+eXcZS+KXU=";
|
||||
npmDepsHash = "sha256-JE84VZUaBSs/Rw3Sk6/N6JY0TcEbq3MTo6uuW7tuU0k=";
|
||||
}
|
||||
|
|
BIN
modules/ags/config/package-lock.json
generated
BIN
modules/ags/config/package-lock.json
generated
Binary file not shown.
|
@ -5,11 +5,11 @@
|
|||
"dependencies": {
|
||||
"astal": "https://gitpkg.vercel.app/Aylur/astal/lang/gjs/src?main",
|
||||
"@eslint/js": "9.18.0",
|
||||
"@stylistic/eslint-plugin": "2.12.1",
|
||||
"@stylistic/eslint-plugin": "2.13.0",
|
||||
"eslint": "9.18.0",
|
||||
"eslint-plugin-jsdoc": "50.6.1",
|
||||
"fzf": "0.5.2",
|
||||
"jiti": "2.4.2",
|
||||
"typescript-eslint": "8.19.1"
|
||||
"typescript-eslint": "8.20.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,209 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
makeWrapper,
|
||||
bat,
|
||||
# batdiff, batgrep, and batwatch
|
||||
coreutils,
|
||||
getconf,
|
||||
less,
|
||||
# tests
|
||||
bash,
|
||||
zsh,
|
||||
fish,
|
||||
# batgrep
|
||||
ripgrep,
|
||||
# prettybat
|
||||
withShFmt ? shfmt != null,
|
||||
shfmt ? null,
|
||||
withPrettier ? nodePackages ? prettier,
|
||||
nodePackages ? null,
|
||||
withClangTools ? clang-tools != null,
|
||||
clang-tools ? null,
|
||||
withRustFmt ? rustfmt != null,
|
||||
rustfmt ? null,
|
||||
# batwatch
|
||||
withEntr ? entr != null,
|
||||
entr ? null,
|
||||
# batdiff
|
||||
gitMinimal,
|
||||
withDelta ? delta != null,
|
||||
delta ? null,
|
||||
# batman
|
||||
util-linux,
|
||||
}: let
|
||||
# Core derivation that all the others are based on.
|
||||
# This includes the complete source so the per-script derivations can run the tests.
|
||||
core = stdenv.mkDerivation rec {
|
||||
pname = "bat-extras";
|
||||
version = "2024.07.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eth-p";
|
||||
repo = "bat-extras";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6IRAKSy5f/WcQZBcJKVSweTjHLznzdxhsyx074bXnUQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up
|
||||
nativeBuildInputs = [bat];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/petrzjunior/nixpkgs/raw/80d08100fa04fdb0187f3a7a8667e12aa3614b5e/pkgs/tools/misc/bat-extras/disable-theme-tests.patch";
|
||||
hash = "sha256-vBNMaJFwr9zTobvIRc5VljMPG3kVk07E+mNc1SJVyzg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
bash ./build.sh --minify=none --no-verify
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# Run the library tests as they don't have external dependencies
|
||||
doCheck = true;
|
||||
nativeCheckInputs =
|
||||
[
|
||||
bash
|
||||
fish
|
||||
zsh
|
||||
]
|
||||
++ (lib.optionals stdenv.hostPlatform.isDarwin [getconf]);
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# test list repeats suites. Unique them
|
||||
declare -A test_suites
|
||||
while read -r action arg _; do
|
||||
[[ "$action" == "test_suite" && "$arg" == lib_* ]] &&
|
||||
test_suites+=(["$arg"]=1)
|
||||
done <<<"$(./test.sh --compiled --list --porcelain)"
|
||||
(( ''${#test_suites[@]} != 0 )) || {
|
||||
echo "Couldn't find any library test suites"
|
||||
exit 1
|
||||
}
|
||||
./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cp -a . $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# A few random files have shebangs. Don't patch them, they don't make it into the final output.
|
||||
# The per-script derivations will go ahead and patch the files they actually install.
|
||||
dontPatchShebangs = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bash scripts that integrate bat with various command line tools";
|
||||
homepage = "https://github.com/eth-p/bat-extras";
|
||||
license = with licenses; [mit];
|
||||
maintainers = with maintainers; [bbigras];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
script = name:
|
||||
# the name of the script
|
||||
dependencies:
|
||||
# the tools we need to prefix onto PATH
|
||||
stdenv.mkDerivation {
|
||||
pname = name;
|
||||
inherit (core) version;
|
||||
|
||||
src = core;
|
||||
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
# Make the dependencies available to the tests.
|
||||
buildInputs = dependencies;
|
||||
|
||||
# Patch shebangs now because our tests rely on them
|
||||
postPatch = ''
|
||||
patchShebangs --host bin/${name}
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true; # we've already built
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs =
|
||||
[
|
||||
bat
|
||||
bash
|
||||
fish
|
||||
zsh
|
||||
]
|
||||
++ (lib.optionals stdenv.hostPlatform.isDarwin [getconf]);
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
bash ./test.sh --compiled --suite ${name}
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp -p bin/${name} $out/bin/${name}
|
||||
''
|
||||
+ lib.optionalString (dependencies != []) ''
|
||||
wrapProgram $out/bin/${name} \
|
||||
--prefix PATH : ${lib.makeBinPath dependencies}
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# We already patched
|
||||
dontPatchShebangs = true;
|
||||
|
||||
meta =
|
||||
core.meta
|
||||
// {
|
||||
mainProgram = name;
|
||||
};
|
||||
};
|
||||
optionalDep = cond: dep:
|
||||
assert cond -> dep != null;
|
||||
lib.optional cond dep;
|
||||
in {
|
||||
batdiff = script "batdiff" (
|
||||
[
|
||||
less
|
||||
coreutils
|
||||
gitMinimal
|
||||
]
|
||||
++ optionalDep withDelta delta
|
||||
);
|
||||
batgrep = script "batgrep" [
|
||||
less
|
||||
coreutils
|
||||
ripgrep
|
||||
];
|
||||
batman = script "batman" (lib.optionals stdenv.hostPlatform.isLinux [util-linux]);
|
||||
batpipe = script "batpipe" [less];
|
||||
batwatch = script "batwatch" (
|
||||
[
|
||||
less
|
||||
coreutils
|
||||
]
|
||||
++ optionalDep withEntr entr
|
||||
);
|
||||
prettybat = script "prettybat" (
|
||||
[]
|
||||
++ optionalDep withShFmt shfmt
|
||||
++ optionalDep withPrettier nodePackages.prettier
|
||||
++ optionalDep withClangTools clang-tools
|
||||
++ optionalDep withRustFmt rustfmt
|
||||
);
|
||||
}
|
|
@ -1,11 +1,4 @@
|
|||
final: prev: let
|
||||
pkgs = final;
|
||||
|
||||
inherit (pkgs) callPackages recurseIntoAttrs;
|
||||
in {
|
||||
# FIXME: https://pr-tracker.nelim.org/?pr=373146
|
||||
bat-extras = recurseIntoAttrs (callPackages ./bat-extras.nix {});
|
||||
|
||||
final: prev: {
|
||||
# FIXME: https://pr-tracker.nelim.org/?pr=357699
|
||||
nodejs_latest = prev.nodejs_22;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue