git.delta.rocks / jrsonnet / refs/commits / 914d5f43698e

difftreelog

ci use flake-parts

Yaroslav Bolyukin2024-06-18parent: #18dc4db.patch.diff
in: master

2 files changed

modifiedflake.lockdiffbeforeafterboth
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,26 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717285511,
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -56,16 +76,15 @@
     "root": {
       "inputs": {
         "crane": "crane",
-        "flake-utils": "flake-utils",
+        "flake-parts": "flake-parts",
         "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay",
+        "shelly": "shelly"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -84,6 +103,29 @@
         "type": "github"
       }
     },
+    "shelly": {
+      "inputs": {
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1718420551,
+        "narHash": "sha256-NU8NBXVPj0KuY4Tl/LtZPrbX3PmmmgPuhk/1pzm9cyk=",
+        "owner": "CertainLach",
+        "repo": "shelly",
+        "rev": "4f70221f3f9ad9058f590eefb25251b6760aaa47",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CertainLach",
+        "repo": "shelly",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
modifiedflake.nixdiffbeforeafterboth
before · flake.nix
1{2  description = "Jrsonnet";3  inputs = {4    nixpkgs.url = "github:nixos/nixpkgs";5    flake-utils.url = "github:numtide/flake-utils";6    rust-overlay = {7      url = "github:oxalica/rust-overlay";8      inputs = {9        nixpkgs.follows = "nixpkgs";10        flake-utils.follows = "flake-utils";11      };12    };13    crane = {14      url = "github:ipetkov/crane";15      inputs.nixpkgs.follows = "nixpkgs";16    };17  };18  outputs = {19    nixpkgs,20    flake-utils,21    rust-overlay,22    crane,23    ...24  }:25    flake-utils.lib.eachDefaultSystem (26      system: let27        pkgs = import nixpkgs {28          inherit system;29          overlays = [rust-overlay.overlays.default];30          config.allowUnsupportedSystem = true;31        };32        rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;33        craneLib = (crane.mkLib pkgs).overrideToolchain rust;34      in {35        packages = rec {36          default = jrsonnet;37          go-jsonnet = pkgs.callPackage ./nix/go-jsonnet.nix {};38          sjsonnet = pkgs.callPackage ./nix/sjsonnet.nix {};39          jsonnet = pkgs.callPackage ./nix/jsonnet.nix {};40          # I didn't managed to build it, and nixpkgs version is marked as broken41          # haskell-jsonnet = pkgs.callPackage ./nix/haskell-jsonnet.nix { };42          rsjsonnet = pkgs.callPackage ./nix/rsjsonnet.nix {};4344          jrsonnet = pkgs.callPackage ./nix/jrsonnet.nix {45            inherit craneLib;46          };47          jrsonnet-nightly = pkgs.callPackage ./nix/jrsonnet.nix {48            inherit craneLib;49            withNightlyFeatures = true;50          };51          jrsonnet-experimental = pkgs.callPackage ./nix/jrsonnet.nix {52            inherit craneLib;53            withExperimentalFeatures = true;54          };5556          jrsonnet-release = pkgs.callPackage ./nix/jrsonnet-release.nix {57            rustPlatform = pkgs.makeRustPlatform {58              rustc = rust;59              cargo = rust;60            };61          };6263          benchmarks = pkgs.callPackage ./nix/benchmarks.nix {64            inherit go-jsonnet sjsonnet jsonnet rsjsonnet;65            jrsonnetVariants = [66              {67                drv = jrsonnet.override {forBenchmarks = true;};68                name = "";69              }70            ];71          };72          benchmarks-quick = pkgs.callPackage ./nix/benchmarks.nix {73            inherit go-jsonnet sjsonnet jsonnet rsjsonnet;74            quick = true;75            jrsonnetVariants = [76              {77                drv = jrsonnet.override {forBenchmarks = true;};78                name = "";79              }80            ];81          };82          benchmarks-against-release = pkgs.callPackage ./nix/benchmarks.nix {83            inherit go-jsonnet sjsonnet jsonnet rsjsonnet;84            jrsonnetVariants = [85              {86                drv = jrsonnet.override {forBenchmarks = true;};87                name = "current";88              }89              {90                drv = jrsonnet-nightly.override {forBenchmarks = true;};91                name = "current-nightly";92              }93              {94                drv = jrsonnet-release.override {forBenchmarks = true;};95                name = "release";96              }97            ];98          };99          benchmarks-quick-against-release = pkgs.callPackage ./nix/benchmarks.nix {100            inherit go-jsonnet sjsonnet jsonnet rsjsonnet;101            quick = true;102            jrsonnetVariants = [103              {104                drv = jrsonnet.override {forBenchmarks = true;};105                name = "current";106              }107              {108                drv = jrsonnet-nightly.override {forBenchmarks = true;};109                name = "current-nightly";110              }111              {112                drv = jrsonnet-release.override {forBenchmarks = true;};113                name = "release";114              }115            ];116          };117        };118        devShells.default = craneLib.devShell {119          packages = with pkgs; [120            alejandra121            cargo-edit122            cargo-asm123            cargo-outdated124            cargo-watch125            cargo-insta126            lld127            hyperfine128            graphviz129          ] ++ lib.optionals (!stdenv.isDarwin) [130            valgrind131            kcachegrind132          ];133        };134      }135    );136}