mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-24 05:00:19 +00:00
Merge staging-next into staging
This commit is contained in:
commit
58f5e2ce23
@ -4,6 +4,7 @@
|
||||
, fetchurl
|
||||
, cmake
|
||||
, dbus
|
||||
, fftwFloat
|
||||
, file
|
||||
, freetype
|
||||
, jansson
|
||||
@ -27,12 +28,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cardinal";
|
||||
version = "22.12";
|
||||
version = "23.02";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
|
||||
sha256 = "sha256-fyko5cWjBNNaw8qL9uyyRxW5MFXKmOsBoR5u05AWxWY=";
|
||||
"https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}+deps.tar.xz";
|
||||
sha256 = "sha256-5vEWTkEXIMG/re7Ex+YKh+ETLDuc2nihTPpYSg5LdRo=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
buildInputs = [
|
||||
dbus
|
||||
fftwFloat
|
||||
freetype
|
||||
jansson
|
||||
libGL
|
||||
|
@ -202,7 +202,7 @@ self: super: {
|
||||
};
|
||||
|
||||
cmp-fish = super.cmp-fish.overrideAttrs {
|
||||
dependencies = with self; [ nvim-cmp fish ];
|
||||
dependencies = with self; [ nvim-cmp ];
|
||||
};
|
||||
|
||||
cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs {
|
||||
@ -214,7 +214,7 @@ self: super: {
|
||||
};
|
||||
|
||||
cmp-git = super.cmp-git.overrideAttrs {
|
||||
dependencies = with self; [ nvim-cmp curl git ];
|
||||
dependencies = with self; [ nvim-cmp ];
|
||||
};
|
||||
|
||||
cmp-greek = super.cmp-greek.overrideAttrs {
|
||||
@ -230,7 +230,7 @@ self: super: {
|
||||
};
|
||||
|
||||
cmp-npm = super.cmp-npm.overrideAttrs {
|
||||
dependencies = with self; [ nvim-cmp nodejs plenary-nvim ];
|
||||
dependencies = with self; [ nvim-cmp plenary-nvim ];
|
||||
};
|
||||
|
||||
cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs {
|
||||
@ -242,11 +242,11 @@ self: super: {
|
||||
};
|
||||
|
||||
cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs {
|
||||
dependencies = with self; [ nvim-cmp pandoc plenary-nvim ];
|
||||
dependencies = with self; [ nvim-cmp plenary-nvim ];
|
||||
};
|
||||
|
||||
cmp-rg = super.cmp-rg.overrideAttrs {
|
||||
dependencies = with self; [ nvim-cmp ripgrep ];
|
||||
dependencies = with self; [ nvim-cmp ];
|
||||
};
|
||||
|
||||
cmp-snippy = super.cmp-snippy.overrideAttrs {
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeshark";
|
||||
version = "41.1";
|
||||
version = "41.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = version;
|
||||
sha256 = "sha256-Etf/zYw/ymA6//sNyCTZYXSTLUJ5QyAor80MoQ2o9zI=";
|
||||
sha256 = "sha256-8RAUFiQLXKYRcthkthoRLl73RKjJj6PVE6SxTvqWiiI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CCkRL6pzwV45whYwCX/vcKllpz4qrUhZpNwVa69elVA=";
|
||||
vendorHash = "sha256-cINzo4G1Rn9T1HBGKOKo2boUpG2S2vnFL/uwEVXq2gU=";
|
||||
|
||||
ldflags = let t = "github.com/kubeshark/kubeshark"; in [
|
||||
"-s" "-w"
|
||||
|
@ -13,13 +13,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "showmethekey";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlynxZhou";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iWZjOhugGD7GikcIKaJimfLrTDaGQeYgmp17N03Meb8=";
|
||||
hash = "sha256-IfegYHHFbZbMTA8JWXAun9Gl3BpykH/5RqUIrlYlLhk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyipp";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "ctalkington";
|
||||
repo = "python-ipp";
|
||||
rev = version;
|
||||
hash = "sha256-l8zDgqv8+9r15dt1YeuAYq2GCl9JsrtNRjPlQ9A7H9c=";
|
||||
hash = "sha256-IPmpup0VrilfLnYiigjVjL6oRwW4RPlgiafIy7yyckI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vala-lint";
|
||||
version = "unstable-2022-09-15";
|
||||
version = "unstable-2023-05-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vala-lang";
|
||||
repo = "vala-lint";
|
||||
rev = "923adb5d3983ed654566304284607e3367998e22";
|
||||
sha256 = "sha256-AHyc6jJyEPfUON7yf/6O2jfcnRD3fW2R9UfIsx2Zmdc=";
|
||||
rev = "4d21b8a2be8b77052176d06d0cf10a8b319117c4";
|
||||
sha256 = "sha256-OnBeiYm83XjAezHEBEA2LvJ5ErVOyKclXJcS0cYaLIg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,12 +1,11 @@
|
||||
{
|
||||
lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, byacc
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "rc-9front";
|
||||
version = "unstable-2022-11-01";
|
||||
|
||||
@ -18,6 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ byacc installShellFiles ];
|
||||
enableParallelBuilding = true;
|
||||
patches = [ ./path.patch ];
|
||||
|
||||
buildPhase = ''
|
||||
|
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "labctl";
|
||||
version = "0.0.20";
|
||||
version = "0.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labctl";
|
||||
repo = "labctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gLdcPT82hkttESxwjk1mCzuaUxcwm0dULil634u7qg8=";
|
||||
hash = "sha256-84t7qhLafNyPLgHmFQUsizEn6Us44dDTercGEm9lup4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-JXFw/u8QaZKt+OjUWW0rPi9QDSkiqYyqcNCxyzvcDM4=";
|
||||
vendorHash = "sha256-vJ9aTMVwKrqjckdfCMvheTSG+gEtMLLQuBCz8Wc5blE=";
|
||||
|
||||
ldflags = [
|
||||
"-X=github.com/labctl/labctl/app.version=${version}"
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "threatest";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DataDog";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xluKQXFa06ng9bs+sBkoFLeyYtQAcej4VFLMeTST6zA=";
|
||||
hash = "sha256-FDcCAKexFpqViSQngfOhkjTr0czHIRtZL3v2psfTuYI=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lux";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "iawia002";
|
||||
repo = "lux";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A3DDKpoaZlDUpafAGs5zCknhTeCuwMPnyBHtxke0Bi8=";
|
||||
sha256 = "sha256-klm1985qBErFfYIWPjr1/n6nYr/jA9dbrDMfw4bf1tM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
Loading…
Reference in New Issue
Block a user