Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -3745,6 +3745,12 @@
|
||||
github = "edlimerkaj";
|
||||
githubId = 71988351;
|
||||
};
|
||||
ehllie = {
|
||||
email = "me@ehllie.xyz";
|
||||
github = "ehllie";
|
||||
githubId = 20847625;
|
||||
name = "Elizabeth Paź";
|
||||
};
|
||||
elliottslaughter = {
|
||||
name = "Elliott Slaughter";
|
||||
email = "elliottslaughter@gmail.com";
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "debian-goodies";
|
||||
version = "0.88";
|
||||
version = "0.88.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "debian-goodies";
|
||||
rev = "debian/${version}";
|
||||
sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY=";
|
||||
sha256 = "sha256-g1xeWhCkC7HEHHOJpcZ6JFA9jmavJE0lUX1Cmp5A0QQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atmos";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SZ/4QKO8PdbHWZ+urOqZPFUb9lFRP+HWbNff1fmwDqI=";
|
||||
sha256 = "sha256-Jt8/sB6cpxNr0Mcp0+KrwxQAicOHHRGnHXLruBSvZ4M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-d2Eod1AK6Ei5Az9wPHVqij8K4CVj7Ptewd3dBJ9Wt3o=";
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.23.10";
|
||||
version = "1.23.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ujSy6akbk4SvMIQdBJkNMwaRNEfFKJmVrN3lNtFudkA=";
|
||||
sha256 = "sha256-fjB5O3kuU09megWGgU7f3otmWD/a31xVV1Dap2+xFkw=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MdKeczst9t7VOxTx4/cAfbEUFOCIS3jQRYJcCJ8AH0Q=";
|
||||
sha256 = "sha256-XWqyeUBrM/ks6Y7tfVXcynuZp9Ied0B7AdtC/qGCBQA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rYPkY6dH4DJ6uwckTbohlutXNnlQBMODPKntu5EVVTY=";
|
||||
vendorSha256 = "sha256-BEKo67EgbCnX5B12Dkio0vkawAdCn+fA8eXn90EPm00=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, llvmPackages_11
|
||||
, clang
|
||||
, llvm
|
||||
, python3
|
||||
, zlib
|
||||
, z3
|
||||
@@ -35,18 +36,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
# Python used for KLEE tests.
|
||||
kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
|
||||
|
||||
# The klee-uclibc derivation.
|
||||
kleeuClibc = callPackage ./klee-uclibc.nix {
|
||||
inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts;
|
||||
inherit stdenv clang llvm extraKleeuClibcConfig debugRuntime runtimeAsserts;
|
||||
};
|
||||
|
||||
in
|
||||
clang.stdenv.mkDerivation rec {
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "klee";
|
||||
version = "2.3";
|
||||
|
||||
@@ -61,7 +58,7 @@ clang.stdenv.mkDerivation rec {
|
||||
cryptominisat
|
||||
gperftools
|
||||
lit # Configure phase checking for lit
|
||||
llvmPackages_11.llvm
|
||||
llvm
|
||||
sqlite
|
||||
stp
|
||||
z3
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, which
|
||||
, linuxHeaders
|
||||
, clang
|
||||
, llvmPackages_11
|
||||
, llvm
|
||||
, python3
|
||||
, curl
|
||||
, debugRuntime ? true
|
||||
@@ -23,8 +24,7 @@ let
|
||||
"RUNTIME_PREFIX" = "/";
|
||||
"DEVEL_PREFIX" = "/";
|
||||
});
|
||||
in
|
||||
clang.stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "klee-uclibc";
|
||||
version = "1.3";
|
||||
src = fetchFromGitHub {
|
||||
@@ -37,7 +37,7 @@ clang.stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
clang
|
||||
curl
|
||||
llvmPackages_11.llvm
|
||||
llvm
|
||||
python3
|
||||
which
|
||||
];
|
||||
|
||||
@@ -13,6 +13,7 @@ let configAwkScript = runCommand "why3-conf.awk" { inherit provers; }
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "${why3.pname}-with-provers";
|
||||
version = why3.version;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ why3 ] ++ provers;
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.25.1";
|
||||
version = "1.25.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IIgFnDPgeQrsleIzzFr4Q0Kz8bCzs0gFluFw+9Dub7I=";
|
||||
sha256 = "sha256-a/p4lljxf+9vpd0LlBVXY4y4rfxH5vaoIj0EKaRa2zQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.10.2";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CxwNnSwF3QD86lzDgSlGZiEv2tMOfDTUGHOZVtsmY94=";
|
||||
sha256 = "sha256-BMSLs12fPY8wat0rKys/7OI7F3GGNmQC+XRi6C4kYk4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Yz2lea+ttgNbfP1mL+kwTKmo81Q6GGjJyvDANzeckpo=";
|
||||
vendorSha256 = "sha256-aD0h7vSUkxaGBeN2S2GOEwKpXHKyvnwbOB7pABgBmCY=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, libffi
|
||||
, libxml2
|
||||
, llvmPackages_13
|
||||
, ncurses
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "ante";
|
||||
version = "unstable-2022-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfecher";
|
||||
repo = "ante";
|
||||
rev = "8b708d549c213c34e4ca62d31cf0dd25bfa7b548";
|
||||
sha256 = "sha256-s8nDuG32lI4pBLsOzgfyUGpc7/r0j4EhzH54ErBK7A0=";
|
||||
};
|
||||
cargoSha256 = "sha256-29D7kPG7vop9lIxWQnaHkCTRY8YsCjERRCOvbU7oemQ=";
|
||||
|
||||
/*
|
||||
https://crates.io/crates/llvm-sys#llvm-compatibility
|
||||
llvm-sys requires a specific version of llvmPackages,
|
||||
that is not the same as the one included by default with rustPlatform.
|
||||
*/
|
||||
nativeBuildInputs = [ llvmPackages_13.llvm ];
|
||||
buildInputs = [ libffi libxml2 ncurses ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/golden_tests.rs --replace \
|
||||
'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/release"
|
||||
'';
|
||||
preBuild =
|
||||
let
|
||||
major = lib.versions.major llvmPackages_13.llvm.version;
|
||||
minor = lib.versions.minor llvmPackages_13.llvm.version;
|
||||
llvm-sys-ver = "${major}${builtins.substring 0 1 minor}";
|
||||
in
|
||||
''
|
||||
# On some architectures llvm-sys is not using the package listed inside nativeBuildInputs
|
||||
export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_13.llvm.dev}
|
||||
export ANTE_STDLIB_DIR=$out/lib
|
||||
mkdir -p $ANTE_STDLIB_DIR
|
||||
cp -r $src/stdlib/* $ANTE_STDLIB_DIR
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://antelang.org/";
|
||||
description = "A low-level functional language for exploring refinement types, lifetime inference, and algebraic effects";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ehllie ];
|
||||
};
|
||||
}
|
||||
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
|
||||
# base_version is of the form major.minor.patch
|
||||
# vc_version is of the form YYMMDDCC
|
||||
# version corresponds to the tag on GitHub
|
||||
base_version = "8.0.1";
|
||||
vc_version = "22070801";
|
||||
base_version = "8.0.3";
|
||||
vc_version = "22090809";
|
||||
version = "${base_version}.${vc_version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renpy";
|
||||
repo = "renpy";
|
||||
rev = version;
|
||||
sha256 = "sha256-rwRykovY8vv+boQiaSjCBoGxGpT1dF3qdEyxkykrKyk=";
|
||||
sha256 = "sha256-0/wkUk7PMPbBSGzDuSd82yxRzvAYxkbEhM5LTVt4bMA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper
|
||||
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
|
||||
, zimg, libass, python3, libiconv
|
||||
, zimg, libass, python3, libiconv, testers
|
||||
, ApplicationServices
|
||||
}:
|
||||
|
||||
@@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
|
||||
inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand
|
||||
vapoursynth makeWrapper withPlugins;
|
||||
};
|
||||
|
||||
tests.version = testers.testVersion {
|
||||
package = vapoursynth;
|
||||
# Check Core version to prevent false positive with API version
|
||||
version = "Core R${version}";
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
@@ -56,5 +62,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.x86_64;
|
||||
maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ];
|
||||
mainProgram = "vspipe";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
|
||||
sha256 = "sha256-/PCw2sF3CxiBXV7WZcTl6NAs+v++od4Fs6uYFUhJMH8=";
|
||||
sha256 = "sha256-BpETor1dz8qdMM8iYijlthnsrPF0FS8b1FDvuXxFB9s=";
|
||||
};
|
||||
|
||||
# force rebuild of headers needed for install
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ultraheat-api";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "ultraheat_api";
|
||||
inherit version;
|
||||
hash = "sha256-UzDGkLvFqqiBuiCgMA0BItmUhrY0b963o05WDHxsS0Q=";
|
||||
hash = "sha256-sdZweq5TDl54UKHqQ0zlFQq0h+piisMKs2P/3E2vqX8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vulcan-api";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "kapi2289";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-decp3wq/O4QTBE40iSkMaCTJYM6XPP7nLlSAEL1bemY=";
|
||||
sha256 = "sha256-0V1skTJdiL04jVKsMb0Kysbw36bQ3EAJG3YT7ik36zQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "winsspi";
|
||||
version = "0.0.10";
|
||||
version = "0.0.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L1qNLEufRZFEQmkJ4mp05VBRLiO2z5r1LCoAADx8P9s=";
|
||||
hash = "sha256-AXC6SJ+iWPGqTmdgoWKEbD8tDUUcg2aD609hO2bdQfM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.2.33";
|
||||
version = "0.2.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+NpoD6PwTd8s9cABnFApnnqrEb8UkhCxmj3FEE6sP9Q=";
|
||||
sha256 = "sha256-gUdvndL8v+7lX/GuMxHlHxp3j8YTQWEh3c+WX+fDOQU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-t/tYN+Zxj3rxzb9QTTuPyjc4hdl+UjwPs+evAXbAByg=";
|
||||
vendorSha256 = "sha256-yNb5OvsnNAk+K0gepKVuqivS+eeLMOVCqxF/rj+Rpps=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dagger"
|
||||
|
||||
@@ -6,16 +6,18 @@
|
||||
buildGoModule
|
||||
rec {
|
||||
pname = "eclint";
|
||||
version = "0.3.4";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "greut";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-inO41C/Ompyfy4CHPK4ksNU19KIcGyPgF/ptZC0GWXg=";
|
||||
sha256 = "sha256-+ZbBmdCl1v4msFFA2kzL/IQTQtR39O5XYgCj7w+QGzE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-imVQnPoKOjed9XlikLWvudmlJklRrLFHKtNZoAmznZg=";
|
||||
vendorSha256 = "sha256-CdvxY3uX6i3Xtg50jqlNr+VXpeOeg8M27huasbzA96M=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/greut/eclint";
|
||||
|
||||
@@ -23,8 +23,8 @@ buildGoModule rec {
|
||||
mv $out/bin/circleci-cli $out/bin/circleci
|
||||
|
||||
installShellCompletion --cmd circleci \
|
||||
--bash <($out/bin/circleci completion bash --skip-update-check) \
|
||||
--zsh <($out/bin/circleci completion zsh --skip-update-check)
|
||||
--bash <(HOME=$TMPDIR $out/bin/circleci completion bash --skip-update-check) \
|
||||
--zsh <(HOME=$TMPDIR $out/bin/circleci completion zsh --skip-update-check)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -11,11 +11,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grails";
|
||||
version = "5.2.3";
|
||||
version = "5.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
|
||||
sha256 = "sha256-kFlMC94+g9I7qzyaslU3RJ4jKtDHRZAei/yD1+8q2Hs=";
|
||||
sha256 = "sha256-jtv14Y6TfiIHwbqqaX36j2H/4+UCikbpFhYgNeAP3L4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.43.0";
|
||||
version = "2.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-swJzMZDBxof8RLMxVZN79zxajMO7kuxZxD8gNpgSksI=";
|
||||
hash = "sha256-/vX7DVZNFuLNNQQDoiggBdp9dsjTAKZbhxD13+VUInU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "0.10.0";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellie";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tBOJkAQCL2YGEJ3gJPxBC0swMuwOQENnhLXyms8WW6g";
|
||||
sha256 = "sha256-fHqZkFWueC2jr86kR3T1qcFaMMhEqfu2pzt8VfqmBnE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-P4jcJ6pl3ZGjiwNYfEjEiNVnE6mTDRUGl6gZW65Jn0I";
|
||||
cargoSha256 = "sha256-BkrrVlqEtQWjc+jaKilAtf9xyaENAuvqCxIrxxmglOY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crowdin-cli";
|
||||
version = "3.7.10";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
|
||||
sha256 = "sha256-beU4hLW5Dp4xbY0kaxuxLD2XmMXdxWEBbAH/G+B5dHU=";
|
||||
sha256 = "sha256-ONkdtp7aXP7dTxqIQ4IZ8c4zwzXVpEMMoXYnQQSU5x0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
|
||||
|
||||
@@ -13067,6 +13067,8 @@ with pkgs;
|
||||
|
||||
algol68g = callPackage ../development/compilers/algol68g { };
|
||||
|
||||
ante = callPackage ../development/compilers/ante { };
|
||||
|
||||
armips = callPackage ../development/compilers/armips {
|
||||
stdenv = gcc10Stdenv;
|
||||
};
|
||||
@@ -28999,7 +29001,11 @@ with pkgs;
|
||||
|
||||
klayout = libsForQt5.callPackage ../applications/misc/klayout { };
|
||||
|
||||
klee = callPackage ../applications/science/logic/klee { };
|
||||
klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; {
|
||||
clang = clang;
|
||||
llvm = llvm;
|
||||
stdenv = stdenv;
|
||||
});
|
||||
|
||||
kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user