Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
SCOTT-HAMILTON committed Jul 10, 2024
1 parent e632e1c commit b1231dc
Show file tree
Hide file tree
Showing 11 changed files with 186 additions and 57 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ $ nix-shell update-readme-tables/shell.nix --command run
| [cargo-sort-ck-1.1](https://github.com/devinr528/cargo-sort-ck) | nur.repos.shamilton.cargo-sort-ck | Check if tables and items in a .toml file are lexically sorted |
| [CdC-cognitoform-result-generator-0.1](https://github.com/SCOTT-HAMILTON/CdC-cognitoform-result-generator) | nur.repos.shamilton.cdc-cognitoform-result-generator | Generates a latex formatted output from an xlsx cognitoform excel sheet, made for classes councils preparation |
| [chunkdrive-2023-08-12](https://github.com/devinr528/cargo-sort-ck) | nur.repos.shamilton.chunkdrive | Check if tables and items in a .toml file are lexically sorted |
| [commix-3.7](https://commixproject.com/) | nur.repos.shamilton.commix | Automated All-in-One OS Command Injection Exploitation Tool |
| [commix-3.9](https://commixproject.com/) | nur.repos.shamilton.commix | Automated All-in-One OS Command Injection Exploitation Tool |
| [Compton-0.1_beta2](https://github.com/tryone144/compton) | nur.repos.shamilton.compton | Compositor for X11 |
| [ControlsForFake-unstable](https://github.com/SCOTT-HAMILTON/ControlsForFake) | nur.repos.shamilton.controls-for-fake | The Qt gui frontend for FakeMicWavPlayer |
| [python3.11-day-night-plasma-wallpapers-2022-02-11](https://github.com/SCOTT-HAMILTON/Day-night-plasma-wallpapers) | nur.repos.shamilton.day-night-plasma-wallpapers | KDE Plasma utility to automatically change to a night wallpaper when the sun is reaching sunset |
Expand Down Expand Up @@ -124,14 +124,13 @@ $ nix-shell update-readme-tables/shell.nix --command run
| [qrup-2022-06-17](https://github.com/SCOTT-HAMILTON/qrup) | nur.repos.shamilton.qrup | Transfer files over LAN from your mobile device to your computer. |
| [perl5.38.2-renrot-1.2.0](https://puszcza.gnu.org.ua/projects/renrot/) | nur.repos.shamilton.renrot | Utility to renames files according the flexible name template |
| rpi-fan-unstable | nur.repos.shamilton.rpi-fan | Little bash script to that controls the rpi fans |
| [rpi-fan-serve-unstable](https://github.com/SCOTT-HAMILTON/rpi-fan-serve) | nur.repos.shamilton.rpi-fan-serve | A web service to access rpi-fan data |
| [scim-0.8.3](https://github.com/andmarti1424/sc-im) | nur.repos.shamilton.scim | Ncurses spreadsheet program for the terminal |
| [Scripts-unstable](https://github.com/SCOTT-HAMILTON/Scripts) | nur.repos.shamilton.scripts | Scripts to make my life easier |
| [slick-greeter-master.mint22](https://github.com/linuxmint/slick-greeter) | nur.repos.shamilton.slick-greeter | A slick-looking LightDM greeter |
| [smtprelay-1.11.1](https://github.com/knqyf263/pet) | nur.repos.shamilton.smtprelay | Simple command-line snippet manager, written in Go |
| [spectacle-clipboard-unstable](https://github.com/SCOTT-HAMILTON/spectacle) | nur.repos.shamilton.spectacle-clipboard | KDE Spectacle fork to enable clipboard funcionnalities |
| [splat-1.4.2](https://www.qsl.net/kd2bd/splat.html) | nur.repos.shamilton.splat | Terrain analysis tool for the electromagnetic spectrum |
| [python3.11-ssh-python-0.10.0](https://github.com/ParallelSSH/ssh-python) | nur.repos.shamilton.ssh-python | Bindings for libssh C library |
| [python3.10-ssh-python-0.10.0](https://github.com/ParallelSSH/ssh-python) | nur.repos.shamilton.ssh-python | Bindings for libssh C library |
| [python3.11-ssh2-python-1.0.0](https://github.com/ParallelSSH/ssh2-python) | nur.repos.shamilton.ssh2-python | Super fast SSH2 protocol library |
| [python3.11-sync-database-2023-07-11](https://github.com/SCOTT-HAMILTON/sync-database) | nur.repos.shamilton.sync-database | Keepass databases synching script to ssh servers and phone |
| [python3.11-tabula-py-2.6.0](https://github.com/chezou/tabula-py) | nur.repos.shamilton.tabula-py | Simple wrapper for tabula-java, read tables from PDF into DataFrame |
Expand Down
8 changes: 5 additions & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,12 @@ pkgs.lib.traceValFn (x:
eom = mate.eom;
inherit (self) merge-keepass;
};
slick-greeter = with pkgs; pkgs.callPackage ./pkgs/slick-greeter {
inherit (gnome3) gnome-common slick-greeter;
slick-greeter = with pkgs; pkgs.callPackage ./pkgs/slick-greeter ({
inherit (gnome3) slick-greeter;
inherit (cinnamon) xapps;
};
} // (if nixosVersion == "master" then {
inherit (gnome3) gnome-common;
} else { }));
smtprelay = pkgs.callPackage ./pkgs/smtprelay { inherit (pkgs) buildGoModule; };
spectacle-clipboard = pkgs.libsForQt5.callPackage ./pkgs/spectacle-clipboard { };
splat = pkgs.callPackage ./pkgs/splat { };
Expand Down
27 changes: 27 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 0 additions & 25 deletions flake.nix

This file was deleted.

27 changes: 27 additions & 0 deletions flakes/master/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions flakes/master/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
description = "My personal NUR repository";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/24.05";
};
outputs = { self, nixpkgs }:
let
systems = [
"x86_64-linux"
# "x86_64-darwin"
];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
in
rec {
legacyPackages = forAllSystems (system: import ../../default.nix {
pkgs = import nixpkgs { inherit system; };
nixosVersion = "master";
localUsage = false;
});
packages = forAllSystems (system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system});
checks = packages;
};
}
27 changes: 27 additions & 0 deletions flakes/nixos-unstable/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions flakes/nixos-unstable/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
description = "My personal NUR repository";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
};
outputs = { self, nixpkgs }:
let
systems = [
"x86_64-linux"
# "x86_64-darwin"
];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
in
rec {
legacyPackages = forAllSystems (system: import ../../default.nix {
pkgs = import nixpkgs { inherit system; };
nixosVersion = "nixos-unstable";
localUsage = false;
});
packages = forAllSystems (system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system});
checks = packages;
};
}
27 changes: 27 additions & 0 deletions flakes/nixpkgs-unstable/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions flakes/nixpkgs-unstable/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
description = "My personal NUR repository";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
};
outputs = { self, nixpkgs }:
let
systems = [
"x86_64-linux"
# "x86_64-darwin"
];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
in
rec {
legacyPackages = forAllSystems (system: import ../../default.nix {
pkgs = import nixpkgs { inherit system; };
nixosVersion = "nixpkgs-unstable";
localUsage = false;
});
packages = forAllSystems (system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system});
checks = packages;
};
}
28 changes: 2 additions & 26 deletions scripts/build-ci.sh
Original file line number Diff line number Diff line change
@@ -1,28 +1,4 @@
#!/bin/bash

eval_output=$(nix-eval-jobs --gc-roots-dir gcroot --argstr nixosVersion "${CHANNEL_BRANCH}" --check-cache-status all-unbroken.nix)

while IFS= read -r line; do
is_cached=$(echo "$line" | jq '.isCached')
drv_path=$(echo "$line" | jq '.drvPath' | tr -d '"')
if [[ "$is_cached" == "false" ]]; then
result+=("$drv_path")
fi
done <<< "$eval_output"

if [[ ${#result[@]} -ne 0 ]]; then
echo "Building the folling derivations: ${result[*]}"
echo cachix watch-exec "${CACHIX_CACHE}" -- nix-build --argstr nixosVersion "${CHANNEL_BRANCH}" ${result[*]} --show-trace
cachix watch-exec "${CACHIX_CACHE}" -- nix-build --argstr nixosVersion "${CHANNEL_BRANCH}" ${result[*]} --show-trace
fi
rm -rf gcroot

remaining=$(nix-build --dry-run --argstr nixosVersion all-unbroken.nix 2>&1 | awk '/^these.*derivations will be built/,/^these.*paths will be fetched/' | sed '1d;$d')
count=$(printf "%s" "$remaining" | wc -l)
if [ $count -gt 0 ]; then
echo "There remains $count derivations to be built:"
echo $remaining
exit 1
else
echo "No new derivations to build, everything is up-to-date."
fi
cd "flakes/${CHANNEL_BRANCH}"
nix run github:Mic92/nix-fast-build -- --skip-cached --no-nom --cachix-cache "${CACHIX_CACHE}"

0 comments on commit b1231dc

Please sign in to comment.