From 7ab1b7cf7090e9c3a6b7752ef5eaebb15a227482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 26 Jan 2024 16:43:36 +0000 Subject: [PATCH] restore builds on foryog, skipping broken packages and distributed builds --- flake.lock | 72 ++++++++++---------- nixos/boxes/foryog/default.nix | 2 - nixos/home-manager/scripts.nix | 5 +- nixos/home-manager/scripts/resize-images.nix | 24 +++++++ 4 files changed, 63 insertions(+), 40 deletions(-) create mode 100644 nixos/home-manager/scripts/resize-images.nix diff --git a/flake.lock b/flake.lock index 5c5053b9..3055acc9 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1704277720, - "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", + "lastModified": 1705915768, + "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", + "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1705017253, - "narHash": "sha256-/ysUOnF/dYJXDTxi/fi4MNN7uYKRji5CKp3EIamXB+0=", + "lastModified": 1705890365, + "narHash": "sha256-MObB+fipA/2Ai3uMuNouxcwz0cqvELPpJ+hfnhSaUeA=", "owner": "nix-community", "repo": "disko", - "rev": "fa5db12d76f9e8ee11e572cdbe021230e48b6afa", + "rev": "9fcdf3375e01e2938a49df103af9fd21bd0f89d9", "type": "github" }, "original": { @@ -183,11 +183,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1704986785, - "narHash": "sha256-h0/pFRsnFesY+u+0EmeOXcReN8uF6Z3ok+eByZIks8E=", + "lastModified": 1706079621, + "narHash": "sha256-grxw04yyeod5OMujsQ+xXCLP/DYMrFzLW5NqIteTGhY=", "owner": "helix-editor", "repo": "helix", - "rev": "17dd102e5cccbb2a9a0f0224af63e52f3dab846b", + "rev": "83f09ecbff5160e4350c8099be1ad4c64513f665", "type": "github" }, "original": { @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1704980875, - "narHash": "sha256-IPZmMjk5f4TBbEpzUFBc3OC1W6OwDNEXk2w/0uVXX1o=", + "lastModified": 1705659542, + "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f0ab0eedc6ede69beb8f45561ffefa54edc6e65", + "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1704786394, - "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=", + "lastModified": 1706085157, + "narHash": "sha256-0pTbYwn9qubaZLtuN0Ouj0neEfrir1wSNyH8gL1BzB0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b", + "rev": "e756ff62c2e9db4f7c197bc1849a02024a7bfb2e", "type": "github" }, "original": { @@ -324,11 +324,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1705065113, - "narHash": "sha256-gcHRP1nU91/ACBkJu6/+bYwpe1OvaQSaG+KLs/F/Vbw=", + "lastModified": 1706128970, + "narHash": "sha256-dXJkLtY5cy5Yr/sx77k3sAXBr4vqXrzhvINn+jOLgOo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f7569cb8e9616d102f61faed810debc3111d8677", + "rev": "57ffca844737585a23d503f60e82fc36df11ad23", "type": "github" }, "original": { @@ -340,11 +340,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -356,11 +356,11 @@ }, "nixpkgs-rust-analyzer": { "locked": { - "lastModified": 1705065113, - "narHash": "sha256-gcHRP1nU91/ACBkJu6/+bYwpe1OvaQSaG+KLs/F/Vbw=", + "lastModified": 1706128970, + "narHash": "sha256-dXJkLtY5cy5Yr/sx77k3sAXBr4vqXrzhvINn+jOLgOo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f7569cb8e9616d102f61faed810debc3111d8677", + "rev": "57ffca844737585a23d503f60e82fc36df11ad23", "type": "github" }, "original": { @@ -372,11 +372,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1705916986, + "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nur": { "locked": { - "lastModified": 1705063377, - "narHash": "sha256-nCjsfNVxEh+HBzYRRzDLU/4uUTLPWuQbd60oCpuRxmM=", + "lastModified": 1706125491, + "narHash": "sha256-AB5mUPy6uFLxMHfTpS/mhb0hh9mR+BJShCOsb8SHc6k=", "owner": "nix-community", "repo": "NUR", - "rev": "5da1d036dcd69a0f5dddd3845b0ce94f34d2ff3b", + "rev": "80e227350a70f5cdd451290d0339eb175b454ed3", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1704908274, - "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", + "lastModified": 1705805983, + "narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", + "rev": "ae171b54e76ced88d506245249609f8c87305752", "type": "github" }, "original": { diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix index fd53e430..d3733ca6 100644 --- a/nixos/boxes/foryog/default.nix +++ b/nixos/boxes/foryog/default.nix @@ -12,7 +12,6 @@ ./hardware-configuration.nix ../../backups.nix ../../boot.nix - ../../distributed-builds.nix ../../emacs ../../git ../../gnome @@ -20,7 +19,6 @@ ../../gui/vscode ../../libvirt.nix ../../mercurial - ../../sdr.nix ../../vim ../../zsh ]; diff --git a/nixos/home-manager/scripts.nix b/nixos/home-manager/scripts.nix index 249d9796..23b34896 100644 --- a/nixos/home-manager/scripts.nix +++ b/nixos/home-manager/scripts.nix @@ -4,8 +4,9 @@ ... }: { imports = [ - ./scripts/mount-vault.nix - ./scripts/umount-vault.nix ./scripts/download.nix + ./scripts/mount-vault.nix + ./scripts/resize-images.nix + ./scripts/umount-vault.nix ]; } diff --git a/nixos/home-manager/scripts/resize-images.nix b/nixos/home-manager/scripts/resize-images.nix new file mode 100644 index 00000000..b9c7b321 --- /dev/null +++ b/nixos/home-manager/scripts/resize-images.nix @@ -0,0 +1,24 @@ +{ + config, + pkgs, + ... +}: let + resize-images = pkgs.writeTextFile { + name = "resize-images"; + executable = true; + destination = "/bin/resize-images"; + text = '' + #!/usr/bin/env bash + + set -e + set -o pipefail + + for file in *.jpg; do convert $file -resize 1000x1000 -quality 95 $file > /dev/null 2>&1; done + for file in *.JPG; do convert $file -resize 1000x1000 -quality 95 $file > /dev/null 2>&1; done + for file in *.png; do convert $file -resize 1000x1000 -quality 95 $file > /dev/null 2>&1; done + exit 0 + ''; + }; +in { + home.packages = with pkgs; [resize-images]; +}