Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub f89ef2c9 1b2b1c3d

+41 -12
+8 -7
pkgs/development/interpreters/bqn/cbqn/default.nix
··· 19 20 stdenv.mkDerivation rec { 21 pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; 22 - version = "0.pre+unstable=2021-10-05"; 23 24 src = fetchFromGitHub { 25 owner = "dzaima"; 26 repo = "CBQN"; 27 - rev = "e23dab20daff9c0dacc2561c616174af72029a3e"; 28 - hash = "sha256-amVKKD9hD5A+LbqglXHLKEsYqFSSztdXs1FCoNJyCJ4="; 29 }; 30 31 dontConfigure = true; ··· 34 sed -i '/SHELL =.*/ d' makefile 35 ''; 36 37 preBuild = '' 38 - # otherwise cbqn defaults to clang 39 - makeFlagsArray+=("CC=$CC") 40 - 41 - # inform make we are providing the runtime ourselves 42 touch src/gen/customRuntime 43 '' + (if genBytecode then '' 44 ${bqn-path} genRuntime ${mbqn-source}
··· 19 20 stdenv.mkDerivation rec { 21 pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; 22 + version = "0.pre+unstable=2021-10-09"; 23 24 src = fetchFromGitHub { 25 owner = "dzaima"; 26 repo = "CBQN"; 27 + rev = "debc4e2afe313a3c54133df9f26969c2927dc8aa"; 28 + hash = "sha256-ixFDmtq6hd2enmPbBT0JCv1bmxt84zle4zPQzz+rMCI="; 29 }; 30 31 dontConfigure = true; ··· 34 sed -i '/SHELL =.*/ d' makefile 35 ''; 36 37 + makeFlags = [ 38 + "CC=${stdenv.cc.targetPrefix}cc" 39 + ]; 40 + 41 preBuild = '' 42 + # Purity: avoids git downloading bytecode files 43 touch src/gen/customRuntime 44 '' + (if genBytecode then '' 45 ${bqn-path} genRuntime ${mbqn-source}
+3 -3
pkgs/misc/screensavers/pipes-rs/default.nix
··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "pipes-rs"; 5 - version = "1.4.4"; 6 7 src = fetchFromGitHub { 8 owner = "lhvy"; 9 repo = pname; 10 rev = "v${version}"; 11 - sha256 = "drqoKkju1EkcWGNnliEah37wVhtU2ddJSOZ5MnCNbuo="; 12 }; 13 14 - cargoSha256 = "0j6b5697ichw4ly7lsj3nbm0mw6bvjma81nd0fl7v1ra9kbmsysk"; 15 16 doInstallCheck = true; 17
··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "pipes-rs"; 5 + version = "1.4.5"; 6 7 src = fetchFromGitHub { 8 owner = "lhvy"; 9 repo = pname; 10 rev = "v${version}"; 11 + sha256 = "sha256-BC6QqSZ7siDVSO8oOH7DimTe6RFnCBygmvtPrQgsC/Q="; 12 }; 13 14 + cargoSha256 = "sha256-nctkc2vDE7WXm84g/EkGKc1/ju/Xy9d/nc8NPIVFl58="; 15 16 doInstallCheck = true; 17
+2 -2
pkgs/tools/admin/eksctl/default.nix
··· 2 3 buildGoModule rec { 4 pname = "eksctl"; 5 - version = "0.68.0"; 6 7 src = fetchFromGitHub { 8 owner = "weaveworks"; 9 repo = pname; 10 rev = version; 11 - sha256 = "sha256-J4suRGr00mdgZv6q9Ar9x4HFZxk4gtUFF1TE3WyNlvE="; 12 }; 13 14 vendorSha256 = "sha256-cUo+tcHhnbJbn3HS/I8lnkvfv+6+htIs1dMtKuEArQg=";
··· 2 3 buildGoModule rec { 4 pname = "eksctl"; 5 + version = "0.69.0"; 6 7 src = fetchFromGitHub { 8 owner = "weaveworks"; 9 repo = pname; 10 rev = version; 11 + sha256 = "sha256-mRY/czMf6KefYCqfCVRtcHuUuqAxyPUd8TJmx7vzOsk="; 12 }; 13 14 vendorSha256 = "sha256-cUo+tcHhnbJbn3HS/I8lnkvfv+6+htIs1dMtKuEArQg=";
+24
pkgs/tools/text/mdbook-katex/default.nix
···
··· 1 + { lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: 2 + 3 + rustPlatform.buildRustPackage rec { 4 + pname = "mdbook-katex"; 5 + version = "0.2.10"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "lzanini"; 9 + repo = pname; 10 + rev = "v${version}"; 11 + sha256 = "sha256-5PzXX7icRxcHpzjp3x/9ssn2o0444uHrzBn1Ds1DEPM="; 12 + }; 13 + 14 + cargoSha256 = "sha256-tqdpIBlKiyYSWFPYTnzVeDML2GM+mukbOHS3sNYUgdc="; 15 + 16 + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; 17 + 18 + meta = with lib; { 19 + description = "A preprocessor for mdbook, rendering LaTeX equations to HTML at build time."; 20 + homepage = "https://github.com/lzanini/${pname}"; 21 + license = [ licenses.mit ]; 22 + maintainers = with maintainers; [ lovesegfault ]; 23 + }; 24 + }
+4
pkgs/top-level/all-packages.nix
··· 6802 inherit (darwin.apple_sdk.frameworks) CoreServices; 6803 }; 6804 6805 mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid { 6806 inherit (darwin.apple_sdk.frameworks) CoreServices; 6807 };
··· 6802 inherit (darwin.apple_sdk.frameworks) CoreServices; 6803 }; 6804 6805 + mdbook-katex = callPackage ../tools/text/mdbook-katex { 6806 + inherit (darwin.apple_sdk.frameworks) CoreServices; 6807 + }; 6808 + 6809 mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid { 6810 inherit (darwin.apple_sdk.frameworks) CoreServices; 6811 };