+1

.ci/.gitignore

reviewed

··· 1 1 + /cached-shell

+5

.ci/cache-shell.sh

reviewed

··· 1 1 + #!/usr/bin/env bash 2 2 + source "$(dirname "${BASH_SOURCE[0]}")/common.sh" 3 3 + 4 4 + >&2 echo "Caching dev shell" 5 5 + nix print-dev-env "${base}#" >"${cached_shell}"

+7

.ci/common.sh

reviewed

··· 1 1 + # Use as: 2 2 + # 3 3 + # source "$(dirname "${BASH_SOURCE[0]}")/common.sh" 4 4 + 5 5 + set -euo pipefail 6 6 + base="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)" 7 7 + cached_shell="${base}/.ci/cached-shell"

+10

.ci/run

reviewed

··· 1 1 + #!/usr/bin/env bash 2 2 + source "$(dirname "${BASH_SOURCE[0]}")/common.sh" 3 3 + 4 4 + if [[ ! -f "${cached_shell}" ]]; then 5 5 + >&2 echo "No cached shell in ${cached_shell}" 6 6 + exit 1 7 7 + fi 8 8 + 9 9 + . "${cached_shell}" 10 10 + exec "$@"

+12 -12

.github/workflows/build.yml

reviewed

··· 23 23 steps: 24 24 - uses: actions/checkout@v4.1.1 25 25 26 26 + - name: Install current Bash on macOS 27 27 + if: runner.os == 'macOS' 28 28 + run: | 29 29 + command -v brew && brew install bash || true 30 30 + 26 31 - uses: DeterminateSystems/nix-installer-action@v9 27 32 continue-on-error: true # Self-hosted runners already have Nix installed 28 33 ··· 45 50 ATTIC_CACHE: ${{ secrets.ATTIC_CACHE }} 46 51 ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }} 47 52 48 48 - - name: Build and run tests 53 53 + - name: Cache dev shell 49 54 run: | 55 55 + .ci/cache-shell.sh 50 56 system=$(nix-instantiate --eval -E 'builtins.currentSystem') 51 57 echo system=$system >>$GITHUB_ENV 52 52 - tests=$(nix build .#internalMatrix."$system".\"${{ matrix.nix }}\".attic-tests --no-link --print-out-paths -L) 53 53 - find "$tests/bin" -exec {} \; 58 58 + 59 59 + - name: Run unit tests 60 60 + run: | 61 61 + .ci/run just ci-unit-tests ${{ matrix.nix }} 54 62 55 63 - name: Build WebAssembly crates 56 64 if: runner.os == 'Linux' 57 65 run: | 58 58 - # https://github.com/rust-lang/rust/issues/122357 59 59 - export RUST_MIN_STACK=16777216 60 60 - 61 61 - pushd attic 62 62 - nix develop .# --command -- cargo build --target wasm32-unknown-unknown --no-default-features -F chunking -F stream 63 63 - popd 64 64 - pushd token 65 65 - nix develop .# --command -- cargo build --target wasm32-unknown-unknown 66 66 - popd 66 66 + .ci/run just ci-build-wasm 67 67 68 68 # TODO: Just take a diff of the list of store paths, also abstract all of this out 69 69 - name: Push build artifacts

+28 -7

flake.lock

reviewed

··· 36 36 "type": "github" 37 37 } 38 38 }, 39 39 + "flake-parts": { 40 40 + "inputs": { 41 41 + "nixpkgs-lib": [ 42 42 + "nixpkgs" 43 43 + ] 44 44 + }, 45 45 + "locked": { 46 46 + "lastModified": 1722555600, 47 47 + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", 48 48 + "owner": "hercules-ci", 49 49 + "repo": "flake-parts", 50 50 + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", 51 51 + "type": "github" 52 52 + }, 53 53 + "original": { 54 54 + "owner": "hercules-ci", 55 55 + "repo": "flake-parts", 56 56 + "type": "github" 57 57 + } 58 58 + }, 39 59 "flake-utils": { 40 60 "inputs": { 41 61 "systems": "systems" ··· 56 76 }, 57 77 "nixpkgs": { 58 78 "locked": { 59 59 - "lastModified": 1723827930, 60 60 - "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", 79 79 + "lastModified": 1724999960, 80 80 + "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", 61 81 "owner": "NixOS", 62 82 "repo": "nixpkgs", 63 63 - "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", 83 83 + "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", 64 84 "type": "github" 65 85 }, 66 86 "original": { ··· 72 92 }, 73 93 "nixpkgs-stable": { 74 94 "locked": { 75 75 - "lastModified": 1720535198, 76 76 - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", 95 95 + "lastModified": 1724316499, 96 96 + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", 77 97 "owner": "NixOS", 78 98 "repo": "nixpkgs", 79 79 - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", 99 99 + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", 80 100 "type": "github" 81 101 }, 82 102 "original": { 83 103 "owner": "NixOS", 84 84 - "ref": "nixos-23.11", 104 104 + "ref": "nixos-24.05", 85 105 "repo": "nixpkgs", 86 106 "type": "github" 87 107 } ··· 90 110 "inputs": { 91 111 "crane": "crane", 92 112 "flake-compat": "flake-compat", 113 113 + "flake-parts": "flake-parts", 93 114 "flake-utils": "flake-utils", 94 115 "nixpkgs": "nixpkgs", 95 116 "nixpkgs-stable": "nixpkgs-stable"

+22 -181

flake.nix

reviewed

··· 3 3 4 4 inputs = { 5 5 nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; 6 6 - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; 6 6 + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; 7 7 flake-utils.url = "github:numtide/flake-utils"; 8 8 + 9 9 + flake-parts = { 10 10 + url = "github:hercules-ci/flake-parts"; 11 11 + inputs.nixpkgs-lib.follows = "nixpkgs"; 12 12 + }; 8 13 9 14 crane = { 10 15 url = "github:ipetkov/crane"; ··· 17 22 }; 18 23 }; 19 24 20 20 - outputs = { self, nixpkgs, nixpkgs-stable, flake-utils, crane, ... }: let 21 21 - supportedSystems = flake-utils.lib.defaultSystems ++ [ "riscv64-linux" ]; 22 22 - 23 23 - makeCranePkgs = pkgs: let 24 24 - craneLib = crane.mkLib pkgs; 25 25 - in pkgs.callPackage ./crane.nix { inherit craneLib; }; 26 26 - in flake-utils.lib.eachSystem supportedSystems (system: let 27 27 - pkgs = import nixpkgs { 28 28 - inherit system; 29 29 - overlays = []; 30 30 - }; 31 31 - cranePkgs = makeCranePkgs pkgs; 32 32 - 33 33 - internalMatrix = lib.mapAttrs (_: nix: let 34 34 - cranePkgs' = cranePkgs.override { inherit nix; }; 35 35 - in { 36 36 - inherit (cranePkgs') attic-tests cargoArtifacts; 37 37 - }) { 38 38 - "2.20" = pkgs.nixVersions.nix_2_20; 39 39 - "2.24" = pkgs.nixVersions.nix_2_24; 40 40 - "default" = pkgs.nix; 41 41 - }; 42 42 - 43 43 - pkgsStable = import nixpkgs-stable { 44 44 - inherit system; 45 45 - overlays = []; 46 46 - }; 47 47 - cranePkgsStable = makeCranePkgs pkgsStable; 48 48 - 49 49 - inherit (pkgs) lib; 50 50 - in rec { 51 51 - inherit internalMatrix; 52 52 - 53 53 - packages = { 54 54 - default = packages.attic; 55 55 - 56 56 - inherit (cranePkgs) attic attic-client attic-server; 57 57 - 58 58 - attic-nixpkgs = pkgs.callPackage ./package.nix { }; 59 59 - 60 60 - attic-ci-installer = pkgs.callPackage ./ci-installer.nix { 61 61 - inherit self; 62 62 - }; 63 63 - 64 64 - book = pkgs.callPackage ./book { 65 65 - attic = packages.attic; 66 66 - }; 67 67 - } // (lib.optionalAttrs (system != "x86_64-darwin") { 68 68 - # Unfortunately, x86_64-darwin fails to evaluate static builds 69 69 - # TODO: Make this work with Crane 70 70 - attic-static = (pkgs.pkgsStatic.callPackage ./package.nix { 71 71 - nix = pkgs.pkgsStatic.nix.overrideAttrs (old: { 72 72 - patches = (old.patches or []) ++ [ 73 73 - # To be submitted 74 74 - (pkgs.fetchpatch { 75 75 - url = "https://github.com/NixOS/nix/compare/3172c51baff5c81362fcdafa2e28773c2949c660...6b09a02536d5946458b537dfc36b7d268c9ce823.diff"; 76 76 - hash = "sha256-LFLq++J2XitEWQ0o57ihuuUlYk2PgUr11h7mMMAEe3c="; 77 77 - }) 78 78 - ]; 79 79 - }); 80 80 - }).overrideAttrs (old: { 81 81 - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ 82 82 - pkgs.nukeReferences 83 83 - ]; 25 25 + outputs = inputs @ { self, flake-parts, ... }: let 26 26 + supportedSystems = inputs.flake-utils.lib.defaultSystems ++ [ "riscv64-linux" ]; 84 27 85 85 - # Read by pkg_config crate (do some autodetection in build.rs?) 86 86 - PKG_CONFIG_ALL_STATIC = "1"; 28 28 + inherit (inputs.nixpkgs) lib; 87 29 88 88 - "NIX_CFLAGS_LINK_${pkgs.pkgsStatic.stdenv.cc.suffixSalt}" = "-lc"; 89 89 - RUSTFLAGS = "-C relocation-model=static"; 30 30 + modules = builtins.foldl' (acc: f: f acc) ./flake [ 31 31 + builtins.readDir 32 32 + (lib.filterAttrs (name: type: 33 33 + type == "regular" && lib.hasSuffix ".nix" name 34 34 + )) 35 35 + (lib.mapAttrsToList (name: _: 36 36 + lib.path.append ./flake name 37 37 + )) 38 38 + ]; 90 39 91 91 - postFixup = (old.postFixup or "") + '' 92 92 - rm -f $out/nix-support/propagated-build-inputs 93 93 - nuke-refs $out/bin/attic 94 94 - ''; 95 95 - }); 40 40 + in flake-parts.lib.mkFlake { inherit inputs; } { 41 41 + imports = modules; 42 42 + systems = supportedSystems; 96 43 97 97 - attic-client-static = packages.attic-static.override { 98 98 - clientOnly = true; 99 99 - }; 100 100 - }) // (lib.optionalAttrs pkgs.stdenv.isLinux { 101 101 - attic-server-image = pkgs.dockerTools.buildImage { 102 102 - name = "attic-server"; 103 103 - tag = "main"; 104 104 - copyToRoot = [ 105 105 - # Debugging utilities for `fly ssh console` 106 106 - pkgs.busybox 107 107 - packages.attic-server 108 108 - 109 109 - # Now required by the fly.io sshd 110 110 - pkgs.dockerTools.fakeNss 111 111 - ]; 112 112 - config = { 113 113 - Entrypoint = [ "${packages.attic-server}/bin/atticd" ]; 114 114 - Env = [ 115 115 - "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" 116 116 - ]; 117 117 - }; 118 118 - }; 119 119 - }); 120 120 - 121 121 - devShells = { 122 122 - default = pkgs.mkShell { 123 123 - inputsFrom = with packages; [ attic book ]; 124 124 - nativeBuildInputs = with pkgs; [ 125 125 - rustc 126 126 - 127 127 - rustfmt clippy 128 128 - cargo-expand 129 129 - # Temporary broken: https://github.com/NixOS/nixpkgs/pull/335152 130 130 - # cargo-outdated 131 131 - cargo-edit 132 132 - tokio-console 133 133 - 134 134 - sqlite-interactive 135 135 - 136 136 - editorconfig-checker 137 137 - 138 138 - flyctl 139 139 - 140 140 - wrk 141 141 - 142 142 - llvmPackages_latest.bintools 143 143 - wrangler worker-build wasm-pack wasm-bindgen-cli 144 144 - ] ++ (lib.optionals pkgs.stdenv.isLinux [ 145 145 - linuxPackages.perf 146 146 - ]); 147 147 - 148 148 - NIX_PATH = "nixpkgs=${pkgs.path}"; 149 149 - RUST_SRC_PATH = "${pkgs.rustPlatform.rustcSrc}/library"; 150 150 - 151 151 - # See comment in `attic/build.rs` 152 152 - NIX_INCLUDE_PATH = "${lib.getDev pkgs.nix}/include"; 153 153 - 154 154 - ATTIC_DISTRIBUTOR = "dev"; 155 155 - }; 156 156 - 157 157 - demo = pkgs.mkShell { 158 158 - nativeBuildInputs = [ 159 159 - packages.default 160 160 - ]; 161 161 - 162 162 - shellHook = '' 163 163 - >&2 echo 164 164 - >&2 echo '🚀 Run `atticd` to get started!' 165 165 - >&2 echo 166 166 - ''; 167 167 - }; 168 168 - }; 169 169 - devShell = devShells.default; 170 170 - 171 171 - checks = let 172 172 - makeIntegrationTests = pkgs: import ./integration-tests { 173 173 - pkgs = import nixpkgs { 174 174 - inherit system; 175 175 - overlays = [ self.overlays.default ]; 176 176 - }; 177 177 - flake = self; 178 178 - }; 179 179 - unstableTests = makeIntegrationTests pkgs; 180 180 - stableTests = lib.mapAttrs' (name: lib.nameValuePair "stable-${name}") (makeIntegrationTests pkgsStable); 181 181 - in lib.optionalAttrs pkgs.stdenv.isLinux (unstableTests // stableTests); 182 182 - }) // { 183 183 - overlays = { 184 184 - default = final: prev: let 185 185 - cranePkgs = makeCranePkgs final; 186 186 - in { 187 187 - inherit (cranePkgs) attic attic-client attic-server; 188 188 - }; 189 189 - }; 190 190 - 191 191 - nixosModules = { 192 192 - atticd = { 193 193 - imports = [ 194 194 - ./nixos/atticd.nix 195 195 - ]; 196 196 - 197 197 - services.atticd.useFlakeCompatOverlay = false; 198 198 - 199 199 - nixpkgs.overlays = [ 200 200 - self.overlays.default 201 201 - ]; 202 202 - }; 203 203 - }; 44 44 + debug = true; 204 45 }; 205 46 }

+114

flake/devshells.nix

reviewed

··· 1 1 + # Development shells 2 2 + 3 3 + toplevel @ { lib, flake-parts-lib, ... }: 4 4 + let 5 5 + inherit (lib) 6 6 + mkOption 7 7 + types 8 8 + ; 9 9 + inherit (flake-parts-lib) 10 10 + mkPerSystemOption 11 11 + ; 12 12 + in 13 13 + { 14 14 + options = { 15 15 + perSystem = mkPerSystemOption { 16 16 + options.attic.devshell = { 17 17 + packageSets = mkOption { 18 18 + type = types.attrsOf (types.listOf types.package); 19 19 + default = {}; 20 20 + }; 21 21 + extraPackages = mkOption { 22 22 + type = types.listOf types.package; 23 23 + default = []; 24 24 + }; 25 25 + extraArgs = mkOption { 26 26 + type = types.attrsOf types.unspecified; 27 27 + default = {}; 28 28 + }; 29 29 + }; 30 30 + }; 31 31 + }; 32 32 + 33 33 + config = { 34 34 + perSystem = { self', pkgs, config, ... }: let 35 35 + cfg = config.attic.devshell; 36 36 + in { 37 37 + attic.devshell.packageSets = with pkgs; { 38 38 + rust = [ 39 39 + rustc 40 40 + 41 41 + cargo-expand 42 42 + cargo-outdated 43 43 + cargo-edit 44 44 + tokio-console 45 45 + ]; 46 46 + 47 47 + linters = [ 48 48 + clippy 49 49 + rustfmt 50 50 + 51 51 + editorconfig-checker 52 52 + ]; 53 53 + 54 54 + utils = [ 55 55 + jq 56 56 + just 57 57 + ]; 58 58 + 59 59 + ops = [ 60 60 + postgresql 61 61 + sqlite-interactive 62 62 + 63 63 + flyctl 64 64 + ] ++ lib.optionals pkgs.stdenv.isLinux [ 65 65 + wrangler 66 66 + ]; 67 67 + 68 68 + bench = [ 69 69 + wrk 70 70 + ] ++ lib.optionals pkgs.stdenv.isLinux [ 71 71 + linuxPackages.perf 72 72 + ]; 73 73 + 74 74 + wasm = [ 75 75 + llvmPackages_latest.bintools 76 76 + worker-build wasm-pack wasm-bindgen-cli 77 77 + ]; 78 78 + }; 79 79 + 80 80 + devShells.default = pkgs.mkShell (lib.recursiveUpdate { 81 81 + inputsFrom = [ 82 82 + self'.packages.attic 83 83 + self'.packages.book 84 84 + ]; 85 85 + 86 86 + packages = lib.flatten (lib.attrValues cfg.packageSets); 87 87 + 88 88 + env = { 89 89 + ATTIC_DISTRIBUTOR = toplevel.config.attic.distributor; 90 90 + 91 91 + RUST_SRC_PATH = "${pkgs.rustPlatform.rustcSrc}/library"; 92 92 + 93 93 + NIX_PATH = "nixpkgs=${pkgs.path}"; 94 94 + 95 95 + # See comment in `attic/build.rs` 96 96 + NIX_INCLUDE_PATH = "${lib.getDev pkgs.nixVersions.nix_2_24}/include"; 97 97 + 98 98 + # Used by `just with-nix` to build/test with alternative Nix versions. 99 99 + NIX_VERSIONS = config.attic.nix-versions.manifestFile; 100 100 + }; 101 101 + } cfg.extraArgs); 102 102 + 103 103 + devShells.demo = pkgs.mkShell { 104 104 + packages = [ self'.packages.default ]; 105 105 + 106 106 + shellHook = '' 107 107 + >&2 echo 108 108 + >&2 echo '🚀 Run `atticd` to get started!' 109 109 + >&2 echo 110 110 + ''; 111 111 + }; 112 112 + }; 113 113 + }; 114 114 + }

+15

flake/distributor.nix

reviewed

··· 1 1 + { lib, flake-parts-lib, ... }: 2 2 + let 3 3 + inherit (lib) 4 4 + mkOption 5 5 + types 6 6 + ; 7 7 + in 8 8 + { 9 9 + options = { 10 10 + attic.distributor = mkOption { 11 11 + type = types.str; 12 12 + default = "dev"; 13 13 + }; 14 14 + }; 15 15 + }

+60

flake/integration-tests.nix

reviewed

··· 1 1 + { lib, flake-parts-lib, inputs, self, ... }: 2 2 + let 3 3 + inherit (lib) 4 4 + mkOption 5 5 + types 6 6 + ; 7 7 + inherit (flake-parts-lib) 8 8 + mkPerSystemOption 9 9 + ; 10 10 + in 11 11 + { 12 12 + options = { 13 13 + perSystem = mkPerSystemOption { 14 14 + options.attic.integration-tests = { 15 15 + nixpkgsArgs = mkOption { 16 16 + type = types.attrsOf types.anything; 17 17 + default = {}; 18 18 + }; 19 19 + tests = mkOption { 20 20 + type = types.attrsOf types.package; 21 21 + default = {}; 22 22 + }; 23 23 + stableTests = mkOption { 24 24 + type = types.attrsOf types.package; 25 25 + default = {}; 26 26 + }; 27 27 + }; 28 28 + }; 29 29 + }; 30 30 + 31 31 + config = { 32 32 + perSystem = { self', pkgs, config, system, ... }: let 33 33 + cfg = config.attic.integration-tests; 34 34 + 35 35 + vmPkgs = import inputs.nixpkgs ({ 36 36 + inherit system; 37 37 + overlays = [ self.overlays.default ]; 38 38 + } // cfg.nixpkgsArgs); 39 39 + vmPkgsStable = import inputs.nixpkgs-stable ({ 40 40 + inherit system; 41 41 + overlays = [ self.overlays.default ]; 42 42 + } // cfg.nixpkgsArgs); 43 43 + 44 44 + makeIntegrationTests = pkgs: import ../integration-tests { 45 45 + inherit pkgs; 46 46 + flake = self; 47 47 + }; 48 48 + in { 49 49 + attic.integration-tests = { 50 50 + tests = makeIntegrationTests vmPkgs; 51 51 + stableTests = makeIntegrationTests vmPkgsStable; 52 52 + }; 53 53 + 54 54 + checks = let 55 55 + tests = cfg.tests; 56 56 + stableTests = lib.mapAttrs' (name: lib.nameValuePair "stable-${name}") cfg.stableTests; 57 57 + in lib.optionalAttrs pkgs.stdenv.isLinux (tests // stableTests); 58 58 + }; 59 59 + }; 60 60 + }

+64

flake/nix-versions.nix

reviewed

··· 1 1 + { lib, flake-parts-lib, config, ... }: 2 2 + let 3 3 + inherit (lib) 4 4 + mkOption 5 5 + types 6 6 + ; 7 7 + inherit (flake-parts-lib) 8 8 + mkPerSystemOption 9 9 + ; 10 10 + in 11 11 + { 12 12 + options = { 13 13 + perSystem = mkPerSystemOption { 14 14 + options.attic.nix-versions = { 15 15 + versions = mkOption { 16 16 + type = types.attrsOf types.package; 17 17 + default = {}; 18 18 + }; 19 19 + manifestFile = mkOption { 20 20 + type = types.package; 21 21 + }; 22 22 + }; 23 23 + 24 24 + options.internalMatrix = mkOption { 25 25 + type = types.attrsOf (types.attrsOf types.package); 26 26 + }; 27 27 + }; 28 28 + }; 29 29 + 30 30 + config = { 31 31 + flake.internalMatrix = lib.mapAttrs (system: ps: ps.internalMatrix) config.allSystems; 32 32 + 33 33 + perSystem = { self', pkgs, config, cranePkgs, ... }: let 34 34 + cfg = config.attic.nix-versions; 35 35 + in { 36 36 + attic.nix-versions = { 37 37 + versions = { 38 38 + default = pkgs.nix; 39 39 + "2.20" = pkgs.nixVersions.nix_2_20; 40 40 + "2.24" = pkgs.nixVersions.nix_2_24; 41 41 + }; 42 42 + 43 43 + manifestFile = let 44 44 + manifest = lib.mapAttrs (_: nix: { 45 45 + inherit nix; 46 46 + shellHook = '' 47 47 + export NIX_INCLUDE_PATH="${lib.getDev nix}/include" 48 48 + export NIX_CFLAGS_COMPILE="-isystem $NIX_INCLUDE_PATH $NIX_CFLAGS_COMPILE" 49 49 + export NIX_LDFLAGS="-L${nix}/lib $NIX_LDFLAGS" 50 50 + export PKG_CONFIG_PATH="${lib.getDev nix}/lib/pkgconfig:$PKG_CONFIG_PATH" 51 51 + export PATH="${lib.getBin nix}/bin:$PATH" 52 52 + ''; 53 53 + }) cfg.versions; 54 54 + in pkgs.writeText "nix-versions.json" (builtins.toJSON manifest); 55 55 + }; 56 56 + 57 57 + internalMatrix = lib.mapAttrs (_: nix: let 58 58 + cranePkgs' = cranePkgs.override { inherit nix; }; 59 59 + in { 60 60 + inherit (cranePkgs') attic-tests cargoArtifacts; 61 61 + }) cfg.versions; 62 62 + }; 63 63 + }; 64 64 + }

+16

flake/nixos.nix

reviewed

··· 1 1 + { config, ... }: 2 2 + { 3 3 + flake.nixosModules = { 4 4 + atticd = { 5 5 + imports = [ 6 6 + ../nixos/atticd.nix 7 7 + ]; 8 8 + 9 9 + services.atticd.useFlakeCompatOverlay = false; 10 10 + 11 11 + nixpkgs.overlays = [ 12 12 + config.flake.overlays.default 13 13 + ]; 14 14 + }; 15 15 + }; 16 16 + }

+14

flake/overlays.nix

reviewed

··· 1 1 + { makeCranePkgs, ... }: 2 2 + { 3 3 + flake.overlays = { 4 4 + default = final: prev: let 5 5 + cranePkgs = makeCranePkgs final; 6 6 + in { 7 7 + inherit (cranePkgs) 8 8 + attic 9 9 + attic-client 10 10 + attic-server 11 11 + ; 12 12 + }; 13 13 + }; 14 14 + }

+96

flake/packages.nix

reviewed

··· 1 1 + { self, inputs, lib, ... }: 2 2 + let 3 3 + makeCranePkgs = pkgs: let 4 4 + craneLib = inputs.crane.mkLib pkgs; 5 5 + in pkgs.callPackage ../crane.nix { inherit craneLib; }; 6 6 + in 7 7 + { 8 8 + _module.args.makeCranePkgs = makeCranePkgs; 9 9 + 10 10 + perSystem = { self', pkgs, cranePkgs, ... }: (lib.mkMerge [ 11 11 + { 12 12 + _module.args.cranePkgs = makeCranePkgs pkgs; 13 13 + 14 14 + packages = { 15 15 + default = self'.packages.attic; 16 16 + 17 17 + inherit (cranePkgs) 18 18 + attic 19 19 + attic-client 20 20 + attic-server 21 21 + ; 22 22 + 23 23 + attic-nixpkgs = pkgs.callPackage ../package.nix { }; 24 24 + 25 25 + attic-ci-installer = pkgs.callPackage ../ci-installer.nix { 26 26 + inherit self; 27 27 + }; 28 28 + 29 29 + book = pkgs.callPackage ../book { 30 30 + attic = self'.packages.attic; 31 31 + }; 32 32 + }; 33 33 + } 34 34 + 35 35 + (lib.mkIf pkgs.stdenv.isLinux { 36 36 + packages = { 37 37 + attic-server-image = pkgs.dockerTools.buildImage { 38 38 + name = "attic-server"; 39 39 + tag = "main"; 40 40 + copyToRoot = [ 41 41 + self'.packages.attic-server 42 42 + 43 43 + # Debugging utilities for `fly ssh console` 44 44 + pkgs.busybox 45 45 + 46 46 + # Now required by the fly.io sshd 47 47 + pkgs.dockerTools.fakeNss 48 48 + ]; 49 49 + config = { 50 50 + Entrypoint = [ "${self'.packages.attic-server}/bin/atticd" ]; 51 51 + Env = [ 52 52 + "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" 53 53 + ]; 54 54 + }; 55 55 + }; 56 56 + }; 57 57 + }) 58 58 + 59 59 + # Unfortunately, x86_64-darwin fails to evaluate static builds 60 60 + (lib.mkIf (pkgs.system != "x86_64-darwin") { 61 61 + packages = { 62 62 + # TODO: Make this work with Crane 63 63 + attic-static = (pkgs.pkgsStatic.callPackage ../package.nix { 64 64 + nix = pkgs.pkgsStatic.nix.overrideAttrs (old: { 65 65 + patches = (old.patches or []) ++ [ 66 66 + # To be submitted 67 67 + (pkgs.fetchpatch { 68 68 + url = "https://github.com/NixOS/nix/compare/3172c51baff5c81362fcdafa2e28773c2949c660...6b09a02536d5946458b537dfc36b7d268c9ce823.diff"; 69 69 + hash = "sha256-LFLq++J2XitEWQ0o57ihuuUlYk2PgUr11h7mMMAEe3c="; 70 70 + }) 71 71 + ]; 72 72 + }); 73 73 + }).overrideAttrs (old: { 74 74 + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ 75 75 + pkgs.nukeReferences 76 76 + ]; 77 77 + 78 78 + # Read by pkg_config crate (do some autodetection in build.rs?) 79 79 + PKG_CONFIG_ALL_STATIC = "1"; 80 80 + 81 81 + "NIX_CFLAGS_LINK_${pkgs.pkgsStatic.stdenv.cc.suffixSalt}" = "-lc"; 82 82 + RUSTFLAGS = "-C relocation-model=static"; 83 83 + 84 84 + postFixup = (old.postFixup or "") + '' 85 85 + rm -f $out/nix-support/propagated-build-inputs 86 86 + nuke-refs $out/bin/attic 87 87 + ''; 88 88 + }); 89 89 + 90 90 + attic-client-static = self'.packages.attic-static.override { 91 91 + clientOnly = true; 92 92 + }; 93 93 + }; 94 94 + }) 95 95 + ]); 96 96 + }

+43

justfile

reviewed

··· 1 1 + set positional-arguments 2 2 + 3 3 + here := env_var_or_default("JUST_INVOCATION_DIR", invocation_directory()) 4 4 + base := `pwd` 5 5 + 6 6 + #@echo "here: {{ here }}" 7 7 + #@echo "base: {{ base }}" 8 8 + 9 9 + # List available targets 10 10 + list: 11 11 + @just --list --unsorted 12 12 + 13 13 + # Run a command with an alternative Nix version 14 14 + with-nix version *command: 15 15 + set -e; \ 16 16 + hook="$(jq -e -r '.[$version].shellHook' --arg version "{{ version }}" < "$NIX_VERSIONS" || (>&2 echo "Version {{ version }} doesn't exist"; exit 1))"; \ 17 17 + eval "$hook"; \ 18 18 + CARGO_TARGET_DIR="{{ base }}/target/nix-{{ version }}" \ 19 19 + {{ command }} 20 20 + 21 21 + # (CI) Build WebAssembly crates 22 22 + ci-build-wasm: 23 23 + #!/usr/bin/env bash 24 24 + set -euxo pipefail 25 25 + 26 26 + # https://github.com/rust-lang/rust/issues/122357 27 27 + export RUST_MIN_STACK=16777216 28 28 + 29 29 + pushd attic 30 30 + cargo build --target wasm32-unknown-unknown --no-default-features -F chunking -F stream 31 31 + popd 32 32 + pushd token 33 33 + cargo build --target wasm32-unknown-unknown 34 34 + popd 35 35 + 36 36 + # (CI) Run unit tests 37 37 + ci-unit-tests matrix: 38 38 + #!/usr/bin/env bash 39 39 + set -euxo pipefail 40 40 + 41 41 + system=$(nix-instantiate --eval -E 'builtins.currentSystem') 42 42 + tests=$(nix build .#internalMatrix."$system".\"{{ matrix }}\".attic-tests --no-link --print-out-paths -L) 43 43 + find "$tests/bin" -exec {} \;