nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 10:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-05-28 00:02:08 +00:00 committed by GitHub
commit 5966be680e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
60 changed files with 329 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maintainers/team-list.nix
View File

@ -236,7 +236,6 @@ with lib.maintainers; {
members = [ members = [
cole-h cole-h
grahamc grahamc
hoverbear
]; ];
scope = "Group registration for packages maintained by Determinate Systems."; scope = "Group registration for packages maintained by Determinate Systems.";
shortName = "Determinate Systems employees"; shortName = "Determinate Systems employees";

4
nixos/modules/programs/less.nix
View File

@ -35,6 +35,8 @@ in
# therefore also enables this module # therefore also enables this module
enable = lib.mkEnableOption "less, a file pager"; enable = lib.mkEnableOption "less, a file pager";
package = lib.mkPackageOption pkgs "less" { };
configFile = lib.mkOption { configFile = lib.mkOption {
type = lib.types.nullOr lib.types.path; type = lib.types.nullOr lib.types.path;
default = null; default = null;
@ -110,7 +112,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.less ]; environment.systemPackages = [ cfg.package ];
environment.variables = { environment.variables = {
LESSKEYIN_SYSTEM = builtins.toString lessKey; LESSKEYIN_SYSTEM = builtins.toString lessKey;

4
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -8274,8 +8274,8 @@ final: prev:
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-pack"; owner = "nvim-pack";
repo = "nvim-spectre"; repo = "nvim-spectre";
rev = "5690ea46baf08bbc1623980012e14b6239ce582e"; rev = "366f46fdd4a1593cc237aea13d5ef113739a472c";
sha256 = "14m9hp7rr7qldqsl40k1jiqyk44bndq4pfibb08xcqp8hqn8f3q1"; sha256 = "sha256-JS0kfM+uxwC/z8bdkdkaC+MAJIyvlvXsi3BDJuBxADA=";
}; };
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
}; };

5
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -1091,19 +1091,18 @@
cargoHash = "sha256-7V4RyWIo9gL3ir4Pay8CMIVn6cXjJi9sgKVOENG4muQ="; cargoHash = "sha256-7V4RyWIo9gL3ir4Pay8CMIVn6cXjJi9sgKVOENG4muQ=";
preCheck = '' preCheck = ''
mkdir tests/tmp/ mkdir tests/tmp/
''; '';
}; };
in in
(lib.optionalAttrs stdenv.isLinux { {
dependencies = with self; dependencies = with self;
[ plenary-nvim ]; [ plenary-nvim ];
postInstall = '' postInstall = ''
ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so
''; '';
})); });
nvim-teal-maker = super.nvim-teal-maker.overrideAttrs { nvim-teal-maker = super.nvim-teal-maker.overrideAttrs {
postPatch = '' postPatch = ''

6
pkgs/applications/networking/cluster/argo/default.nix
View File

@ -34,16 +34,16 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "argo"; pname = "argo";
version = "3.5.6"; version = "3.5.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo"; repo = "argo";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-CcPY9eEpvDTIxilxHI+VBVVRxZy/82fi6uayBrGR/Dc="; hash = "sha256-OJkC+uqOuXA6NBpVxmQAFs+N99d4Zonh9dcZnuB26Ts=";
}; };
vendorHash = "sha256-ttpDGeANQyrTfRyNGFkmJFpE+nnjz8PZN+0HScBJ1yg="; vendorHash = "sha256-O7Lv5RLcqB4JbdXHKXFWkg/dvids8QH619urpeACuN8=";
doCheck = false; doCheck = false;

6
pkgs/applications/networking/cluster/roxctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "roxctl"; pname = "roxctl";
version = "4.3.5"; version = "4.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stackrox"; owner = "stackrox";
repo = "stackrox"; repo = "stackrox";
rev = version; rev = version;
sha256 = "sha256-zTZ03Qtb3ndBf1MunhYS8rzPReExzEPGxCh1JexkwuA="; sha256 = "sha256-OHDQr83EQn0qjObuzldRAa9fDv1itqipkDRcKdt3kxg=";
}; };
vendorHash = "sha256-Sl5eIK8PWeGi2V7q/Qm5Gfjj1A9nQPtM0BGdO6inPxk="; vendorHash = "sha256-SLr7h830lZpou2FyYqqUsYzRsh/QzMgkTArAJjHzCx0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

2
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
View File

@ -15,6 +15,7 @@
, qtsvg , qtsvg
, qtimageformats , qtimageformats
, gtk3 , gtk3
, glib-networking
, boost , boost
, fmt , fmt
, libdbusmenu , libdbusmenu
@ -137,6 +138,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
qtwayland qtwayland
gtk3 gtk3
glib-networking
fmt fmt
libdbusmenu libdbusmenu
alsa-lib alsa-lib

8
pkgs/applications/office/zk/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "zk"; pname = "zk";
version = "0.14.0"; version = "0.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mickael-menu"; owner = "zk-org";
repo = "zk"; repo = "zk";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-c0Grk5Bs9MOzuvWYbp+Y6cHouljUWoM3i7vFmQRFR18="; sha256 = "sha256-PbF2k7b03Oo3fIWIN4BHUZJ625HUeX+htT9FTINowIs=";
}; };
vendorHash = "sha256-23m0fHYJl3X2uHCFnMYID9umTjZvGFoOKTtRrerlWKg="; vendorHash = "sha256-UZsJa5hmMQwe9lhrp4ey8GGTkWUF8xJW+LPWMR0qfoo=";
doCheck = false; doCheck = false;

8
pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, toKodiAddon, addonDir }: { lib, stdenv, fetchFromGitHub, toKodiAddon, addonDir }:
let let
drv = stdenv.mkDerivation { drv = stdenv.mkDerivation rec {
pname = "controller-topology-project"; pname = "controller-topology-project";
version = "unstable-2022-11-19"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kodi-game"; owner = "kodi-game";
repo = "controller-topology-project"; repo = "controller-topology-project";
rev = "d96894ca68678000f26f56d14aa3ceea47b1a3a8"; rev = "v${version}";
sha256 = "sha256-KfDr2bSJFey/aNO5WzoOQ8Mz0v4uitKkOesymIMZH1o="; sha256 = "sha256-6g4dyR34b0YgxlzRRS2C/gY3wjlO9MMYEB2fHLSCqC4=";
}; };
postPatch = '' postPatch = ''

6
pkgs/by-name/as/ast-grep/package.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ast-grep"; pname = "ast-grep";
version = "0.22.3"; version = "0.22.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ast-grep"; owner = "ast-grep";
repo = "ast-grep"; repo = "ast-grep";
rev = version; rev = version;
hash = "sha256-Q2xVB9GZBtXx67rKpeTpy1llXCBpgn9vdZmYkQVHtp8="; hash = "sha256-AzwwOJ2SS+5wM/+357mXg+QMwXVPToKiTaFP+LZXP+U=";
}; };
cargoHash = "sha256-0N98WvNLlflNCu7I2nHDSgFHDmbMVqwu4YkqA9GNSwM="; cargoHash = "sha256-fyEncz5eVe8OPNQO4TJQXBMfOcybesoBBNRv3T1EooU=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

34
pkgs/by-name/ch/ch341eeprom/package.nix
View File

@ -1,25 +1,25 @@
{ lib {
, stdenv lib,
, fetchFromGitHub stdenv,
, libusb1 fetchFromGitHub,
, libusb1,
unstableGitUpdater,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "ch341eeprom"; pname = "ch341eeprom";
version = "0-unstable-2021-01-05"; version = "0-unstable-2024-05-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "command-tab"; owner = "command-tab";
repo = "ch341eeprom"; repo = "ch341eeprom";
rev = "d5b2fba35a33a1cddd7a3e920e1df933f21ba9b0"; rev = "7cffbef7552d93162bd90cae836a45e94acb93fb";
hash = "sha256-QUl5ErOfEfDhk1fF+BNu6n0Bake3IagNfn4I43b6Uns="; hash = "sha256-8pvQ2hBP3Rf8+MWsmMY53BghFiC5/b9k8vUjU2K6Ib4=";
}; };
buildInputs = [ libusb1 ]; buildInputs = [ libusb1 ];
makeFlags = [ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
"CC=${stdenv.cc.targetPrefix}cc"
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -27,12 +27,16 @@ stdenv.mkDerivation {
runHook postInstall runHook postInstall
''; '';
meta = with lib; { passthru = {
updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
};
meta = {
description = "A libusb based programming tool for 24Cxx serial EEPROMs using the WinChipHead CH341A IC"; description = "A libusb based programming tool for 24Cxx serial EEPROMs using the WinChipHead CH341A IC";
homepage = "https://github.com/command-tab/ch341eeprom"; homepage = "https://github.com/command-tab/ch341eeprom";
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = platforms.darwin ++ platforms.linux;
mainProgram = "ch341eeprom"; mainProgram = "ch341eeprom";
maintainers = with maintainers; [ xokdvium ]; maintainers = with lib.maintainers; [ xokdvium ];
platforms = with lib.platforms; darwin ++ linux;
}; };
} }

45
pkgs/by-name/gh/gh-eco/package.nix Normal file
View File

@ -0,0 +1,45 @@
{
lib,
fetchFromGitHub,
buildGoModule,
fetchpatch,
}:
let
version = "0.1.3";
in
buildGoModule {
pname = "gh-eco";
inherit version;
src = fetchFromGitHub {
owner = "jrnxf";
repo = "gh-eco";
rev = "refs/tags/v${version}";
hash = "sha256-TE1AymNlxjUtkBnBO/VBjYaqLuRyxL75s6sMidKUXTE=";
};
patches = [
# Fix package breaking on runtime by updating deps
(fetchpatch {
name = "update-deps.patch";
url = "https://github.com/jrnxf/gh-eco/commit/d45b1e7de8cbcb692def0e94111262cdeff2835d.patch";
hash = "sha256-vW5YX6C552dVYjBkYVoDbzT2PP8CaZzxh5g1TKHjrbU=";
})
];
vendorHash = "sha256-O3FQ+Z3KVYgTafwVXUhrGRuOAWlWlOhtVegKVoZBnDE=";
ldflags = [
"-s"
"-w"
"-X main.Version=${version}"
];
meta = {
homepage = "https://github.com/coloradocolby/gh-eco";
description = "gh extension to explore the ecosystem";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ helium ];
mainProgram = "gh-eco";
};
}

3
pkgs/by-name/ic/icewm/package.nix
View File

@ -49,10 +49,13 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-n0p8i6v6QreCFiChngHnx+5K4Djj34/+dmIA+bj/0cU="; hash = "sha256-n0p8i6v6QreCFiChngHnx+5K4Djj34/+dmIA+bj/0cU=";
}; };
strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
perl perl
pkg-config pkg-config
gettext # msgmerge
]; ];
buildInputs = [ buildInputs = [

4
pkgs/by-name/im/immich-go/package.nix
View File

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }:
buildGoModule rec { buildGoModule rec {
pname = "immich-go"; pname = "immich-go";
version = "0.14.1"; version = "0.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simulot"; owner = "simulot";
repo = "immich-go"; repo = "immich-go";
rev = "${version}"; rev = "${version}";
hash = "sha256-5dgEyg55ffJLH8zxp6mFVsUqAzyPnY18XnX+jMethUc="; hash = "sha256-gZVjs0aFwlx5joX7iqy7uDd23d/4LjP/t6u7z8X/P8o=";
# Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
# The intention here is to write the information into files in the `src`'s # The intention here is to write the information into files in the `src`'s

4
pkgs/by-name/ja/jan/package.nix
View File

@ -5,10 +5,10 @@
let let
pname = "jan"; pname = "jan";
version = "0.4.13"; version = "0.4.14";
src = fetchurl { src = fetchurl {
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
hash = "sha256-6RjpkIMYScgJ2xTS7b2w90ixEm4ZHw8Izecjho93sRE="; hash = "sha256-nqTvLZ0upNI82R4QaHTKaGQLVC3eHMVEHoOZ4JvXR1E=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

3
pkgs/by-name/le/less/package.nix
View File

@ -4,6 +4,7 @@
, fetchpatch , fetchpatch
, ncurses , ncurses
, pcre2 , pcre2
, withSecure ? false
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
# Look for 'sysless' in /etc. # Look for 'sysless' in /etc.
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--with-regex=pcre2" "--with-regex=pcre2"
]; ] ++ lib.optional withSecure "--with-secure";
meta = { meta = {
homepage = "https://www.greenwoodsoftware.com/less/"; homepage = "https://www.greenwoodsoftware.com/less/";

2
pkgs/by-name/sa/samrewritten/package.nix
View File

@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/PaulCombal/SamRewritten"; homepage = "https://github.com/PaulCombal/SamRewritten";
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ ludovicopiero ]; maintainers = with lib.maintainers; [ ludovicopiero ];
platforms = lib.platforms.linux; platforms = [ "x86_64-linux" ];
}; };
}) })

6
pkgs/by-name/sh/shopware-cli/package.nix
View File

@ -9,18 +9,18 @@
buildGoModule rec { buildGoModule rec {
pname = "shopware-cli"; pname = "shopware-cli";
version = "0.4.43"; version = "0.4.44";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "shopware-cli"; repo = "shopware-cli";
owner = "FriendsOfShopware"; owner = "FriendsOfShopware";
rev = version; rev = version;
hash = "sha256-c8CaPxV54bF4Unlz15SIh64jiGZMZywcKOzdZ74AtaM="; hash = "sha256-i9FRt86kd2bUW5fyn/qRRSzXRSqUHTGlxOnzehEfnxU=";
}; };
nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeBuildInputs = [ installShellFiles makeWrapper ];
nativeCheckInputs = [ git dart-sass ]; nativeCheckInputs = [ git dart-sass ];
vendorHash = "sha256-7K56fBX4y2UPofksAl6+u7jBg5tySvtrutUJXDJ/qz4="; vendorHash = "sha256-j1zKugueG4QaCetwfZXnWqo5SciX2N/dr0VD4d0ITS4=";
postInstall = '' postInstall = ''
export HOME="$(mktemp -d)" export HOME="$(mktemp -d)"

28
pkgs/applications/video/smplayer/default.nix → pkgs/by-name/sm/smplayer/package.nix
View File

@ -1,20 +1,22 @@
{ lib {
, stdenv lib,
, fetchFromGitHub stdenv,
, qmake fetchFromGitHub,
, qtscript qt5,
, wrapQtAppsHook
}: }:
let
inherit (qt5) qmake qtscript wrapQtAppsHook;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "smplayer"; pname = "smplayer";
version = "23.12.0"; version = "24.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smplayer-dev"; owner = "smplayer-dev";
repo = "smplayer"; repo = "smplayer";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-ip4y9GF2u1yl1Ts8T9XcFg9wdXVTYXfDrrPuHLz6oSs="; hash = "sha256-KblVDlE8EglMMAclGFZm81obipm6/JLUvsn5sLrpKqc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -22,15 +24,11 @@ stdenv.mkDerivation (finalAttrs: {
wrapQtAppsHook wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [ qtscript ];
qtscript
];
dontUseQmakeConfigure = true; dontUseQmakeConfigure = true;
makeFlags = [ makeFlags = [ "PREFIX=${placeholder "out"}" ];
"PREFIX=${placeholder "out"}"
];
meta = { meta = {
homepage = "https://www.smplayer.info"; homepage = "https://www.smplayer.info";
@ -53,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
options of MPlayer, SMPlayer adds other interesting features like the options of MPlayer, SMPlayer adds other interesting features like the
possibility to play Youtube videos or download subtitles. possibility to play Youtube videos or download subtitles.
''; '';
changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/v${finalAttrs.version}"; changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/${finalAttrs.src.rev}";
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ]; maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;

6
pkgs/by-name/ty/typstyle/package.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "typstyle"; pname = "typstyle";
version = "0.11.23"; version = "0.11.24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Enter-tainer"; owner = "Enter-tainer";
repo = "typstyle"; repo = "typstyle";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-42wpXEQdvVgN4aIXUp/t1jnPxqOW9ChxD0YB07PGE5o="; hash = "sha256-FLvbY+0TozOWZ+JTX//psNjle5GxcyeZXzMOf4/s1v0=";
}; };
cargoHash = "sha256-Zp094Hs3850foQ1oGz56qEHY1dDIkXS+iDC7hJlOET0="; cargoHash = "sha256-VA2WNheQltgCaWwtpbEAn2qtlA0fTeEbCjvgkjF+nvw=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

5
pkgs/by-name/uv/uv/Cargo.lock generated
View File

@ -4471,7 +4471,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
[[package]] [[package]]
name = "uv" name = "uv"
version = "0.2.3" version = "0.2.4"
dependencies = [ dependencies = [
"anstream", "anstream",
"anyhow", "anyhow",
@ -4496,7 +4496,6 @@ dependencies = [
"miette", "miette",
"mimalloc", "mimalloc",
"owo-colors", "owo-colors",
"pep440_rs",
"pep508_rs", "pep508_rs",
"platform-tags", "platform-tags",
"predicates", "predicates",
@ -5057,7 +5056,7 @@ dependencies = [
[[package]] [[package]]
name = "uv-version" name = "uv-version"
version = "0.2.3" version = "0.2.4"
[[package]] [[package]]
name = "uv-virtualenv" name = "uv-virtualenv"

4
pkgs/by-name/uv/uv/package.nix
View File

@ -16,14 +16,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "uv"; pname = "uv";
version = "0.2.3"; version = "0.2.4";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astral-sh"; owner = "astral-sh";
repo = "uv"; repo = "uv";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-NwIjuOsf6tv+kVEXA2GvQkVwDznZs5fnnkzcnVoOGpY="; hash = "sha256-x0uFBHfH+RXMS67y7NdikqNzXrNVv40HGVV6TVqR5NY=";
}; };
cargoDeps = rustPlatform.importCargoLock { cargoDeps = rustPlatform.importCargoLock {

4
pkgs/development/libraries/opencv/3.x.nix
View File

@ -15,7 +15,7 @@
, enableContrib ? true , enableContrib ? true
, enableCuda ? config.cudaSupport , enableCuda ? config.cudaSupport
, cudaPackages ? { } , cudaPackages
, enableUnfree ? false , enableUnfree ? false
, enableIpp ? false , enableIpp ? false
, enablePython ? false, pythonPackages ? null , enablePython ? false, pythonPackages ? null
@ -295,6 +295,8 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Open Computer Vision Library with more than 500 algorithms"; description = "Open Computer Vision Library with more than 500 algorithms";
homepage = "https://opencv.org/"; homepage = "https://opencv.org/";
# OpenCV 3 won't build with CUDA 12+
broken = enableCuda && cudaPackages.cudaAtLeast "12";
license = with licenses; if enableUnfree then unfree else bsd3; license = with licenses; if enableUnfree then unfree else bsd3;
maintainers = with maintainers; [mdaiter basvandijk]; maintainers = with maintainers; [mdaiter basvandijk];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;

4
pkgs/development/python-modules/oslo-log/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "oslo-log"; pname = "oslo-log";
version = "5.5.1"; version = "6.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "oslo.log"; pname = "oslo.log";
inherit version; inherit version;
hash = "sha256-SEFIUSxdsqizXIPNmX6ZU3Vf2L+oqvbuDMjHrrdCkhA="; hash = "sha256-ifDW+iy6goH4m1CKf+Sb+5far1XFJ4GH1FowaZceaH8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/tools/database/vitess/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "vitess"; pname = "vitess";
version = "19.0.3"; version = "19.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vitessio"; owner = "vitessio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Zy54nZCnwyZ1JNPvaKi0/bRt5g5ucPANwer/3pl4dGU="; hash = "sha256-rP2a/t+5FhGIj9T6CQodMp9YXYf3fL5oBdFpAn7e7hw=";
}; };
vendorHash = "sha256-QUzBxYEvxVzv4c8tKiFb+4NLy8RsXh0QTn9twfstMtw="; vendorHash = "sha256-BlHd5GQJwdntmvVti+Jvfw65LrYM+hjwdvQ0duKk5d8=";
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];

4
pkgs/servers/headphones/default.nix
View File

@ -2,14 +2,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "headphones"; pname = "headphones";
version = "0.6.1"; version = "0.6.3";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rembo10"; owner = "rembo10";
repo = "headphones"; repo = "headphones";
rev = "v${version}"; rev = "v${version}";
sha256 = "1pj6xrcc6g336lb2knlc9l3qxgj3jaaymnbd7bmfjahgq5cp4d4v"; sha256 = "195v0ylhqd49bqq3dpig5nh0kivmwgmn0977fknix9j14jpvmd3b";
}; };
dontBuild = true; dontBuild = true;

6
pkgs/servers/http/angie/default.nix
View File

@ -3,6 +3,7 @@
, lib , lib
, fetchurl , fetchurl
, nixosTests , nixosTests
, withAcme ? false
, withQuic ? false , withQuic ? false
, fetchpatch , fetchpatch
, ... , ...
@ -17,7 +18,10 @@ callPackage ../nginx/generic.nix args rec {
hash = "sha256-pSBy+Gv3rSa0WqQOxLHM0V03/vLqvOYBGxrjY9qsBfQ="; hash = "sha256-pSBy+Gv3rSa0WqQOxLHM0V03/vLqvOYBGxrjY9qsBfQ=";
}; };
configureFlags = lib.optional withQuic [ configureFlags = lib.optionals withAcme [
"--with-http_acme_module"
"--http-acme-client-path=/var/lib/nginx/acme"
] ++ lib.optionals withQuic [
"--with-http_v3_module" "--with-http_v3_module"
]; ];

3
pkgs/servers/web-apps/discourse/default.nix
View File

@ -409,6 +409,9 @@ let
passthru = { passthru = {
inherit rubyEnv runtimeEnv runtimeDeps rake mkDiscoursePlugin assets; inherit rubyEnv runtimeEnv runtimeDeps rake mkDiscoursePlugin assets;
inherit (pkgs)
discourseAllPlugins
;
enabledPlugins = plugins; enabledPlugins = plugins;
plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; }; plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; };
ruby = rubyEnv.wrappedRuby; ruby = rubyEnv.wrappedRuby;

4
pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-assign"; repo = "discourse-assign";
rev = "0cbf10b8055370445bd36536e51986bf48bdc57e"; rev = "b796ae3fcc89b48cf777de5ee3a4c21aada9271e";
sha256 = "sha256-7rJ2zQo1nCHwtVuLJUmdj66Ky2bi4Cpo+22H3DbO1uo="; sha256 = "sha256-PnSD2ZuUVjH8TifHuzbkpmpfGSN/q4VWyJtkOPND44o=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-docs"; homepage = "https://github.com/discourse/discourse-docs";

4
pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-bbcode-color"; repo = "discourse-bbcode-color";
rev = "35aab2e9b92f8b01633d374ea999e7fd59d020d7"; rev = "3336efe231e6c02e1dbe11ada71296af258cff58";
sha256 = "sha256-DHckx921EeQysm1UPloCrt43BJetTnZKnTbJGk15NMs="; sha256 = "sha256-C2PPF8kJm0agcYcRSUUBmmxZJliPatPM1vRtjufEd4M=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-bbcode-color"; homepage = "https://github.com/discourse/discourse-bbcode-color";

20
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
View File

@ -1,15 +1,25 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (7.0.8) activesupport (7.1.3.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0) tzinfo (~> 2.0)
concurrent-ruby (1.2.2) base64 (0.2.0)
i18n (1.14.1) bigdecimal (3.1.8)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
drb (2.2.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
minitest (5.20.0) minitest (5.23.1)
mutex_m (0.2.0)
rrule (0.4.4) rrule (0.4.4)
activesupport (>= 2.3) activesupport (>= 2.3)
tzinfo (2.0.6) tzinfo (2.0.6)
@ -22,4 +32,4 @@ DEPENDENCIES
rrule (= 0.4.4) rrule (= 0.4.4)
BUNDLED WITH BUNDLED WITH
2.4.13 2.5.9

4
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-calendar"; repo = "discourse-calendar";
rev = "afc2ee684de41601d6cecc46713d139760f176a6"; rev = "455eeed541a9b5cacf627349e543028427178a44";
sha256 = "sha256-rTQWO+E/Jg4zjZDYDvBrDQsox5q4dHkdQjwnJxgv3dI="; sha256 = "sha256-RXjMpeqCvAvwNsHpc3Fyms4pRXXqvarU8hWo3o1VgXY=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-calendar"; homepage = "https://github.com/discourse/discourse-calendar";

68
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
View File

@ -1,24 +1,64 @@
{ {
activesupport = { activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; sha256 = "0z8kygxmz99krz9pwp947znkzf0jr64sml28df0vf1gzxlg7y57i";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.1.3.3";
};
base64 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
version = "3.1.8";
}; };
concurrent-ruby = { concurrent-ruby = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
type = "gem"; type = "gem";
}; };
version = "1.2.2"; version = "1.2.3";
};
connection_pool = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
type = "gem";
};
version = "2.4.1";
};
drb = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
version = "2.2.1";
}; };
i18n = { i18n = {
dependencies = ["concurrent-ruby"]; dependencies = ["concurrent-ruby"];
@ -26,20 +66,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
type = "gem"; type = "gem";
}; };
version = "1.14.1"; version = "1.14.5";
}; };
minitest = { minitest = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i";
type = "gem"; type = "gem";
}; };
version = "5.20.0"; version = "5.23.1";
};
mutex_m = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
type = "gem";
};
version = "0.2.0";
}; };
rrule = { rrule = {
dependencies = ["activesupport"]; dependencies = ["activesupport"];

4
pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-chat-integration"; repo = "discourse-chat-integration";
rev = "70fea6b66b68868aa4c00b45a169436deaa142a8"; rev = "2e17b03e9a435de0079ae1c2eed1b48a11ad16a9";
sha256 = "sha256-K9MmP1F0B6Na2dTqgnsjMbTQFkF+nNKkI8aF3zPAodc="; sha256 = "sha256-FOIQrpVFHak2PB8eNFv/oJwYiESJcHBqeC+MZMXnexo=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-chat-integration"; homepage = "https://github.com/discourse/discourse-chat-integration";

4
pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-checklist"; repo = "discourse-checklist";
rev = "d94e58c3060ee7ca0fe76339215ed9456d5f4ea4"; rev = "6fcf9fed5c3ae3baf9ddd1cca9cef4dc089996c1";
sha256 = "sha256-zTMkU8NRqxLQ3/ghYTmEhRqbCgdYsYaImHdGu7WwuFk="; sha256 = "sha256-RIuoqZo7dW1DXbfbWhyyhCOGe4R5sLerzFW2TT0zO6U=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-checklist"; homepage = "https://github.com/discourse/discourse-checklist";

4
pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-data-explorer"; repo = "discourse-data-explorer";
rev = "e4f8d3924a18b303c2bb7da9472cf0c060060e4e"; rev = "ebe71a7a138c856d88737eb11b5096a42d4fbaf3";
sha256 = "sha256-K+GPszO3je6NmnhIRSqSEhylUK5oEByaS0bLfAGjvB4="; sha256 = "sha256-3CdA4liSrPhucOGevEbKuIYETlXpAn9qtsG0+Tr67EQ=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-data-explorer"; homepage = "https://github.com/discourse/discourse-data-explorer";

4
pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-docs"; repo = "discourse-docs";
rev = "a4b203274b88c5277d0b5b936de0bc0e0016726c"; rev = "94c7b7da216c66d773f800a714493f087affaac9";
sha256 = "sha256-R+VP/gsb2Oa6lPVMhRoGZzOBx5C7kRSxqwYpWE10GHw="; sha256 = "sha256-4ZPv42fw5YdJ3+QUGOh5CJMWkXoUVs4bTVd9zuFekQM=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-docs"; homepage = "https://github.com/discourse/discourse-docs";

18
pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
View File

@ -1,20 +1,22 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.8.5) addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0) public_suffix (>= 2.0.2, < 6.0)
faraday (2.7.10) faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.1) faraday-net_http (>= 2.0, < 3.2)
ruby2_keywords (>= 0.0.4) faraday-net_http (3.1.0)
faraday-net_http (3.0.2) net-http
net-http (0.4.1)
uri
octokit (5.6.1) octokit (5.6.1)
faraday (>= 1, < 3) faraday (>= 1, < 3)
sawyer (~> 0.9) sawyer (~> 0.9)
public_suffix (5.0.3) public_suffix (5.0.5)
ruby2_keywords (0.0.5)
sawyer (0.9.2) sawyer (0.9.2)
addressable (>= 2.3.5) addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3) faraday (>= 0.17.3, < 3)
uri (0.13.0)
PLATFORMS PLATFORMS
ruby ruby
@ -24,4 +26,4 @@ DEPENDENCIES
sawyer (= 0.9.2) sawyer (= 0.9.2)
BUNDLED WITH BUNDLED WITH
2.4.13 2.5.9

4
pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-github"; repo = "discourse-github";
rev = "8aa068d56ef010cecaabd50657e7753f4bbecc1f"; rev = "53e22ccbd32dd868435f66efa2d48e0389673dea";
sha256 = "sha256-WzljuGvv6pki3ROkvhXZWQaq5D9JkCbWjdlkdRI8lHE="; sha256 = "sha256-QaKmnftCxkgGUP5U9wNYm483D+GdpcU8F96CLl8woo8=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-github"; homepage = "https://github.com/discourse/discourse-github";

50
pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
View File

@ -5,31 +5,43 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
type = "gem"; type = "gem";
}; };
version = "2.8.5"; version = "2.8.6";
}; };
faraday = { faraday = {
dependencies = ["faraday-net_http" "ruby2_keywords"]; dependencies = ["faraday-net_http"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s";
type = "gem"; type = "gem";
}; };
version = "2.7.10"; version = "2.9.0";
}; };
faraday-net_http = { faraday-net_http = {
dependencies = ["net-http"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn";
type = "gem"; type = "gem";
}; };
version = "3.0.2"; version = "3.1.0";
};
net-http = {
dependencies = ["uri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9";
type = "gem";
};
version = "0.4.1";
}; };
octokit = { octokit = {
dependencies = ["faraday" "sawyer"]; dependencies = ["faraday" "sawyer"];
@ -47,20 +59,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj";
type = "gem"; type = "gem";
}; };
version = "5.0.3"; version = "5.0.5";
};
ruby2_keywords = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
version = "0.0.5";
}; };
sawyer = { sawyer = {
dependencies = ["addressable" "faraday"]; dependencies = ["addressable" "faraday"];
@ -73,4 +75,14 @@
}; };
version = "0.9.2"; version = "0.9.2";
}; };
uri = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96";
type = "gem";
};
version = "0.13.0";
};
} }

4
pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-math"; repo = "discourse-math";
rev = "529ad1fe6da924da378a60bec48c35657bb01a68"; rev = "2984713f68044544129b3575b9e2f9be31105293";
sha256 = "sha256-zhtAy0tTVMzQfPilTwfyyzxgCJD4xazOITBuliFR5Gg="; sha256 = "sha256-3jxSwjKGyKQy+ed6S2tQ27jseB9NygeiYvaldgV1XW4=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-math"; homepage = "https://github.com/discourse/discourse-math";

2
pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile
View File

@ -5,6 +5,6 @@ source "https://rubygems.org"
# gem "rails" # gem "rails"
gem 'bcrypt', '3.1.13' gem 'bcrypt', '3.1.13'
gem 'unix-crypt', '1.3.0' gem 'unix-crypt', '1.3.0'
gem 'ffi', '1.15.5', require: false gem 'ffi', '1.16.3', require: false
gem 'ffi-compiler', '1.0.1', require: false gem 'ffi-compiler', '1.0.1', require: false
gem 'argon2', '2.2.0' gem 'argon2', '2.2.0'

8
pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock
View File

@ -5,11 +5,11 @@ GEM
ffi (~> 1.15) ffi (~> 1.15)
ffi-compiler (~> 1.0) ffi-compiler (~> 1.0)
bcrypt (3.1.13) bcrypt (3.1.13)
ffi (1.15.5) ffi (1.16.3)
ffi-compiler (1.0.1) ffi-compiler (1.0.1)
ffi (>= 1.0.0) ffi (>= 1.0.0)
rake rake
rake (13.0.6) rake (13.2.1)
unix-crypt (1.3.0) unix-crypt (1.3.0)
PLATFORMS PLATFORMS
@ -18,9 +18,9 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
argon2 (= 2.2.0) argon2 (= 2.2.0)
bcrypt (= 3.1.13) bcrypt (= 3.1.13)
ffi (= 1.15.5) ffi (= 1.16.3)
ffi-compiler (= 1.0.1) ffi-compiler (= 1.0.1)
unix-crypt (= 1.3.0) unix-crypt (= 1.3.0)
BUNDLED WITH BUNDLED WITH
2.4.13 2.5.9

4
pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix
View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "communiteq"; owner = "communiteq";
repo = "discourse-migratepassword"; repo = "discourse-migratepassword";
rev = "a95ae6bca4126172186fafcd2315f51a4504c23b"; rev = "32d5fca6de3e8daf3869696ce835fefca1f00bfa";
sha256 = "sha256-lr2xHz+8q4XnHc/7KLX0Z2m0KMffLgGYk36zxGG9X5o="; sha256 = "sha256-kNYkA6zuiuUZlPgvIvaO49P8bD+nNysEsow33xG1PnI=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/communiteq/discourse-migratepassword"; homepage = "https://github.com/communiteq/discourse-migratepassword";

8
pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix
View File

@ -25,10 +25,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
type = "gem"; type = "gem";
}; };
version = "1.15.5"; version = "1.16.3";
}; };
ffi-compiler = { ffi-compiler = {
dependencies = ["ffi" "rake"]; dependencies = ["ffi" "rake"];
@ -46,10 +46,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
type = "gem"; type = "gem";
}; };
version = "13.0.6"; version = "13.2.1";
}; };
unix-crypt = { unix-crypt = {
groups = ["default"]; groups = ["default"];

4
pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-openid-connect"; repo = "discourse-openid-connect";
rev = "b1df541ad29f6f6098a1008b83393b2d400986ed"; rev = "f31a869611a2fad8efadd9b2504440215169a391";
sha256 = "sha256-afRd/9M0nQGkS14Q8BJhcJwMCkOku3Fr0uHxcRl44vQ="; sha256 = "sha256-cEgAjf7EPAVKsJOmm9lj9Jm0YNFjRswOJFFHU12Q5/Y=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-openid-connect"; homepage = "https://github.com/discourse/discourse-openid-connect";

2
pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock
View File

@ -13,4 +13,4 @@ DEPENDENCIES
webrick (= 1.7.0) webrick (= 1.7.0)
BUNDLED WITH BUNDLED WITH
2.4.13 2.5.9

4
pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
View File

@ -6,8 +6,8 @@
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-prometheus"; repo = "discourse-prometheus";
rev = "8a7a46a80cc65aa0839bc5e3c3b6f8ef6544089f"; rev = "831dba15659055361966e0c42e6b517b3d7b133b";
sha256 = "sha256-TL+pbP26LvRMKdy8CAuBEK+LZfAs8HfggMeUDaBu9hc="; sha256 = "sha256-b7Du8rENY/gBbkqZSu6b9KHbvklYMkIRl8IGd1W4dHk=";
}; };
patches = [ patches = [

4
pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-reactions"; repo = "discourse-reactions";
rev = "643f807a3a2195f08211064301f0350d9f51604f"; rev = "354695cf5fce2bf516c9be451fe4bb56e487b95a";
sha256 = "sha256-4FdiYUNysSuOJ664G3YvlUHx/J7MLUS3kVBdXT47oEw="; sha256 = "sha256-pTK7gcDgWAlRPrUnJikMOEd0N/DBrHE0hOP23t//MiE=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-reactions"; homepage = "https://github.com/discourse/discourse-reactions";

4
pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-saved-searches"; repo = "discourse-saved-searches";
rev = "7c9bdcd68951e7cef16cafe3c4bfb583bb994d2a"; rev = "063e35ec5a905aac3332be6821b15eec6909f022";
sha256 = "sha256-6RIN12ACDCeRcxmsC3FgeIPdvovI4arn7w/Dqil1yCI="; sha256 = "sha256-33aBhw00/tIF0Y0isYISctn3Bd+KntrRngj6sxW30EY=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-saved-searches"; homepage = "https://github.com/discourse/discourse-saved-searches";

4
pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-solved"; repo = "discourse-solved";
rev = "b5d487d6a5bfe2571d936eec5911d02a5f3fcc32"; rev = "a18ce6d712fafed286bcc99543dd173110c6dfb8";
sha256 = "sha256-Tt7B9PcsV8E7B+m8GnJw+MBz9rGYtojKt6NjBFMQvOM="; sha256 = "sha256-MUkQ/6ChMGqSNFZO2t8amecrYZbK1OyVq5lhPeB99ow=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-solved"; homepage = "https://github.com/discourse/discourse-solved";

4
pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-spoiler-alert"; repo = "discourse-spoiler-alert";
rev = "65989714af08eda44196cca3a0afe85c9e9443f9"; rev = "42b77ec048b9b386a8b25a22bfec6472817da465";
sha256 = "sha256-R/vqNEDst50+Y7anckIvhy4viBOqBemIZMh4sPt7kRM="; sha256 = "sha256-BQeID+y9RvmcnuNsodOMXseVvre5QYxv+E/ul8bucUI=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-spoiler-alert"; homepage = "https://github.com/discourse/discourse-spoiler-alert";

4
pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-voting"; repo = "discourse-voting";
rev = "6449fc15658d972e20086a3f1fae3dbac9cd9eeb"; rev = "ba41633e0abe0535fd358a0809e0b4e0c79be128";
sha256 = "sha256-f04LpVeodCVEB/t5Ic2dketp542Nrc0rZWbQ6hrC22g="; sha256 = "sha256-Ni+g9mWftvYsknIoSFBRoq7IMIWPbj4mgGM+k8fjOuI=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-voting"; homepage = "https://github.com/discourse/discourse-voting";

4
pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse-yearly-review"; repo = "discourse-yearly-review";
rev = "3246c6b378f9e69e664c575efc63c2ad83bcac2f"; rev = "59b98bab5ee370da4774f60ea7b5122dddcbd83a";
sha256 = "sha256-usHHyfYP4YAQ94f7gvNSH7VBRRkdZMmsSi9QQM8tPfY="; sha256 = "sha256-OIptI6T5n021AsWO/eYK3ntL0JJG7+f4OmZwdxGcfFg=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/discourse/discourse-yearly-review"; homepage = "https://github.com/discourse/discourse-yearly-review";

14
pkgs/tools/graphics/mangohud/default.nix
View File

@ -4,7 +4,6 @@
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, substituteAll , substituteAll
, fetchpatch
, coreutils , coreutils
, curl , curl
, glxinfo , glxinfo
@ -34,6 +33,7 @@
, gamescopeSupport ? true # build mangoapp and mangohudctl , gamescopeSupport ? true # build mangoapp and mangohudctl
, lowerBitnessSupport ? stdenv.hostPlatform.isx86_64 # Support 32 bit on 64bit , lowerBitnessSupport ? stdenv.hostPlatform.isx86_64 # Support 32 bit on 64bit
, nix-update-script , nix-update-script
, libxkbcommon
}: }:
let let
@ -94,14 +94,14 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mangohud"; pname = "mangohud";
version = "0.7.1"; version = "0.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flightlessmango"; owner = "flightlessmango";
repo = "MangoHud"; repo = "MangoHud";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-Gnq+1j+PFbeipAfXGnTq7wZdVQeG9R9vLAKZnZj7Bvs="; hash = "sha256-cj/F/DWUDm2AHTJvHgkKa+KdIrfxPWLzI570Dp4VFhs=";
}; };
outputs = [ "out" "doc" "man" ]; outputs = [ "out" "doc" "man" ];
@ -140,13 +140,6 @@ stdenv.mkDerivation (finalAttrs: {
libdbus = dbus.lib; libdbus = dbus.lib;
inherit hwdata; inherit hwdata;
}) })
# Add dep_vulkan to mangoapp and test_amdgpu to fix build failure
# TODO: Remove in next release
(fetchpatch {
url = "https://github.com/flightlessmango/MangoHud/commit/cba217ffaf93aea6acb4e59e3e46bf912f740ccf.patch";
hash = "sha256-1My4/EuSMpe3AFhhFOJr8rz/wnywp+BW+F4dSgxToe0=";
})
]; ];
postPatch = '' postPatch = ''
@ -202,6 +195,7 @@ stdenv.mkDerivation (finalAttrs: {
glew glew
glfw glfw
xorg.libXrandr xorg.libXrandr
libxkbcommon
]; ];
doCheck = true; doCheck = true;

7
pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
View File

@ -12,17 +12,18 @@ index 7379af1..4eef3fe 100644
return false; return false;
} }
diff --git a/src/logging.cpp b/src/logging.cpp diff --git a/src/logging.cpp b/src/logging.cpp
index ca33ee3..90d3638 100644 index 7d4cb98..256128c 100644
--- a/src/logging.cpp --- a/src/logging.cpp
+++ b/src/logging.cpp +++ b/src/logging.cpp
@@ -26,7 +26,11 @@ string exec(string command) { @@ -27,8 +27,12 @@ string exec(string command) {
#endif #endif
std::array<char, 128> buffer; std::array<char, 128> buffer;
std::string result; std::string result;
+ +
+ char* originalPath = getenv("PATH"); + char* originalPath = getenv("PATH");
+ setenv("PATH", "@path@", 1); + setenv("PATH", "@path@", 1);
std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(command.c_str(), "r"), pclose); auto deleter = [](FILE* ptr){ pclose(ptr); };
std::unique_ptr<FILE, decltype(deleter)> pipe(popen(command.c_str(), "r"), deleter);
+ setenv("PATH", originalPath, 1); + setenv("PATH", originalPath, 1);
if (!pipe) { if (!pipe) {
return "popen failed!"; return "popen failed!";

8
pkgs/tools/inputmethods/keymapper/default.nix
View File

@ -10,18 +10,18 @@
, wayland , wayland
, libxkbcommon , libxkbcommon
, gtk3 , gtk3
, libappindicator , libayatana-appindicator
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "keymapper"; pname = "keymapper";
version = "4.3.0"; version = "4.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "houmain"; owner = "houmain";
repo = "keymapper"; repo = "keymapper";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-QfISsRm0j/VoTmpDQes5XQooXHcmjqRD/WS/nvPDl00="; hash = "sha256-SjYPkcXBEHjK7zgwL6U4ltjvhKuGMZWbp55LtndU400=";
}; };
# all the following must be in nativeBuildInputs # all the following must be in nativeBuildInputs
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
libusb1 libusb1
libxkbcommon libxkbcommon
gtk3 gtk3
libappindicator libayatana-appindicator
]; ];
meta = { meta = {

33
pkgs/tools/misc/gh-eco/default.nix
View File

@ -1,33 +0,0 @@
{ lib
, fetchFromGitHub
, buildGoModule
}:
buildGoModule rec {
pname = "gh-eco";
version = "0.1.3";
src = fetchFromGitHub {
owner = "coloradocolby";
repo = "gh-eco";
rev = "v${version}";
sha256 = "sha256-TE1AymNlxjUtkBnBO/VBjYaqLuRyxL75s6sMidKUXTE=";
};
vendorHash = "sha256-K85fYV1uP/qSw8GPoG1u6UQo94vQOUo4cd9Ro+UApQ0=";
ldflags = [
"-s"
"-w"
"-X main.Version=${version}"
];
meta = with lib; {
homepage = "https://github.com/coloradocolby/gh-eco";
description = "gh extension to explore the ecosystem";
license = licenses.mit;
maintainers = with maintainers; [ helium ];
mainProgram = "gh-eco";
};
}

13
pkgs/tools/networking/zerotierone/default.nix
View File

@ -65,6 +65,19 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
# Ensure Rust compiles for the right target
env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTarget;
# Cargo won't compile to target/release but to target/<RUST_TARGET>/release when a target is
# explicitly defined. The build-system however expects target/release. Hence we just symlink from
# the latter to the former.
preBuild = ''
mkdir -p rustybits/target/release
ln -rs \
./rustybits/target/${stdenv.hostPlatform.rust.rustcTarget}/release/libzeroidc.a \
./rustybits/target/release/
'';
buildFlags = [ "all" "selftest" ]; buildFlags = [ "all" "selftest" ];
doCheck = stdenv.hostPlatform == stdenv.buildPlatform; doCheck = stdenv.hostPlatform == stdenv.buildPlatform;

6
pkgs/top-level/all-packages.nix
View File

@ -1821,8 +1821,6 @@ with pkgs;
gh-dash = callPackage ../tools/misc/gh-dash { }; gh-dash = callPackage ../tools/misc/gh-dash { };
gh-eco = callPackage ../tools/misc/gh-eco { };
gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { };
ghostie = callPackage ../tools/misc/ghostie { }; ghostie = callPackage ../tools/misc/ghostie { };
@ -23627,6 +23625,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) inherit (darwin.apple_sdk.frameworks)
AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate;
ffmpeg = ffmpeg_4; ffmpeg = ffmpeg_4;
# OpenCV3 won't build with anything newer than CUDA 11 due to API changes.
cudaPackages = cudaPackages_11;
}; };
opencv4 = callPackage ../development/libraries/opencv/4.x.nix { opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
@ -33233,8 +33233,6 @@ with pkgs;
protobuf = protobuf_21; protobuf = protobuf_21;
}; };
smplayer = libsForQt5.callPackage ../applications/video/smplayer { };
smtube = libsForQt5.callPackage ../applications/video/smtube { }; smtube = libsForQt5.callPackage ../applications/video/smtube { };
softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { }; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { };