Merge master into staging-next
This commit is contained in:
commit
37c421747f
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, itstool
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
@ -24,6 +26,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
itstool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.19";
|
||||
version = "0.8.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-GbuDL0JSG0r2LVcdJgQFBMNDpAl2WbhjIX0Ls9yCDYg=";
|
||||
sha256 = "sha256-DIXvsYYckNlxFzeJqk3TYRQIAtafAfylyDc/a20kl+0=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
@ -12,8 +12,6 @@ buildGoModule rec {
|
|||
};
|
||||
vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# Bundle release metadata
|
||||
|
|
|
@ -13,8 +13,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "cmd/kubeseal" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
|
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.36.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.37.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-x1PUEDq/0B1T14mBs2FuKtcGpJHWOIvHAs8hptpzhZk=";
|
||||
sha256 = "sha256-hnRS/7CZPk1bbBjpHLAywKVu2u7jgg3p5/pxEdkzMJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,8 +13,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-M2PlvUsEG3Um+NqbpHdtu9g+Gj6jSXZ9YZ7t1MwjjdI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
|
@ -36,6 +37,13 @@ python3Packages.buildPythonApplication rec {
|
|||
# and saves them to the generated binary. This would make the build-time
|
||||
# dependencies part of the closure so we remove it.
|
||||
./prevent-closure-contamination.patch
|
||||
|
||||
# Fix build with meson 0.61
|
||||
# https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/414
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c.patch";
|
||||
sha256 = "MC4naGnqhrYlFBFHZaSzbOzrqaNK5/Xv5jBmCu0fLQE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "berry";
|
||||
version = "0.1.10";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JLErvin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6asph0QXzhmHuYcfrLcQ8RTP4QzX8m6AcCp5ImA++9M=";
|
||||
hash = "sha256-cs1NVwaANMIteCQuGqPcEWuUbfJulhjmfWnlU8Eb2OM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -18,8 +18,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
# As of rustc 1.45.0, these env vars are required to build rustfmt (due to
|
||||
# https://github.com/rust-lang/rust/pull/72001)
|
||||
CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly";
|
||||
CFG_RELEASE_CHANNEL = "nightly";
|
||||
CFG_RELEASE = rustPlatform.rust.rustc.version;
|
||||
CFG_RELEASE_CHANNEL = "stable";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for formatting Rust code according to style guidelines";
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
, gjs
|
||||
, libintl
|
||||
, dbus
|
||||
, xvfb-run
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -59,16 +58,14 @@ stdenv.mkDerivation rec {
|
|||
python3
|
||||
python3.pkgs.dbus-python
|
||||
python3.pkgs.pygobject3
|
||||
xvfb-run
|
||||
dbus
|
||||
gjs
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
patchShebangs ./tool/test-*.sh
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
@ -3,13 +3,11 @@
|
|||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.05";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
pname = "asn1-combinators";
|
||||
version = "0.2.6";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz";
|
||||
sha256 = "sha256-ASreDYhp72IQY3UsHPjqAm9rxwL+0Q35r1ZojikbGpE=";
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }:
|
||||
|
||||
assert lib.versionAtLeast (lib.getVersion ocaml) "3.12";
|
||||
|
||||
if lib.versionAtLeast ocaml.version "4.06"
|
||||
then throw "sqlite3EZ is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml-sqlite3EZ";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlin";
|
||||
repo = "ocaml-sqlite3EZ";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pKysvth0efxJeyJQY2Dnqarg7OtsKyyLnFV/1ZhsfDY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
|
||||
buildInputs = [ twt ];
|
||||
|
||||
propagatedBuildInputs = [ ocaml_sqlite3 ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mlin/ocaml-sqlite3EZ";
|
||||
description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
platforms = ocaml.meta.platforms or [ ];
|
||||
};
|
||||
}
|
|
@ -56,5 +56,6 @@ buildDunePackage rec {
|
|||
description = "Ocaml bindings to Pytorch";
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
license = licenses.asl20;
|
||||
broken = lib.versionAtLeast pytorch.version "1.11";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "anyconfig";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MJHXZ1dAaG+t6FdVU38qfGzO+oZZxbtWF04C3tdLltU=";
|
||||
sha256 = "sha256-A/8uF2KvOI+7vtHBq3+fHsAGqR2n2zpouWPabneV0qw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "qbs";
|
||||
|
||||
version = "1.21.0";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbs";
|
||||
repo = "qbs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jlJ7bk+lKBUs+jB6MTMe2Qxhf7BA7s5M9Xa2Dnx2UJs=";
|
||||
sha256 = "sha256-gFPcT/TNsKEUNzkJVaXHCGNmhQ0dV1/NYgQQInYrcNI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, lib
|
||||
, rustPlatform
|
||||
, rustfmt
|
||||
, protobuf
|
||||
}:
|
||||
let
|
||||
src = fetchFromGitHub {
|
||||
|
@ -30,7 +31,9 @@ in
|
|||
|
||||
buildAndTestSubdir = "server";
|
||||
|
||||
nativeBuildInputs = [ rustfmt ];
|
||||
PROTOC = "${protobuf}/bin/protoc";
|
||||
|
||||
nativeBuildInputs = [ rustfmt rustPlatform.bindgenHook ];
|
||||
|
||||
# test rely on libindradb and it can't be found
|
||||
# failure at https://github.com/indradb/indradb/blob/master/server/tests/plugins.rs#L63
|
||||
|
@ -44,7 +47,9 @@ in
|
|||
|
||||
cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
|
||||
|
||||
nativeBuildInputs = [ rustfmt ];
|
||||
PROTOC = "${protobuf}/bin/protoc";
|
||||
|
||||
nativeBuildInputs = [ rustfmt rustPlatform.bindgenHook ];
|
||||
|
||||
buildAndTestSubdir = "client";
|
||||
};
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
@ -18,6 +19,14 @@ python3.pkgs.buildPythonApplication {
|
|||
hash = "sha256-01vj35mMakqKi5zbMIPQ+R8xdkOWbzpnigd3/SU+svw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fixes compatibility with recent nix versions
|
||||
url = "https://github.com/timokau/nix-bisect/commit/01eefe174b740cb90e48b06d67d5582d51786b96.patch";
|
||||
hash = "sha256-Gls/NtHH7LujdEgLbcIRZ12KsJDrasXIMcHeeBVns4A=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
numpy
|
||||
|
|
|
@ -13,8 +13,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-R40zU0jOc/eIFVDsWG3+4o51iro7Sd7jwtyH/fpWVZs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -13,8 +13,6 @@ buildGoModule {
|
|||
|
||||
vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
outputs = [ "out" "index" ];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -14,8 +14,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-Rp0vTtpdKpYg/7UjX73Qwxu6dOqDr24nqp41fKN1IYw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ gobject-introspection vips ]
|
||||
|
|
|
@ -12,8 +12,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "cmd/traefik" ];
|
||||
|
||||
nativeBuildInputs = [ go-bindata ];
|
||||
|
|
|
@ -13,8 +13,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "TUI Client for Docker";
|
||||
homepage = "https://github.com/skanehira/docui";
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fprintd";
|
||||
version = "1.94.1";
|
||||
version = "1.94.2";
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "libfprint";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XHfHPffVp0jV3Md9Gui9v/nyOJ/bTWM3+hiR7WdEsgQ=";
|
||||
sha256 = "sha256-ePhcIZyXoGr8XlBuzKjpibU9D/44iCXYBlpVR9gcswQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -16,8 +16,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "1isp2jd6k4ppns5zi9irj09090imnc0xp6vcps135ymgp8qg4163";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers";
|
||||
homepage = "https://github.com/OJ/gobuster";
|
||||
|
|
|
@ -1293,8 +1293,6 @@ let
|
|||
|
||||
spelll = callPackage ../development/ocaml-modules/spelll { };
|
||||
|
||||
sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
|
||||
|
||||
srt = callPackage ../development/ocaml-modules/srt {
|
||||
inherit (pkgs) srt;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue