git.delta.rocks / jrsonnet / refs/commits / be6e85a39913

difftreelog

ci update flake

Yaroslav Bolyukin2023-08-10parent: #906c620.patch.diff
in: master

4 files changed

modifiedflake.nixdiffbeforeafterboth
15 rust-overlay,
16 ...
17 }:
13 flake-utils.lib.eachDefaultSystem (system:18 flake-utils.lib.eachSystem (with flake-utils.lib.system; [x86_64-linux x86_64-windows]) (
14 let19 system: let
15 pkgs = import nixpkgs {20 pkgs = import nixpkgs {
16 inherit system;21 inherit system;
17 overlays = [ rust-overlay.overlays.default ];22 overlays = [rust-overlay.overlays.default];
23 config.allowUnsupportedSystem = true;
18 };24 };
25 lib = pkgs.lib;
19 rust = ((pkgs.rustChannelOf { date = "2023-08-02"; channel = "nightly"; }).default.override {26 rust =
27 (pkgs.rustChannelOf {
28 date = "2023-08-02";
29 channel = "nightly";
30 })
31 .default
32 .override {
20 extensions = [ "rust-src" "miri" "rust-analyzer" "clippy" ];33 extensions = ["rust-src" "miri" "rust-analyzer" "clippy"];
21 });34 };
22 in35 in rec {
23 rec {
24 packages = rec {36 packages = rec {
78 ];114 ];
79 };115 };
80 };116 };
117 packagesCross = lib.genAttrs ["mingwW64"] (crossSystem: let
118 callPackage = pkgs.pkgsCross.${crossSystem}.callPackage;
119 in {
120 jrsonnet = callPackage ./nix/jrsonnet.nix {
121 # rustPlatform = pkgs.makeRustPlatform {
122 # rustc = rust;
123 # cargo = rust;
124 # };
125 };
126 });
81 devShell = pkgs.mkShell {127 devShells.default = pkgs.mkShell {
82 nativeBuildInputs = with pkgs;[128 nativeBuildInputs = with pkgs; [
83 alejandra129 alejandra
84 rust130 rust
87 cargo-outdated133 cargo-outdated
88 lld134 lld
89 hyperfine135 hyperfine
90 valgrind
91 kcachegrind
92 graphviz136 graphviz
93 ];137 ];
94 };138 };
modifiednix/benchmarks.nixdiffbeforeafterboth
38 src = fetchFromGitHub {38 src = fetchFromGitHub {
39 owner = "prometheus-operator";39 owner = "prometheus-operator";
40 repo = "kube-prometheus";40 repo = "kube-prometheus";
41 rev = "6a570e3154eac26e32da61d784fbe626da4804df";41 rev = "d3889807798d1697ea0691f10caf1b6a1997a8bd";
42 hash = "sha256-s6BK8KQiSjql2w6R+8m5pvPPAcKW+SKjQwqxZHjimFw=";42 hash = "sha256-TeYWHzoZAmDp2PzT7EH8XRUcvb3tR8Qfxel7o2QBvIM=";
43 };43 };
44 in44 in
45 runCommand "kube-prometheus-vendor"45 runCommand "kube-prometheus-vendor"
46 {46 {
47 outputHash = "sha256-R60RI/7FQPOHisnzANb34m9WPj5D9FeMVoGOjB19zl8=";47 outputHash = "sha256-AGc0dHlD/Ld7I5b1+gOotzJkYrn+bB1VjISdD5NITtw=";
48 outputHashMode = "recursive";48 outputHashMode = "recursive";
49 buildInputs = [ cacert ];49 buildInputs = [ cacert ];
50 }50 }
modifiednix/jrsonnet.nixdiffbeforeafterboth
33 ];33 ];
34 cargoBuildFlags = cargoTestFlags;34 cargoBuildFlags = cargoTestFlags;
3535
36 buildInputs = [ makeWrapper ];36 nativeBuildInputs = [ makeWrapper ];
3737
38 postInstall = ''38 postInstall = ''
39 wrapProgram $out/bin/jrsonnet --add-flags "--max-stack=200000 --os-stack=200000"39 wrapProgram $out/bin/jrsonnet --add-flags "--max-stack=200000 --os-stack=200000"
modifiednix/jsonnet.nixdiffbeforeafterboth
15 "jsonnet"15 "jsonnet"
16 ];16 ];
1717
18 buildInputs = [ makeWrapper ];18 nativeBuildInputs = [ makeWrapper ];
1919
20 installPhase = ''20 installPhase = ''
21 mkdir -p $out/bin21 mkdir -p $out/bin