diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c64877..f81712c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,4 +17,6 @@ jobs: - name: Run nixci env: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} - run: nixci | cachix push 42loco42 + run: | + set -eo pipefail + nixci | cachix push 42loco42 diff --git a/flake.lock b/flake.lock index 0f799c0..5178b39 100644 --- a/flake.lock +++ b/flake.lock @@ -40,25 +40,6 @@ "type": "indirect" } }, - "nimble": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1679323550, - "narHash": "sha256-JvGdeb8mO/2xa+j9zSah8B8prCDuVDrxg/sVjnLnWOM=", - "owner": "nix-community", - "repo": "flake-nimble", - "rev": "e68031106a51ffb88138cd827dfb6d62f1c4cfd0", - "type": "github" - }, - "original": { - "id": "nimble", - "type": "indirect" - } - }, "nixpkgs": { "locked": { "lastModified": 1703499205, @@ -77,7 +58,6 @@ "inputs": { "argon-kg": "argon-kg", "flake-utils": "flake-utils", - "nimble": "nimble", "nixpkgs": "nixpkgs" } }, diff --git a/flake.nix b/flake.nix index 65de67a..f80f507 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ inputs.argon-kg.inputs.nixpkgs.follows = "nixpkgs"; inputs.argon-kg.inputs.flake-utils.follows = "flake-utils"; - inputs.nimble.inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nimble.inputs.nixpkgs.follows = "nixpkgs"; outputs = { self, nixpkgs, flake-utils, ... }: let @@ -20,9 +20,9 @@ SwayAudioIdleInhibit = pkgs.callPackage ./packages/SwayAudioIdleInhibit.nix { }; XWaylandVideoBridge = pkgs.callPackage ./packages/XWaylandVideoBridge.nix { }; argon-kg = self.inputs.argon-kg.outputs.defaultPackage.${system}; - boomer = pkgs.callPackage ./packages/boomer.nix { inherit nimblePkgs; }; + # boomer = pkgs.callPackage ./packages/boomer.nix { inherit nimblePkgs; }; capnp-go = pkgs.callPackage ./packages/capnp-go.nix { }; - certbot-dns-duckdns = pkgs.callPackage ./packages/certbot-dns-duckdns.nix { }; + # certbot-dns-duckdns = pkgs.callPackage ./packages/certbot-dns-duckdns.nix { }; e2eirc = pkgs.callPackage ./packages/e2eirc.nix { }; flameshot-fixed = pkgs.callPackage ./packages/flameshot-fixed.nix { }; foot-transparent = pkgs.callPackage ./packages/foot-transparent.nix { }; @@ -33,7 +33,7 @@ m9u = pkgs.callPackage ./packages/m9u.nix { }; msp-cgt = pkgs.callPackage ./packages/msp-cgt.nix { }; mspgcc-ti = pkgs.callPackage ./packages/mspgcc-ti.nix { }; - musializer = pkgs.callPackage ./packages/musializer.nix { }; + # musializer = pkgs.callPackage ./packages/musializer.nix { }; redis-json = pkgs.callPackage ./packages/redis-json.nix { }; samloader = pkgs.callPackage ./packages/samloader.nix { }; wayland-shell = pkgs.callPackage ./packages/wayland-shell.nix { inherit gtk4-layer-shell; }; diff --git a/packages/capnp-go.nix b/packages/capnp-go.nix index 04acf63..48b6e4d 100644 --- a/packages/capnp-go.nix +++ b/packages/capnp-go.nix @@ -11,7 +11,7 @@ hash = "sha256-f3fiVf3ihZOrTMZUPwSy+v4EX4cuIvJXaYMvLKzPgSg="; }; - vendorSha256 = "sha256-ggZqhFEbqP4UHb1FDgFgVVIngE7c6c3F+PTgXO5nyXs="; + vendorHash = "sha256-ggZqhFEbqP4UHb1FDgFgVVIngE7c6c3F+PTgXO5nyXs="; preBuild = '' rm -rf example