chore(npins): Update #116
4 changed files with 47 additions and 124 deletions
36
default.nix
36
default.nix
|
|
@ -41,33 +41,19 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
git-checks =
|
git-checks = (import (builtins.storePath sources.git-hooks)).run {
|
||||||
(import (
|
src = ./.;
|
||||||
pkgs.applyPatches {
|
|
||||||
name = "git-hooks.nix";
|
|
||||||
src = builtins.storePath sources.git-hooks;
|
|
||||||
patches = [ ./patches/00-git-hooks-nixfmt.patch ];
|
|
||||||
}
|
|
||||||
)).run
|
|
||||||
{
|
|
||||||
src = ./.;
|
|
||||||
|
|
||||||
hooks = {
|
hooks = {
|
||||||
# Nix Hooks
|
# Nix Hooks
|
||||||
statix.enable = true;
|
statix.enable = true;
|
||||||
deadnix.enable = true;
|
deadnix.enable = true;
|
||||||
rfc101 = {
|
nixfmt-rfc-style.enable = true;
|
||||||
enable = true;
|
|
||||||
|
|
||||||
name = "RFC-101 formatting";
|
# Misc Hooks
|
||||||
entry = "${pkgs.lib.getExe pkgs.nixfmt-rfc-style}";
|
commitizen.enable = true;
|
||||||
files = "\\.nix$";
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Misc Hooks
|
|
||||||
commitizen.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,42 +1,15 @@
|
||||||
{ pkgs, nixpkgs, ... }:
|
{ nixpkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
dgn-id = "5891e1bbda792e0546f8d785cdd4d3f570a01579";
|
dgn-id = "f756a0f47e704db815a7af6786f6eb0aec628d6b";
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
services.stirling-pdf = {
|
services.stirling-pdf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
package = nixpkgs.unstable.stirling-pdf.overrideAttrs (old: rec {
|
package = nixpkgs.unstable.stirling-pdf.overrideAttrs (old: {
|
||||||
version = "0.26.1";
|
patches = (old.patches or [ ]) ++ [
|
||||||
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "Stirling-Tools";
|
|
||||||
repo = "Stirling-PDF";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-msxP2n8Varc7/h9RVwYRBuD253JZu6/p7zQC1lmNmqc=";
|
|
||||||
};
|
|
||||||
|
|
||||||
deps = old.deps.overrideAttrs (_: {
|
|
||||||
patches = [
|
|
||||||
./01-spotless.patch
|
|
||||||
./05-java-output-test.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
doCheck = false;
|
|
||||||
outputHash = "sha256-i2PJmsuJ8jqTUNwj4HoiWynaK4LlLrqjIZ67rSSYypc=";
|
|
||||||
});
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./01-spotless.patch
|
|
||||||
./02-propsfile.patch
|
|
||||||
./03-jar-timestamps.patch
|
|
||||||
(pkgs.substituteAll {
|
|
||||||
src = ./04-local-maven-deps.patch;
|
|
||||||
inherit deps;
|
|
||||||
})
|
|
||||||
./05-java-output-test.patch
|
|
||||||
(builtins.fetchurl "https://git.dgnum.eu/DGNum/Stirling-PDF/commit/${dgn-id}.patch")
|
(builtins.fetchurl "https://git.dgnum.eu/DGNum/Stirling-PDF/commit/${dgn-id}.patch")
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -35,9 +35,9 @@
|
||||||
"repo": "attic"
|
"repo": "attic"
|
||||||
},
|
},
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"revision": "717cc95983cdc357bc347d70be20ced21f935843",
|
"revision": "aec90814a4ecbc40171d57eeef97c5cab4aaa7b4",
|
||||||
"url": "https://github.com/zhaofengli/attic/archive/717cc95983cdc357bc347d70be20ced21f935843.tar.gz",
|
"url": "https://github.com/zhaofengli/attic/archive/aec90814a4ecbc40171d57eeef97c5cab4aaa7b4.tar.gz",
|
||||||
"hash": "1fdj8jp9wxqix67ia6yb54nx1yyjp2n9w5k8p98fmi73wi2khzch"
|
"hash": "0dmcy9r9vks4xnfa4y68vjf3fgc4dz1ix4df9rykq3lprr3q4mcx"
|
||||||
},
|
},
|
||||||
"cas-eleves": {
|
"cas-eleves": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
@ -60,10 +60,10 @@
|
||||||
"pre_releases": false,
|
"pre_releases": false,
|
||||||
"version_upper_bound": null,
|
"version_upper_bound": null,
|
||||||
"release_prefix": null,
|
"release_prefix": null,
|
||||||
"version": "v1.6.1",
|
"version": "v1.7.0",
|
||||||
"revision": "4677f6c53482a8b01ee93957e3bdd569d51261d6",
|
"revision": "e55f9a8678adc02024a4877c2a403e3f6daf24fe",
|
||||||
"url": "https://api.github.com/repos/nix-community/disko/tarball/v1.6.1",
|
"url": "https://api.github.com/repos/nix-community/disko/tarball/v1.7.0",
|
||||||
"hash": "1p9vsml07bm3riw703dv83ihlmgyc11qv882qa6bqzqdgn86y8z4"
|
"hash": "16zjxysjhk3sgd8b4x5mvx9ilnq35z3zfpkv1la33sqkr8xh1amn"
|
||||||
},
|
},
|
||||||
"dns.nix": {
|
"dns.nix": {
|
||||||
"type": "GitRelease",
|
"type": "GitRelease",
|
||||||
|
|
@ -87,9 +87,9 @@
|
||||||
"repo": "git-hooks.nix"
|
"repo": "git-hooks.nix"
|
||||||
},
|
},
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"revision": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
|
"revision": "7570de7b9b504cfe92025dd1be797bf546f66528",
|
||||||
"url": "https://github.com/cachix/git-hooks.nix/archive/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07.tar.gz",
|
"url": "https://github.com/cachix/git-hooks.nix/archive/7570de7b9b504cfe92025dd1be797bf546f66528.tar.gz",
|
||||||
"hash": "0bmgc731c5rvky6qxc4f6gvgyiic8dna5dv3j19kya86idf7wn0p"
|
"hash": "1snjia7d5x7nqz8j6zgj45fb9kvza86yrhgc8bpjn9b0lc1i88xp"
|
||||||
},
|
},
|
||||||
"kadenios": {
|
"kadenios": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
@ -109,9 +109,9 @@
|
||||||
"url": "https://git.eleves.ens.fr/mboyer02/kahulm"
|
"url": "https://git.eleves.ens.fr/mboyer02/kahulm"
|
||||||
},
|
},
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"revision": "64b290315f241837769c4608c4b7758b76cab178",
|
"revision": "bf8c69e4f8e6d4f3280ad09df2ab170226f2edf5",
|
||||||
"url": null,
|
"url": null,
|
||||||
"hash": "1kl8lg5ajvq7gb3i2y3xydh7l220424b99vnn8qz60y402bx17nb"
|
"hash": "0jypfqgjbwc1i27fyhnsx18diwpz9kpxj7mgmb8xcnixrkh1am61"
|
||||||
},
|
},
|
||||||
"liminix": {
|
"liminix": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
@ -144,9 +144,9 @@
|
||||||
"url": "https://git.lix.systems/lix-project/lix.git"
|
"url": "https://git.lix.systems/lix-project/lix.git"
|
||||||
},
|
},
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"revision": "d00edfb28d0a52d9acd392c582a43f98e773cf4c",
|
"revision": "cc183fdbc14ce105a5661d646983f791978b9d5c",
|
||||||
"url": null,
|
"url": null,
|
||||||
"hash": "0gnvk11kblidk2fpb4fhglc4lwk5acjm4v68rj79z7pjr4sc5r7p"
|
"hash": "1bgh8z445yhv0b46yimr2ic33hplm33xj50ivgsbykdf30xks95n"
|
||||||
},
|
},
|
||||||
"lix-module": {
|
"lix-module": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
@ -155,9 +155,9 @@
|
||||||
"url": "https://git.lix.systems/lix-project/nixos-module.git"
|
"url": "https://git.lix.systems/lix-project/nixos-module.git"
|
||||||
},
|
},
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"revision": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37",
|
"revision": "353b25f0b6da5ede15206d416345a2ec4195b5c8",
|
||||||
"url": null,
|
"url": null,
|
||||||
"hash": "02dg1icyxamxblrvgxshadp2s8mx2ryjja7m9w26sgs07jl438zk"
|
"hash": "0aq9l1qhz01wm232gskq2mywik98zv2r8qn42bjw3kdb185wf9kl"
|
||||||
},
|
},
|
||||||
"metis": {
|
"metis": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
@ -216,21 +216,21 @@
|
||||||
"url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs"
|
"url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs"
|
||||||
},
|
},
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"revision": "20222847f9ed5ea7670dd2fdb1110b7b521c6237",
|
"revision": "c3257569375903f94ad1af9fe8b77186bd824332",
|
||||||
"url": null,
|
"url": null,
|
||||||
"hash": "1pyvhcglmsp9zgkm569gbd0fm96vxyxwwf3bk8smiiylld2avmqx"
|
"hash": "01kmivbk0ji5n7fifydq0wvlv34v1ima66r6icxrfykshh635w4p"
|
||||||
},
|
},
|
||||||
"nixos-23.11": {
|
"nixos-23.11": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixos-23.11",
|
"name": "nixos-23.11",
|
||||||
"url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.7777.7144d6241f02/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.7870.205fd4226592/nixexprs.tar.xz",
|
||||||
"hash": "17m99lkrqsz9rk899g2lfivyqpr9qalmn4g36vsz3dqyxvgks3dw"
|
"hash": "1mbp7jydzxqgv9w3a8fqggq1x8h3cd0vh9wafri5pls52ngyww47"
|
||||||
},
|
},
|
||||||
"nixos-24.05": {
|
"nixos-24.05": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixos-24.05",
|
"name": "nixos-24.05",
|
||||||
"url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.2411.706eef542dec/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.4798.f4c846aee8e1/nixexprs.tar.xz",
|
||||||
"hash": "13cwynfypavij6asd1ll054ly5kcch63kafdvbzhm13n0s0bk6zq"
|
"hash": "0i08jxfa55ifpdmcwg2isgszprxaikjalinmcqjfzk336hzvh7if"
|
||||||
},
|
},
|
||||||
"nixos-generators": {
|
"nixos-generators": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
@ -240,21 +240,21 @@
|
||||||
"repo": "nixos-generators"
|
"repo": "nixos-generators"
|
||||||
},
|
},
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"revision": "168b220231a70e47cc1f0919048fa5914415fb18",
|
"revision": "214efbd73241d72a8f48b8b9a73bb54895cd51a7",
|
||||||
"url": "https://github.com/nix-community/nixos-generators/archive/168b220231a70e47cc1f0919048fa5914415fb18.tar.gz",
|
"url": "https://github.com/nix-community/nixos-generators/archive/214efbd73241d72a8f48b8b9a73bb54895cd51a7.tar.gz",
|
||||||
"hash": "12006f32zkfa34lvsdd8q6qk2jphmcxm53wmj4mycl9q0mxv7a28"
|
"hash": "00cavr7wlaa6mc16245gn5d5bq7y67fg7l4bgkx3q5109jay1837"
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixos-unstable",
|
"name": "nixos-unstable",
|
||||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre647193.9f4128e00b0a/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre677397.574d1eac1c20/nixexprs.tar.xz",
|
||||||
"hash": "02ixm7pzl0jzanv7lmwfzqg7znjmq3wwads1l8r94xhln758lm1z"
|
"hash": "0j66kv4xq4csa5hwizlab5a7j47hd44182xvz541ll3cdfd5a7gx"
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixpkgs-unstable",
|
"name": "nixpkgs-unstable",
|
||||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre647518.1afc5440469f/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre678893.5775c2583f18/nixexprs.tar.xz",
|
||||||
"hash": "1y526xag5s2jyrs3w08pgwa8891zv2ibwl5jmkbr94x4vpyir8hz"
|
"hash": "09r3fc2xk4nxzhmkn7wvk99i8qibrhh6lhd3mz6iz64imj1k5r9r"
|
||||||
},
|
},
|
||||||
"signal-irc-bridge": {
|
"signal-irc-bridge": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
@ -286,9 +286,9 @@
|
||||||
"server": "https://git.helsinki.tools/"
|
"server": "https://git.helsinki.tools/"
|
||||||
},
|
},
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"revision": "c900c5c6010d57b547756470d6bf3134216e508c",
|
"revision": "a1c485d16f0df1f55634787b63961846288b3d31",
|
||||||
"url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=c900c5c6010d57b547756470d6bf3134216e508c",
|
"url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=a1c485d16f0df1f55634787b63961846288b3d31",
|
||||||
"hash": "0vz0qz2lys544842icdapd76j9mxk7ps1m92rf3awl9r9dsmf5f7"
|
"hash": "09xmhv821x2w704lbg43ayr83ycb0rvqfh6fq0c9l4x9v23wv9cw"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"version": 3
|
"version": 3
|
||||||
|
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
diff --git a/modules/hooks.nix b/modules/hooks.nix
|
|
||||||
index bb194ee..8505794 100644
|
|
||||||
--- a/modules/hooks.nix
|
|
||||||
+++ b/modules/hooks.nix
|
|
||||||
@@ -2848,7 +2848,7 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.ormol
|
|
||||||
{
|
|
||||||
name = "nixfmt";
|
|
||||||
description = "Nix code prettifier.";
|
|
||||||
- package = tools.nixfmt;
|
|
||||||
+ package = tools.nixfmt-classic;
|
|
||||||
entry = "${hooks.nixfmt.package}/bin/nixfmt ${lib.optionalString (hooks.nixfmt.settings.width != null) "--width=${toString hooks.nixfmt.settings.width}"}";
|
|
||||||
files = "\\.nix$";
|
|
||||||
};
|
|
||||||
diff --git a/nix/tools.nix b/nix/tools.nix
|
|
||||||
index 9bcc89d..9fec5d5 100644
|
|
||||||
--- a/nix/tools.nix
|
|
||||||
+++ b/nix/tools.nix
|
|
||||||
@@ -44,7 +44,7 @@
|
|
||||||
, mdl
|
|
||||||
, mdsh
|
|
||||||
, nil
|
|
||||||
-, nixfmt
|
|
||||||
+, nixfmt-classic
|
|
||||||
, nixpkgs-fmt
|
|
||||||
, nodePackages
|
|
||||||
, ocamlPackages
|
|
||||||
@@ -131,7 +131,7 @@ in
|
|
||||||
mdl
|
|
||||||
mdsh
|
|
||||||
nil
|
|
||||||
- nixfmt
|
|
||||||
+ nixfmt-classic
|
|
||||||
nixpkgs-fmt
|
|
||||||
ormolu
|
|
||||||
pre-commit-hook-ensure-sops
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue