diff --git a/.github/workflows/cachix.yaml b/.github/workflows/cachix.yaml index b798b62..e7b0a18 100644 --- a/.github/workflows/cachix.yaml +++ b/.github/workflows/cachix.yaml @@ -7,9 +7,12 @@ jobs: steps: - uses: actions/checkout@v3 name: 📤 Checkout - - uses: cachix/install-nix-action@v25 + - uses: DeterminateSystems/nix-installer-action@main + name: ❄️ Set up Nix with: - nix_path: nixpkgs=channel:nixos-23.11 + extra-conf: | + extra-substituters = https://cache.iog.io + extra-trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - uses: cachix/cachix-action@v14 name: 🧰 Cachix with: @@ -17,5 +20,7 @@ jobs: authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: 🏗️ Build run: | + nix build .#fission-cli + nix build .#web-api nix build .#homestar nix build .#fission-server diff --git a/flake.lock b/flake.lock index 2c87327..4b2f8f3 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,22 @@ "type": "github" } }, + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1703184318, + "narHash": "sha256-vx2/goSpegxiFc7e1jKNHzBkhnsIQjriV4GZLaVe17M=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "a5fb72de318a74eb69a2c241c0e46705684a35d0", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "cabal-32": { "flake": false, "locked": { @@ -83,6 +99,134 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1703439018, + "narHash": "sha256-VT+06ft/x3eMZ1MJxWzQP3zXFGcrxGo5VR2rB7t88hs=", + "owner": "ipetkov", + "repo": "crane", + "rev": "afdcd41180e3dfe4dac46b5ee396e3b12ccc967a", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": [ + "homestar", + "nixify", + "nix-log", + "nixify", + "flake-utils" + ], + "nixpkgs": [ + "homestar", + "nixify", + "nix-log", + "nixify", + "nixpkgs" + ], + "rust-overlay": [ + "homestar", + "nixify", + "nix-log", + "nixify", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1679255352, + "narHash": "sha256-nkGwGuNkhNrnN33S4HIDV5NzkzMLU5mNStRn9sZwq8c=", + "owner": "rvolosatovs", + "repo": "crane", + "rev": "cec65880599a4ec6426186e24342e663464f5933", + "type": "github" + }, + "original": { + "owner": "rvolosatovs", + "ref": "feat/wit", + "repo": "crane", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "homestar", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1705645424, + "narHash": "sha256-bSw0GDnWBvMSvW4oxdFMyhs7i3rNN0LAcreFDJmw3ks=", + "owner": "nix-community", + "repo": "fenix", + "rev": "e514ed523707ec423d34f0748e6e6f18adadf42d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "homestar", + "nixify", + "nixpkgs-nixos" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1703485398, + "narHash": "sha256-eJkxehEmQjSLD/UwPCXlHxH6g41R66fY7Hw9AOSsQA8=", + "owner": "nix-community", + "repo": "fenix", + "rev": "57a533b99ebe646449b71718e43ca29b550bd254", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_3": { + "inputs": { + "nixpkgs": [ + "homestar", + "nixify", + "nix-log", + "nixify", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_3" + }, + "locked": { + "lastModified": 1679552560, + "narHash": "sha256-L9Se/F1iLQBZFGrnQJO8c9wE5z0Mf8OiycPGP9Y96hA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "fb49a9f5605ec512da947a21cc7e4551a3950397", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "fission": { "inputs": { "flake-compat": "flake-compat", @@ -95,11 +239,11 @@ ] }, "locked": { - "lastModified": 1696358187, - "narHash": "sha256-7Es81skHrvAMsFYr2gyKF0NatKXr1f8dsZAt9A2mBCs=", + "lastModified": 1707949101, + "narHash": "sha256-vTed5vRYfeS+6Y+QbwyCc9LohsfsWsEA0+5kAgJg7Yc=", "owner": "fission-codes", "repo": "fission", - "rev": "e5bbb76dbedbd0adc64fe43e856abbd686fc603c", + "rev": "16f4562ee31cf9458efd2a6f9db3849a91e2b079", "type": "github" }, "original": { @@ -109,14 +253,34 @@ "type": "github" } }, + "fission-server": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1707493759, + "narHash": "sha256-QU0FItelogWR7o0ILNOsQ1qBe7HdUyYYydqQsmNovMw=", + "owner": "fission-codes", + "repo": "fission-server", + "rev": "a7ff1d02d79a6b628ba06c1d963f989b0bb3b552", + "type": "github" + }, + "original": { + "owner": "fission-codes", + "repo": "fission-server", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1696267196, - "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -158,16 +322,48 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -194,6 +390,93 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ghc-8.6.5-iohk": { "flake": false, "locked": { @@ -211,14 +494,14 @@ "type": "github" } }, - "ghc980": { + "ghc98X": { "flake": false, "locked": { - "lastModified": 1692910316, - "narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=", + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", "ref": "ghc-9.8", - "rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904", - "revCount": 61566, + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -233,11 +516,11 @@ "ghc99": { "flake": false, "locked": { - "lastModified": 1695427505, - "narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=", + "lastModified": 1701580282, + "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", "ref": "refs/heads/master", - "rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f", - "revCount": 61951, + "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", + "revCount": 62197, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -251,11 +534,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1696206172, - "narHash": "sha256-LqdVPNF4F7aAkNEM7otBI7/pKSIDT6M1MJ+7ZUhyAyU=", + "lastModified": 1707870123, + "narHash": "sha256-pOvz6uuPYw3CiPgi63QhNYumoKeyzDh9JOkLDngGWsE=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "fc83d6b2053eab42033efe2aa72f4ab76aff7fad", + "rev": "75345eba5d4159e6f54cbdc38785d1e0d0e655e0", "type": "github" }, "original": { @@ -273,16 +556,20 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc980": "ghc980", + "ghc98X": "ghc98X", "ghc99": "ghc99", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", + "hls-2.5": "hls-2.5", + "hls-2.6": "hls-2.6", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", + "nix-tools-static": "nix-tools-static", "nixpkgs": [ "fission", "haskellNix", @@ -294,16 +581,17 @@ "nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1696239148, - "narHash": "sha256-mM5CdPfJLzjb4IGUPjh3U6SwGOk3Zunhvu8KbMuW1uk=", + "lastModified": 1707876653, + "narHash": "sha256-hsj9chw/cy9h8XuxQkxnfFR22Ek8xEm33aON2+TcUaI=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "54adb7f62dde7f12aee4ee371aea435928f5af00", + "rev": "d1a608f84c9ed00ceca8571b253e79f67a1ae2d6", "type": "github" }, "original": { @@ -380,6 +668,83 @@ "type": "github" } }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.5": { + "flake": false, + "locked": { + "lastModified": 1701080174, + "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.5.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.6": { + "flake": false, + "locked": { + "lastModified": 1705325287, + "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.6.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "homestar": { + "inputs": { + "fenix": "fenix", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", + "nixify": "nixify", + "nixlib": "nixlib_3", + "nixpkgs": "nixpkgs_5", + "rust-overlay": "rust-overlay_4", + "wit-deps": "wit-deps" + }, + "locked": { + "lastModified": 1705776780, + "narHash": "sha256-5o2/ln2sunmfhN0DnGGdVvimjh76bKTnYERbjBib5VM=", + "owner": "ipvm-wg", + "repo": "homestar", + "rev": "f29d4d45ae8838c705dc169a5dbf71ce976fefa3", + "type": "github" + }, + "original": { + "owner": "ipvm-wg", + "ref": "homestar-runtime-v0.1.1", + "repo": "homestar", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -453,6 +818,19 @@ "type": "github" } }, + "macos-sdk": { + "flake": false, + "locked": { + "lastModified": 1693509154, + "narHash": "sha256-TEvVJy+NMPyzgWSk/6S29ZMQR+ICFxSdS3tw247uhFc=", + "type": "tarball", + "url": "https://github.com/roblabla/MacOSX-SDKs/releases/download/macosx14.0/MacOSX14.0.sdk.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/roblabla/MacOSX-SDKs/releases/download/macosx14.0/MacOSX14.0.sdk.tar.xz" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -474,42 +852,268 @@ "type": "github" } }, - "nixpkgs": { + "nix-filter": { "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "lastModified": 1701697642, + "narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "c843418ecfd0344ecb85844b082ff5675e02c443", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", + "owner": "numtide", + "repo": "nix-filter", "type": "github" } }, - "nixpkgs-2003": { + "nix-filter_2": { "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1678109515, + "narHash": "sha256-C2X+qC80K2C1TOYZT8nabgo05Dw2HST/pSn6s+n6BO8=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "aa9ff6ce4a7f19af6415fb3721eaa513ea6c763c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "numtide", + "repo": "nix-filter", "type": "github" } }, - "nixpkgs-2105": { + "nix-flake-tests": { "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "lastModified": 1677844186, + "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=", + "owner": "antifuchs", + "repo": "nix-flake-tests", + "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb", + "type": "github" + }, + "original": { + "owner": "antifuchs", + "repo": "nix-flake-tests", + "type": "github" + } + }, + "nix-flake-tests_2": { + "locked": { + "lastModified": 1677844186, + "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=", + "owner": "antifuchs", + "repo": "nix-flake-tests", + "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb", + "type": "github" + }, + "original": { + "owner": "antifuchs", + "repo": "nix-flake-tests", + "type": "github" + } + }, + "nix-log": { + "inputs": { + "nix-flake-tests": "nix-flake-tests", + "nixify": "nixify_2", + "nixlib": "nixlib_2" + }, + "locked": { + "lastModified": 1681933283, + "narHash": "sha256-phDsQdaoUEI4DUTErR6Tz7lS0y3kXvDwwbqtxpzd0eo=", + "owner": "rvolosatovs", + "repo": "nix-log", + "rev": "833d31e3c1a677eac81ba87e777afa5076071d66", + "type": "github" + }, + "original": { + "owner": "rvolosatovs", + "repo": "nix-log", + "type": "github" + } + }, + "nix-log_2": { + "inputs": { + "nix-flake-tests": "nix-flake-tests_2", + "nixify": [ + "homestar", + "wit-deps", + "nixify" + ], + "nixlib": [ + "homestar", + "wit-deps", + "nixlib" + ] + }, + "locked": { + "lastModified": 1681933283, + "narHash": "sha256-phDsQdaoUEI4DUTErR6Tz7lS0y3kXvDwwbqtxpzd0eo=", + "owner": "rvolosatovs", + "repo": "nix-log", + "rev": "833d31e3c1a677eac81ba87e777afa5076071d66", + "type": "github" + }, + "original": { + "owner": "rvolosatovs", + "repo": "nix-log", + "type": "github" + } + }, + "nix-tools-static": { + "flake": false, + "locked": { + "lastModified": 1706266250, + "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", + "owner": "input-output-hk", + "repo": "haskell-nix-example", + "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "nix", + "repo": "haskell-nix-example", + "type": "github" + } + }, + "nixify": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane", + "fenix": "fenix_2", + "flake-utils": "flake-utils_5", + "macos-sdk": "macos-sdk", + "nix-filter": "nix-filter", + "nix-log": "nix-log", + "nixlib": [ + "homestar", + "nixlib" + ], + "nixpkgs-darwin": "nixpkgs-darwin", + "nixpkgs-jshon": "nixpkgs-jshon", + "nixpkgs-nixos": "nixpkgs-nixos", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1703580151, + "narHash": "sha256-ZuDDix6PzSee+ppvp3rIaI9Zzg6OXxH3xDeR3IVZQbY=", + "owner": "rvolosatovs", + "repo": "nixify", + "rev": "32f1b8bdd67b7c312779a2d4e49cc4c8163a4576", + "type": "github" + }, + "original": { + "owner": "rvolosatovs", + "repo": "nixify", + "type": "github" + } + }, + "nixify_2": { + "inputs": { + "crane": "crane_2", + "fenix": "fenix_3", + "flake-utils": "flake-utils_6", + "nix-filter": "nix-filter_2", + "nixlib": "nixlib", + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1679748566, + "narHash": "sha256-yA4yIJjNCOLoUh0py9S3SywwbPnd/6NPYbXad+JeOl0=", + "owner": "rvolosatovs", + "repo": "nixify", + "rev": "80e823959511a42dfec4409fef406a14ae8240f3", + "type": "github" + }, + "original": { + "owner": "rvolosatovs", + "repo": "nixify", + "type": "github" + } + }, + "nixlib": { + "locked": { + "lastModified": 1679187309, + "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "44214417fe4595438b31bdb9469be92536a61455", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixlib_2": { + "locked": { + "lastModified": 1679791877, + "narHash": "sha256-tTV1Mf0hPWIMtqyU16Kd2JUBDWvfHlDC9pF57vcbgpQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "cc060ddbf652a532b54057081d5abd6144d01971", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixlib_3": { + "locked": { + "lastModified": 1705193289, + "narHash": "sha256-oL5EAaZHiA3ABLdyKag/DgT+457vmELv8A+eaox2xsI=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "da839f74dc77c9826fa333b1bc2c8258fd6ffcbe", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2003": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", "owner": "NixOS", "repo": "nixpkgs", "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", @@ -572,11 +1176,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1695416179, - "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", "type": "github" }, "original": { @@ -586,6 +1190,70 @@ "type": "github" } }, + "nixpkgs-2311": { + "locked": { + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-darwin": { + "locked": { + "lastModified": 1703361334, + "narHash": "sha256-mFg2LtgFLEh5qY0RVrHcLLM0X87eWFUzaaU4ckh1nto=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4d644e746a64e03cae79645287b1f7d19145f152", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-jshon": { + "locked": { + "lastModified": 1701781644, + "narHash": "sha256-z6MHVdvNM6PnwxofjyCTXYrDCRB6dXs82lMyAxfK2ik=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "89023fc074c2333ec5f1d28075602c94341655d2", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "89023fc074c2333ec5f1d28075602c94341655d2", + "type": "github" + } + }, + "nixpkgs-nixos": { + "locked": { + "lastModified": 1703200384, + "narHash": "sha256-q5j06XOsy0qHOarsYPfZYJPWbTbc8sryRxianlEPJN0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0b3d618173114c64ab666f557504d6982665d328", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -604,27 +1272,90 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1706826059, - "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", + "lastModified": 1707347730, + "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1679577639, + "narHash": "sha256-7u7bsNP0ApBnLgsHVROQ5ytoMqustmMVMgtaFS/P7EU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8f1bcd72727c5d4cd775545595d068be410f2a7e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1705666311, + "narHash": "sha256-VYdSQm7zq3AStyHhRr3SBCTA8fVzrl6WtIlXTs2Wlts=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a455c5fb3ee513e2f443838a0e84d52b035adb67", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1707786466, + "narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", + "rev": "01885a071465e223f8f68971f864b15829988504", "type": "github" }, "original": { @@ -654,19 +1385,177 @@ "root": { "inputs": { "fission": "fission", + "fission-server": "fission-server", "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_3", + "homestar": "homestar", + "nixpkgs": "nixpkgs_6" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1705592412, + "narHash": "sha256-jhqkrAhd+lTLmnszaYHKf3Fr/fNXXdeVDwvsPwmmlD8=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "3f4c6dac3d5e34ccf56587419c2077aec799e60c", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1703421399, + "narHash": "sha256-GRRhRsZvVgH/Rx2zic0c1Rxt7VumRPqsan6sqculRvU=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "85fb463fc586594925f05fc8e285b1568f98f41a", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_3": { + "flake": false, + "locked": { + "lastModified": 1679520343, + "narHash": "sha256-AJGSGWRfoKWD5IVTu1wEsR990wHbX0kIaolPqNMEh0c=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "eb791f31e688ae00908eb75d4c704ef60c430a92", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "fission-server", + "flake-utils" + ], + "nixpkgs": [ + "fission-server", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707444620, + "narHash": "sha256-P8kRkiJLFttN+hbAOlm11wPxUrQZqKle+QtVCqFiGXY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "78503e9199010a4df714f29a4f9c00eb2ccae071", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "homestar", + "nixify", + "nix-log", + "nixify", + "flake-utils" + ], + "nixpkgs": [ + "homestar", + "nixify", + "nix-log", + "nixify", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1679537973, + "narHash": "sha256-R6borgcKeyMIjjPeeYsfo+mT8UdS+OwwbhhStdCfEjg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "fbc7ae3f14d32e78c0e8d7865f865cc28a46b232", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "flake-utils": [ + "homestar", + "nixify", + "flake-utils" + ], + "nixpkgs": [ + "homestar", + "nixify", + "nixpkgs-nixos" + ] + }, + "locked": { + "lastModified": 1703470538, + "narHash": "sha256-NVFMSr99F0TIqVWBwDqMH6lWoM4PVyzMtI+CPGRIscg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f2b937756343365f9b1ba66ec7a1ca489aef745c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": "flake-utils_7", + "nixpkgs": [ + "homestar", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705696331, + "narHash": "sha256-jTWF4EIjwdsiL0W1vwK5fyFrpJjMKYMGXz7OHkAyq8I=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d20edfd8d4f053f3466c7bb5ca53ed2e70a0bc35", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "stackage": { "flake": false, "locked": { - "lastModified": 1696205369, - "narHash": "sha256-3+WGDoBOE21+cTFU6f+zdV9a0ptvVya96oY7QRxUiW0=", + "lastModified": 1707782972, + "narHash": "sha256-kJMGCvGbkYUM1XYubcYpeOTvsNSW2UAU+5xtR3mSV3A=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "bb023369b3977a66e748310b6604894794a37e38", + "rev": "e9080d9ae6b8f5bd5e1a3981cfa214fc3c36fe16", "type": "github" }, "original": { @@ -704,6 +1593,93 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "wit-deps": { + "inputs": { + "nix-log": "nix-log_2", + "nixify": [ + "homestar", + "nixify" + ], + "nixlib": [ + "homestar", + "nixlib" + ] + }, + "locked": { + "lastModified": 1700564022, + "narHash": "sha256-1vU6go1MLuFIB1up2jn6hlIHSfaRr+7/Yf0Cj4hShAU=", + "owner": "bytecodealliance", + "repo": "wit-deps", + "rev": "5c24e323fc57314f98f69ca5c417f565993a8bb1", + "type": "github" + }, + "original": { + "owner": "bytecodealliance", + "ref": "v0.3.5", + "repo": "wit-deps", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 70a6651..0ff7bc7 100644 --- a/flake.nix +++ b/flake.nix @@ -10,23 +10,29 @@ }; fission.url = "github:fission-codes/fission/walkah/haskell-nix"; + homestar.url = "github:ipvm-wg/homestar/homestar-runtime-v0.1.1"; + fission-server.url = "github:fission-codes/fission-server"; }; - outputs = { nixpkgs, flake-utils, fission, ... }: + outputs = { self, nixpkgs, flake-utils, fission, homestar, fission-server, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in { - packages = import ./pkgs { - inherit fission pkgs system; + packages = { + homestar = homestar.packages.${system}.default; + fission-server = fission-server.packages.${system}.default; + fission-cli = fission.packages.${system}.fission-cli; + web-api = fission.packages.${system}.fission-server; }; - devShells.default = pkgs.mkShell { buildInputs = with pkgs; [ jq ]; }; } ) // { - overlay = final: _prev: import ./pkgs { inherit fission; system = final.system; pkgs = final; }; + overlay = final: prev: { + inherit (self.packages.${prev.system}) homestar fission-server fission-cli web-api; + }; }; } diff --git a/pkgs/carmirror/default.nix b/pkgs/carmirror/default.nix deleted file mode 100644 index a9151ee..0000000 --- a/pkgs/carmirror/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, buildGo119Module, fetchFromGitHub, ... }: -let - version = "0.1.0"; -in -buildGo119Module { - name = "carmirror"; - version = version; - - src = fetchFromGitHub { - owner = "fission-codes"; - repo = "kubo-car-mirror"; - rev = "b0bce69e8db26d0aec27fa379a66f6f7149df282"; - sha256 = "sha256-BMl5IDw8kr4OQA117p4QA5p1gRKdpJBjzz40pCK4qNc="; - }; - - vendorSha256 = "sha256-VqmGQd8osA0EVcxeI4r71FeWeItOheGrvYDdbtwyck8="; - - subPackages = [ "cmd/carmirror" ]; -} - diff --git a/pkgs/carmirror/kubo.nix b/pkgs/carmirror/kubo.nix deleted file mode 100644 index c2f93c8..0000000 --- a/pkgs/carmirror/kubo.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ pkgs, buildGo119Module, fetchFromGitHub, nixosTests, ... }: -let - version = "0.19.1-carmirror"; -in -buildGo119Module { - pname = "kubo"; - version = version; - - passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version - - src = fetchFromGitHub { - owner = "fission-codes"; - repo = "kubo"; - rev = "f40ed2f9b9947d5d10d22ab046586ecdcf8841ca"; - sha256 = "sha256-Tzzv5x19mgXsvk7ja/0N9jUx8wCY43RSak9sbwnk4uQ="; - }; - - subPackages = [ "cmd/ipfs" ]; - - buildInputs = [ pkgs.openssl ]; - nativeBuildInputs = [ pkgs.pkg-config ]; - tags = [ "openssl" ]; - - passthru.tests.kubo = nixosTests.kubo; - - vendorSha256 = "sha256-1gMP7OyoqV1BPRmafhazyC0ly0/J0Y/WZuLCrNudhz0="; - - outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ]; - - postPatch = '' - substituteInPlace 'misc/systemd/ipfs.service' \ - --replace '/usr/bin/ipfs' "$out/bin/ipfs" - substituteInPlace 'misc/systemd/ipfs-hardened.service' \ - --replace '/usr/bin/ipfs' "$out/bin/ipfs" - ''; - - postInstall = '' - install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit/etc/systemd/system/ipfs-api.socket" - install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit/etc/systemd/system/ipfs-gateway.socket" - install --mode=444 -D 'misc/systemd/ipfs.service' "$systemd_unit/etc/systemd/system/ipfs.service" - - install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-api.socket" - install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-gateway.socket" - install --mode=444 -D 'misc/systemd/ipfs-hardened.service' "$systemd_unit_hardened/etc/systemd/system/ipfs.service" - ''; -} diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 25656cd..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, fission, system, ... }: { - fission-server = pkgs.callPackage ./fission-server.nix { }; - homestar = pkgs.callPackage ./homestar.nix { }; - - fission-cli = fission.packages.${system}.fission-cli; - web-api = fission.packages.${system}.fission-server; -} diff --git a/pkgs/fission-server.nix b/pkgs/fission-server.nix deleted file mode 100644 index ce50b13..0000000 --- a/pkgs/fission-server.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ darwin, fetchFromGitHub, lib, pkgs, rustPlatform, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "fission-server"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "fission-codes"; - repo = pname; - rev = "8985ae9c039e1d6c9c13a0c582aadbc258f6cba2"; - hash = "sha256-4A5KCZAj8hqEdPrsn2ZKQMsHy27TtoQMm4M2RMgAsNI="; - }; - - buildInputs = with pkgs; [ openssl postgresql ] ++ lib.optionals stdenv.isDarwin ( - with darwin.apple_sdk.frameworks; [ - CoreFoundation - Security - SystemConfiguration - ] - ); - nativeBuildInputs = with pkgs; [ pkg-config ]; - OPENSSL_NO_VENDOR = 1; - - cargoLock = { - lockFile = src + "/Cargo.lock"; - outputHashes = { - "rexpect-0.5.0" = "sha256-njjXt4pbLV3Z/ZkBzmBxcwDSqpbOttIpdg+kHND1vSo="; - "rs-ucan-0.1.0" = "sha256-HSxIzqPECJ9KbPYU0aitjxpCf0CSDAv7su1PGxZlpHc="; - }; - }; - - doCheck = false; -} diff --git a/pkgs/homestar.nix b/pkgs/homestar.nix deleted file mode 100644 index e8ff786..0000000 --- a/pkgs/homestar.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ darwin, fetchFromGitHub, lib, rustPlatform, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "homestar"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "ipvm-wg"; - repo = pname; - rev = "homestar-runtime-v${version}"; - hash = "sha256-5o2/ln2sunmfhN0DnGGdVvimjh76bKTnYERbjBib5VM="; - }; - - cargoHash = "sha256-S7rS3exeRzg2JPgZfVbgmQgaXvywA8kzutIMpbxeYvA="; - - buildInputs = lib.optionals stdenv.isDarwin ( - with darwin.apple_sdk.frameworks; [ - Security - SystemConfiguration - ] - ); - - doCheck = false; -}