Compare commits
10 commits
35881fbe3d
...
f050831191
Author | SHA1 | Date | |
---|---|---|---|
|
f050831191 | ||
|
5e48ab41b2 | ||
|
081690e8c6 | ||
|
c55176b109 | ||
|
94f612217b | ||
|
b66c26da12 | ||
|
b10e911a61 | ||
|
ff74863ca8 | ||
|
3c3e09373f | ||
|
a47e28ee3f |
7 changed files with 55 additions and 6 deletions
|
@ -7,10 +7,12 @@ EPOCHREALTIME
|
||||||
EPOCHSECONDS
|
EPOCHSECONDS
|
||||||
eza
|
eza
|
||||||
killall
|
killall
|
||||||
|
lastpipe
|
||||||
mktemp
|
mktemp
|
||||||
newermt
|
newermt
|
||||||
nullglob
|
nullglob
|
||||||
readlink
|
readlink
|
||||||
|
realpath
|
||||||
setaf
|
setaf
|
||||||
sgr0
|
sgr0
|
||||||
usr
|
usr
|
||||||
|
|
|
@ -667,6 +667,7 @@ noatime
|
||||||
nokogiri
|
nokogiri
|
||||||
noninteractive
|
noninteractive
|
||||||
nonpresent
|
nonpresent
|
||||||
|
nonreproducible
|
||||||
nonresponsive
|
nonresponsive
|
||||||
nonresponsiveness
|
nonresponsiveness
|
||||||
normie
|
normie
|
||||||
|
@ -1130,6 +1131,7 @@ unsettable
|
||||||
unsetting
|
unsetting
|
||||||
unstaged
|
unstaged
|
||||||
unstick
|
unstick
|
||||||
|
unsuffixed
|
||||||
untagged
|
untagged
|
||||||
untargeted
|
untargeted
|
||||||
untrusted
|
untrusted
|
||||||
|
|
16
nur.nix
16
nur.nix
|
@ -27,7 +27,21 @@ rec {
|
||||||
ch57x-keyboard-tool = pkgs.callPackage ./packages/ch57x-keyboard-tool.nix { };
|
ch57x-keyboard-tool = pkgs.callPackage ./packages/ch57x-keyboard-tool.nix { };
|
||||||
co2monitor = pkgs.callPackage ./packages/co2monitor.nix { };
|
co2monitor = pkgs.callPackage ./packages/co2monitor.nix { };
|
||||||
decompiler-mc = pkgs.callPackage ./packages/decompiler-mc.nix { };
|
decompiler-mc = pkgs.callPackage ./packages/decompiler-mc.nix { };
|
||||||
dmarc-report-notifier = pkgs.callPackage ./packages/dmarc-report-notifier.nix { };
|
dmarc-report-notifier = pkgs.callPackage ./packages/dmarc-report-notifier.nix (
|
||||||
|
# Dependency pkgs.python3Packages.parsedmarc was broken on 2024-03-12 by
|
||||||
|
# NixOS/nixpkgs#294305. A workaround was subsequently applied to dependent
|
||||||
|
# pkgs.parsedmarc in NixOS/nixpkgs#280940 but the library remains broken, so
|
||||||
|
# here we duplicate the workaround.
|
||||||
|
pkgs.lib.optionalAttrs (pkgs.lib.versionAtLeast pkgs.lib.trivial.release "24.05") {
|
||||||
|
python3Packages = pkgs.lib.throwIfNot pkgs.python3Packages.parsedmarc.meta.broken
|
||||||
|
"python3Packages.parsedmarc is no longer broken"
|
||||||
|
(pkgs.python3.override {
|
||||||
|
packageOverrides = _: _: {
|
||||||
|
msgraph-core = pkgs.lib.findFirst (p: p.pname == "msgraph-core") null pkgs.parsedmarc.requiredPythonModules;
|
||||||
|
};
|
||||||
|
}).pkgs;
|
||||||
|
}
|
||||||
|
);
|
||||||
fastnbt-tools = pkgs.callPackage ./packages/fastnbt-tools.nix { };
|
fastnbt-tools = pkgs.callPackage ./packages/fastnbt-tools.nix { };
|
||||||
fediblockhole = pkgs.callPackage ./packages/fediblockhole.nix { };
|
fediblockhole = pkgs.callPackage ./packages/fediblockhole.nix { };
|
||||||
git-diff-image = pkgs.callPackage ./packages/git-diff-image.nix { };
|
git-diff-image = pkgs.callPackage ./packages/git-diff-image.nix { };
|
||||||
|
|
|
@ -1,17 +1,18 @@
|
||||||
{ fetchFromGitHub
|
{ fetchFromGitHub
|
||||||
|
, gitUpdater
|
||||||
, lib
|
, lib
|
||||||
, python3Packages
|
, python3Packages
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "dmarc-report-notifier";
|
pname = "dmarc-report-notifier";
|
||||||
version = "1.1.5";
|
version = "1.1.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "AndrewKvalheim";
|
owner = "AndrewKvalheim";
|
||||||
repo = "dmarc-report-notifier";
|
repo = "dmarc-report-notifier";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-EtNehLxBPQ5ro3u1qHXc+VdDpkI6cL3ZzxAM4B15U9M=";
|
hash = "sha256-P+3V+VeWKQoT45j/Jt/smC+3Cr/IsGFp3FP2KD2hIi8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
@ -27,6 +28,8 @@ python3Packages.buildPythonApplication rec {
|
||||||
parsedmarc
|
parsedmarc
|
||||||
];
|
];
|
||||||
|
|
||||||
|
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Headless periodic DMARC report handler";
|
description = "Headless periodic DMARC report handler";
|
||||||
homepage = "https://github.com/AndrewKvalheim/dmarc-report-notifier";
|
homepage = "https://github.com/AndrewKvalheim/dmarc-report-notifier";
|
||||||
|
|
|
@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec {
|
||||||
description = "Prometheus exporter for iptables";
|
description = "Prometheus exporter for iptables";
|
||||||
homepage = "https://github.com/kbknapp/iptables_exporter";
|
homepage = "https://github.com/kbknapp/iptables_exporter";
|
||||||
license = with lib.licenses; [ afl20 mit ];
|
license = with lib.licenses; [ afl20 mit ];
|
||||||
|
broken = lib.versionOlder rustPlatform.rust.rustc.version (lib.importTOML (src + "/Cargo.toml")).package.rust-version;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ fetchFromGitea
|
{ fetchFromGitea
|
||||||
|
, gitUpdater
|
||||||
, lib
|
, lib
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
|
|
||||||
|
@ -8,17 +9,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "little-a-map";
|
pname = "little-a-map";
|
||||||
version = "0.12.2";
|
version = "0.12.3";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
domain = "codeberg.org";
|
domain = "codeberg.org";
|
||||||
owner = "AndrewKvalheim";
|
owner = "AndrewKvalheim";
|
||||||
repo = "little-a-map";
|
repo = "little-a-map";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-6nvQ9TjeF9yHZtD/kN/dR/QwkZVshmbmbND9gsBTfWY=";
|
hash = "sha256-2BJDOluZarGnBPCt9wADH2DuDkP9nyt7RygnyphZRPw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-toe+SkWfKh5ZPd0m20mr+xvF6wBH/Y6vAIYICYjs134=";
|
cargoHash = "sha256-eU+0k1zwj/AUIfSLeFNWHrcvmDqsK1TCxqqGUnYSbGY=";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
|
@ -26,10 +27,13 @@ rustPlatform.buildRustPackage rec {
|
||||||
export TEST_OUTPUT_PATH="$TMPDIR"
|
export TEST_OUTPUT_PATH="$TMPDIR"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Players can have little a map—if they've surveyed the area in-game. This tool renders a composite of player-created map items with the goal of minimizing external effects on survival gameplay.";
|
description = "Players can have little a map—if they've surveyed the area in-game. This tool renders a composite of player-created map items with the goal of minimizing external effects on survival gameplay.";
|
||||||
homepage = "https://codeberg.org/AndrewKvalheim/little-a-map";
|
homepage = "https://codeberg.org/AndrewKvalheim/little-a-map";
|
||||||
license = lib.licenses.gpl3;
|
license = lib.licenses.gpl3;
|
||||||
mainProgram = pname;
|
mainProgram = pname;
|
||||||
|
broken = lib.versionOlder rustPlatform.rust.rustc.version (lib.importTOML (src + "/Cargo.toml")).package.rust-version;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
23
tasks/validate-nur
Executable file
23
tasks/validate-nur
Executable file
|
@ -0,0 +1,23 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
for channel in 'unstable' 'nixpkgs'; do
|
||||||
|
nix_args=(
|
||||||
|
--option restrict-eval 'true'
|
||||||
|
-I './'
|
||||||
|
-I "$channel=$(realpath "$(nix-instantiate --find-file "$channel")")"
|
||||||
|
--arg 'pkgs' "import <$channel> { overlays = [ ]; }"
|
||||||
|
)
|
||||||
|
|
||||||
|
nix-env "${nix_args[@]}" --file 'nur.nix' --query '*' --available --meta --json \
|
||||||
|
| jq --raw-output 'to_entries[] | "\(.key)\(.value.meta.broken)"' \
|
||||||
|
| while IFS='' read -r name broken; do
|
||||||
|
if [[ $broken == 'true' ]]; then
|
||||||
|
echo "⚠️ Build marked as broken for $name@$channel"
|
||||||
|
elif nix-build "${nix_args[@]}" 'nur.nix' --attr "$name" --no-out-link; then
|
||||||
|
echo "✅ Build succeeded for $name@$channel"
|
||||||
|
else
|
||||||
|
echo "❌️ Build failed for $name@$channel"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
Loading…
Reference in a new issue