difftreelog
ci update flake
in: master
4 files changed
flake.nixdiffbeforeafterboth1{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.nixpkgs.follows = "nixpkgs";9 inputs.flake-utils.follows = "flake-utils";10 };11 };12 outputs = { nixpkgs, flake-utils, rust-overlay, ... }:13 flake-utils.lib.eachDefaultSystem (system:14 let15 pkgs = import nixpkgs {16 inherit system;17 overlays = [ rust-overlay.overlays.default ];18 };19 rust = ((pkgs.rustChannelOf { date = "2023-08-02"; channel = "nightly"; }).default.override {20 extensions = [ "rust-src" "miri" "rust-analyzer" "clippy" ];21 });22 in23 rec {24 packages = rec {25 go-jsonnet = pkgs.callPackage ./nix/go-jsonnet.nix { };26 sjsonnet = pkgs.callPackage ./nix/sjsonnet.nix { };27 jsonnet = pkgs.callPackage ./nix/jsonnet.nix { };28 # I didn't managed to build it, and nixpkgs version is marked as broken29 # haskell-jsonnet = pkgs.callPackage ./nix/haskell-jsonnet.nix { };30 jrsonnet = pkgs.callPackage ./nix/jrsonnet.nix {31 rustPlatform = pkgs.makeRustPlatform {32 rustc = rust;33 cargo = rust;34 };35 };36 jrsonnet-nightly = pkgs.callPackage ./nix/jrsonnet.nix {37 rustPlatform = pkgs.makeRustPlatform {38 rustc = rust;39 cargo = rust;40 };41 withNightlyFeatures = true;42 };43 jrsonnet-release = pkgs.callPackage ./nix/jrsonnet-release.nix {44 rustPlatform = pkgs.makeRustPlatform {45 rustc = rust;46 cargo = rust;47 };48 };4950 benchmarks = pkgs.callPackage ./nix/benchmarks.nix {51 inherit go-jsonnet sjsonnet jsonnet;52 jrsonnetVariants = [53 { drv = jrsonnet; name = ""; }54 ];55 };56 benchmarks-quick = pkgs.callPackage ./nix/benchmarks.nix {57 inherit go-jsonnet sjsonnet jsonnet;58 quick = true;59 jrsonnetVariants = [60 { drv = jrsonnet; name = ""; }61 ];62 };63 benchmarks-against-release = pkgs.callPackage ./nix/benchmarks.nix {64 inherit go-jsonnet sjsonnet jsonnet;65 jrsonnetVariants = [66 { drv = jrsonnet; name = "current"; }67 { drv = jrsonnet-nightly; name = "current-nightly"; }68 { drv = jrsonnet-release; name = "release"; }69 ];70 };71 benchmarks-quick-against-release = pkgs.callPackage ./nix/benchmarks.nix {72 inherit go-jsonnet sjsonnet jsonnet;73 quick = true;74 jrsonnetVariants = [75 { drv = jrsonnet; name = "current"; }76 { drv = jrsonnet-nightly; name = "current-nightly"; }77 { drv = jrsonnet-release; name = "release"; }78 ];79 };80 };81 devShell = pkgs.mkShell {82 nativeBuildInputs = with pkgs;[83 alejandra84 rust85 cargo-edit86 cargo-asm87 cargo-outdated88 lld89 hyperfine90 valgrind91 kcachegrind92 graphviz93 ];94 };95 }96 );97}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.nixpkgs.follows = "nixpkgs";9 inputs.flake-utils.follows = "flake-utils";10 };11 };12 outputs = {13 nixpkgs,14 flake-utils,15 rust-overlay,16 ...17 }:18 flake-utils.lib.eachSystem (with flake-utils.lib.system; [x86_64-linux x86_64-windows]) (19 system: let20 pkgs = import nixpkgs {21 inherit system;22 overlays = [rust-overlay.overlays.default];23 config.allowUnsupportedSystem = true;24 };25 lib = pkgs.lib;26 rust =27 (pkgs.rustChannelOf {28 date = "2023-08-02";29 channel = "nightly";30 })31 .default32 .override {33 extensions = ["rust-src" "miri" "rust-analyzer" "clippy"];34 };35 in rec {36 packages = rec {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 jrsonnet = pkgs.callPackage ./nix/jrsonnet.nix {43 rustPlatform = pkgs.makeRustPlatform {44 rustc = rust;45 cargo = rust;46 };47 };48 jrsonnet-nightly = pkgs.callPackage ./nix/jrsonnet.nix {49 rustPlatform = pkgs.makeRustPlatform {50 rustc = rust;51 cargo = rust;52 };53 withNightlyFeatures = true;54 };55 jrsonnet-release = pkgs.callPackage ./nix/jrsonnet-release.nix {56 rustPlatform = pkgs.makeRustPlatform {57 rustc = rust;58 cargo = rust;59 };60 };6162 benchmarks = pkgs.callPackage ./nix/benchmarks.nix {63 inherit go-jsonnet sjsonnet jsonnet;64 jrsonnetVariants = [65 {66 drv = jrsonnet;67 name = "";68 }69 ];70 };71 benchmarks-quick = pkgs.callPackage ./nix/benchmarks.nix {72 inherit go-jsonnet sjsonnet jsonnet;73 quick = true;74 jrsonnetVariants = [75 {76 drv = jrsonnet;77 name = "";78 }79 ];80 };81 benchmarks-against-release = pkgs.callPackage ./nix/benchmarks.nix {82 inherit go-jsonnet sjsonnet jsonnet;83 jrsonnetVariants = [84 {85 drv = jrsonnet;86 name = "current";87 }88 {89 drv = jrsonnet-nightly;90 name = "current-nightly";91 }92 {93 drv = jrsonnet-release;94 name = "release";95 }96 ];97 };98 benchmarks-quick-against-release = pkgs.callPackage ./nix/benchmarks.nix {99 inherit go-jsonnet sjsonnet jsonnet;100 quick = true;101 jrsonnetVariants = [102 {103 drv = jrsonnet;104 name = "current";105 }106 {107 drv = jrsonnet-nightly;108 name = "current-nightly";109 }110 {111 drv = jrsonnet-release;112 name = "release";113 }114 ];115 };116 };117 packagesCross = lib.genAttrs ["mingwW64"] (crossSystem: let118 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 });127 devShells.default = pkgs.mkShell {128 nativeBuildInputs = with pkgs; [129 alejandra130 rust131 cargo-edit132 cargo-asm133 cargo-outdated134 lld135 hyperfine136 graphviz137 ];138 };139 }140 );141}nix/benchmarks.nixdiffbeforeafterboth--- a/nix/benchmarks.nix
+++ b/nix/benchmarks.nix
@@ -38,13 +38,13 @@
src = fetchFromGitHub {
owner = "prometheus-operator";
repo = "kube-prometheus";
- rev = "6a570e3154eac26e32da61d784fbe626da4804df";
- hash = "sha256-s6BK8KQiSjql2w6R+8m5pvPPAcKW+SKjQwqxZHjimFw=";
+ rev = "d3889807798d1697ea0691f10caf1b6a1997a8bd";
+ hash = "sha256-TeYWHzoZAmDp2PzT7EH8XRUcvb3tR8Qfxel7o2QBvIM=";
};
in
runCommand "kube-prometheus-vendor"
{
- outputHash = "sha256-R60RI/7FQPOHisnzANb34m9WPj5D9FeMVoGOjB19zl8=";
+ outputHash = "sha256-AGc0dHlD/Ld7I5b1+gOotzJkYrn+bB1VjISdD5NITtw=";
outputHashMode = "recursive";
buildInputs = [ cacert ];
}
nix/jrsonnet.nixdiffbeforeafterboth--- a/nix/jrsonnet.nix
+++ b/nix/jrsonnet.nix
@@ -33,7 +33,7 @@
];
cargoBuildFlags = cargoTestFlags;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/jrsonnet --add-flags "--max-stack=200000 --os-stack=200000"
nix/jsonnet.nixdiffbeforeafterboth--- a/nix/jsonnet.nix
+++ b/nix/jsonnet.nix
@@ -15,7 +15,7 @@
"jsonnet"
];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin