diff --git a/.woodpecker.yml b/.woodpecker.yml index 7114908..9dc5132 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -4,9 +4,10 @@ steps: event: [push, tag] image: alpine:edge commands: + - apk update && apk upgrade - apk add --no-cache git nix --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing - echo "system-features = nixos-test benchmark big-parallel uid-range kvm" > /etc/nix/nix.conf - - nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#docker + - nix build --extra-experimental-features nix-command --extra-experimental-features flakes --max-jobs 16 .#docker - cp $(nix build --extra-experimental-features nix-command --extra-experimental-features flakes --print-out-paths .#docker) ./memejoin-rs.tar.gz volumes: - ${AGENT_NIX_STORE_PATH}:/nix diff --git a/Cargo.lock b/Cargo.lock index 3493bc7..12006c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1110,7 +1110,7 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memejoin-rs" -version = "0.2.1-alpha" +version = "0.2.2-alpha" dependencies = [ "async-trait", "axum", diff --git a/Cargo.toml b/Cargo.toml index 4ca4cb6..a34d895 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "memejoin-rs" -version = "0.2.1-alpha" +version = "0.2.2-alpha" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/flake.lock b/flake.lock index 697ca3d..a420bc1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -17,7 +20,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1705309234, @@ -35,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675942811, - "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "724bfc0892363087709bd3a5a1666296759154b1", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -105,6 +108,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 899f911..2358f3e 100644 --- a/flake.nix +++ b/flake.nix @@ -8,19 +8,19 @@ outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: let - tag = "v0.2.1-alpha"; + tag = "v0.2.2-alpha"; overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { inherit system overlays; }; yt-dlp = pkgs.yt-dlp.overrideAttrs (oldAttr: rec { inherit (oldAttr) name; - version = "2023.02.17"; + version = "2024.05.27"; src = pkgs.fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; rev = "${version}"; - sha256 = "naC74T6aqCLX45wJLmygsMmTMqdqLbfXLjJKIKMRpiI="; + sha256 = "55zDAMwCJPn5zKrAFw4ogTxxmvjrv4PvhYO7PsHbRo4="; }; }); local-rust = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain).override { @@ -56,6 +56,10 @@ cargoLock = { lockFile = ./Cargo.lock; }; + + postPatch = '' + ln -sf ${./Cargo.lock} Cargo.lock + ''; }; docker = dockerTools.buildImage {