dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-09-06 18:01:28 +00:00 committed by GitHub
commit aba6d8043f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
67 changed files with 879 additions and 108770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -79,6 +79,8 @@
- `pass` now does not contain `password-store.el`. Users should get `password-store.el` from Emacs lisp package set `emacs.pkgs.password-store`. - `pass` now does not contain `password-store.el`. Users should get `password-store.el` from Emacs lisp package set `emacs.pkgs.password-store`.
- `mu` now does not install `mu4e` files by default. Users should get `mu4e` from Emacs lisp package set `emacs.pkgs.mu4e`.
- `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues. - `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues.
- `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms). - `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms).

5
nixos/tests/akkoma.nix
View File

@ -33,7 +33,10 @@ let
echo '${userPassword}' | ${pkgs.toot}/bin/toot login_cli -i "akkoma.nixos.test" -e "jamy@nixos.test" echo '${userPassword}' | ${pkgs.toot}/bin/toot login_cli -i "akkoma.nixos.test" -e "jamy@nixos.test"
echo "y" | ${pkgs.toot}/bin/toot post "hello world Jamy here" echo "y" | ${pkgs.toot}/bin/toot post "hello world Jamy here"
echo "y" | ${pkgs.toot}/bin/toot timeline | grep -F -q "hello world Jamy here"
# Retrieving timeline with toot currently broken due to incompatible timestamp format
# cf. <https://akkoma.dev/AkkomaGang/akkoma/issues/637> and <https://github.com/ihabunek/toot/issues/399>
#echo "y" | ${pkgs.toot}/bin/toot timeline | grep -F -q "hello world Jamy here"
# Test file upload # Test file upload
echo "y" | ${pkgs.toot}/bin/toot upload <(dd if=/dev/zero bs=1024 count=1024 status=none) \ echo "y" | ${pkgs.toot}/bin/toot upload <(dd if=/dev/zero bs=1024 count=1024 status=none) \

68
pkgs/applications/audio/quodlibet/default.nix
View File

@ -1,14 +1,13 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, tag ? "" , tag ? ""
# build time # build time
, gettext , gettext
, gobject-introspection , gobject-introspection
, wrapGAppsHook , wrapGAppsHook
# runtime # runtime
, adwaita-icon-theme , adwaita-icon-theme
, gdk-pixbuf , gdk-pixbuf
, glib , glib
@ -23,20 +22,22 @@
, libsoup , libsoup
, webkitgtk , webkitgtk
# optional features # optional features
, withDbusPython ? false , withDbusPython ? false
, withPypresence ? false
, withPyInotify ? false
, withMusicBrainzNgs ? false , withMusicBrainzNgs ? false
, withPahoMqtt ? false , withPahoMqtt ? false
, withPyInotify ? false
, withPypresence ? false
, withSoco ? false , withSoco ? false
# backends # backends
, withGstreamerBackend ? true, gst_all_1
, withGstPlugins ? withGstreamerBackend , withGstPlugins ? withGstreamerBackend
, withXineBackend ? true, xine-lib , withGstreamerBackend ? true
, gst_all_1
, withXineBackend ? true
, xine-lib
# tests # tests
, dbus , dbus
, glibcLocales , glibcLocales
, hicolor-icon-theme , hicolor-icon-theme
@ -46,36 +47,25 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "quodlibet${tag}"; pname = "quodlibet${tag}";
version = "4.5.0"; version = "4.6.0";
format = "pyproject"; format = "pyproject";
outputs = [ "out" "doc" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quodlibet"; owner = "quodlibet";
repo = "quodlibet"; repo = "quodlibet";
rev = "refs/tags/release-${version}"; rev = "refs/tags/release-${version}";
hash = "sha256-G6zcdnHkevbVCrMoseWoSia5ajEor8nZhee6NeZIs8Q="; hash = "sha256-dkO/CFN7Dk72xhtmcSDcwUciOPMeEjQS2mch+jSfiII=";
}; };
patches = [
(fetchpatch {
# Fixes cover globbing under python 3.10.5+
url = "https://github.com/quodlibet/quodlibet/commit/5eb7c30766e1dcb30663907664855ee94a3accc0.patch";
hash = "sha256-bDyEOE7Vs4df4BeN4QMvt6niisVEpvc1onmX5rtoAWc=";
})
];
outputs = [
"out"
"doc"
];
nativeBuildInputs = [ nativeBuildInputs = [
gettext gettext
gobject-introspection gobject-introspection
wrapGAppsHook wrapGAppsHook
] ++ (with python3.pkgs; [ ] ++ (with python3.pkgs; [
sphinxHook
sphinx-rtd-theme sphinx-rtd-theme
sphinxHook
]); ]);
buildInputs = [ buildInputs = [
@ -111,14 +101,12 @@ python3.pkgs.buildPythonApplication rec {
pygobject3 pygobject3
] ]
++ lib.optionals withDbusPython [ dbus-python ] ++ lib.optionals withDbusPython [ dbus-python ]
++ lib.optionals withPypresence [ pypresence ]
++ lib.optionals withPyInotify [ pyinotify ]
++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ] ++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ]
++ lib.optionals withPahoMqtt [ paho-mqtt ] ++ lib.optionals withPahoMqtt [ paho-mqtt ]
++ lib.optionals withPyInotify [ pyinotify ]
++ lib.optionals withPypresence [ pypresence ]
++ lib.optionals withSoco [ soco ]; ++ lib.optionals withSoco [ soco ];
LC_ALL = "en_US.UTF-8";
nativeCheckInputs = [ nativeCheckInputs = [
dbus dbus
gdk-pixbuf gdk-pixbuf
@ -132,23 +120,23 @@ python3.pkgs.buildPythonApplication rec {
]); ]);
pytestFlags = [ pytestFlags = [
# requires networking
"--deselect=tests/test_browsers_iradio.py::TIRFile::test_download_tags"
# missing translation strings in potfiles # missing translation strings in potfiles
"--deselect=tests/test_po.py::TPOTFILESIN::test_missing" "--deselect=tests/test_po.py::TPOTFILESIN::test_missing"
# require networking
"--deselect=tests/plugin/test_covers.py::test_live_cover_download"
"--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station"
# upstream does actually not enforce source code linting # upstream does actually not enforce source code linting
"--ignore=tests/quality" "--ignore=tests/quality"
# build failure on Arch Linux
# https://github.com/NixOS/nixpkgs/pull/77796#issuecomment-575841355
"--ignore=tests/test_operon.py"
] ++ lib.optionals (withXineBackend || !withGstPlugins) [ ] ++ lib.optionals (withXineBackend || !withGstPlugins) [
"--ignore=tests/plugin/test_replaygain.py" "--ignore=tests/plugin/test_replaygain.py"
]; ];
env.LC_ALL = "en_US.UTF-8";
preCheck = '' preCheck = ''
export XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS"
export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
export XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS"
''; '';
checkPhase = '' checkPhase = ''
@ -167,8 +155,6 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "GTK-based audio player written in Python, using the Mutagen tagging library"; description = "GTK-based audio player written in Python, using the Mutagen tagging library";
license = licenses.gpl2Plus;
longDescription = '' longDescription = ''
Quod Libet is a GTK-based audio player written in Python, using Quod Libet is a GTK-based audio player written in Python, using
the Mutagen tagging library. It's designed around the idea that the Mutagen tagging library. It's designed around the idea that
@ -182,8 +168,8 @@ python3.pkgs.buildPythonApplication rec {
player, like Unicode support, tag editing, Replay Gain, podcasts player, like Unicode support, tag editing, Replay Gain, podcasts
& internet radio, and all major audio formats. & internet radio, and all major audio formats.
''; '';
homepage = "https://quodlibet.readthedocs.io/en/latest";
maintainers = with maintainers; [ coroa pbogdan ]; license = licenses.gpl2Plus;
homepage = "https://quodlibet.readthedocs.io/en/latest/"; maintainers = with maintainers; [ coroa paveloom pbogdan ];
}; };
} }

2
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View File

@ -61,6 +61,8 @@ in
_map = self.map; _map = self.map;
}; };
mu4e = callPackage ./manual-packages/mu4e { };
ott-mode = callPackage ./manual-packages/ott-mode { }; ott-mode = callPackage ./manual-packages/ott-mode { };
perl-completion = callPackage ./manual-packages/perl-completion { }; perl-completion = callPackage ./manual-packages/perl-completion { };

33
pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ elpaBuild, mu }:
let
pname = "mu4e";
version = mu.mu4e.version;
in
elpaBuild {
inherit pname version;
src = mu.mu4e;
propagatedUserEnvPkgs = [ mu ];
dontUnpack = false;
# prepare a multi-file package tar archive according to info
# "(elisp) Multi-file Packages" for elpaBuild to install
postUnpack = ''
pushd mu-*-mu4e
local content_directory=${pname}-${version}
mkdir $content_directory
cp --verbose share/emacs/site-lisp/mu4e/*.el $content_directory/
rm --verbose --force $content_directory/mu4e-autoloads.el
cp --verbose share/info/* $content_directory/
src=$PWD/$content_directory.tar
tar --create --verbose --file=$src $content_directory
popd
'';
meta = mu.meta // {
description = "A full-featured e-mail client";
};
}

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

File diff suppressed because it is too large Load Diff

66
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

@ -5,12 +5,12 @@
{ {
ada = buildGrammar { ada = buildGrammar {
language = "ada"; language = "ada";
version = "0.0.0+rev=0f572c4"; version = "0.0.0+rev=f21f13a";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "briot"; owner = "briot";
repo = "tree-sitter-ada"; repo = "tree-sitter-ada";
rev = "0f572c4dccac8cd6a149bbc88c9d8423e9c71ce9"; rev = "f21f13afe0410311be1f78959a25aee393c569c9";
hash = "sha256-LNpzqyafrh1JKj0VXaq3Hf3IZHqM1UcUAXy2xVXeSEQ="; hash = "sha256-Qnw1skHo9Wy88WEXAxfV4kkD4v9rdvLmu/++raLIges=";
}; };
meta.homepage = "https://github.com/briot/tree-sitter-ada"; meta.homepage = "https://github.com/briot/tree-sitter-ada";
}; };
@ -126,12 +126,12 @@
}; };
blueprint = buildGrammar { blueprint = buildGrammar {
language = "blueprint"; language = "blueprint";
version = "0.0.0+rev=7f1a5df"; version = "0.0.0+rev=863cea9";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gabmus"; owner = "gabmus";
repo = "tree-sitter-blueprint"; repo = "tree-sitter-blueprint";
rev = "7f1a5df44861291d6951b6b2146a9fef4c226e14"; rev = "863cea9f83ad5637300478e0559262f1e791684b";
hash = "sha256-ihbcrDRMA+jGs7ZmDU1j9PwTEYY6SyMhC0vgmh1Om6Y="; hash = "sha256-QbkwdqH4Q+bqsp7XawUNXR45ROxfpMf+goCBFTw07I4=";
}; };
meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git"; meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git";
}; };
@ -348,12 +348,12 @@
}; };
devicetree = buildGrammar { devicetree = buildGrammar {
language = "devicetree"; language = "devicetree";
version = "0.0.0+rev=d2cc332"; version = "0.0.0+rev=cc26cbf";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "joelspadin"; owner = "joelspadin";
repo = "tree-sitter-devicetree"; repo = "tree-sitter-devicetree";
rev = "d2cc332aeb814ea40e1e34ed6b9446324b32612a"; rev = "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e";
hash = "sha256-iDiG6pNfALxy7nKyjuHfI9HW5/KElW/6zYguPaiMrzY="; hash = "sha256-r23ycLCR79Ow4eI8rK03B3M1loU8/7K8dDrqBIPSAS0=";
}; };
meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
}; };
@ -768,12 +768,12 @@
}; };
gpg = buildGrammar { gpg = buildGrammar {
language = "gpg"; language = "gpg";
version = "0.0.0+rev=c44ce76"; version = "0.0.0+rev=9c26b66";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ObserverOfTime"; owner = "ObserverOfTime";
repo = "tree-sitter-gpg-config"; repo = "tree-sitter-gpg-config";
rev = "c44ce76960114352dd00728b835ceef02e0506b8"; rev = "9c26b66d6bca0bd0520269e98241709806561bd5";
hash = "sha256-EDkmwHzRwf3x5LMsnOnhj+AbYLKF3dy/t4sGxuIWnYg="; hash = "sha256-OybtJVKiQYpftPA+jMyOjswxtkLHvqqyLbmZkKkBFZc=";
}; };
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config"; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config";
}; };
@ -900,12 +900,12 @@
}; };
hoon = buildGrammar { hoon = buildGrammar {
language = "hoon"; language = "hoon";
version = "0.0.0+rev=900a272"; version = "0.0.0+rev=1d5df35";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "urbit-pilled"; owner = "urbit-pilled";
repo = "tree-sitter-hoon"; repo = "tree-sitter-hoon";
rev = "900a272271cc2fb78f24aa7b5a1e21ed36bb1d39"; rev = "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6";
hash = "sha256-g2jBCZjsEsWG+LCAGj7b/t5mOET5/mVN39+/HDRUBCk="; hash = "sha256-2xrpyA5JCibGxaJkRmcgNreFHcCvJaYkHThSc6KAV1U=";
}; };
meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon"; meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
}; };
@ -988,12 +988,12 @@
}; };
java = buildGrammar { java = buildGrammar {
language = "java"; language = "java";
version = "0.0.0+rev=ca4afaa"; version = "0.0.0+rev=83044af";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tree-sitter"; owner = "tree-sitter";
repo = "tree-sitter-java"; repo = "tree-sitter-java";
rev = "ca4afaaa41dd7735b35edc0a77629cf932e95799"; rev = "83044af4950e9f1adb46a20f616d10934930ce7e";
hash = "sha256-b87WFvpboNcQUt3W7tbsfkxzIfc27D0djBgMiF68/EA="; hash = "sha256-i3j55vAQV5TaMR7IsUkh0OrLCP95Xos0UCI0SoY5phI=";
}; };
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
}; };
@ -1076,12 +1076,12 @@
}; };
julia = buildGrammar { julia = buildGrammar {
language = "julia"; language = "julia";
version = "0.0.0+rev=bb7e587"; version = "0.0.0+rev=0c088d1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tree-sitter"; owner = "tree-sitter";
repo = "tree-sitter-julia"; repo = "tree-sitter-julia";
rev = "bb7e587837fdeda74dd510256253d60f59a1e2cd"; rev = "0c088d1ad270f02c4e84189247ac7001e86fe342";
hash = "sha256-rtv2rNBUYcp8vwicMbX2ZQBB1vH7SKc+Lsc0LF1oFYA="; hash = "sha256-WEmuLNUoOyWkcDlVcf8ucdraPEi+gClAw8z9Gx51gpo=";
}; };
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
}; };
@ -1754,12 +1754,12 @@
}; };
requirements = buildGrammar { requirements = buildGrammar {
language = "requirements"; language = "requirements";
version = "0.0.0+rev=56ddb4d"; version = "0.0.0+rev=eda424e";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ObserverOfTime"; owner = "ObserverOfTime";
repo = "tree-sitter-requirements"; repo = "tree-sitter-requirements";
rev = "56ddb4dad2ea0761d20c0995a0de2990caa350b5"; rev = "eda424eade0f2afbafbf0c89d18c77818fa19273";
hash = "sha256-0q7cyv/a9gZG00tyBcF2i9TUcj3TqAi89CWjbzszD7U="; hash = "sha256-cZjj17316Cnz/A+7K3f81H/iedrlu0IDTdDLkXThcnQ=";
}; };
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements"; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
}; };
@ -2210,6 +2210,18 @@
}; };
meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar"; meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar";
}; };
unison = buildGrammar {
language = "unison";
version = "0.0.0+rev=694c8c0";
src = fetchFromGitHub {
owner = "kylegoetz";
repo = "tree-sitter-unison";
rev = "694c8c0c79f8d1b80d497401acf4d1b77bfb004a";
hash = "sha256-g8g/YUKabxWwN+w0akMYMu0fFOkUHGAN44CVDOfPqI4=";
};
generate = true;
meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
};
usd = buildGrammar { usd = buildGrammar {
language = "usd"; language = "usd";
version = "0.0.0+rev=718a6b3"; version = "0.0.0+rev=718a6b3";
@ -2334,12 +2346,12 @@
}; };
wing = buildGrammar { wing = buildGrammar {
language = "wing"; language = "wing";
version = "0.0.0+rev=ca6d5be"; version = "0.0.0+rev=f1446e7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "winglang"; owner = "winglang";
repo = "wing"; repo = "wing";
rev = "ca6d5bea6c7cf5d16ca65f9ee223d2d3457ab2ec"; rev = "f1446e78183df1d12f864c3e514b24c1b00c0a47";
hash = "sha256-RKDIfU82b58DEDXLte4TTuzTtN44MClyBJQwSuQ8YFo="; hash = "sha256-f19KOuce+Ls/Mmb0hnxVrDOc4mdZ4m9SsiZlgGuh1bk=";
}; };
location = "libs/tree-sitter-wing"; location = "libs/tree-sitter-wing";
generate = true; generate = true;

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

@ -789,6 +789,10 @@ self: super: {
meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
}; };
multicursors-nvim = super.multicursors-nvim.overrideAttrs {
dependencies = with self; [ nvim-treesitter hydra-nvim ];
};
ncm2 = super.ncm2.overrideAttrs { ncm2 = super.ncm2.overrideAttrs {
dependencies = with self; [ nvim-yarp ]; dependencies = with self; [ nvim-yarp ];
}; };

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -471,6 +471,7 @@ https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
https://github.com/leafo/moonscript-vim/,HEAD, https://github.com/leafo/moonscript-vim/,HEAD,
https://github.com/yegappan/mru/,, https://github.com/yegappan/mru/,,
https://github.com/smoka7/multicursors.nvim/,HEAD,
https://github.com/jbyuki/nabla.nvim/,HEAD, https://github.com/jbyuki/nabla.nvim/,HEAD,
https://github.com/ncm2/ncm2/,, https://github.com/ncm2/ncm2/,,
https://github.com/ncm2/ncm2-bufword/,, https://github.com/ncm2/ncm2-bufword/,,

4
pkgs/applications/file-managers/tuifimanager/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "tuifi-manager"; pname = "tuifi-manager";
version = "3.0.0"; version = "3.3.1";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GiorgosXou"; owner = "GiorgosXou";
repo = "TUIFIManager"; repo = "TUIFIManager";
rev = "v.${version}"; rev = "v.${version}";
hash = "sha256-ahZUm+FkAaM4I6FfSa/Oej+lMux8avw8LxzzGqTpuH8="; hash = "sha256-yBMme0LJSlEXPxE9NMr0Z5VJWcWOzzdvbTnavkLHsvo=";
}; };
postPatch = '' postPatch = ''

4
pkgs/applications/misc/cartridges/default.nix
View File

@ -12,13 +12,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "cartridges"; pname = "cartridges";
version = "2.2.1"; version = "2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kra-mo"; owner = "kra-mo";
repo = "cartridges"; repo = "cartridges";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-LCO3GSRNi1alP9rRwBAfVAF49i4FmhsMOG9LW4PGB3s="; hash = "sha256-d0c0043kssPvGxs6FygDkTKZoYtFge2cH4MIhz2vVYk=";
}; };
buildInputs = [ buildInputs = [

14
pkgs/applications/misc/dmenu/wayland.nix
View File

@ -4,14 +4,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dmenu-wayland-unstable"; pname = "dmenu-wayland";
version = "2022-11-04"; version = "unstable-2023-05-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nyyManni"; owner = "nyyManni";
repo = "dmenu-wayland"; repo = "dmenu-wayland";
rev = "b60047236ef7a4e5dcde6c4ac0dcfaa070d90041"; rev = "a380201dff5bfac2dace553d7eaedb6cea6855f9";
sha256 = "sha256-CeJWLBPAzE3JITVuS6f4CQxLz9v09WvfG3O0wErJJS4="; hash = "sha256-dqFvU2mRYEw7n8Fmbudwi5XMLQ7mQXFkug9D9j4FIrU=";
}; };
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config makeWrapper wayland-scanner ]; nativeBuildInputs = [ meson ninja pkg-config makeWrapper wayland-scanner ];
buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ]; buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ];
# Patch to support cross-compilation, see https://github.com/nyyManni/dmenu-wayland/pull/23/
patches = [ patches = [
# can be removed when https://github.com/nyyManni/dmenu-wayland/pull/23 is included # can be removed when https://github.com/nyyManni/dmenu-wayland/pull/23 is included
(fetchpatch { (fetchpatch {
name = "support-cross-compilation.patch";
url = "https://github.com/nyyManni/dmenu-wayland/commit/3434410de5dcb007539495395f7dc5421923dd3a.patch"; url = "https://github.com/nyyManni/dmenu-wayland/commit/3434410de5dcb007539495395f7dc5421923dd3a.patch";
sha256 = "sha256-im16kU8RWrCY0btYOYjDp8XtfGEivemIPlhwPX0C77o="; sha256 = "sha256-im16kU8RWrCY0btYOYjDp8XtfGEivemIPlhwPX0C77o=";
}) })
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
description = "dmenu for wayland-compositors"; description = "An efficient dynamic menu for wayland (wlroots)";
homepage = "https://github.com/nyyManni/dmenu-wayland"; homepage = "https://github.com/nyyManni/dmenu-wayland";
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ rewine ];
}; };
} }

45
pkgs/applications/misc/remnote/default.nix
View File

@ -1,19 +1,52 @@
{ lib, fetchurl, appimageTools }: { lib, stdenv, fetchurl, appimageTools, makeDesktopItem }:
appimageTools.wrapType2 rec { stdenv.mkDerivation (finalAttrs: let
inherit (finalAttrs) pname version src appexec icon desktopItem;
in
{
pname = "remnote"; pname = "remnote";
version = "1.12.9"; version = "1.12.22";
src = fetchurl { src = fetchurl {
url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
sha256 = "sha256-ZBo7yxbTS+2pWecbPGxp0UMy16HRMwuuUUejb6DUHic="; hash = "sha256-lsTs9Xf0gDRvHQkteNu2JK2eZvF7XK0ryZZgMwTRWvk=";
}; };
appexec = appimageTools.wrapType2 {
inherit pname version src;
};
icon = fetchurl {
url = "https://www.remnote.io/icon.png";
hash = "sha256-r5D7fNefKPdjtmV7f/88Gn3tqeEG8LGuD4nHI/sCk94=";
};
desktopItem = makeDesktopItem {
type = "Application";
name = "remnote";
desktopName = "RemNote";
comment = "Spaced Repetition";
icon = "remnote";
exec = "remnote %u";
categories = [ "Office" ];
mimeTypes = [ "x-scheme-handler/remnote" "x-scheme-handler/rn" ];
};
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
install -D ${appexec}/bin/remnote-${version} $out/bin/remnote
install -D "${desktopItem}/share/applications/"* -t $out/share/applications/
install -D ${icon} $out/share/pixmaps/remnote.png
runHook postInstall
'';
meta = with lib; { meta = with lib; {
description = "A note-taking application focused on learning and productivity"; description = "A note-taking application focused on learning and productivity";
homepage = "https://remnote.com/"; homepage = "https://remnote.com/";
maintainers = with maintainers; [ max-niederman jgarcia ]; maintainers = with maintainers; [ max-niederman jgarcia ];
license = licenses.unfree; license = licenses.unfree;
platforms = platforms.linux; platforms = [ "x86_64-linux" ];
mainProgram = "remnote";
}; };
} })

4
pkgs/applications/networking/cluster/kubedb-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubedb-cli"; pname = "kubedb-cli";
version = "0.34.0"; version = "0.35.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubedb"; owner = "kubedb";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mrWE1MwcS0KYEQmJ8DSP5Sp5w6jpsDxvU03+KqfPDx4="; sha256 = "sha256-keYCF/Jte3sgJi4fnVO1ZDAsYyqXlHzX91tyS5oVCW4=";
}; };
vendorHash = null; vendorHash = null;

6
pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nomad-driver-podman"; pname = "nomad-driver-podman";
version = "0.4.2"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qHhdjWc9bxUpHYUFUrupjtxxIVQDP43OeKKsCDa+4/M="; sha256 = "sha256-MYqsTuMLxbVNWLAWjQ8xQts5qJvhTylle7YLtGyswjY=";
}; };
vendorHash = "sha256-UIUavFdBuSiaUsNaibPjRMURMLLK5UjNHVoyNSIRNQ4="; vendorHash = "sha256-wjJ+mq/m7IjbwypoBvBhjOyAT4v4HDSChHY5OE0xA2U=";
subPackages = [ "." ]; subPackages = [ "." ];

4
pkgs/applications/networking/cluster/vcluster/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "vcluster"; pname = "vcluster";
version = "0.15.2"; version = "0.15.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "loft-sh"; owner = "loft-sh";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-xXeNWLhaCjOqKYJWshosStuAGy43Ur2Kp7xSY6KKcqw="; hash = "sha256-frYE/0PcVNlk+hwSCoPwSbL2se4dEP9g6aLDMGdn6x8=";
}; };
vendorHash = null; vendorHash = null;

8
pkgs/applications/networking/mailreaders/betterbird/default.nix
View File

@ -12,13 +12,13 @@
let let
thunderbird-unwrapped = thunderbirdPackages.thunderbird-102; thunderbird-unwrapped = thunderbirdPackages.thunderbird-102;
version = "102.14.0"; version = "102.15.0";
majVer = lib.versions.major version; majVer = lib.versions.major version;
betterbird-patches = fetchFromGitHub { betterbird-patches = fetchFromGitHub {
owner = "Betterbird"; owner = "Betterbird";
repo = "thunderbird-patches"; repo = "thunderbird-patches";
rev = "${version}-bb39"; rev = "${version}-bb40";
postFetch = '' postFetch = ''
echo "Retrieving external patches" echo "Retrieving external patches"
@ -36,7 +36,7 @@ let
. ./external.sh . ./external.sh
rm external.sh rm external.sh
''; '';
hash = "sha256-O9nGlJs3OziQLbdbdt3eFRHvk1A9cdEsbKDtsZrnY5Q="; hash = "sha256-7/JEcP76rp0hSSxzlIlHqkcxTSEJQswFhCoOLYntQ5I=";
}; };
in ((buildMozillaMach { in ((buildMozillaMach {
pname = "betterbird"; pname = "betterbird";
@ -49,7 +49,7 @@ in ((buildMozillaMach {
src = fetchurl { src = fetchurl {
# https://download.cdn.mozilla.net/pub/thunderbird/releases/ # https://download.cdn.mozilla.net/pub/thunderbird/releases/
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "4ae3f216833aec55421f827d55bc1b5fc2f0ad4fefecb27724a5be3318c351df24d30a4897b924e733ed2e3995be284b6d135049d46001143fb1c961fefc1830"; sha512 = "11d4c77049c532753c9b693d69ab9a0bcd0eb13d49f87a511ad8ba680b70041ac6f64c5f9cd5dd44246d46e7695d9bd51146b1fe62b0b7c9fbc862eb53d5cfda";
}; };
extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''

8
pkgs/applications/networking/misc/zammad/default.nix
View File

@ -2,6 +2,7 @@
, lib , lib
, nixosTests , nixosTests
, fetchFromGitHub , fetchFromGitHub
, fetchYarnDeps
, applyPatches , applyPatches
, bundlerEnv , bundlerEnv
, defaultGemConfig , defaultGemConfig
@ -95,10 +96,13 @@ let
yarnEnv = yarn2nix-moretea.mkYarnPackage { yarnEnv = yarn2nix-moretea.mkYarnPackage {
pname = "${pname}-node-modules"; pname = "${pname}-node-modules";
inherit version src; inherit version src;
yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix;
packageJSON = ./package.json; packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-HI4RR4/ll/zNBNtDCb8OvEsG/BMVYacM0CcYqbkNHEY=";
};
yarnPreBuild = '' yarnPreBuild = ''
mkdir -p deps/Zammad mkdir -p deps/Zammad
cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad

10810
pkgs/applications/networking/misc/zammad/yarn.lock
View File

File diff suppressed because it is too large Load Diff

11446
pkgs/applications/networking/misc/zammad/yarn.nix
View File

File diff suppressed because it is too large Load Diff

5
pkgs/applications/office/jabref/default.nix
View File

@ -93,6 +93,11 @@ stdenv.mkDerivation rec {
'org.jabref:afterburner.fx:${versionReplace.afterburner.pin}' \ 'org.jabref:afterburner.fx:${versionReplace.afterburner.pin}' \
--replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \ --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \
'com.tobiasdiez:easybind:${versionReplace.easybind.pin}' 'com.tobiasdiez:easybind:${versionReplace.easybind.pin}'
# Disable update check
substituteInPlace src/main/java/org/jabref/preferences/JabRefPreferences.java \
--replace 'VERSION_CHECK_ENABLED, Boolean.TRUE' \
'VERSION_CHECK_ENABLED, Boolean.FALSE'
''; '';
preBuild = '' preBuild = ''

34
pkgs/applications/science/biology/mrtrix/default.nix
View File

@ -1,17 +1,33 @@
{ stdenv, lib, fetchFromGitHub, python, makeWrapper { stdenv
, eigen, fftw, libtiff, libpng, zlib, ants, bc , lib
, qt5, libGL, libGLU, libX11, libXext , fetchFromGitHub
, withGui ? true, less }: , python
, makeWrapper
, eigen
, fftw
, libtiff
, libpng
, zlib
, ants
, bc
, qt5
, libGL
, libGLU
, libX11
, libXext
, less
, withGui ? true
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mrtrix"; pname = "mrtrix";
version = "unstable-2021-11-25"; version = "3.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MRtrix3"; owner = "MRtrix3";
repo = "mrtrix3"; repo = "mrtrix3";
rev = "994498557037c9e4f7ba67f255820ef84ea899d9"; rev = "refs/tags/${version}";
sha256 = "sha256-8eFDS5z4ZxMzi9Khk90KAS4ndma/Syd6JDXM2Fpr0M8="; hash = "sha256-87zBAoBLWQPccGS37XyQ8H0GhL01k8GQFgcLL6IwbcM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

6
pkgs/applications/version-management/gh/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "2.33.0"; version = "2.34.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-BvGZS0n9S3a/QCbzpP2539wj7hN54G5VlJnQVtqdSTk="; hash = "sha256-Bb0vEaMOjgQ5p9r/tfciKo4/MXjUCUIdoDSB/Bido/8=";
}; };
vendorHash = "sha256-7Izhqma/zukH9M7EvV9I4axefVaTDoNVXQmLx+GjAt0="; vendorHash = "sha256-iql/CEWwg6t5k8qOFEQotMUUJd4VQ/H4JcuL2Eunqg0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

31
pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch Normal file
View File

@ -0,0 +1,31 @@
diff --git a/Cargo.lock b/Cargo.lock
index 4cd154b..fee3267 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -323,7 +323,7 @@ dependencies = [
[[package]]
name = "conmon-common"
-version = "0.5.1"
+version = "0.6.0"
dependencies = [
"capnp",
"capnpc",
@@ -331,7 +331,7 @@ dependencies = [
[[package]]
name = "conmonrs"
-version = "0.5.1"
+version = "0.6.0"
dependencies = [
"anyhow",
"capnp",
@@ -376,7 +376,7 @@ dependencies = [
[[package]]
name = "conmonrs-cli"
-version = "0.5.1"
+version = "0.6.0"
dependencies = [
"capnp",
"capnp-rpc",

9
pkgs/applications/virtualization/conmon-rs/default.nix
View File

@ -7,19 +7,22 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "conmon-rs"; pname = "conmon-rs";
version = "0.5.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mngs5ivRyMJ927VV00mFNIG+nD9EuE3qLyN+OHMMkHQ="; sha256 = "sha256-RQ3cVM7aEuCCmOCr4UWkxBMr66tdYFl0nNO7tXY05vE=";
}; };
# Cargo.lock is out of date for this release.
cargoPatches = [ ./Cargo.lock.patch ];
nativeBuildInputs = [ capnproto protobuf ]; nativeBuildInputs = [ capnproto protobuf ];
doCheck = false; doCheck = false;
cargoSha256 = "sha256-ruChRz2rnPalBiXcpco/WS/eDgg52ckPBLBuoQa9us4="; cargoHash = "sha256-BNowZkD+y1jh25EvfhQzvT5BZzrq46KBd69AJ//9enE=";
meta = with lib; { meta = with lib; {
description = "An OCI container runtime monitor written in Rust"; description = "An OCI container runtime monitor written in Rust";

4
pkgs/applications/virtualization/podman/default.nix
View File

@ -62,13 +62,13 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "podman"; pname = "podman";
version = "4.6.1"; version = "4.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "podman"; repo = "podman";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-bGhLjf4GZpuWX1xOC4Hm9SkYvUJ45ZipcKAIEJF0tDQ="; hash = "sha256-Zxzb7ORyugvN9mhxa0s8r0ch16Ndbm3Z1JCsQcwbF6g=";
}; };
patches = [ patches = [

1
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -161,6 +161,7 @@ checkout_hash(){
hash=$(hash_from_ref "$ref") hash=$(hash_from_ref "$ref")
fi fi
[[ -z "$deepClone" ]] && \
clean_git fetch ${builder:+--progress} --depth=1 origin "$hash" || \ clean_git fetch ${builder:+--progress} --depth=1 origin "$hash" || \
clean_git fetch -t ${builder:+--progress} origin || return 1 clean_git fetch -t ${builder:+--progress} origin || return 1

2
pkgs/by-name/README.md
View File

@ -67,7 +67,7 @@ So instead it is preferable to use the same generic parameter name `libbar`
and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-packages.nix): and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-packages.nix):
```nix ```nix
libfoo = callPackage ../by-name/so/somePackage/package.nix { libfoo = callPackage ../by-name/so/some-package/package.nix {
libbar = libbar_2; libbar = libbar_2;
}; };
``` ```

14
pkgs/development/libraries/valhalla/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, pkg-config , pkg-config
, boost , boost
@ -29,6 +30,14 @@ stdenv.mkDerivation (finalAttrs: {
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
# Fix build
(fetchpatch {
url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch";
hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U=";
})
];
postPatch = '' postPatch = ''
substituteInPlace src/bindings/python/CMakeLists.txt \ substituteInPlace src/bindings/python/CMakeLists.txt \
--replace "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}" --replace "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}"
@ -44,6 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
"-DENABLE_BENCHMARKS=OFF" "-DENABLE_BENCHMARKS=OFF"
]; ];
env.NIX_CFLAGS_COMPILE = toString [
# Needed for date submodule with GCC 12 https://github.com/HowardHinnant/date/issues/750
"-Wno-error=stringop-overflow"
];
buildInputs = [ buildInputs = [
boost boost
curl curl

2
pkgs/development/python-modules/pyside6/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
inherit (shiboken6) version src; inherit (shiboken6) version src;
sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
# FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
# reside in the same directory as QtCore.framework, which is not true for Nix. # reside in the same directory as QtCore.framework, which is not true for Nix.

33
pkgs/development/python-modules/quaternion/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, oldest-supported-numpy
, scipy
, numba
}:
buildPythonPackage rec {
pname = "quaternion";
version = "2022.4.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "moble";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-iLjVQ6eGwpLQXi8Sr5ShJdXMqYNclGEuq/oxR4ExDLA=";
};
propagatedBuildInputs = [
oldest-supported-numpy
numba
scipy
];
meta = with lib; {
description = "A package add built-in support for quaternions to numpy";
homepage = "https://github.com/moble/quaternion";
license = licenses.mit;
maintainers = [ maintainers.ocfox ];
};
}

11
pkgs/development/python-modules/shiboken6/default.nix
View File

@ -9,17 +9,20 @@
, libxcrypt , libxcrypt
}: }:
llvmPackages.stdenv.mkDerivation rec { let
stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv;
in
stdenv'.mkDerivation rec {
pname = "shiboken6"; pname = "shiboken6";
version = "6.5.0"; version = "6.5.2";
src = fetchurl { src = fetchurl {
# https://download.qt.io/official_releases/QtForPython/shiboken6/ # https://download.qt.io/official_releases/QtForPython/shiboken6/
url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz";
sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ="; sha256 = "sha256-kNvx0U/NQcmKfL6kS4pJUeENC3mOFUdJdW5JRmVNG6g";
}; };
sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
patches = [ patches = [
./fix-include-qt-headers.patch ./fix-include-qt-headers.patch

6
pkgs/development/tools/oras/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "oras"; pname = "oras";
version = "1.0.1"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oras-project"; owner = "oras-project";
repo = "oras"; repo = "oras";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Q+KTT7wIsakE79WJpP8uUhOEh+sJfcxC4Od8z92gX6Q="; hash = "sha256-oWDxrxCrBU0quSpRLXZ0w1COuImVj4FzAmv8574x76o=";
}; };
vendorHash = "sha256-NhgppD2sYgdM3cAmtij/1Sd5Wq/my8nguHjUfv7wOaY="; vendorHash = "sha256-51keQmj1eGT3rJysnfTWIl8xoHfz3NPL/qXegc3wwNc=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

46
pkgs/development/tools/rust/dioxus-cli/default.nix
View File

@ -1,29 +1,47 @@
{ lib, fetchCrate, rustPlatform, openssl, pkg-config, cacert, stdenv, CoreServices }: { lib
, stdenv
, fetchCrate
, rustPlatform
, pkg-config
, cacert
, openssl
, darwin
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "dioxus-cli"; pname = "dioxus-cli";
version = "0.3.2"; version = "0.4.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-8S8zUOb2oiXbJQRgY/g9H2+EW+wWOQugr8+ou34CYPg="; hash = "sha256-4BIuD/rrA398hPEoNt5PwWylPAR0fA1UKc90xyH5Fd0=";
}; };
cargoHash = "sha256-ok+fjvwz4k0/M5j7wut2A2AK6tuO3UfZtgoCXaCaHXY=";
nativeBuildInputs = [ pkg-config cacert ]; nativeBuildInputs = [ pkg-config cacert ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
cargoSha256 = "sha256-sCP8njwYA29XmYu2vfuog0NCL1tZlsZiupkDVImrYCE=";
checkFlags = [
# these tests require dioxous binary in PATH,
# can be removed after: https://github.com/DioxusLabs/dioxus/pull/1138
"--skip=cli::autoformat::spawn_properly"
"--skip=cli::translate::generates_svgs"
]; ];
OPENSSL_NO_VENDOR = 1;
checkFlags = [
# requires network access
"--skip=server::web::proxy::test::add_proxy"
"--skip=server::web::proxy::test::add_proxy_trailing_slash"
];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/dx --version | grep "dioxus ${version}"
'';
meta = with lib; { meta = with lib; {
description = "CLI tool for developing, testing, and publishing Dioxus apps";
homepage = "https://dioxuslabs.com"; homepage = "https://dioxuslabs.com";
description = "CLI tool for developing, testing, and publishing Dioxus apps";
license = with licenses; [ mit asl20 ]; license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ xanderio ]; maintainers = with maintainers; [ xanderio cathalmullan ];
mainProgram = "dx";
}; };
} }

4
pkgs/development/tools/yamlfmt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "yamlfmt"; pname = "yamlfmt";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-l081PgSAT9h2oHp1eH96XztcCLeyv1Y11l6lJhHQj1I="; sha256 = "sha256-+xlPXHM/4blnm09OcMSpvVTLJy38U4xkVMd3Ea2scyU=";
}; };
vendorHash = "sha256-qrHrLOfyJhsuU75arDtfOhLaLqP+GWTfX+oyLX3aea8="; vendorHash = "sha256-qrHrLOfyJhsuU75arDtfOhLaLqP+GWTfX+oyLX3aea8=";

23
pkgs/os-specific/linux/ena/default.nix
View File

@ -1,33 +1,16 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: { lib, stdenv, fetchFromGitHub, kernel }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.8.6"; version = "2.8.9";
name = "ena-${version}-${kernel.version}"; name = "ena-${version}-${kernel.version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "amzn"; owner = "amzn";
repo = "amzn-drivers"; repo = "amzn-drivers";
rev = "ena_linux_${version}"; rev = "ena_linux_${version}";
hash = "sha256-clRu+ecK/Je0kvlAAm6qCJqMyvZv0C88YIGDImhRhKA="; hash = "sha256-9Csrq9wM7Q99qPj7+NlnQgP6KcciNHMbAAb+Wg7eYAU=";
}; };
patches =
[ # https://github.com/amzn/amzn-drivers/issues/269#issuecomment-1552483792
(fetchpatch {
url = "https://github.com/amzn/amzn-drivers/files/11504862/phc_kernel_6_2_fix.patch";
hash = "sha256-/EBkISwXMd7t4WZjsG9KVP6vncFwcZq1QBsxQLXyWsY=";
})
# https://github.com/amzn/amzn-drivers/issues/270#issuecomment-1561924754
(fetchpatch {
url = "https://github.com/amzn/amzn-drivers/files/11559312/devlink_6_2_fix.patch";
hash = "sha256-Nc71u91G0dL+ld6ovqjHaE6X2TxduWeQYr5K0KdoA3Q=";
})
(fetchpatch {
url = "https://github.com/amzn/amzn-drivers/files/11559314/devlink_6_3_fix.patch";
hash = "sha256-aEQTbwHC1DcDrtj188eoGzi3GU9MXnwIxuJW4L7qb/I=";
})
];
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
nativeBuildInputs = kernel.moduleBuildDependencies; nativeBuildInputs = kernel.moduleBuildDependencies;

6
pkgs/servers/akkoma/akkoma-fe/default.nix
View File

@ -7,14 +7,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "akkoma-fe"; pname = "akkoma-fe";
version = "unstable-2023-05-23"; version = "unstable-2023-08-05";
src = fetchFromGitea { src = fetchFromGitea {
domain = "akkoma.dev"; domain = "akkoma.dev";
owner = "AkkomaGang"; owner = "AkkomaGang";
repo = "akkoma-fe"; repo = "akkoma-fe";
rev = "e530c2b4626fab3bc94736cb7d0774809717911f"; rev = "e7a558a533dd31de174791f130afdaa5b6893b74";
hash = "sha256-dowo4YzlkfuQv1G4NclPrKyBwtOq7bEXruQY/BVjNyM="; hash = "sha256-BRmfppsC7NjDdcLxQHuLbQZmYGkj4DFPRtQOf/pRCpI=";
}; };
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {

25
pkgs/servers/akkoma/default.nix
View File

@ -9,14 +9,14 @@
beamPackages.mixRelease rec { beamPackages.mixRelease rec {
pname = "pleroma"; pname = "pleroma";
version = "3.9.3"; version = "3.10.4";
src = fetchFromGitea { src = fetchFromGitea {
domain = "akkoma.dev"; domain = "akkoma.dev";
owner = "AkkomaGang"; owner = "AkkomaGang";
repo = "akkoma"; repo = "akkoma";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-vXE7jv1GPAMKpWEAE9IUgWo7A+zkGYUzu0jlZ9oSbjA="; hash = "sha256-MPUZFcIxZ21fe3edwi+/Kt8qpwNBCh40wheC3QMqw2M=";
}; };
postPatch = '' postPatch = ''
@ -45,19 +45,20 @@ beamPackages.mixRelease rec {
group = "pleroma"; group = "pleroma";
owner = "elixir-libraries"; owner = "elixir-libraries";
repo = "elixir-captcha"; repo = "elixir-captcha";
rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab"; rev = "3bbfa8b5ea13accc1b1c40579a380d8e5cfd6ad2";
sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c"; hash = "sha256-skZ0QwF46lUTfsgACMR0AR5ymY2F50BQy1AUBjWVdro=";
}; };
}; };
credo = beamPackages.buildMix rec { concurrent_limiter = beamPackages.buildMix rec {
name = "credo"; name = "concurrent_limiter";
version = "1.7.0-dev"; version = "0.1.1";
src = fetchFromGitHub { src = fetchFromGitea {
owner = "rrrene"; domain = "akkoma.dev";
repo = "credo"; owner = "AkkomaGang";
rev = "1c1b99ea41a457761383d81aaf6a606913996fe7"; repo = "concurrent-limiter";
hash = "sha256-NdOg6p2J1D8VGGWabAMLs/qRVbi4BzN2DTHci++dJnA="; rev = "a9e0b3d64574bdba761f429bb4fba0cf687b3338";
hash = "sha256-A7ucZnXks4K+JDVY5vV2cT5KfEOUOo/OHO4rga5mGys=";
}; };
}; };
elasticsearch = beamPackages.buildMix rec { elasticsearch = beamPackages.buildMix rec {

207
pkgs/servers/akkoma/mix.nix
View File

@ -10,12 +10,12 @@ let
packages = with beamPackages; with self; { packages = with beamPackages; with self; {
argon2_elixir = buildMix rec { argon2_elixir = buildMix rec {
name = "argon2_elixir"; name = "argon2_elixir";
version = "3.0.0"; version = "3.1.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0mywrvzzm76glvajzxrdg6ka49xby30fpk9zl4dxamzm18kknxcb"; sha256 = "0wyxj4197jnz4z38611f00ym5n3w7hv06l4l3dfid4h2xvhfm3y0";
}; };
beamDeps = [ comeonin elixir_make ]; beamDeps = [ comeonin elixir_make ];
@ -49,12 +49,12 @@ let
bcrypt_elixir = buildMix rec { bcrypt_elixir = buildMix rec {
name = "bcrypt_elixir"; name = "bcrypt_elixir";
version = "2.3.1"; version = "3.0.1";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0ybjs37fyn45x31lzhxic4kd4jmzwcwkgy4spwayykbn8rgjs622"; sha256 = "1kwnzcjf6v4af12nzw5b2fksk1m1fvbxvhclczy1wpb4zdgbjss8";
}; };
beamDeps = [ comeonin elixir_make ]; beamDeps = [ comeonin elixir_make ];
@ -114,12 +114,12 @@ let
castore = buildMix rec { castore = buildMix rec {
name = "castore"; name = "castore";
version = "0.1.22"; version = "1.0.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1b1cl89fzkykimxwgm8mwb9wmxcrd8qk8hfc83pa2npb8zgpcxf1"; sha256 = "02rrljx2f6zhmiwqwyk7al0gdf66qpx4jm59sqg1cnyiylgb02k8";
}; };
beamDeps = []; beamDeps = [];
@ -164,19 +164,6 @@ let
beamDeps = []; beamDeps = [];
}; };
concurrent_limiter = buildMix rec {
name = "concurrent_limiter";
version = "0.1.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1sqnb987qwwy4ip7kxh9g7vv5wz61fpv3pbnxpbv9yy073r8z5jk";
};
beamDeps = [ telemetry ];
};
connection = buildMix rec { connection = buildMix rec {
name = "connection"; name = "connection";
version = "1.1.0"; version = "1.1.0";
@ -192,12 +179,12 @@ let
cors_plug = buildMix rec { cors_plug = buildMix rec {
name = "cors_plug"; name = "cors_plug";
version = "2.0.3"; version = "3.0.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1sls8rns2k48qrga0ngysbn9aknapmn3xfn28by1gqbcir0y2jpf"; sha256 = "03c3vwp4bdk3sixica4mmg0vinmx8qdz2bmbby1x6bi7ijg7ab9z";
}; };
beamDeps = [ plug ]; beamDeps = [ plug ];
@ -218,12 +205,12 @@ let
cowboy_telemetry = buildRebar3 rec { cowboy_telemetry = buildRebar3 rec {
name = "cowboy_telemetry"; name = "cowboy_telemetry";
version = "0.3.1"; version = "0.4.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1bzhcdq12p837cii2jgvzjyrffiwgm5bsb1pra2an3hkcqrzsvis"; sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x";
}; };
beamDeps = [ cowboy telemetry ]; beamDeps = [ cowboy telemetry ];
@ -242,6 +229,19 @@ let
beamDeps = []; beamDeps = [];
}; };
credo = buildMix rec {
name = "credo";
version = "1.7.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1mv9lyw6hgjn6hlnzfbs0x2dchvwlmj8bg0a8l7iq38z7pvgqfb8";
};
beamDeps = [ bunt file_system jason ];
};
custom_base = buildMix rec { custom_base = buildMix rec {
name = "custom_base"; name = "custom_base";
version = "0.2.1"; version = "0.2.1";
@ -309,12 +309,12 @@ let
earmark = buildMix rec { earmark = buildMix rec {
name = "earmark"; name = "earmark";
version = "1.4.38"; version = "1.4.39";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0zzcslyv92gcp4zs3rd1vmw844s1q0fv127m7f7pszhnwh6y6f7r"; sha256 = "0h547ri1nbxyaisyx7jddg3wib7fpm3q4v914szwvv6bqf79sv0m";
}; };
beamDeps = [ earmark_parser ]; beamDeps = [ earmark_parser ];
@ -322,12 +322,12 @@ let
earmark_parser = buildMix rec { earmark_parser = buildMix rec {
name = "earmark_parser"; name = "earmark_parser";
version = "1.4.32"; version = "1.4.33";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0md7rhw1ix4fp31bql9scvl4jpijixczm2ky7mxffwq3srvxvc5q"; sha256 = "13qvlqnii8g6bcz6cl330vjwaan7jy30g1app3yvjncvf8rnhlid";
}; };
beamDeps = []; beamDeps = [];
@ -348,12 +348,12 @@ let
ecto = buildMix rec { ecto = buildMix rec {
name = "ecto"; name = "ecto";
version = "3.9.5"; version = "3.10.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0k5p40cy6zxi3wm885amf78724zvb5a8chmpljzw1kdsiifi3wyl"; sha256 = "0crlrpl392pbkzl6ar4z6afna8h9d46wshky1zbr3m344d7cggj4";
}; };
beamDeps = [ decimal jason telemetry ]; beamDeps = [ decimal jason telemetry ];
@ -374,12 +374,12 @@ let
ecto_psql_extras = buildMix rec { ecto_psql_extras = buildMix rec {
name = "ecto_psql_extras"; name = "ecto_psql_extras";
version = "0.7.11"; version = "0.7.12";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "08qbsk5njwz48vj4nq7bb6jc1mhjf8ay5fhbr18hvx6lj8gizxny"; sha256 = "0k3iczvfj7m77170falil6h49r4hih1p54m952j37q2cnw81s7aa";
}; };
beamDeps = [ ecto_sql postgrex table_rex ]; beamDeps = [ ecto_sql postgrex table_rex ];
@ -387,12 +387,12 @@ let
ecto_sql = buildMix rec { ecto_sql = buildMix rec {
name = "ecto_sql"; name = "ecto_sql";
version = "3.9.2"; version = "3.10.1";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0w1zplm8ndf10dwxffg60iwzvbz3hyyiy761x91cvnwg6nsfxd8y"; sha256 = "0sy5277akp828hvcg60yxhpfgj543y2z1bqy2z414pv9ppdmp8pn";
}; };
beamDeps = [ db_connection ecto postgrex telemetry ]; beamDeps = [ db_connection ecto postgrex telemetry ];
@ -439,15 +439,15 @@ let
ex_aws = buildMix rec { ex_aws = buildMix rec {
name = "ex_aws"; name = "ex_aws";
version = "2.1.9"; version = "2.4.4";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "040dmj94xg3wnk9wplm0myr2q12zad4w1xz1zc0n01y90dkpfv1y"; sha256 = "1iqxr74m7wwqbjkrzrm6xs2ri9kshabh1wpk0jw6zcd2bi43xmm7";
}; };
beamDeps = [ hackney jason sweet_xml ]; beamDeps = [ hackney jason mime sweet_xml telemetry ];
}; };
ex_aws_s3 = buildMix rec { ex_aws_s3 = buildMix rec {
@ -478,12 +478,12 @@ let
ex_doc = buildMix rec { ex_doc = buildMix rec {
name = "ex_doc"; name = "ex_doc";
version = "0.29.4"; version = "0.30.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1xf49d0ni08a83iankdj8fb6jyxm67wjl0gdwihwnimf6ykrjric"; sha256 = "1dhqi5qx2fkphia0g7x2qg6pib08wsbn4dyyg7gmxln18qh71j7v";
}; };
beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ];
@ -504,38 +504,51 @@ let
ex_syslogger = buildMix rec { ex_syslogger = buildMix rec {
name = "ex_syslogger"; name = "ex_syslogger";
version = "1.5.2"; version = "2.0.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "16c376cvw0bcjz8a6gs3nhmg037i894gl5kgxi8jdinv6r0sp7xb"; sha256 = "17h1p3l3a3icqlkyxglw4wwqxxhjb1indas9s7nfdsb42zkjyax5";
}; };
beamDeps = [ poison syslog ]; beamDeps = [ jason syslog ];
}; };
excoveralls = buildMix rec { excoveralls = buildMix rec {
name = "excoveralls"; name = "excoveralls";
version = "0.15.1"; version = "0.16.1";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1rq7vqvzw7sa2r7n59bhbxbhcnjr6z44dkvq45mdb0h01kcnnhgq"; sha256 = "0f7i5gx1rpswbqmmqv133v3lpjwpkhjb2k56fmqcy210ir367rys";
}; };
beamDeps = [ hackney jason ]; beamDeps = [ hackney jason ];
}; };
fast_html = buildMix rec { expo = buildMix rec {
name = "fast_html"; name = "expo";
version = "2.0.5"; version = "0.4.1";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "01k51qri44535b1hwixlxk7151vph6vapswlfq918g245544ypv0"; sha256 = "0iyfl4vppfhmimfqaracjza9a6y8rgia03sm28y5934cg5xbmxrg";
};
beamDeps = [];
};
fast_html = buildMix rec {
name = "fast_html";
version = "2.2.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1bpvmqw4pcx8ssgmazvqn0dm6b3g0m5rij6shy8qy5m6nhilyk06";
}; };
beamDeps = [ elixir_make nimble_pool ]; beamDeps = [ elixir_make nimble_pool ];
@ -569,12 +582,12 @@ let
finch = buildMix rec { finch = buildMix rec {
name = "finch"; name = "finch";
version = "0.14.0"; version = "0.16.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1pd805jyd4qbpb2md3kw443325yqynpkpyr2iixb9zf432psqnal"; sha256 = "1iayffbjzb1rcy1p0wibzv6j5n7dc16ha5lhcbn5z7ji9m61fq7n";
}; };
beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ];
@ -595,12 +608,12 @@ let
floki = buildMix rec { floki = buildMix rec {
name = "floki"; name = "floki";
version = "0.34.2"; version = "0.34.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1j6ilik6pviff34rrqr8456h7pp0qlash731pv36ny811w7xbf96"; sha256 = "0h936kfai562dh4qpcpri7jxrdmqyxaymizk9d5r55svx8748xwm";
}; };
beamDeps = []; beamDeps = [];
@ -608,28 +621,28 @@ let
gen_smtp = buildRebar3 rec { gen_smtp = buildRebar3 rec {
name = "gen_smtp"; name = "gen_smtp";
version = "0.15.0"; version = "1.2.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "03s40l97j6z4mx6a84cbl9w94v3dvfw4f97dqx4hi61hh2l19g99"; sha256 = "0yb7541zx0x76gzk0m1m8fkl6524jhl8rxc59l6g5a5wh1b3gq2y";
}; };
beamDeps = []; beamDeps = [ ranch ];
}; };
gettext = buildMix rec { gettext = buildMix rec {
name = "gettext"; name = "gettext";
version = "0.20.0"; version = "0.22.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0ggb458h60ch3inndqp9xhbailhb0jkq3xnp85sa94sy8dvv20qw"; sha256 = "1gb49f75apkgfa5ddg02x08w1i3qm31jifzicrl4m58kfx226pwk";
}; };
beamDeps = []; beamDeps = [ expo ];
}; };
hackney = buildRebar3 rec { hackney = buildRebar3 rec {
@ -725,12 +738,12 @@ let
jason = buildMix rec { jason = buildMix rec {
name = "jason"; name = "jason";
version = "1.4.0"; version = "1.4.1";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0891p2yrg3ri04p302cxfww3fi16pvvw1kh4r91zg85jhl87k8vr"; sha256 = "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v";
}; };
beamDeps = [ decimal ]; beamDeps = [ decimal ];
@ -751,12 +764,12 @@ let
jose = buildMix rec { jose = buildMix rec {
name = "jose"; name = "jose";
version = "1.11.5"; version = "1.11.6";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "115k981kfg9jmafgs16rybc5qah6p0zgvni3bdyfl0pyp8av5lyw"; sha256 = "0f4pzx8xdzjkkfjkl442w6lhajgfzsnp3dxcxrh1x72ga1swnxb2";
}; };
beamDeps = []; beamDeps = [];
@ -777,12 +790,12 @@ let
mail = buildMix rec { mail = buildMix rec {
name = "mail"; name = "mail";
version = "0.2.3"; version = "0.3.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1xbbdkyar8h0pdihfnsd84j1w3vfh9sk3xkz1llxz7y6m67kjawk"; sha256 = "0v0i0xwhsqvdxxyacmcf25pqyda87yqkn7g49vf8gn1i485p0gaj";
}; };
beamDeps = []; beamDeps = [];
@ -829,12 +842,12 @@ let
makeup_erlang = buildMix rec { makeup_erlang = buildMix rec {
name = "makeup_erlang"; name = "makeup_erlang";
version = "0.1.1"; version = "0.1.2";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1fvw0zr7vqd94vlj62xbqh0yrih1f7wwnmlj62rz0klax44hhk8p"; sha256 = "02411riqa713wzw8in582yva6n6spi4w1ndnj8nhjvnfjg5a3xgk";
}; };
beamDeps = [ makeup ]; beamDeps = [ makeup ];
@ -907,12 +920,12 @@ let
mock = buildMix rec { mock = buildMix rec {
name = "mock"; name = "mock";
version = "0.3.7"; version = "0.3.8";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0p3yrx049fdw88kjidngd2lkwqkkyck5r51ng2dxj7z41539m92d"; sha256 = "08i0zvk3wss217pjr4qczmdgxi607wcp2mfinydxf5vnr5j27a3z";
}; };
beamDeps = [ meck ]; beamDeps = [ meck ];
@ -920,12 +933,12 @@ let
mogrify = buildMix rec { mogrify = buildMix rec {
name = "mogrify"; name = "mogrify";
version = "0.9.2"; version = "0.9.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "17b9dy40rq3rwn7crjggjafibxz4ys4nqq81adcf486af3yi13f1"; sha256 = "1rii2yjswnbivmdfnxljvqw3vlpgkhiqikz8k8mmyi97vvhv3281";
}; };
beamDeps = []; beamDeps = [];
@ -946,12 +959,12 @@ let
nimble_options = buildMix rec { nimble_options = buildMix rec {
name = "nimble_options"; name = "nimble_options";
version = "0.5.2"; version = "1.0.2";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1q6wa2ljprybfb9w2zg0gbppiwsnimgw5kcvakdp3z8mp42gk9sd"; sha256 = "1f7ih1rnkvph0daf4lsv4rrp6dpccksjd7rh5bhnq0r143dsh4px";
}; };
beamDeps = []; beamDeps = [];
@ -985,12 +998,12 @@ let
oban = buildMix rec { oban = buildMix rec {
name = "oban"; name = "oban";
version = "2.12.1"; version = "2.15.2";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0n6h8a6v9hzk6s5dhadfbrvwnx2nkl64n575ff5ph3afnz14864v"; sha256 = "1sgickk10b73pkddfhk5vhmi8vjn065wzyl41ng4iiwgljg5fjhg";
}; };
beamDeps = [ ecto_sql jason postgrex telemetry ]; beamDeps = [ ecto_sql jason postgrex telemetry ];
@ -998,12 +1011,12 @@ let
open_api_spex = buildMix rec { open_api_spex = buildMix rec {
name = "open_api_spex"; name = "open_api_spex";
version = "3.16.3"; version = "3.17.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1bgcp0sfj9j95nb353dn66m81085sq5pwdzwq80x1xc8mgpydjqv"; sha256 = "1zphp59dd3l4l8279pjmhbddskimbgrr123wivycz0yahldb4p8n";
}; };
beamDeps = [ jason plug poison ]; beamDeps = [ jason plug poison ];
@ -1037,12 +1050,12 @@ let
phoenix_ecto = buildMix rec { phoenix_ecto = buildMix rec {
name = "phoenix_ecto"; name = "phoenix_ecto";
version = "4.4.0"; version = "4.4.2";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1h9wnjmxns8y8dsr0r41ks66gscaqm7ivk4gsh5y07nkiralx1h9"; sha256 = "0pcgrvj5lqjmsngrhl77kv0l8ik8gg7pw19v4xlhpm818vfjw93h";
}; };
beamDeps = [ ecto phoenix_html plug ]; beamDeps = [ ecto phoenix_html plug ];
@ -1089,12 +1102,12 @@ let
phoenix_pubsub = buildMix rec { phoenix_pubsub = buildMix rec {
name = "phoenix_pubsub"; name = "phoenix_pubsub";
version = "2.1.1"; version = "2.1.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1nfqrmbrq45if9pgk6g6vqiply2sxc40is3bfanphn7a3rnpqdl1"; sha256 = "00p5dvizhawhqbia2cakdn4whaxsm2adq3lzfn3b137xvk0np85v";
}; };
beamDeps = []; beamDeps = [];
@ -1102,25 +1115,25 @@ let
phoenix_swoosh = buildMix rec { phoenix_swoosh = buildMix rec {
name = "phoenix_swoosh"; name = "phoenix_swoosh";
version = "0.3.4"; version = "1.2.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "072pa2rnzkvw645f3jh15rmgsnzccbyqjx1wbsmj28138qc24w9r"; sha256 = "1fhxh4sff7b3qz2lyryzgms9d6mrhxnmlh924awid6p8a5r133g8";
}; };
beamDeps = [ hackney phoenix phoenix_html swoosh ]; beamDeps = [ finch hackney phoenix phoenix_html phoenix_view swoosh ];
}; };
phoenix_template = buildMix rec { phoenix_template = buildMix rec {
name = "phoenix_template"; name = "phoenix_template";
version = "1.0.1"; version = "1.0.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1vlkd4z2bxinczwcysydidpnh49rpxjihb5k3k4k8qr2yrwc0z8m"; sha256 = "0b4fbp9dhfii6njksm35z8xf4bp8lw5hr7bv0p6g6lj1i9cbdx0n";
}; };
beamDeps = [ phoenix_html ]; beamDeps = [ phoenix_html ];
@ -1219,15 +1232,15 @@ let
postgrex = buildMix rec { postgrex = buildMix rec {
name = "postgrex"; name = "postgrex";
version = "0.16.5"; version = "0.17.2";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1s5jbwfzsdsyvlwgx3bqlfwilj2c468wi3qxq0c2d23fvhwxdspd"; sha256 = "036r3q250vrhj4nmyr4cc40krjgbyci18qkhppvkj7akx6liiac0";
}; };
beamDeps = [ connection db_connection decimal jason ]; beamDeps = [ db_connection decimal jason ];
}; };
pot = buildRebar3 rec { pot = buildRebar3 rec {
@ -1297,12 +1310,12 @@ let
ssl_verify_fun = buildRebar3 rec { ssl_verify_fun = buildRebar3 rec {
name = "ssl_verify_fun"; name = "ssl_verify_fun";
version = "1.1.6"; version = "1.1.7";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; sha256 = "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y";
}; };
beamDeps = []; beamDeps = [];
@ -1336,12 +1349,12 @@ let
swoosh = buildMix rec { swoosh = buildMix rec {
name = "swoosh"; name = "swoosh";
version = "1.10.2"; version = "1.11.4";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0fm0vp0azzrbs53r967x5dgqrj3879dzvka5304wcjgdfkrzldhp"; sha256 = "03rxj2jdrjg6pab05iz8myr0j9fi3d1v7z2bc3hnli9a08a0jffk";
}; };
beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry ]; beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry ];
@ -1375,12 +1388,12 @@ let
telemetry = buildRebar3 rec { telemetry = buildRebar3 rec {
name = "telemetry"; name = "telemetry";
version = "0.4.3"; version = "1.2.1";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0hc0fr2bh97wah9ycpm7hb5jdqr5hnl1s3b2ibbbx9gxbwvbhwpb"; sha256 = "1mgyx9zw92g6w8fp9pblm3b0bghwxwwcbslrixq23ipzisfwxnfs";
}; };
beamDeps = []; beamDeps = [];
@ -1427,12 +1440,12 @@ let
telemetry_poller = buildRebar3 rec { telemetry_poller = buildRebar3 rec {
name = "telemetry_poller"; name = "telemetry_poller";
version = "0.5.1"; version = "1.0.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1m1zcq65yz0wp1wx7mcy2iq37cyizbzrmv0c11x6xg0hj8375asc"; sha256 = "0vjgxkxn9ll1gc6xd8jh4b0ldmg9l7fsfg7w63d44gvcssplx8mk";
}; };
beamDeps = [ telemetry ]; beamDeps = [ telemetry ];
@ -1440,12 +1453,12 @@ let
tesla = buildMix rec { tesla = buildMix rec {
name = "tesla"; name = "tesla";
version = "1.4.4"; version = "1.7.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m"; sha256 = "04y31nq54j1wnzpi37779bzzq0sjwsh53ikvnh4n40nvpwgg0r1f";
}; };
beamDeps = [ castore finch hackney jason mime mint poison telemetry ]; beamDeps = [ castore finch hackney jason mime mint poison telemetry ];

10
pkgs/servers/apache-airflow/python-package.nix
View File

@ -80,6 +80,7 @@
, pytestCheckHook , pytestCheckHook
, time-machine , time-machine
, mkYarnPackage , mkYarnPackage
, fetchYarnDeps
, writeScript , writeScript
# Extra airflow providers to enable # Extra airflow providers to enable
@ -101,13 +102,16 @@ let
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
# This replicates this shell script, fixing bugs in yarn.lock and package.json # This replicates this shell script, fixing bugs in yarn.lock and package.json
airflow-frontend = mkYarnPackage { airflow-frontend = mkYarnPackage rec {
name = "airflow-frontend"; name = "airflow-frontend";
src = "${airflow-src}/airflow/www"; src = "${airflow-src}/airflow/www";
packageJSON = ./package.json; packageJSON = ./package.json;
yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix; offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-ZUvjSA6BKj27xTNieVBBXm6oCTAWIvxk2menQMt91uE=";
};
distPhase = "true"; distPhase = "true";

11878
pkgs/servers/apache-airflow/yarn.lock
View File

File diff suppressed because it is too large Load Diff

12349
pkgs/servers/apache-airflow/yarn.nix
View File

File diff suppressed because it is too large Load Diff

10
pkgs/servers/http/envoy/default.nix
View File

@ -24,8 +24,8 @@ let
# However, the version string is more useful for end-users. # However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that # These are contained in a attrset of their own to make it obvious that
# people should update both. # people should update both.
version = "1.26.3"; version = "1.26.4";
rev = "ea9d25e93cef74b023c95ca1a3f79449cdf7fa9a"; rev = "cfa32deca25ac57c2bbecdad72807a9b13493fc1";
}; };
in in
buildBazelPackage rec { buildBazelPackage rec {
@ -36,7 +36,7 @@ buildBazelPackage rec {
owner = "envoyproxy"; owner = "envoyproxy";
repo = "envoy"; repo = "envoy";
inherit (srcVer) rev; inherit (srcVer) rev;
sha256 = "sha256-ZZAVuelcPzFQRqh9SwRxt+odEjF0jTNh/KkLWHKiZ3o="; hash = "sha256-j5QyqT+9tpChg5JxdSw21rtb9AI036vIiAmzCNzGWGc=";
postFetch = '' postFetch = ''
chmod -R +w $out chmod -R +w $out
@ -80,8 +80,8 @@ buildBazelPackage rec {
fetchAttrs = { fetchAttrs = {
sha256 = { sha256 = {
x86_64-linux = "sha256-IykwwjRWIxruV7kSU1EYx6sQoUtFctcVqs22dCQuEDA="; x86_64-linux = "sha256-KcTh6Fd1EUXcXByPSwMVy5J/6VSVGWBmHr8asS1/ffU=";
aarch64-linux = "sha256-YtII4hSVp9CFWvlRgjQ3l7/nHvkVKJOImtmBxYwleOQ="; aarch64-linux = "sha256-v1T6/qfVapsNFQiB9vdZvxBZ3RoNO7MxgRh3s9dA+pQ=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); }.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
dontUseGnConfigure = true; dontUseGnConfigure = true;

9
pkgs/servers/mail/listmonk/frontend.nix
View File

@ -1,5 +1,6 @@
{ yarn2nix-moretea { yarn2nix-moretea
, fetchFromGitHub , fetchFromGitHub
, fetchYarnDeps
, meta , meta
}: }:
@ -15,8 +16,12 @@ yarn2nix-moretea.mkYarnPackage rec {
}; };
packageJSON = ./package.json; packageJSON = ./package.json;
yarnLock = ./yarn.lock; yarnLock = "${src}/frontend/yarn.lock";
yarnNix = ./yarn.nix;
offlineCache = fetchYarnDeps {
inherit yarnLock;
hash = "sha256-KKNk4lrM7unMFClkY6F3nqhKx5xfx87Ac+rug9sOwvI=";
};
# For Node.js v17+, this is necessary. # For Node.js v17+, this is necessary.
NODE_OPTIONS = "--openssl-legacy-provider"; NODE_OPTIONS = "--openssl-legacy-provider";

14
pkgs/servers/mail/listmonk/package.json
View File

@ -19,7 +19,7 @@
"indent.js": "^0.3.5", "indent.js": "^0.3.5",
"qs": "^6.10.1", "qs": "^6.10.1",
"textversionjs": "^1.1.3", "textversionjs": "^1.1.3",
"tinymce": "^5.10.0", "tinymce": "^5.10.7",
"turndown": "^7.0.0", "turndown": "^7.0.0",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-i18n": "^8.22.2", "vue-i18n": "^8.22.2",
@ -27,14 +27,14 @@
"vuex": "^3.6.2" "vuex": "^3.6.2"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "~4.5.13", "@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-eslint": "~4.5.13", "@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-plugin-router": "~4.5.13", "@vue/cli-plugin-router": "~5.0.8",
"@vue/cli-plugin-vuex": "~4.5.13", "@vue/cli-plugin-vuex": "~5.0.8",
"@vue/cli-service": "~4.5.13", "@vue/cli-service": "~5.0.8",
"@vue/eslint-config-airbnb": "^5.3.0", "@vue/eslint-config-airbnb": "^5.3.0",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"cypress": "9.5.2", "cypress": "10.10.0",
"cypress-file-upload": "^5.0.2", "cypress-file-upload": "^5.0.2",
"eslint": "^7.27.0", "eslint": "^7.27.0",
"eslint-plugin-import": "^2.23.3", "eslint-plugin-import": "^2.23.3",

10337
pkgs/servers/mail/listmonk/yarn.lock
View File

File diff suppressed because it is too large Load Diff

11085
pkgs/servers/mail/listmonk/yarn.nix
View File

File diff suppressed because it is too large Load Diff

6
pkgs/servers/nostr-rs-relay/default.nix
View File

@ -11,15 +11,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nostr-rs-relay"; pname = "nostr-rs-relay";
version = "0.8.9"; version = "0.8.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "scsibug"; owner = "scsibug";
repo = "nostr-rs-relay"; repo = "nostr-rs-relay";
rev = version; rev = version;
hash = "sha256-x5y/d76Qel8FMIlUn8NdwihWebJsNIt2it2vs/Xlk0Q="; hash = "sha256-3/hd3w06bILcgd7gmmpzky4Sj3exHX5xn3XGrueGDbE=";
}; };
cargoHash = "sha256-1wgBABgcogHCk183AaTwbbSGk8d8FvlZYvw1//5y93I="; cargoHash = "sha256-ulCUJ59LSYxzSbMBZcv2/7wDTwTGGGXoHPAZO4rudDE=";
buildInputs = [ openssl.dev ] buildInputs = [ openssl.dev ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [

4
pkgs/servers/tracing/tempo/default.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec { buildGoModule rec {
pname = "tempo"; pname = "tempo";
version = "2.2.1"; version = "2.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grafana"; owner = "grafana";
repo = "tempo"; repo = "tempo";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-ols6cYKd1FVRG/fbq+oXst18eCQ3+V2032m03t3DvEc="; hash = "sha256-FeQTg0EuAwpSMf+rPLFNegXEXfVa6dqR2xjl4MfZnYg=";
}; };
vendorHash = null; vendorHash = null;

6
pkgs/servers/web-apps/outline/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchYarnDeps
, makeWrapper , makeWrapper
, nodejs , nodejs
, yarn , yarn
@ -22,7 +23,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ];
buildInputs = [ yarn nodejs ]; buildInputs = [ yarn nodejs ];
yarnOfflineCache = yarn2nix-moretea.importOfflineCache ./yarn.nix; yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-j9iaxXfMlG9dT6fvYgPQg6Y0QvCRiBU1peO0YgsGHOY=";
};
configurePhase = '' configurePhase = ''
export HOME=$(mktemp -d)/yarn_home export HOME=$(mktemp -d)/yarn_home

13778
pkgs/servers/web-apps/outline/yarn.lock
View File

File diff suppressed because it is too large Load Diff

15013
pkgs/servers/web-apps/outline/yarn.nix
View File

File diff suppressed because it is too large Load Diff

8
pkgs/servers/xmpp/prosody/default.nix
View File

@ -22,7 +22,7 @@ let
); );
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.12.3"; # also update communityModules version = "0.12.4"; # also update communityModules
pname = "prosody"; pname = "prosody";
# The following community modules are necessary for the nixos module # The following community modules are necessary for the nixos module
# prosody module to comply with XEP-0423 and provide a working # prosody module to comply with XEP-0423 and provide a working
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
]; ];
src = fetchurl { src = fetchurl {
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
sha256 = "sha256-NdoNAx/0YECi1jjgBNQlXiSbYyP+YhLbnd12tAHbIQE="; sha256 = "R9cSJzwvKVWMQS9s2uwHMmC7wmt92iQ9tYAzAYPWWFY=";
}; };
# A note to all those merging automated updates: Please also update this # A note to all those merging automated updates: Please also update this
@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
# version. # version.
communityModules = fetchhg { communityModules = fetchhg {
url = "https://hg.prosody.im/prosody-modules"; url = "https://hg.prosody.im/prosody-modules";
rev = "3e30799deec2"; rev = "7c105277a9ca";
sha256 = "sha256-oaWs2D5z1LtvhtZMlaZPLNoNNL/1TIZLZwFfC3vtRUo="; sha256 = "eiObn5Kw7dS+oxdQiJ8NhSC4P7EvILIOEnMoxCWIFro=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/admin/fioctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "fioctl"; pname = "fioctl";
version = "0.33"; version = "0.35";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "foundriesio"; owner = "foundriesio";
repo = "fioctl"; repo = "fioctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9c0eyRij1L2C6nJ9ufDGONVenJTGdRALFojK3SFRTjI="; sha256 = "sha256-4lAoUmbNsC0d+yaB+DqHVqz3UMI08rhXIm7rgueeXik=";
}; };
vendorHash = "sha256-hSllpWjiYOBbANCX7usdAAF1HNAJ79ELK92qEyn8G1c="; vendorHash = "sha256-hSllpWjiYOBbANCX7usdAAF1HNAJ79ELK92qEyn8G1c=";

14
pkgs/tools/admin/meshcentral/default.nix
View File

@ -1,4 +1,10 @@
{ lib, fetchzip, yarn2nix-moretea, nodejs_18, dos2unix }: { lib
, fetchzip
, fetchYarnDeps
, yarn2nix-moretea
, nodejs_18
, dos2unix
}:
yarn2nix-moretea.mkYarnPackage { yarn2nix-moretea.mkYarnPackage {
version = "1.1.6"; version = "1.1.6";
@ -12,7 +18,11 @@ yarn2nix-moretea.mkYarnPackage {
packageJSON = ./package.json; packageJSON = ./package.json;
yarnLock = ./yarn.lock; yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix;
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-aKWa6pvIi2JkOtpiWH19KZoncPuSIgvDk/j7PvXp2nw=";
};
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them. # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
nativeBuildInputs = [ dos2unix ]; nativeBuildInputs = [ dos2unix ];

11381
pkgs/tools/admin/meshcentral/yarn.nix
View File

File diff suppressed because it is too large Load Diff

16
pkgs/tools/filesystems/irods/common.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq, libarchive { lib, stdenv, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq, libarchive
, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt , avro-cpp, boost, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt
, nlohmann_json, spdlog }: , nlohmann_json, spdlog, curl }:
# Common attributes of irods packages # Common attributes of irods packages
{ {
nativeBuildInputs = [ autoconf automake cmake help2man texinfo which gcc ]; nativeBuildInputs = [ autoconf automake cmake help2man texinfo which gcc ];
buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp zeromq openssl pam libiodbc libkrb5 boost
libcxx catch2 nanodbc fmt nlohmann_json spdlog ]; libcxx catch2 nanodbc fmt nlohmann_json spdlog curl ];
cmakeFlags = [ cmakeFlags = [
"-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}"
@ -15,7 +15,6 @@
"-DIRODS_EXTERNALS_FULLPATH_ARCHIVE=${libarchive.lib}" "-DIRODS_EXTERNALS_FULLPATH_ARCHIVE=${libarchive.lib}"
"-DIRODS_EXTERNALS_FULLPATH_AVRO=${avro-cpp}" "-DIRODS_EXTERNALS_FULLPATH_AVRO=${avro-cpp}"
"-DIRODS_EXTERNALS_FULLPATH_BOOST=${boost}" "-DIRODS_EXTERNALS_FULLPATH_BOOST=${boost}"
"-DIRODS_EXTERNALS_FULLPATH_JANSSON=${jansson}"
"-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}" "-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}"
"-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}"
"-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}"
@ -31,13 +30,10 @@
postPatch = '' postPatch = ''
patchShebangs ./packaging ./scripts patchShebangs ./packaging ./scripts
substituteInPlace CMakeLists.txt \
--replace "DESTINATION usr/bin" "DESTINATION bin" \
--replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/" \
--replace "DESTINATION usr/lib/" "DESTINATION lib/" \
--replace "{IRODS_EXTERNALS_FULLPATH_JSON}/include" "{IRODS_EXTERNALS_FULLPATH_JSON}/include/nlohmann"
export cmakeFlags="$cmakeFlags export cmakeFlags="$cmakeFlags
-DCMAKE_INSTALL_PREFIX=$out -DCMAKE_INSTALL_PREFIX=$out
-DIRODS_HOME_DIRECTORY=$out
-DCMAKE_INSTALL_SBINDIR=$out/sbin
" "
''; '';

38
pkgs/tools/filesystems/irods/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq { lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq
, libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 , libarchive, avro-cpp_llvm, boost, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2
, nanodbc_llvm, fmt, nlohmann_json, spdlog }: , nanodbc_llvm, fmt, nlohmann_json, spdlog, curl }:
let let
avro-cpp = avro-cpp_llvm; avro-cpp = avro-cpp_llvm;
@ -9,43 +9,33 @@ in
let let
common = import ./common.nix { common = import ./common.nix {
inherit lib stdenv bzip2 zlib autoconf automake cmake inherit lib stdenv bzip2 zlib autoconf automake cmake
help2man texinfo libtool cppzmq libarchive jansson help2man texinfo libtool cppzmq libarchive
zeromq openssl pam libiodbc libkrb5 gcc libcxx zeromq openssl pam libiodbc libkrb5 gcc libcxx
boost avro-cpp which catch2 nanodbc fmt nlohmann_json boost avro-cpp which catch2 nanodbc fmt nlohmann_json
spdlog; spdlog curl;
}; };
in in
rec { rec {
# irods: libs and server package # irods: libs and server package
irods = stdenv.mkDerivation (common // rec { irods = stdenv.mkDerivation (finalAttrs: common // {
version = "4.2.11"; version = "4.3.0";
pname = "irods"; pname = "irods";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "irods"; owner = "irods";
repo = "irods"; repo = "irods";
rev = version; rev = finalAttrs.version;
sha256 = "0prcsiddk8n3h515jjapgfz1d6hjqywhrkcf6giqd7xc7b0slz44"; sha256 = "sha256-rceDGFpfoFIByzDOtgNIo9JRoVd0syM21MjEKoZUQaE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
# Patches:
# irods_root_path.patch : the root path is obtained by stripping 3 items of the path,
# but we don't use /usr with nix, so remove only 2 items.
patches = [ ./irods_root_path.patch ];
# fix build with recent llvm versions # fix build with recent llvm versions
env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations";
postPatch = common.postPatch + '' postPatch = common.postPatch + ''
patchShebangs ./test patchShebangs ./test
substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
substituteInPlace cmake/server.cmake --replace "DESTINATION usr/sbin" "DESTINATION sbin"
substituteInPlace cmake/server.cmake --replace "IRODS_DOC_DIR usr/share" "IRODS_DOC_DIR share"
substituteInPlace cmake/runtime_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib"
substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib"
substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/include" "DESTINATION include"
for file in unit_tests/cmake/test_config/*.cmake for file in unit_tests/cmake/test_config/*.cmake
do do
substituteInPlace $file --replace "CATCH2}/include" "CATCH2}/include/catch2" substituteInPlace $file --replace "CATCH2}/include" "CATCH2}/include/catch2"
@ -56,7 +46,7 @@ rec {
-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib
" "
substituteInPlace cmake/server.cmake --replace SETUID "" substituteInPlace server/auth/CMakeLists.txt --replace SETUID ""
''; '';
meta = common.meta // { meta = common.meta // {
@ -66,19 +56,17 @@ rec {
# icommands (CLI) package, depends on the irods package # icommands (CLI) package, depends on the irods package
irods-icommands = stdenv.mkDerivation (common // rec { irods-icommands = stdenv.mkDerivation (finalAttrs: common // {
version = "4.2.11"; version = "4.3.0";
pname = "irods-icommands"; pname = "irods-icommands";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "irods"; owner = "irods";
repo = "irods_client_icommands"; repo = "irods_client_icommands";
rev = version; rev = finalAttrs.version;
sha256 = "0wgs585j2lp820py2pbizsk54xgz5id96fhxwwk9lqhbzxhfjhcg"; sha256 = "sha256-90q1GPkoEUoiQXM6cA+DWwth7g8v93V471r9jm+l9aw=";
}; };
patches = [ ./zmqcpp-deprecated-send_recv.patch ];
buildInputs = common.buildInputs ++ [ irods ]; buildInputs = common.buildInputs ++ [ irods ];
postPatch = common.postPatch + '' postPatch = common.postPatch + ''

49
pkgs/tools/filesystems/irods/irods_root_path.patch
View File

@ -1,49 +0,0 @@
diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py
--- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000
+++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000
@@ -10,7 +10,7 @@
return os.path.join(root_directory(), 'var', 'lib', 'irods')
def config_directory():
- return os.path.join(root_directory(), 'etc', 'irods')
+ return os.path.join(os.path.abspath('/'), 'etc', 'irods')
def plugins_directory():
return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins')
@@ -37,7 +37,7 @@
def version_path():
return os.path.join(
- irods_directory(),
+ home_directory(),
'VERSION.json')
def hosts_config_path():
@@ -64,7 +64,7 @@
def log_directory():
return os.path.join(
- irods_directory(),
+ home_directory(),
'log')
def control_log_path():
@@ -110,8 +110,7 @@
def server_bin_directory():
return os.path.join(
root_directory(),
- 'usr',
- 'sbin')
+ 'bin')
def server_executable():
return os.path.join(
@@ -132,7 +131,7 @@
return os.path.join(config_directory(), 'service_account.config')
def genosauth_path():
- return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth')
+ return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth')
def irods_user_and_group_entries():
try:

21
pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch
View File

@ -1,21 +0,0 @@
diff -r -u source/src/irods-grid.cpp source.new/src/irods-grid.cpp
--- source/src/irods-grid.cpp 1970-01-01 01:00:01.000000000 +0100
+++ source.new/src/irods-grid.cpp 2020-05-05 16:34:35.566464346 +0200
@@ -412,7 +412,7 @@
data_to_send.data(),
data_to_send.size() );
try {
- if (!zmq_skt.send(req)) {
+ if (!zmq_skt.send( req, zmq::send_flags::dontwait )) {
std::cerr << "ZeroMQ encountered an error sending a message.\n";
return errno;
}
@@ -426,7 +426,7 @@
zmq::message_t rep;
// wait for the server reponse
try {
- if (!zmq_skt.recv( &rep )) {
+ if (!zmq_skt.recv( rep, zmq::recv_flags::dontwait )) {
std::cerr << "ZeroMQ encountered an error receiving a message.\n";
return errno;
}

4
pkgs/tools/misc/convimg/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "convimg"; pname = "convimg";
version = "9.1"; version = "9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mateoconlechuga"; owner = "mateoconlechuga";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-lcd9IL/xV6O81/HqZW+nA2eZXUbwS8nJ1jmjqVs8BR0="; sha256 = "sha256-37nJyaUyC5aQ4h3sH+s8XOzyLh6zfzgIEDp+M6SERSg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

13
pkgs/tools/misc/trackma/default.nix
View File

@ -24,27 +24,28 @@ let
in in
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "trackma"; pname = "trackma";
version = "0.8.5"; version = "0.8.6";
format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "z411"; owner = "z411";
repo = "trackma"; repo = "trackma";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-BjZw/AYFlTYtgJTDFOALHx1d71ZQsYZ2TXnEUeQVvpw="; sha256 = "qlkFQSJFjxkGd5WkNGfyAo64ys8VJLep/ZOL6icXQ4c=";
fetchSubmodules = true; # for anime-relations submodule fetchSubmodules = true; # for anime-relations submodule
}; };
nativeBuildInputs = [ copyDesktopItems ] nativeBuildInputs = [ copyDesktopItems python3.pkgs.poetry-core ]
++ lib.optionals withGTK [ wrapGAppsHook gobject-introspection ] ++ lib.optionals withGTK [ wrapGAppsHook gobject-introspection ]
++ lib.optionals withQT [ qt5.wrapQtAppsHook ]; ++ lib.optionals withQT [ qt5.wrapQtAppsHook ];
buildInputs = lib.optionals withGTK [ glib gtk3 ]; buildInputs = lib.optionals withGTK [ glib gtk3 ];
propagatedBuildInputs = with python3.pkgs; ([ urllib3 ] propagatedBuildInputs = with python3.pkgs; ([ requests ]
++ lib.optionals withQT [ pyqt5 ] ++ lib.optionals withQT [ pyqt5 ]
++ lib.optionals withGTK [ pycairo ] ++ lib.optionals withGTK [ pycairo pygobject3 ]
++ lib.optionals withCurses [ urwid ] ++ lib.optionals withCurses [ urwid ]
++ lib.optionals stdenv.isLinux [ dbus-python pygobject3 pyinotify ] ++ lib.optionals stdenv.isLinux [ pydbus pyinotify ]
++ lib.optionals (withGTK || withQT) [ pillow ]); ++ lib.optionals (withGTK || withQT) [ pillow ]);
dontWrapQtApps = true; dontWrapQtApps = true;

38
pkgs/tools/networking/mu/default.nix
View File

@ -10,12 +10,15 @@
, gmime3 , gmime3
, texinfo , texinfo
, xapian , xapian
, fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mu"; pname = "mu";
version = "1.10.7"; version = "1.10.7";
outputs = [ "out" "mu4e" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "djcb"; owner = "djcb";
repo = "mu"; repo = "mu";
@ -23,6 +26,14 @@ stdenv.mkDerivation rec {
hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI="; hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI=";
}; };
patches = [
(fetchpatch {
name = "add-mu4e-pkg.el";
url = "https://github.com/djcb/mu/commit/00f7053d51105eea0c72151f1a8cf0b6d8478e4e.patch";
hash = "sha256-21c7djmYTcqyyygqByo9vu/GsH8WMYcq8NOAvJsS5AQ=";
})
];
postPatch = '' postPatch = ''
# Fix mu4e-builddir (set it to $out) # Fix mu4e-builddir (set it to $out)
substituteInPlace mu4e/mu4e-config.el.in \ substituteInPlace mu4e/mu4e-config.el.in \
@ -31,17 +42,23 @@ stdenv.mkDerivation rec {
--replace "/bin/rm" "${coreutils}/bin/rm" --replace "/bin/rm" "${coreutils}/bin/rm"
''; '';
# AOT native-comp, mostly copied from pkgs/build-support/emacs/generic.nix postInstall = ''
postInstall = lib.optionalString (emacs.withNativeCompilation or false) '' rm --verbose $mu4e/share/emacs/site-lisp/mu4e/*.elc
mkdir -p $out/share/emacs/native-lisp '';
export EMACSLOADPATH=$out/share/emacs/site-lisp/mu4e:
export EMACSNATIVELOADPATH=$out/share/emacs/native-lisp:
find $out/share/emacs -type f -name '*.el' -print0 \ # move only the mu4e info manual
| xargs -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \ # this has to be after preFixup otherwise the info manual may be moved back by _multioutDocs()
"emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true" # we manually move the mu4e info manual instead of setting
'' + '' # outputInfo to mu4e because we do not want to move the mu-guile
emacs --batch -l package --eval "(package-generate-autoloads \"mu4e\" \"$out/share/emacs/site-lisp/mu4e\")" # info manual (if it exists)
postFixup = ''
moveToOutput share/info/mu4e.info.gz $mu4e
install-info $mu4e/share/info/mu4e.info.gz $mu4e/share/info/dir
if [[ -a ''${!outputInfo}/share/info/mu-guile.info.gz ]]; then
install-info --delete $mu4e/share/info/mu4e.info.gz ''${!outputInfo}/share/info/dir
else
rm --verbose --recursive ''${!outputInfo}/share/info
fi
''; '';
buildInputs = [ emacs glib gmime3 texinfo xapian ]; buildInputs = [ emacs glib gmime3 texinfo xapian ];
@ -49,6 +66,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dguile=disabled" "-Dguile=disabled"
"-Dreadline=disabled" "-Dreadline=disabled"
"-Dlispdir=${placeholder "mu4e"}/share/emacs/site-lisp"
]; ];
nativeBuildInputs = [ pkg-config meson ninja ]; nativeBuildInputs = [ pkg-config meson ninja ];

6
pkgs/tools/security/slsa-verifier/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "slsa-verifier"; pname = "slsa-verifier";
version = "2.3.0"; version = "2.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "slsa-framework"; owner = "slsa-framework";
repo = "slsa-verifier"; repo = "slsa-verifier";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-qhBMWYyd2S8ZKAqwMkXWTP84kLt3f4471JOPrfScFek="; hash = "sha256-2/4ExhMWXIKpkYQIodEsajA7q9zb4tOT9QUGunAutl0=";
}; };
vendorHash = "sha256-9EY7zhvDgZsNQA7iNu1zueJxpTA6cLwjpQYjUdUy6do="; vendorHash = "sha256-TwPbxoNu9PYAFEbUT5htyUY1RbkGow712ARJW6y496E=";
CGO_ENABLED = 0; CGO_ENABLED = 0;
GO111MODULE = "on"; GO111MODULE = "on";

17
pkgs/tools/text/gawk/gawkextlib.nix
View File

@ -9,12 +9,12 @@ let
let is_extension = gawkextlib != null; let is_extension = gawkextlib != null;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gawkextlib-${name}"; pname = "gawkextlib-${name}";
version = "unstable-2019-11-21"; version = "unstable-2022-10-20";
src = fetchgit { src = fetchgit {
url = "git://git.code.sf.net/p/gawkextlib/code"; url = "git://git.code.sf.net/p/gawkextlib/code";
rev = "f70f10da2804e4fd0a0bac57736e9c1cf21e345d"; rev = "f6c75b4ac1e0cd8d70c2f6c7a8d58b4d94cfde97";
sha256 = "0r8fz89n3l4dfszs1980yqj0ah95430lj0y1lb7blfkwxa6c2xik"; sha256 = "sha256-0p3CrQ3TBl7UcveZytK/9rkAzn69RRM2GwY2eCeqlkg=";
}; };
postPatch = '' postPatch = ''
@ -83,11 +83,12 @@ let
name = "gd"; name = "gd";
extraBuildInputs = [ gd ]; extraBuildInputs = [ gd ];
}; };
haru = buildExtension { # Build has been broken: https://github.com/NixOS/nixpkgs/issues/191072
inherit gawkextlib; # haru = buildExtension {
name = "haru"; # inherit gawkextlib;
extraBuildInputs = [ libharu ]; # name = "haru";
}; # extraBuildInputs = [ libharu ];
# };
json = buildExtension { json = buildExtension {
inherit gawkextlib; inherit gawkextlib;
name = "json"; name = "json";

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

@ -9310,9 +9310,9 @@ with pkgs;
idevicerestore = callPackage ../tools/misc/idevicerestore { }; idevicerestore = callPackage ../tools/misc/idevicerestore { };
inherit (callPackages ../tools/filesystems/irods rec { inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages.libcxxStdenv; stdenv = llvmPackages_13.libcxxStdenv;
libcxx = llvmPackages.libcxx; libcxx = llvmPackages_13.libcxx;
boost = boost179.override { inherit stdenv; }; boost = boost178.override { inherit stdenv; };
fmt = fmt_8.override { inherit stdenv; }; fmt = fmt_8.override { inherit stdenv; };
nanodbc_llvm = nanodbc.override { inherit stdenv; }; nanodbc_llvm = nanodbc.override { inherit stdenv; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
@ -19230,9 +19230,7 @@ with pkgs;
dive = callPackage ../development/tools/dive { }; dive = callPackage ../development/tools/dive { };
dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { };
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
doclifter = callPackage ../development/tools/misc/doclifter { }; doclifter = callPackage ../development/tools/misc/doclifter { };
@ -25574,6 +25572,11 @@ with pkgs;
valhalla = callPackage ../development/libraries/valhalla { valhalla = callPackage ../development/libraries/valhalla {
boost = boost.override { enablePython = true; python = python38; }; boost = boost.override { enablePython = true; python = python38; };
protobuf = protobuf3_21.override {
abseil-cpp = abseil-cpp_202103.override {
cxxStandard = "17";
};
};
}; };
vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { };
@ -34756,7 +34759,13 @@ with pkgs;
osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { }; osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { };
osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server {
protobuf = protobuf3_21.override {
abseil-cpp = abseil-cpp_202103.override {
cxxStandard = "17";
};
};
};
palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { }; palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { };
@ -35153,14 +35162,17 @@ with pkgs;
keybinder3 = null; keybinder3 = null;
libappindicator-gtk3 = null; libappindicator-gtk3 = null;
libmodplug = null; libmodplug = null;
libsoup = libsoup_3;
}; };
quodlibet-without-gst-plugins = quodlibet.override { quodlibet-without-gst-plugins = quodlibet.override {
libsoup = libsoup_3;
tag = "-without-gst-plugins"; tag = "-without-gst-plugins";
withGstPlugins = false; withGstPlugins = false;
}; };
quodlibet-xine = quodlibet.override { quodlibet-xine = quodlibet.override {
libsoup = libsoup_3;
tag = "-xine"; tag = "-xine";
withGstreamerBackend = false; withGstreamerBackend = false;
withXineBackend = true; withXineBackend = true;
@ -35172,6 +35184,7 @@ with pkgs;
keybinder3 = keybinder3; keybinder3 = keybinder3;
libappindicator-gtk3 = libappindicator-gtk3; libappindicator-gtk3 = libappindicator-gtk3;
libmodplug = libmodplug; libmodplug = libmodplug;
libsoup = libsoup_3;
tag = "-full"; tag = "-full";
withDbusPython = true; withDbusPython = true;
withMusicBrainzNgs = true; withMusicBrainzNgs = true;
@ -35182,6 +35195,7 @@ with pkgs;
}; };
quodlibet-xine-full = quodlibet-full.override { quodlibet-xine-full = quodlibet-full.override {
libsoup = libsoup_3;
tag = "-xine-full"; tag = "-xine-full";
withGstreamerBackend = false; withGstreamerBackend = false;
withXineBackend = true; withXineBackend = true;

2
pkgs/top-level/python-packages.nix
View File

@ -10941,6 +10941,8 @@ self: super: with self; {
quart-cors = callPackage ../development/python-modules/quart-cors { }; quart-cors = callPackage ../development/python-modules/quart-cors { };
quaternion = callPackage ../development/python-modules/quaternion { };
qudida = callPackage ../development/python-modules/qudida { }; qudida = callPackage ../development/python-modules/qudida { };
querystring_parser = callPackage ../development/python-modules/querystring-parser { }; querystring_parser = callPackage ../development/python-modules/querystring-parser { };