Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-09-18 06:01:00 +00:00 committed by GitHub
commit 3c56b929c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 731 additions and 1979 deletions

View file

@ -2,20 +2,20 @@
buildNpmPackage rec {
pname = "vieb";
version = "10.2.0";
version = "10.3.0";
src = fetchFromGitHub {
owner = "Jelmerro";
repo = pname;
rev = version;
hash = "sha256-eI+doYI5kssuVLNLlAj67CRvBuWQ+TRm0RKXPcW+S8c=";
hash = "sha256-eopsDwgyWshZOppkODGKT8UGnj4vvc7ssEzVAhZeDTA=";
};
postPatch = ''
sed -i '/"electron"/d' package.json
'';
npmDepsHash = "sha256-Emiw5ZlHh4+YqtW+T3iQW/ldr1Exx/66vsQteCijObQ=";
npmDepsHash = "sha256-9tnLlKzOy8ze4m2beS/pI34IiEa5TdNNr+Rmm2TFgfk=";
dontNpmBuild = true;
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "roxctl";
version = "4.1.2";
version = "4.2.0";
src = fetchFromGitHub {
owner = "stackrox";
repo = "stackrox";
rev = version;
sha256 = "sha256-5wNf80kiYnKg/urIQQqe4HijqxQweiFx0UktFiOTeaU=";
sha256 = "sha256-GrqefNH3wLMMd+JfkugVJhUHFP5vvqroAMbWLan9ylU=";
};
vendorHash = "sha256-5glD904guK+TR9YFzeuIyHOXrJblcEVi9EReQz0fCCA=";
vendorHash = "sha256-y/ZoSK/lgqt8VZAb8NgCzyde/cwAhpu658/3mC/tI98=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.29";
ptb = "0.0.46";
canary = "0.0.166";
canary = "0.0.167";
development = "0.0.232";
} else {
stable = "0.0.273";
@ -24,7 +24,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-bUbJpaHUf0ALJ1+4ACcVz0kpZpoXi0S4QO5yLiUZSgs=";
sha256 = "sha256-ua99w5pJz8UZldMvYLB7SkcgAG2hQBdorbnugvFDktE=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

View file

@ -1,102 +0,0 @@
{ lib, stdenv, alsa-lib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl
, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libdrm, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss
, pango, systemd }:
let gitterDirectorySuffix = "opt/gitter";
libPath = lib.makeLibraryPath [
alsa-lib
atk
at-spi2-core
cairo
cups
dbus
expat
fontconfig
freetype
gdk-pixbuf
glib
gtk3
libX11
libXScrnSaver
libXcomposite
libXcursor
libXdamage
libXext
libXfixes
libXi
libXrandr
libXrender
libXtst
libappindicator-gtk3
libcxx
libdrm
libnotify
libpulseaudio
libxcb
mesa
nspr
nss
pango
stdenv.cc.cc
systemd
];
doELFPatch = target: ''
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
--set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
$out/${gitterDirectorySuffix}/${target}
'';
in stdenv.mkDerivation rec {
pname = "gitter";
version = "5.0.1";
src = fetchurl {
url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb";
sha256 = "1ps9akylqrril4902r8mi0mprm0hb5wra51ry6c1rb5xz5nrzgh1";
};
nativeBuildInputs = [ makeWrapper dpkg ];
unpackPhase = "dpkg -x $src .";
installPhase = ''
mkdir -p $out/{bin,opt/gitter,share/pixmaps}
mv ./opt/Gitter/linux64/* $out/opt/gitter
${doELFPatch "Gitter"}
${doELFPatch "nacl_helper"}
${doELFPatch "minidump_stackwalk"}
${doELFPatch "nwjc"}
${doELFPatch "chromedriver"}
${doELFPatch "payload"}
patchelf --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
$out/${gitterDirectorySuffix}/lib/libnw.so
wrapProgram $out/${gitterDirectorySuffix}/Gitter --prefix LD_LIBRARY_PATH : ${libPath}
ln -s $out/${gitterDirectorySuffix}/Gitter $out/bin/
ln -s $out/${gitterDirectorySuffix}/logo.png $out/share/pixmaps/gitter.png
ln -s "${desktopItem}/share/applications" $out/share/
'';
desktopItem = makeDesktopItem {
name = pname;
exec = "Gitter";
icon = pname;
desktopName = "Gitter";
genericName = meta.description;
categories = [ "Network" "InstantMessaging" ];
};
meta = with lib; {
description = "Where developers come to talk";
downloadPage = "https://gitter.im/apps";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
maintainers = [ maintainers.imalison ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
pname = "libcoap";
version = "4.3.1";
version = "4.3.3";
src = fetchFromGitHub {
repo = "libcoap";
owner = "obgm";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-4XcAo5StyYIfe9wD0cPHKFZalMcBAuiVV2qFZ126KT8=";
sha256 = "sha256-RS37Fpo1uzwEKzCysilXiH/NYOySEYGPOk0R/+rqiag=";
};
nativeBuildInputs = [
automake

File diff suppressed because it is too large Load diff

View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
libmrss
libproxy
libsoup_3
];
] ++ libsoup_3.propagatedUserEnvPackages;
doCheck = false; # Requires network access

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "buildkit-nix";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "reproducible-containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gKTCBz7om1M7UBzyMJDetNGcKLkQKMyuzwrHBbuuifM=";
sha256 = "sha256-i8KQLLL36iP26jIj10fZLtYpS57Xni4eIQEJG4ixWy8=";
};
vendorHash = "sha256-1H5oWgcaamf+hocABWWnzJUjWiqwk1ZZtbBjF6EKzzU=";
vendorHash = "sha256-SFsf2QOIuUQY5Zzshb2190pQtOBGEsELBRihOvHYVGA=";
CGO_ENABLED = 0;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddev";
version = "1.22.1";
version = "1.22.2";
src = fetchFromGitHub {
owner = "ddev";
repo = "ddev";
rev = "v${version}";
hash = "sha256-3uDdp827noiY6P7VSBXM34MTe9+MCEkNtuRQ3eFoBnk=";
hash = "sha256-S3NesYJH66vqMSDSd2UKWyjOjrZYasY0sWqYMiQC7i0=";
};
vendorHash = null;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Rt65BXrDFne7bT26yQLVMNwwgN8JAmXLrGx/BLlInkI=";
sha256 = "sha256-iZOcpVvhHbf8u2NrnwAIg7jlTN/afeBi2+jbsNYKlz4=";
};
cargoHash = "sha256-dZbLLxvkJzApl9+MwbZRJQXFzMHOfbikwEZs9wFKZHQ=";
cargoHash = "sha256-cysxQ4qc70zpEOpL5bccMHdEDGbdjzbGftTMb58RrYc=";
# skip test due FHS dependency
doCheck = false;

View file

@ -0,0 +1,40 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, fetchpatch
}:
buildNpmPackage {
pname = "arrpc";
version = "3.2.0";
src = fetchFromGitHub {
owner = "OpenAsar";
repo = "arrpc";
# Release commits are not tagged
# release: 3.2.0
rev = "9c3e981437b75606c74ef058c67d1a8c083ce49a";
hash = "sha256-tsO58q6tqqXCJLjZmLQGt1VtKsuoqWmh5SlnuDtJafg=";
};
# Make installation less cumbersome
# Remove after next release
patches = [
(fetchpatch {
url = "https://github.com/OpenAsar/arrpc/pull/50.patch";
hash = "sha256-qFlrbe2a4x811wpmWUcGDe2CPlt9x3HI+/t0P2v4kPc=";
})
];
npmDepsHash = "sha256-vxx0w6UjwxIK4cgpivtjNbIgkb4wKG4ijSHdP/FeQZ4=";
dontNpmBuild = true;
meta = with lib; {
description = "Open Discord RPC server for atypical setups";
homepage = "https://arrpc.openasar.dev/";
license = licenses.mit;
maintainers = with maintainers; [ anomalocaris ];
mainProgram = "arrpc";
};
}

View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
, numpy
}:
buildPythonPackage rec {
pname = "langid";
version = "1.1.6";
format = "setuptools";
src = fetchPypi { # use PyPi as source, github repository does not contain tags or release branches
inherit pname version;
hash = "sha256-BEvK4ZEtq4XDPY6Y8oEbj0/xIT5emp6VEBN7hNosspM=";
};
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
numpy
];
doCheck = false; # Package has no tests
pythonImportsCheck = [ "langid" ];
meta = with lib; {
description = "Langid.py is a standalone Language Identification (LangID) tool";
homepage = "https://pypi.org/project/langid/";
license = licenses.bsd2;
maintainers = with maintainers; [ mbalatsko ];
};
}

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.43";
version = "0.0.45";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "v${version}";
hash = "sha256-+h69AtuFBvqy/P6Qe5s0Ht66eXzg5KDs2ipoNyKludo=";
hash = "sha256-YEw8EU+YUBqfKL2RM1komz6D1/2GshNQtQso7rN0yCM=";
};
cargoHash = "sha256-Jqe3mswnbrfvUdQm4DfnCkJGksEuGzfuxNjEI7cEyQs=";
cargoHash = "sha256-5NaeSu/9mAQoqN/7mXrZomlzR/JjUxcIy9fRdV2H8yM=";
nativeBuildInputs = [
git

View file

@ -6,8 +6,8 @@
, buildWebExtension ? false
}:
let
version = "1.4.6";
gitHash = "9b987d1";
version = "1.4.7";
gitHash = "25a1d93";
in
buildNpmPackage rec {
pname = "vencord";
@ -17,7 +17,7 @@ buildNpmPackage rec {
owner = "Vendicated";
repo = "Vencord";
rev = "v${version}";
sha256 = "sha256-LVFCf2BdTdl4t+Fp2oM7jAskzGx/fhSr6tNcaZ1X8xA=";
sha256 = "sha256-bSLPZJyBKws+6IE4YTgQTMau5yKpHJdq5tw6Jg1Uc/s=";
};
ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gcsfuse";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
hash = "sha256-9RqvEETRwcyK59AIWRgT3YNMu9MYZGD9rr5vyzTn0xg=";
hash = "sha256-fMKFQheFlSwz4ik1tgLheZGkS55LHq3nncOmvgY/TqM=";
};
vendorHash = "sha256-oTELdPPkKBQFBIRhjns6t3wj84RQhDVOi95seNyeeR0=";
vendorHash = "sha256-bgZgYbQN6Dg4uHp29tazJ9un9fR1o9mYp8R8ZHtAs9Q=";
subPackages = [ "." "tools/mount_gcsfuse" ];

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "maskromtool";
version = "2023-08-06";
version = "2023-09-13";
src = fetchFromGitHub {
owner = "travisgoodspeed";
repo = "maskromtool";
rev = "v${version}";
hash = "sha256-CsGa+MQP0EtG3cPxhD1ymZt20QsYMh94XWppbLdvIaE=";
hash = "sha256-HZOQFFEADjmd3AbZLK3Qr57Jw+DKkRa3cMxW0mU77Us=";
};
buildInputs = [

View file

@ -617,6 +617,7 @@ mapAliases ({
gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07
gitinspector = throw "gitinspector has been removed because it doesn't work with python3"; # Added 2022-01-12
gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18
gksu = throw "gksu has been removed"; # Added 2022-01-16
glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22
glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11

View file

@ -3831,8 +3831,6 @@ with pkgs;
gistyc = with python3Packages; toPythonApplication gistyc;
gitter = callPackage ../applications/networking/instant-messengers/gitter { };
gjs = callPackage ../development/libraries/gjs { };
gjo = callPackage ../tools/text/gjo { };

View file

@ -5880,6 +5880,8 @@ self: super: with self; {
langdetect = callPackage ../development/python-modules/langdetect { };
langid = callPackage ../development/python-modules/langid { };
langsmith = callPackage ../development/python-modules/langsmith { };
language-data = callPackage ../development/python-modules/language-data { };