cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-09-14 18:01:28 +00:00 committed by GitHub
commit dd6646009e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
83 changed files with 1713 additions and 1619 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
doc/languages-frameworks/python.section.md
View file

@ -101,7 +101,7 @@ The following is an example:
buildPythonPackage rec {
pname = "pytest";
version = "3.3.1";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
@ -167,12 +167,15 @@ following are specific to `buildPythonPackage`:
* `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs.
* `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment
variable in wrapped programs.
* `format ? "setuptools"`: Format of the source. Valid options are
`"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`.
`"setuptools"` is for when the source has a `setup.py` and `setuptools` is
used to build a wheel, `flit`, in case `flit` should be used to build a wheel,
and `wheel` in case a wheel is provided. Use `other` when a custom
`buildPhase` and/or `installPhase` is needed.
* `pyproject`: Whether the pyproject format should be used. When set to `true`,
`pypaBuildHook` will be used, and you can add the required build dependencies
from `build-system.requires` to `nativeBuildInputs`. Note that the pyproject
format falls back to using `setuptools`, so you can use `pyproject = true`
even if the package only has a `setup.py`. When set to `false`, you can
use the existing [hooks](#setup-hooks0 or provide your own logic to build the
package. This can be useful for packages that don't support the pyproject
format. When unset, the legacy `setuptools` hooks are used for backwards
compatibility.
* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to
`makeWrapper`, which wraps generated binaries. By default, the arguments to
`makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling
@ -286,20 +289,25 @@ specifying an interpreter version), like this:
python3.pkgs.buildPythonApplication rec {
pname = "luigi";
version = "2.7.9";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw=";
};
nativeBuildInputs = [
python3.pkgs.setuptools
python3.pkgs.wheel
];
propagatedBuildInputs = with python3.pkgs; [
tornado
python-daemon
];
meta = with lib; {
...
# ...
};
}
```
@ -716,8 +724,8 @@ We've now seen how to create an ad-hoc temporary shell session, and how to
create a single script with Python dependencies, but in the course of normal
development we're usually working in an entire package repository.
As explained in the Nix manual, `nix-shell` can also load an expression from a
`.nix` file. Say we want to have Python 3.11, `numpy` and `toolz`, like before,
As explained [in the `nix-shell` section](https://nixos.org/manual/nix/stable/command-ref/nix-shell) of the Nix manual, `nix-shell` can also load an expression from a `.nix` file.
Say we want to have Python 3.11, `numpy` and `toolz`, like before,
in an environment. We can add a `shell.nix` file describing our dependencies:
```nix
@ -858,18 +866,25 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
}:
buildPythonPackage rec {
pname = "toolz";
version = "0.10.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
};
nativeBuildInputs = [
setuptools
wheel
];
# has no tests
doCheck = false;
@ -918,13 +933,18 @@ with import <nixpkgs> {};
my_toolz = python311.pkgs.buildPythonPackage rec {
pname = "toolz";
version = "0.10.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
};
nativeBuildInputs = [
python311.pkgs.setuptools
python311.pkgs.wheel
];
# has no tests
doCheck = false;
@ -972,6 +992,9 @@ order to build [`datashape`](https://github.com/blaze/datashape).
, buildPythonPackage
, fetchPypi
# build dependencies
, setuptools, wheel
# dependencies
, numpy, multipledispatch, python-dateutil
@ -982,13 +1005,18 @@ order to build [`datashape`](https://github.com/blaze/datashape).
buildPythonPackage rec {
pname = "datashape";
version = "0.4.7";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong=";
};
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
multipledispatch
numpy
@ -1023,6 +1051,8 @@ when building the bindings and are therefore added as `buildInputs`.
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
, libxml2
, libxslt
}:
@ -1030,13 +1060,18 @@ when building the bindings and are therefore added as `buildInputs`.
buildPythonPackage rec {
pname = "lxml";
version = "3.4.4";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk=";
};
nativeBuildInputs = [
setuptools
wheel
];
buildInputs = [
libxml2
libxslt
@ -1067,6 +1102,10 @@ therefore we have to set `LDFLAGS` and `CFLAGS`.
, buildPythonPackage
, fetchPypi
# build dependencies
, setuptools
, wheel
# dependencies
, fftw
, fftwFloat
@ -1078,13 +1117,18 @@ therefore we have to set `LDFLAGS` and `CFLAGS`.
buildPythonPackage rec {
pname = "pyFFTW";
version = "0.9.2";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ=";
};
nativeBuildInputs = [
setuptools
wheel
];
buildInputs = [
fftw
fftwFloat
@ -1334,9 +1378,7 @@ instead of a dev dependency).
Keep in mind that while the examples above are done with `requirements.txt`,
`pythonRelaxDepsHook` works by modifying the resulting wheel file, so it should
work in any of the formats supported by `buildPythonPackage` currently,
with the exception of `other` (see `format` in
[`buildPythonPackage` parameters](#buildpythonpackage-parameters) for more details).
work with any of the existing [hooks](#setup-hooks).
#### Using unittestCheckHook {#using-unittestcheckhook}
@ -1461,18 +1503,26 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix`
```nix
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
}:
buildPythonPackage rec {
pname = "toolz";
version = "0.10.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
};
nativeBuildInputs = [
setuptools
wheel
];
meta = with lib; {
changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}";
homepage = "https://github.com/pytoolz/toolz/";

3
doc/languages-frameworks/ruby.section.md
View file

@ -32,7 +32,8 @@ Again, it's possible to launch the interpreter from the shell. The Ruby interpre
#### Load Ruby environment from `.nix` expression {#load-ruby-environment-from-.nix-expression}
As explained in the Nix manual, `nix-shell` can also load an expression from a `.nix` file. Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with:
As explained [in the `nix-shell` section](https://nixos.org/manual/nix/stable/command-ref/nix-shell) of the Nix manual, `nix-shell` can also load an expression from a `.nix` file.
Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with:
```nix
with import <nixpkgs> {};

2
doc/preface.chapter.md
View file

@ -2,7 +2,7 @@
The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the
[Nix package manager](https://nixos.org/nix/), released under a
[permissive MIT/X11 license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
[permissive MIT license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
Packages are available for several platforms, and can be used with the Nix
package manager on most GNU/Linux distributions as well as [NixOS](https://nixos.org/nixos).

5
doc/stdenv/meta.chapter.md
View file

@ -24,7 +24,8 @@ It is expected that each meta-attribute is one of the following:
### `description` {#var-meta-description}
A short (one-line) description of the package. This is shown by `nix-env -q --description` and also on the Nixpkgs release pages.
A short (one-line) description of the package.
This is displayed on [search.nixos.org](https://search.nixos.org/packages).
Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package --- just describe what it does.
@ -74,7 +75,7 @@ The name of the main binary for the package. This affects the binary `nix run` e
### `priority` {#var-meta-priority}
The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the Nix manual page for `nix-env` for details. Example: `"10"` (a low-priority package).
The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the [manual page for `nix-env`](https://nixos.org/manual/nix/stable/command-ref/nix-env) for details. Example: `"10"` (a low-priority package).
### `platforms` {#var-meta-platforms}

2
doc/using/overlays.chapter.md
View file

@ -24,7 +24,7 @@ The list of overlays is determined as follows.
2. Otherwise, if the Nix path entry `<nixpkgs-overlays>` exists, we look for overlays at that path, as described below.
See the section on `NIX_PATH` in the Nix manual for more details on how to set a value for `<nixpkgs-overlays>.`
See the [section on `NIX_PATH`](https://nixos.org/manual/nix/stable/command-ref/env-common.html#env-NIX_PATH) in the Nix manual for more details on how to set a value for `<nixpkgs-overlays>.`
3. If one of `~/.config/nixpkgs/overlays.nix` and `~/.config/nixpkgs/overlays/` exists, then we look for overlays at that path, as described below. It is an error if both exist.

9
nixos/modules/hardware/video/nvidia.nix
View file

@ -4,10 +4,9 @@
pkgs,
...
}: let
x11Enabled = config.services.xserver.enable
&& (lib.elem "nvidia" config.services.xserver.videoDrivers);
nvidiaEnabled = (lib.elem "nvidia" config.services.xserver.videoDrivers);
nvidia_x11 =
if x11Enabled || cfg.datacenter.enable
if nvidiaEnabled || cfg.datacenter.enable
then cfg.package
else null;
@ -256,7 +255,7 @@ in {
({
assertions = [
{
assertion = !(x11Enabled && cfg.datacenter.enable);
assertion = !(nvidiaEnabled && cfg.datacenter.enable);
message = "You cannot configure both X11 and Data Center drivers at the same time.";
}
];
@ -289,7 +288,7 @@ in {
];
})
# X11
(lib.mkIf x11Enabled {
(lib.mkIf nvidiaEnabled {
assertions = [
{
assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == "";

2
nixos/tests/discourse.nix
View file

@ -166,7 +166,7 @@ import ./make-test-python.nix (
request = builtins.toJSON {
title = "Private message";
raw = "This is a test message.";
target_usernames = admin.username;
target_recipients = admin.username;
archetype = "private_message";
};
in ''

6
pkgs/applications/audio/plexamp/default.nix
View file

@ -2,12 +2,12 @@
let
pname = "plexamp";
version = "4.8.2";
version = "4.8.3";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
sha512 = "7NQmH42yzItReQ5WPdcbNPr/xed74H4UyDNlX5PGmoJRBpV1RdeuW1KRweIWfYNhw0KeqULVTjr/aCggoWp4WA==";
sha512 = "CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg==";
};
appimageContents = appimageTools.extractType2 {
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/52";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/53";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];

4
pkgs/applications/blockchains/clightning/default.nix
View file

@ -22,11 +22,11 @@ let
in
stdenv.mkDerivation rec {
pname = "clightning";
version = "23.08";
version = "23.08.1";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
sha256 = "sha256-kersWWGytZmdVbpgezrWyjfb4jeG5dShk/CUb5hpiqA=";
sha256 = "sha256-Pongzgr+VMrp8nrpnR0QCarMWUBPPjTdoebvpWrSy6w=";
};
# when building on darwin we need dawin.cctools to provide the correct libtool

3
pkgs/applications/editors/sublime/4/common.nix
View file

@ -9,9 +9,10 @@
let
pnameBase = "sublimetext4";
packageAttribute = "sublime4${lib.optionalString dev "-dev"}";
binaries = [ "sublime_text" "plugin_host-3.3" "plugin_host-3.8" "crash_reporter" ];
binaries = [ "sublime_text" "plugin_host-3.3" "plugin_host-3.8" crashHandlerBinary ];
primaryBinary = "sublime_text";
primaryBinaryAliases = [ "subl" "sublime" "sublime4" ];
crashHandlerBinary = if lib.versionAtLeast buildVersion "4153" then "crash_handler" else "crash_reporter";
downloadUrl = arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz";
versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
versionFile = builtins.toString ./packages.nix;

12
pkgs/applications/editors/sublime/4/packages.nix
View file

@ -5,15 +5,15 @@ let
in
{
sublime4 = common {
buildVersion = "4143";
x64sha256 = "fehiw40ZNnQUEXEQMo3e11SscJ/tVMjMXLBzfIlMBzw=";
aarch64sha256 = "4zpNHVEHO98vHcWTbqmwlrB4+HIwoQojeQvq7nAqSpM=";
buildVersion = "4152";
x64sha256 = "bt48g1GZWYlwQcZQboUHU8GZYmA7cb2fc6Ylrh5NNVQ=";
aarch64sha256 = "nSH5a5KRYzqLMnLo2mFk3WpjL9p6Qh3zNy8oFPEHHoA=";
} {};
sublime4-dev = common {
buildVersion = "4150";
buildVersion = "4155";
dev = true;
x64sha256 = "6Kafp4MxmCn978SqjSY8qAT6Yc/7WC8U9jVkIUUmUHs=";
aarch64sha256 = "dPxe2RLoMJS+rVtcVZZpMPQ5gfTEnW/INcnzYYeFEIQ=";
x64sha256 = "owcux1/CjXQsJ8/6ex3CWV1/Wvh/ofZFH7yNQtxl9d4=";
aarch64sha256 = "YAcdpBDmaajQPvyp8ypJNom+XOKx2YKA2uylfxlKuZY=";
} {};
}

12
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -7724,6 +7724,18 @@ final: prev:
meta.homepage = "https://github.com/AckslD/nvim-whichkey-setup.lua/";
};
nvim-window-picker = buildVimPluginFrom2Nix {
pname = "nvim-window-picker";
version = "2023-07-29";
src = fetchFromGitHub {
owner = "s1n7ax";
repo = "nvim-window-picker";
rev = "1b1bb834b0acb9eebb11a61664efc665757f1ba2";
sha256 = "1ds2x5hnliw8c7zkqvmnij9bycnxgf3q0vnl0bzb7ki3jc2qg1r8";
};
meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/";
};
nvim-yarp = buildVimPluginFrom2Nix {
pname = "nvim-yarp";
version = "2022-06-08";

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

@ -648,6 +648,7 @@ https://github.com/kevinhwang91/nvim-ufo/,HEAD,
https://github.com/samjwill/nvim-unception/,HEAD,
https://github.com/kyazdani42/nvim-web-devicons/,,
https://github.com/AckslD/nvim-whichkey-setup.lua/,,
https://github.com/s1n7ax/nvim-window-picker/,HEAD,
https://github.com/roxma/nvim-yarp/,,
https://github.com/haringsrob/nvim_context_vt/,,
https://github.com/neovim/nvimdev.nvim/,,

10
pkgs/applications/emulators/pcsx2/default.nix
View file

@ -4,6 +4,7 @@
, llvmPackages_16
, cubeb
, curl
, extra-cmake-modules
, ffmpeg
, fmt_8
, gettext
@ -36,20 +37,20 @@ let
pcsx2_patches = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2_patches";
rev = "c09d842168689aeba88b656e3e0a042128673a7c";
sha256 = "sha256-h1jqv3a3Ib/4C7toZpSlVB1VFNNF1MrrUxttqKJL794=";
rev = "04d727b3bf451da11b6594602036e4f7f5580610";
sha256 = "sha256-zrulsSMRNLPFvrC/jeYzl53i4ZvFQ4Yl2nB0bA6Y8KU=";
};
in
llvmPackages_16.stdenv.mkDerivation rec {
pname = "pcsx2";
version = "1.7.4658";
version = "1.7.5004";
src = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-5y7CYFWgNh9oCBuTITvw7Rn4sC6MbMczVMAwtWFkn9A=";
sha256 = "sha256-o+9VSuoZgTkS75rZ6qYM8ITD+0OcwXp+xh/hdUGpVK4=";
};
cmakeFlags = [
@ -61,6 +62,7 @@ llvmPackages_16.stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
strip-nondeterminism
wrapQtAppsHook

2
pkgs/applications/kde/angelfish.nix
View file

@ -24,7 +24,7 @@
, srcs
# provided as callPackage input to enable easier overrides through overlays
, cargoSha256 ? "sha256-FI94TU3MgIl1tcjwJnzb2PKO1rbZ3uRB1mzXXkNU95I="
, cargoSha256 ? "sha256-ggYQ2cUwTnqFdoBlTar5zCWtUQGsWAAtWCcebtovF/k="
}:
mkDerivation rec {

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.0/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.1/src -A '*.tar.xz' )

4
pkgs/applications/kde/neochat.nix
View file

@ -15,6 +15,7 @@
, kirigami2
, kitemmodels
, knotifications
, kquickcharts
, kquickimageedit
, libpulseaudio
, libquotient
@ -24,6 +25,7 @@
, qqc2-desktop-style
, qtgraphicaleffects
, qtkeychain
, qtlocation
, qtmultimedia
, qtquickcontrols2
, sonnet
@ -49,6 +51,7 @@ mkDerivation {
kirigami2
kitemmodels
knotifications
kquickcharts
kquickimageedit
libpulseaudio
libquotient
@ -57,6 +60,7 @@ mkDerivation {
qcoro
qtgraphicaleffects
qtkeychain
qtlocation
qtmultimedia
qtquickcontrols2
qqc2-desktop-style

1954
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

7
pkgs/applications/misc/auto-multiple-choice/default.nix
View file

@ -25,10 +25,11 @@
}:
stdenv.mkDerivation (finalAttrs: rec {
pname = "auto-multiple-choice";
version = "1.5.2";
version = "1.6.0";
src = fetchurl {
url = "https://download.auto-multiple-choice.net/${pname}_${version}_precomp.tar.gz";
sha256 = "sha256-AjonJOooSe53Fww3QU6Dft95ojNqWrTuPul3nkIbctM=";
url = "https://download.auto-multiple-choice.net/${pname}_${version}_dist.tar.gz";
# before 1.6.0, the URL pattern used "precomp" instead of "dist". ^^^^
sha256 = "sha256-I9Xw1BN8ZSQhi5F1R3axHBKE6tnaCNk8k5tts6LoMjY=";
};
# There's only the Makefile

4
pkgs/applications/networking/browsers/mullvad-browser/default.nix
View file

@ -78,7 +78,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "12.5.3";
version = "12.5.4";
sources = {
x86_64-linux = fetchurl {
@ -86,7 +86,7 @@ let
"https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"
"https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"
];
hash = "sha256-vnxpmZSqPe7wE4USDbYGm+5k9J/nuUk2uJx4CmwFPvw=";
hash = "sha256-xjCsCg6XsnXAiNw6frgJVZRV9UBZA2EAcuHa2Bjq/ro=";
};
};

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -92,7 +92,7 @@ lib.warnIf (useHardenedMalloc != null)
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "12.5.3";
version = "12.5.4";
lang = "ALL";
@ -104,7 +104,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
hash = "sha256-QF71UXZXwLjr1XugKeFWZH9RXb4xeKWZScds+xtNekI=";
hash = "sha256-AIwqIz8QG7Fq3Vvd22QTNFH1fnZgtH25qUaECX50QCQ=";
};
i686-linux = fetchurl {
@ -114,7 +114,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
hash = "sha256-xaLTYo8aJO0DzFQLSUHF12vKOEMO6hbVXQdL3PHLb8s=";
hash = "sha256-s8UReyurIKlxG0bT0ecGUcXMTTHyYKy/AcygTE6ujqo=";
};
};

16
pkgs/applications/networking/cluster/k3s/1_27/versions.nix
View file

@ -1,14 +1,14 @@
{
k3sVersion = "1.27.4+k3s1";
k3sCommit = "36645e7311e9bdbbf2adb79ecd8bd68556bc86f6";
k3sRepoSha256 = "0nvh66c4c01kcz63vk2arh0cd9kcss7c83r92ds6f15x1fxv1w3z";
k3sVendorSha256 = "sha256-azHl2jv/ioI7FVWpgtp7a1dmO9Dlr4CnRmGCIh5Biyg=";
k3sVersion = "1.27.5+k3s1";
k3sCommit = "8d074ecb5a8765a09eeef6f8be7987055210bc40";
k3sRepoSha256 = "0bv0r1l97zip9798d8r3ldymmdhlrfw3j9i0nvads1sd1d4az6m6";
k3sVendorSha256 = "sha256-dFLBa/Sn3GrOPWsTFkP0H2HASE8XB99Orxx5K7nnNio=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.2.0-k3s1";
k3sCNISha256 = "0hzcap4vbl94zsiqc66dlwjgql50gw5g6f0adag0p8yqwcy6vaw2";
containerdVersion = "1.7.1-k3s1";
containerdSha256 = "00k7nkclfxwbzcgnn8s7rkrxyn0zpk57nyy18icf23wsj352gfrn";
k3sCNIVersion = "1.3.0-k3s1";
k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av";
containerdVersion = "1.7.3-k3s1";
containerdSha256 = "03352jn1igsqi23sll06mdsvdbkfhrscqa2ackwczx1a3innxv9r";
criCtlVersion = "1.26.0-rc.0-k3s1";
}

10
pkgs/applications/networking/instant-messengers/element/pin.nix
View file

@ -1,9 +1,9 @@
{
"version" = "1.11.40";
"version" = "1.11.42";
"hashes" = {
"desktopSrcHash" = "sha256-GbmRhdTcbwhDnFv0ljaf3SfoRmuw+zqcetKfCrnxwZ8=";
"desktopYarnHash" = "0w8m318gqm5s2ws9l314l3pm6d6biqp1h58v35zisz2j777kcp76";
"webSrcHash" = "sha256-TCK3MqKodeIt6Nh1+QK2v6DgC1PHrcKljsN2hHMwHe4=";
"webYarnHash" = "0lx42rz9s6ssdp5d31y5pcaigbs290mn1mnpknbcfdygw0pra897";
"desktopSrcHash" = "sha256-0zXvRE3hCGgM93RrJIUnE25k95LbavhNRxtpR6zeTjE=";
"desktopYarnHash" = "0y59610i3jamvk6wh04i39ka9jhdg869wa5qbq38nxckmhjk6wf3";
"webSrcHash" = "sha256-jfV4s76J36woooYXpcU4DBvih3NGlhdxWWKmQmBWrFY=";
"webYarnHash" = "0qvvhbj5mrrry2zcslz5n3pv4bpmdr5vsv446fm4cfvrj4awbz06";
};
}

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file

@ -1,8 +1,8 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
version = "6.30.1";
hash = "sha256-tG5R4A+Uz/ynw0cD7tW5/Fp8KlnNk+zmnRp01m/6vZU=";
version = "6.30.2";
hash = "sha256-qz3eO+pTLK0J+XjAccrZIJdyoU1zyYyrnpQKeLRZvc8=";
};
signal-desktop-beta = {
dir = "Signal Beta";

14
pkgs/applications/networking/remote/remmina/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook
{ lib, stdenv, fetchFromGitLab, fetchpatch, cmake, ninja, pkg-config, wrapGAppsHook
, desktopToDarwinBundle
, glib, gtk3, gettext, libxkbfile, libX11, python3
, freerdp, libssh, libgcrypt, gnutls, vte
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
@ -23,7 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-oEgpav4oQ9Sld9PY4TsutS5xEnhQgOHnpQhDesRFTeQ=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
patches = [
# https://gitlab.com/Remmina/Remmina/-/merge_requests/2525
(fetchpatch {
url = "https://gitlab.com/Remmina/Remmina/-/commit/2ce153411597035d0f3db5177d703541e09eaa06.patch";
hash = "sha256-RV/8Ze9aN4dW49Z+y3z0jFs4dyEWu7DK2FABtmse9Hc=";
})
];
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
buildInputs = [
gsettings-desktop-schemas

2
pkgs/applications/networking/seahub/default.nix
View file

@ -22,7 +22,7 @@ in
python.pkgs.buildPythonApplication rec {
pname = "seahub";
version = "9.0.10";
format = "other";
pyproject = false;
src = fetchFromGitHub {
owner = "haiwen";

30
pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix
View file

@ -1,4 +1,4 @@
{ writeScriptBin, lib, ... }:
{ writeScriptBin, lib, makeBinaryWrapper }:
let
pListText = lib.generators.toPlist { } {
@ -17,23 +17,31 @@ in writeScriptBin "write-darwin-bundle" ''
readonly prefix=$1
readonly name=$2
readonly exec=$3
# TODO: support executables with spaces in their names
readonly execName=''${3%% *} # Before the first space
[[ $3 =~ " " ]] && readonly execArgs=''${3#* } # Everything after the first space
readonly icon=$4.icns
readonly squircle=''${5:-1}
readonly plist=$prefix/Applications/$name.app/Contents/Info.plist
readonly binary=$prefix/bin/$execName
readonly bundleExecutable=$prefix/Applications/$name.app/Contents/MacOS/$name
cat > "$plist" <<EOF
${pListText}
EOF
if [[ $squircle == 0 || $squircle == "false" ]]; then
sed '/CFBundleIconFiles/,\|</array>|d' -i "$plist"
fi
if [[ $squircle == 0 || $squircle == "false" ]]; then
sed '/CFBundleIconFiles/,\|</array>|d' -i "$plist"
fi
cat > "$prefix/Applications/$name.app/Contents/MacOS/$name" <<EOF
#!/bin/bash
exec $prefix/bin/$exec
EOF
chmod +x "$prefix/Applications/$name.app/Contents/MacOS/$name"
if [[ -n "$execArgs" ]]; then
(
source ${makeBinaryWrapper}/nix-support/setup-hook
# WORKAROUND: makeBinaryWrapper fails when -u is set
set +u
makeBinaryWrapper "$binary" "$bundleExecutable" --add-flags "$execArgs"
)
else
ln -s "$binary" "$bundleExecutable"
fi
''

4
pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
View file

@ -204,8 +204,8 @@ processExecFieldCodes() {
local -r execNoKC="${execNoK/\%c/$(getDesktopParam "${file}" "Name")}"
local -r icon=$(getDesktopParam "${file}" "Icon")
local -r execNoKCI="${execNoKC/\%i/${icon:+--icon }${icon}}"
local -r execNoKCIfu="${execNoKCI/\%[fu]/\$1}"
local -r exec="${execNoKCIfu/\%[FU]/\$@}"
local -r execNoKCIfu="${execNoKCI/ \%[fu]/}"
local -r exec="${execNoKCIfu/ \%[FU]/}"
if [[ "$exec" != "$execRaw" ]]; then
echo 1>&2 "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'."
fi

6
pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
View file

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "deepin-icon-theme";
version = "2021.11.24";
version = "2023.04.03";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-UC3PbqolcCbVrIEDqMovfJ4oeofMUGJag1A6u7X3Ml8=";
hash = "sha256-YRmpJr3tvBxomgb7yJPTqE3u4tXQKE5HHOP0CpjbQEg=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];
@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
'';
meta = with lib; {
description = "Deepin Icon Theme provides the base icon themes on Deepin";
description = "Provides the base icon themes on deepin";
homepage = "https://github.com/linuxdeepin/deepin-icon-theme";
license = licenses.gpl3Plus;
platforms = platforms.linux;

38
pkgs/development/interpreters/python/mk-python-derivation.nix
View file

@ -82,6 +82,11 @@
# However, some packages do provide executables with extensions, and thus bytecode is generated.
, removeBinBytecode ? true
# pyproject = true <-> format = "pyproject"
# pyproject = false <-> format = "other"
# https://github.com/NixOS/nixpkgs/issues/253154
, pyproject ? null
# Several package formats are supported.
# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel.
# "wheel" : Install from a pre-compiled wheel.
@ -89,7 +94,7 @@
# "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel.
# "egg": Install a package from an egg.
# "other" : Provide your own buildPhase and installPhase.
, format ? "setuptools"
, format ? null
, meta ? {}
@ -101,10 +106,23 @@
, ... } @ attrs:
assert (pyproject != null) -> (format == null);
let
inherit (python) stdenv;
withDistOutput = lib.elem format ["pyproject" "setuptools" "flit" "wheel"];
format' =
if pyproject != null then
if pyproject then
"pyproject"
else
"other"
else if format != null then
format
else
"setuptools";
withDistOutput = lib.elem format' ["pyproject" "setuptools" "flit" "wheel"];
name_ = name;
@ -177,7 +195,7 @@ let
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
"disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
"disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format"
"disabledTestPaths" "outputs"
]) // {
@ -202,11 +220,11 @@ let
pythonRemoveBinBytecodeHook
] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
unzip
] ++ lib.optionals (format == "setuptools") [
] ++ lib.optionals (format' == "setuptools") [
setuptoolsBuildHook
] ++ lib.optionals (format == "flit") [
] ++ lib.optionals (format' == "flit") [
flitBuildHook
] ++ lib.optionals (format == "pyproject") [(
] ++ lib.optionals (format' == "pyproject") [(
if isBootstrapPackage then
pypaBuildHook.override {
inherit (python.pythonForBuild.pkgs.bootstrap) build;
@ -214,11 +232,11 @@ let
}
else
pypaBuildHook
)] ++ lib.optionals (format == "wheel") [
)] ++ lib.optionals (format' == "wheel") [
wheelUnpackHook
] ++ lib.optionals (format == "egg") [
] ++ lib.optionals (format' == "egg") [
eggUnpackHook eggBuildHook eggInstallHook
] ++ lib.optionals (format != "other") [(
] ++ lib.optionals (format' != "other") [(
if isBootstrapInstallPackage then
pypaInstallHook.override {
inherit (python.pythonForBuild.pkgs.bootstrap) installer;
@ -252,7 +270,7 @@ let
doCheck = false;
doInstallCheck = attrs.doCheck or true;
nativeInstallCheckInputs = [
] ++ lib.optionals (format == "setuptools") [
] ++ lib.optionals (format' == "setuptools") [
# Longer-term we should get rid of this and require
# users of this function to set the `installCheckPhase` or
# pass in a hook that sets it.

44
pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch
View file

@ -1,44 +0,0 @@
From 4bfac4471f53c4f74c8d81020beb938f92d84ca5 Mon Sep 17 00:00:00 2001
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Tue, 22 Aug 2023 16:07:30 +0200
Subject: [PATCH] Avoid clobbering non-volatile XMM registers
This affects some Poly1305 assembler functions
which are only used for certain CPU types.
Remove those functions for Windows targets,
as a simple interim solution.
Fixes #21522
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21808)
(cherry picked from commit 7b8e27bc2e02238986d89ef0ece067ec1b48e165)
---
crypto/poly1305/asm/poly1305-x86_64.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl
index fa9bfb7a7b81..24bab9d0bcf9 100755
--- a/crypto/poly1305/asm/poly1305-x86_64.pl
+++ b/crypto/poly1305/asm/poly1305-x86_64.pl
@@ -195,7 +195,7 @@ sub poly1305_iteration {
bt \$`5+32`,%r9 # AVX2?
cmovc %rax,%r10
___
-$code.=<<___ if ($avx>3);
+$code.=<<___ if ($avx>3 && !$win64);
mov \$`(1<<31|1<<21|1<<16)`,%rax
shr \$32,%r9
and %rax,%r9
@@ -2724,7 +2724,7 @@ sub poly1305_iteration {
.cfi_endproc
.size poly1305_blocks_avx512,.-poly1305_blocks_avx512
___
-if ($avx>3) {
+if ($avx>3 && !$win64) {
########################################################################
# VPMADD52 version using 2^44 radix.
#

7
pkgs/development/libraries/openssl/default.nix
View file

@ -236,14 +236,11 @@ in {
# the permitted insecure version to ensure it gets cached for our users
# and backport this to stable release (23.05).
openssl_1_1 = common {
version = "1.1.1v";
sha256 = "sha256-1ml+KHHncjhGBALpNi1H0YOCsV758karpse9eA04prA=";
version = "1.1.1w";
sha256 = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg=";
patches = [
./1.1/nix-ssl-cert-file.patch
# https://www.openssl.org/news/secadv/20230908.txt
./1.1/CVE-2023-4807.patch
(if stdenv.hostPlatform.isDarwin
then ./use-etc-ssl-certs-darwin.patch
else ./use-etc-ssl-certs.patch)

1
pkgs/development/libraries/wayland/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, substituteAll
, meson
, pkg-config
, ninja

19
pkgs/development/ocaml-modules/ocaml-protoc/default.nix
View file

@ -1,30 +1,19 @@
{ lib, fetchFromGitHub, buildDunePackage
, pbrt
, stdlib-shims
}:
buildDunePackage rec {
pname = "ocaml-protoc";
version = "2.0.2";
useDune2 = true;
minimumOCamlVersion = "4.02";
src = fetchFromGitHub {
owner = "mransan";
repo = "ocaml-protoc";
rev = version;
sha256 = "1vlnjqqpypmjhlyrxfzla79y4ilmc9ggz311giy6vmh4cyzl29h3";
};
inherit (pbrt) version src;
buildInputs = [ stdlib-shims ];
propagatedBuildInputs = [ pbrt ];
doCheck = true;
meta = with lib; {
homepage = "https://github.com/mransan/ocaml-protoc";
meta = pbrt.meta // {
description = "A Protobuf Compiler for OCaml";
license = licenses.mit;
maintainers = [ maintainers.vyorkin ];
};
}

23
pkgs/development/ocaml-modules/pbrt/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ lib, fetchFromGitHub, buildDunePackage }:
buildDunePackage rec {
pname = "pbrt";
version = "2.4";
minimalOCamlVersion = "4.03";
src = fetchFromGitHub {
owner = "mransan";
repo = "ocaml-protoc";
rev = "${version}.0";
hash = "sha256-EXugdcjALukSjB31zAVG9WiN6GMGXi2jlhHWaZ+p+uM=";
};
meta = with lib; {
homepage = "https://github.com/mransan/ocaml-protoc";
description = "Runtime library for Protobuf tooling";
license = licenses.mit;
maintainers = [ maintainers.vyorkin ];
};
}

4
pkgs/development/python-modules/peaqevcore/default.nix
View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "19.3.2";
version = "19.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-hVI3syst8F5BNrHcu21OxszPMWuv0wY65yFdfoXLMWM=";
hash = "sha256-SJ3G301HO0TnrupzhK4K6JPDs25Nltv+lNj1nQB7gV4=";
};
postPatch = ''

4
pkgs/development/python-modules/transmission-rpc/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "transmission-rpc";
version = "6.0.0";
version = "7.0.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Trim21";
repo = "transmission-rpc";
rev = "refs/tags/v${version}";
hash = "sha256-gRyxQ6Upc1YBRhciVfyt0IGjv8K8ni4I1ODRS6o3tHA=";
hash = "sha256-66TKUi4rNZDMWPncyxgHY6oW62DVOQLSWO1RevHG7EY=";
};
nativeBuildInputs = [

3
pkgs/development/python-modules/twisted/default.nix
View file

@ -60,7 +60,8 @@ buildPythonPackage rec {
patches = [
(fetchpatch {
url = "https://github.com/twisted/twisted/pull/11787.diff";
name = "11787.diff";
url = "https://github.com/twisted/twisted/commit/da3bf3dc29f067e7019b2a1c205834ab64b2139a.diff";
hash = "sha256-bQgUmbvDa61Vg8p/o/ivfkOAHyj1lTgHkrRVEGLM9aU=";
})
(fetchpatch {

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View file

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "6918a7d323874cbc8d59d353f1ac8f105bb79b81";
version = "2023-08-28";
rev = "2533707e47be067946572f4c83f3ba42036fa425";
version = "2023-09-13";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "awRkk9mir/lcpPUEDnNeDSe+aynYKwKQd066cws5nhU=";
sha256 = "k53jlbXf1VRdZQcTwpSeNJTcOCVoLWNzfEdEOVNPFsY=";
};
dontBuild = true;

2
pkgs/development/tools/language-servers/ruff-lsp/default.nix
View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "ruff-lsp";
version = "0.0.39";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {

16
pkgs/development/tools/misc/catppuccin-catwalk/default.nix
View file

@ -1,7 +1,10 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, installShellFiles
, pkg-config
, libwebp
}:
rustPlatform.buildRustPackage {
@ -18,7 +21,8 @@ rustPlatform.buildRustPackage {
buildAndTestSubdir = "catwalk";
cargoHash = "sha256-KoxivYLzJEjWbxIkizrMpmVwUF7bfVxl13H774lzQRg=";
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ libwebp ];
postInstall = ''
installShellCompletion --cmd catwalk \
@ -27,6 +31,14 @@ rustPlatform.buildRustPackage {
--fish <("$out/bin/catwalk" completion fish)
'';
doInstallCheck = !stdenv.hostPlatform.isStatic &&
stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf;
installCheckPhase = ''
runHook preInstallCheck
readelf -a $out/bin/catwalk | grep -F 'Shared library: [libwebp.so'
runHook postInstallCheck
'';
meta = with lib; {
homepage = "https://github.com/catppuccin/toolbox/tree/main/catwalk";
description = "A CLI for Catppuccin that takes in four showcase images and displays them all at once";

12
pkgs/development/tools/misc/ztags/default.nix
View file

@ -1,24 +1,30 @@
{ lib
, stdenv
, fetchFromGitHub
, scdoc
, zig_0_11
}:
stdenv.mkDerivation {
pname = "ztags";
version = "unstable-2023-08-29";
version = "unstable-2023-09-07";
src = fetchFromGitHub {
owner = "gpanders";
repo = "ztags";
rev = "87dbc4ba7993fa1537ddce942c6ce4cf90ce0809";
hash = "sha256-FZZZnTmz4mxhiRXs16A41fz0WYIg6oGM7xj2cECRkrM=";
rev = "6cdbd6dcdeda0d1ab9ad30261000e3d21b2407e6";
hash = "sha256-lff5L7MG8RJdJM/YebJKDkKfkG4oumC0HytiCUOUG5Q=";
};
nativeBuildInputs = [
scdoc
zig_0_11.hook
];
postInstall = ''
zig build docs --prefix $out
'';
meta = with lib; {
description = "Generate tags files for Zig projects";
homepage = "https://github.com/gpanders/ztags";

10
pkgs/os-specific/linux/nftables/default.nix
View file

@ -1,9 +1,10 @@
{ lib, stdenv, fetchurl, pkg-config, bison, flex
, asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
, libmnl, libnftnl, libpcap
, gmp, jansson, libedit
, gmp, jansson
, autoreconfHook
, withDebugSymbols ? false
, withCli ? true, libedit
, withPython ? false, python3
, withXtables ? true, iptables
, nixosTests
@ -26,8 +27,9 @@ stdenv.mkDerivation rec {
buildInputs = [
libmnl libnftnl libpcap
gmp jansson libedit
] ++ lib.optional withXtables iptables
gmp jansson
] ++ lib.optional withCli libedit
++ lib.optional withXtables iptables
++ lib.optionals withPython [
python3
python3.pkgs.setuptools
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-json"
"--with-cli=editline"
(lib.withFeatureAs withCli "cli" "editline")
] ++ lib.optional (!withDebugSymbols) "--disable-debug"
++ lib.optional (!withPython) "--disable-python"
++ lib.optional withPython "--enable-python"

29
pkgs/servers/web-apps/discourse/default.nix
View file

@ -37,8 +37,7 @@
, yarn
, fixup_yarn_lock
, nodePackages
, nodejs_16
, dart-sass-embedded
, nodejs_18
, jq
, moreutils
, terser
@ -47,13 +46,13 @@
}@args:
let
version = "3.1.0.beta4";
version = "3.1.0";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE=";
sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY=";
};
ruby = ruby_3_2;
@ -163,9 +162,9 @@ let
cd ../..
mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/
ln -s "${nodejs_16.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
ln -s "${nodejs_18.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
ln -s ${nodejs_16.libv8}/include vendor/v8/include
ln -s ${nodejs_18.libv8}/include vendor/v8/include
mkdir -p ext/libv8-node
echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
@ -190,20 +189,6 @@ let
cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
'';
};
sass-embedded = gems.sass-embedded // {
dontBuild = false;
# `sass-embedded` depends on `dart-sass-embedded` and tries to
# fetch that as `.tar.gz` from GitHub releases. That `.tar.gz`
# can also be specified via `SASS_EMBEDDED`. But instead of
# compressing our `dart-sass-embedded` just to decompress it
# again, we simply patch the Rakefile to symlink that path.
patches = [
./rubyEnv/sass-embedded-static.patch
];
postPatch = ''
export SASS_EMBEDDED=${dart-sass-embedded}/bin
'';
};
};
groups = [
@ -217,7 +202,7 @@ let
yarnOfflineCache = fetchYarnDeps {
yarnLock = src + "/app/assets/javascripts/yarn.lock";
sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk";
sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj";
};
nativeBuildInputs = runtimeDeps ++ [
@ -227,7 +212,7 @@ let
terser
nodePackages.patch-package
yarn
nodejs_16
nodejs_18
jq
moreutils
];

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

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

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

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

8
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
View file

@ -1,15 +1,15 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.4.3)
activesupport (7.0.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
concurrent-ruby (1.2.2)
i18n (1.13.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
minitest (5.18.0)
minitest (5.20.0)
rrule (0.4.4)
activesupport (>= 2.3)
tzinfo (2.0.6)
@ -22,4 +22,4 @@ DEPENDENCIES
rrule (= 0.4.4)
BUNDLED WITH
2.4.10
2.4.13

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

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

12
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
View file

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5";
type = "gem";
};
version = "7.0.4.3";
version = "7.0.8";
};
concurrent-ruby = {
groups = ["default"];
@ -26,20 +26,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
type = "gem";
};
version = "1.13.0";
version = "1.14.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
type = "gem";
};
version = "5.18.0";
version = "5.20.0";
};
rrule = {
dependencies = ["activesupport"];

4
pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
View file

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-canned-replies";
rev = "5a2d9a11ef3f07fc781acd83770bafc14eca2c1b";
sha256 = "sha256-R6CmL1hqqybc/I3oAzr3xZ4WThPWQirMjlXkF82xmIk=";
rev = "732598b6cdc86c74622bb15bfeaebb05611bbc25";
sha256 = "sha256-t0emNsPT8o0ralUedt33ufH0VLl4/12lVBBCnzfdRxE=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-canned-replies";

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

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-chat-integration";
rev = "9647c7afc0df42b8e2b5ae585afaf51f107fa195";
sha256 = "sha256-lP404OJvEEQVKIQTBMca7zb/YxQ6HXcPG1jMKpEB3iA=";
rev = "70fea6b66b68868aa4c00b45a169436deaa142a8";
sha256 = "sha256-K9MmP1F0B6Na2dTqgnsjMbTQFkF+nNKkI8aF3zPAodc=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-chat-integration";

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

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

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

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

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

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

8
pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
View file

@ -1,16 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.4)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
faraday (2.7.4)
faraday (2.7.10)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
octokit (5.6.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
public_suffix (5.0.1)
public_suffix (5.0.3)
ruby2_keywords (0.0.5)
sawyer (0.9.2)
addressable (>= 2.3.5)
@ -24,4 +24,4 @@ DEPENDENCIES
sawyer (= 0.9.2)
BUNDLED WITH
2.4.10
2.4.13

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

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-github";
rev = "77e336a1b4ea08e2bb8a010d30146e4844afb3f3";
sha256 = "sha256-VHuf4ymT+W676RAuA3WPQl9QXLdQz4s8vP9EC8XAwW0=";
rev = "8aa068d56ef010cecaabd50657e7753f4bbecc1f";
sha256 = "sha256-WzljuGvv6pki3ROkvhXZWQaq5D9JkCbWjdlkdRI8lHE=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-github";

12
pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
View file

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33";
type = "gem";
};
version = "2.8.4";
version = "2.8.5";
};
faraday = {
dependencies = ["faraday-net_http" "ruby2_keywords"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj";
sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9";
type = "gem";
};
version = "2.7.4";
version = "2.7.10";
};
faraday-net_http = {
groups = ["default"];
@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k";
type = "gem";
};
version = "5.0.1";
version = "5.0.3";
};
ruby2_keywords = {
groups = ["default"];

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

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-math";
rev = "69494ca5a4d708e16e35f1daebeaa53e3edbca2c";
sha256 = "sha256-C0iVUwj+Lbe6TGfkbu6WxdCeMWVjBaejUh6fXVTqq08=";
rev = "529ad1fe6da924da378a60bec48c35657bb01a68";
sha256 = "sha256-zhtAy0tTVMzQfPilTwfyyzxgCJD4xazOITBuliFR5Gg=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-math";

2
pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock
View file

@ -23,4 +23,4 @@ DEPENDENCIES
unix-crypt (= 1.3.0)
BUNDLED WITH
2.4.6
2.4.13

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

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

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

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

2
pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile
View file

@ -4,4 +4,4 @@ source "https://rubygems.org"
# gem "rails"
gem "webrick", "1.7.0"
gem "prometheus_exporter", File.read(File.expand_path("../prometheus_exporter_version", __FILE__)).strip
gem "prometheus_exporter", "2.0.6"

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

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

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

@ -6,8 +6,8 @@
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-prometheus";
rev = "802cb5aa89838ecb3078dbe21b70d87b1675d89e";
sha256 = "sha256-tgujK/k/7l/9dAFna5sfUpgP0PVfjk+aGRbqZ70lmRw=";
rev = "8a7a46a80cc65aa0839bc5e3c3b6f8ef6544089f";
sha256 = "sha256-TL+pbP26LvRMKdy8CAuBEK+LZfAs8HfggMeUDaBu9hc=";
};
patches = [

20
pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/spec-import-fix-abi-version.patch
View file

@ -1,16 +1,20 @@
diff --git a/bin/collector b/bin/collector
index 4fec65e..e59eac7 100755
index 6bd04a8caffb..119526fc6ea3 100644
--- a/bin/collector
+++ b/bin/collector
@@ -3,8 +3,10 @@
@@ -3,12 +3,14 @@
Process.setproctitle("discourse prometheus-collector")
+# We need the ABI version {MAJOR}.{MINOR}.0 here.
+abi_version = ENV['GEM_PATH'].split("/")[-1]
version = File.read(File.expand_path("../../prometheus_exporter_version", __FILE__)).strip
-spec_file = File.expand_path("../../gems/#{RUBY_VERSION}/specifications/prometheus_exporter-#{version}.gemspec", __FILE__)
+spec_file = File.expand_path("../../gems/#{abi_version}/specifications/prometheus_exporter-#{version}.gemspec", __FILE__)
spec = Gem::Specification.load spec_file
spec.activate
[
"webrick-#{ENV["WEBRICK_VERSION"]}",
"prometheus_exporter-#{ENV["PROMETHEUS_EXPORTER_VERSION"]}",
].each do |spec_name|
spec_file =
- File.expand_path("../../gems/#{RUBY_VERSION}/specifications/#{spec_name}.gemspec", __FILE__)
+ File.expand_path("../../gems/#{abi_version}/specifications/#{spec_name}.gemspec", __FILE__)
spec = Gem::Specification.load(spec_file)
spec.activate
end

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

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

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

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-saved-searches";
rev = "5c6d1b6c186c5c96bb92bd6de62d3bc2da6a5b68";
sha256 = "sha256-Z9wWwf9gH/Iainxx089J4eT7MpQeHpFXgTU40p/IcYY=";
rev = "7c9bdcd68951e7cef16cafe3c4bfb583bb994d2a";
sha256 = "sha256-6RIN12ACDCeRcxmsC3FgeIPdvovI4arn7w/Dqil1yCI=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-saved-searches";

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

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

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

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-spoiler-alert";
rev = "0ee68da1fe1d029685a373df7fc874fcd2e50991";
sha256 = "sha256-z+0RL7HAJ92TyI1z2DBpirYN7IWzV7iGejs8Howo2+s=";
rev = "65989714af08eda44196cca3a0afe85c9e9443f9";
sha256 = "sha256-R/vqNEDst50+Y7anckIvhy4viBOqBemIZMh4sPt7kRM=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-spoiler-alert";

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

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

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

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-yearly-review";
rev = "af7e294d04ca7b0c64dd604d19a553500accee51";
sha256 = "sha256-ioUJqLe/sUDKKa106hGY4OhwOgC+96YFQ4Lqr/CFF7Y=";
rev = "3246c6b378f9e69e664c575efc63c2ad83bcac2f";
sha256 = "sha256-usHHyfYP4YAQ94f7gvNSH7VBRRkdZMmsSi9QQM8tPfY=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-yearly-review";

11
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
View file

@ -18,7 +18,7 @@ else
# this allows us to include the bits of rails we use without pieces we do not.
#
# To issue a rails update bump the version number here
rails_version = "7.0.4.3"
rails_version = "7.0.5.1"
gem "actionmailer", rails_version
gem "actionpack", rails_version
gem "actionview", rails_version
@ -96,8 +96,7 @@ gem "omniauth-oauth2", require: false
gem "omniauth-google-oauth2"
# pending: https://github.com/ohler55/oj/issues/789
gem "oj", "3.13.14"
gem "oj"
gem "pg"
gem "mini_sql"
@ -145,6 +144,7 @@ group :test do
gem "selenium-webdriver", require: false
gem "test-prof"
gem "webdrivers", require: false
gem "rails-dom-testing", require: false
end
group :test, :development do
@ -158,7 +158,7 @@ group :test, :development do
gem "rspec-rails"
gem "shoulda-matchers", require: false
gem "shoulda-matchers", require: false, github: "thoughtbot/shoulda-matchers"
gem "rspec-html-matchers"
gem "byebug", require: ENV["RM_INFO"].nil?, platform: :mri
gem "rubocop-discourse", require: false
@ -272,9 +272,6 @@ gem "faraday-retry"
# https://github.com/ruby/net-imap/issues/16#issuecomment-803086765
gem "net-http"
# workaround for prometheus-client
gem "webrick", require: false
# Workaround until Ruby ships with cgi version 0.3.6 or higher.
gem "cgi", ">= 0.3.6", require: false

267
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
View file

@ -7,28 +7,35 @@ GIT
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
GIT
remote: https://github.com/thoughtbot/shoulda-matchers.git
revision: 783a90554053002017510285bc736099b2749c22
specs:
shoulda-matchers (5.3.0)
activesupport (>= 5.2.0)
GEM
remote: https://rubygems.org/
specs:
actionmailer (7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activesupport (= 7.0.4.3)
actionmailer (7.0.5.1)
actionpack (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.4.3)
actionview (= 7.0.4.3)
activesupport (= 7.0.4.3)
rack (~> 2.0, >= 2.2.0)
actionpack (7.0.5.1)
actionview (= 7.0.5.1)
activesupport (= 7.0.5.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (7.0.4.3)
activesupport (= 7.0.4.3)
actionview (7.0.5.1)
activesupport (= 7.0.5.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
@ -37,15 +44,15 @@ GEM
actionview (>= 6.0.a)
active_model_serializers (0.8.4)
activemodel (>= 3.0)
activejob (7.0.4.3)
activesupport (= 7.0.4.3)
activejob (7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.3.6)
activemodel (7.0.4.3)
activesupport (= 7.0.4.3)
activerecord (7.0.4.3)
activemodel (= 7.0.4.3)
activesupport (= 7.0.4.3)
activesupport (7.0.4.3)
activemodel (7.0.5.1)
activesupport (= 7.0.5.1)
activerecord (7.0.5.1)
activemodel (= 7.0.5.1)
activesupport (= 7.0.5.1)
activesupport (7.0.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -75,10 +82,10 @@ GEM
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.0)
aws-eventstream (~> 1, >= 1.0.2)
better_errors (2.9.1)
coderay (>= 1.0.0)
better_errors (2.10.1)
erubi (>= 1.0.0)
rack (>= 0.9.0)
rouge (>= 1.0.0)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bootsnap (1.16.0)
@ -88,7 +95,7 @@ GEM
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
capybara (3.39.0)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
@ -104,7 +111,7 @@ GEM
coderay (1.1.3)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
connection_pool (2.4.0)
connection_pool (2.4.1)
cose (1.3.0)
cbor (~> 0.5.9)
openssl-signature_algorithm (~> 1.0)
@ -135,32 +142,30 @@ GEM
faker (~> 2.16)
literate_randomizer
docile (1.4.0)
ecma-re-validator (0.4.0)
regexp_parser (~> 2.2)
email_reply_trimmer (0.1.13)
erubi (1.12.0)
excon (0.99.0)
excon (0.100.0)
execjs (2.8.1)
exifr (1.3.10)
exifr (1.4.0)
fabrication (2.30.0)
faker (2.23.0)
i18n (>= 1.8.11, < 2)
fakeweb (1.3.0)
faraday (2.7.4)
faraday (2.7.10)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
faraday-retry (2.1.0)
faraday-retry (2.2.0)
faraday (~> 2.0)
fast_blank (1.0.1)
fast_xs (0.8.0)
fastimage (2.2.6)
fastimage (2.2.7)
ffi (1.15.5)
fspath (3.1.2)
gc_tracer (1.5.1)
globalid (1.1.0)
activesupport (>= 5.0)
google-protobuf (3.22.3)
google-protobuf (3.23.4)
guess_html_encoding (0.0.11)
hana (1.3.7)
hashdiff (1.0.1)
@ -169,7 +174,7 @@ GEM
hkdf (1.0.0)
htmlentities (4.3.4)
http_accept_language (2.1.1)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
image_optim (0.31.3)
exifr (~> 1.2, >= 1.2.2)
@ -177,25 +182,25 @@ GEM
image_size (>= 1.5, < 4)
in_threads (~> 1.3)
progress (~> 3.0, >= 3.0.1)
image_size (3.2.0)
image_size (3.3.0)
in_threads (1.6.0)
jmespath (1.6.2)
json (2.6.3)
json-schema (3.0.0)
addressable (>= 2.8)
json_schemer (0.2.23)
ecma-re-validator (~> 0.3)
json_schemer (1.0.3)
hana (~> 1.3)
regexp_parser (~> 2.0)
uri_template (~> 0.7)
jwt (2.7.0)
simpleidn (~> 0.2)
jwt (2.7.1)
kgio (2.11.4)
libv8-node (16.10.0.0)
language_server-protocol (3.17.0.3)
libv8-node (18.16.0.0)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
literate_randomizer (0.4.0)
lograge (0.12.0)
lograge (0.13.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
@ -204,9 +209,9 @@ GEM
logstash-logger (0.26.1)
logstash-event (~> 1.2)
logster (2.12.2)
loofah (2.20.0)
loofah (2.21.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
lru_redux (1.1.0)
lz4-ruby (0.3.3)
mail (2.8.1)
@ -217,28 +222,28 @@ GEM
matrix (0.4.2)
maxminddb (0.1.22)
memory_profiler (1.0.1)
message_bus (4.3.2)
message_bus (4.3.7)
rack (>= 1.1.3)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
mini_racer (0.6.3)
libv8-node (~> 16.10.0.0)
mini_scheduler (0.15.0)
mini_portile2 (2.8.4)
mini_racer (0.8.0)
libv8-node (~> 18.16.0.0)
mini_scheduler (0.16.0)
sidekiq (>= 4.2.3, < 7.0)
mini_sql (1.4.0)
mini_suffix (0.3.3)
ffi (~> 1.9)
minitest (5.18.0)
mocha (2.0.2)
minitest (5.19.0)
mocha (2.1.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.0)
msgpack (1.7.2)
multi_json (1.15.0)
multi_xml (0.6.0)
mustache (1.1.1)
net-http (0.3.2)
uri
net-imap (0.3.4)
net-imap (0.3.7)
date
net-protocol
net-pop (0.1.2)
@ -248,8 +253,8 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.9)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
nokogiri (1.15.3)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oauth (1.1.0)
oauth-tty (~> 1.0, >= 1.0.1)
@ -263,7 +268,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 4)
oj (3.13.14)
oj (3.15.1)
omniauth (1.9.2)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
@ -289,12 +294,13 @@ GEM
openssl (3.1.0)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
optimist (3.0.1)
parallel (1.22.1)
parallel_tests (4.2.0)
optimist (3.1.0)
parallel (1.23.0)
parallel_tests (4.2.1)
parallel
parser (3.2.2.0)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
pg (1.4.6)
prettier_print (1.2.1)
progress (3.6.0)
@ -306,32 +312,34 @@ GEM
pry (>= 0.13, < 0.15)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (5.0.1)
puma (6.2.1)
public_suffix (5.0.3)
puma (6.3.0)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.4)
racc (1.7.1)
rack (2.2.8)
rack-mini-profiler (3.1.0)
rack (>= 1.2.0)
rack-protection (3.0.6)
rack
rack-test (2.1.0)
rack (>= 1.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
rails-dom-testing (2.1.1)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails_failover (1.0.0)
activerecord (> 6.0, < 7.1)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rails_failover (2.0.1)
activerecord (>= 6.1, <= 7.1)
concurrent-ruby
railties (> 6.0, < 7.1)
rails_multisite (4.0.1)
activerecord (> 5.0, < 7.1)
railties (> 5.0, < 7.1)
railties (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
railties (>= 6.1, <= 7.1)
rails_multisite (5.0.0)
activerecord (>= 6.0)
railties (>= 6.0)
railties (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
@ -348,15 +356,16 @@ GEM
optimist (>= 3.0.0)
rchardet (1.8.0)
redis (4.8.1)
redis-namespace (1.10.0)
redis-namespace (1.11.0)
redis (>= 4)
regexp_parser (2.8.0)
regexp_parser (2.8.1)
request_store (1.5.1)
rack (>= 1.4)
rexml (3.2.5)
rexml (3.2.6)
rinku (2.0.6)
rotp (6.2.2)
rqrcode (2.1.2)
rouge (4.1.3)
rqrcode (2.2.0)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
@ -364,75 +373,77 @@ GEM
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-html-matchers (0.10.0)
nokogiri (~> 1)
rspec (>= 3.0.0.a)
rspec-mocks (3.12.5)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.1)
rspec-rails (6.0.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.11)
rspec-expectations (~> 3.11)
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
rspec-support (3.12.0)
rspec-core (~> 3.12)
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rss (0.2.9)
rexml
rswag-specs (2.8.0)
rswag-specs (2.10.1)
activesupport (>= 3.1, < 7.1)
json-schema (>= 2.2, < 4.0)
railties (>= 3.1, < 7.1)
rspec-core (>= 2.14)
rtlcss (0.2.0)
mini_racer (~> 0.6.3)
rubocop (1.50.2)
rtlcss (0.2.1)
mini_racer (>= 0.6.3)
rubocop (1.55.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.17.1)
rubocop-capybara (2.18.0)
rubocop (~> 1.41)
rubocop-discourse (3.2.0)
rubocop-discourse (3.3.0)
rubocop (>= 1.1.0)
rubocop-rspec (>= 2.0.0)
rubocop-rspec (2.19.0)
rubocop-factory_bot (2.23.1)
rubocop (~> 1.33)
rubocop-rspec (2.23.0)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
ruby-prof (1.6.1)
rubocop-factory_bot (~> 2.22)
ruby-prof (1.6.3)
ruby-progressbar (1.13.0)
ruby-readability (0.7.0)
guess_html_encoding (>= 0.0.4)
nokogiri (>= 1.6.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
sanitize (6.0.1)
sanitize (6.0.2)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
sass-embedded (1.62.0)
google-protobuf (~> 3.21)
rake (>= 10.0.0)
selenium-webdriver (4.8.6)
sass-embedded (1.64.1)
google-protobuf (~> 3.23)
rake (>= 13.0.0)
selenium-webdriver (4.10.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
shoulda-matchers (5.3.0)
activesupport (>= 5.2.0)
sidekiq (6.5.8)
sidekiq (6.5.9)
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.5.0, < 5)
@ -442,6 +453,8 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
simpleidn (0.2.1)
unf (~> 0.1.4)
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
@ -454,10 +467,10 @@ GEM
syntax_tree (6.1.1)
prettier_print (>= 1.2.0)
syntax_tree-disable_ternary (1.0.0)
test-prof (1.2.1)
thor (1.2.1)
tilt (2.1.0)
timeout (0.3.2)
test-prof (1.2.2)
thor (1.2.2)
tilt (2.2.0)
timeout (0.4.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2023.3)
@ -472,41 +485,39 @@ GEM
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.16.0)
uri (0.12.1)
uri_template (0.7.0)
version_gem (1.1.2)
uri (0.12.2)
version_gem (1.1.3)
web-push (3.0.0)
hkdf (~> 1.0)
jwt (~> 2.0)
openssl (~> 3.0)
webdrivers (5.2.0)
webdrivers (5.3.1)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0)
selenium-webdriver (~> 4.0, < 4.11)
webmock (3.18.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.7.0)
websocket (1.2.9)
xpath (3.2.0)
nokogiri (~> 1.8)
yaml-lint (0.1.2)
yard (0.9.34)
zeitwerk (2.6.7)
zeitwerk (2.6.10)
PLATFORMS
ruby
DEPENDENCIES
actionmailer (= 7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
actionmailer (= 7.0.5.1)
actionpack (= 7.0.5.1)
actionview (= 7.0.5.1)
actionview_precompiler
active_model_serializers (~> 0.8.3)
activemodel (= 7.0.4.3)
activerecord (= 7.0.4.3)
activesupport (= 7.0.4.3)
activemodel (= 7.0.5.1)
activerecord (= 7.0.5.1)
activesupport (= 7.0.5.1)
addressable
annotate
aws-sdk-s3
@ -575,7 +586,7 @@ DEPENDENCIES
net-pop
net-smtp
nokogiri
oj (= 3.13.14)
oj
omniauth
omniauth-facebook
omniauth-github
@ -590,9 +601,10 @@ DEPENDENCIES
rack
rack-mini-profiler
rack-protection
rails-dom-testing
rails_failover
rails_multisite
railties (= 7.0.4.3)
railties (= 7.0.5.1)
rake
rb-fsevent
rbtrace
@ -614,7 +626,7 @@ DEPENDENCIES
rubyzip
sanitize
selenium-webdriver
shoulda-matchers
shoulda-matchers!
sidekiq
simplecov
sprockets!
@ -632,9 +644,8 @@ DEPENDENCIES
web-push
webdrivers
webmock
webrick
yaml-lint
yard
BUNDLED WITH
2.4.10
2.4.13

401
pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
View file

File diff suppressed because it is too large Load diff

21
pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch
View file

@ -1,21 +0,0 @@
diff --git a/ext/sass/Rakefile b/ext/sass/Rakefile
index 77ced01..1e60ab0 100644
--- a/ext/sass/Rakefile
+++ b/ext/sass/Rakefile
@@ -18,15 +18,7 @@ file 'protoc.exe' do |t|
end
file 'sass_embedded' do |t|
- archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded })
- unarchive archive
- rm archive
-
- if ENV.key?('NIX_BINTOOLS')
- sh 'patchelf',
- '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp,
- (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) })
- end
+ symlink(ENV.fetch(t.name.upcase), 'sass_embedded')
end
file 'embedded.rb' => %w[sass_embedded] do |t|

2
pkgs/servers/web-apps/discourse/update.py
View file

@ -322,7 +322,7 @@ def update_plugins():
for [discourse_version, plugin_rev]
in [line.split(':')
for line
in compatibility_spec.splitlines()]]
in compatibility_spec.splitlines() if line != '']]
discourse_version = DiscourseVersion(_get_current_package_version('discourse'))
versions = list(filter(lambda ver: ver[0] >= discourse_version, versions))
if versions == []:

16
pkgs/tools/admin/syft/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "syft";
version = "0.88.0";
version = "0.90.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
hash = "sha256-A9EYbZigG6TmyYhMjqhpZRaYnR7KzCJpaOBEEaSXWQ4=";
hash = "sha256-W1BLwoqo7sDRZ1LjAbfuuZpoJCWfAK8ekIFwfItkH4A=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -22,7 +22,7 @@ buildGoModule rec {
};
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-7KL/Z95Gg2Cy6oUIVS8KLS3DvQYcLCZaxgKbtzR1M1U=";
vendorHash = "sha256-TG292RncaL/4kfuM02huEaIAsuUj7vrTre2aFnjqx3Y=";
nativeBuildInputs = [ installShellFiles ];
@ -31,14 +31,14 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/anchore/syft/internal/version.version=${version}"
"-X github.com/anchore/syft/internal/version.gitDescription=v${version}"
"-X github.com/anchore/syft/internal/version.gitTreeState=clean"
"-X main.version=${version}"
"-X main.gitDescription=v${version}"
"-X main.gitTreeState=clean"
];
preBuild = ''
ldflags+=" -X github.com/anchore/syft/internal/version.gitCommit=$(cat COMMIT)"
ldflags+=" -X github.com/anchore/syft/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
ldflags+=" -X main.gitCommit=$(cat COMMIT)"
ldflags+=" -X main.buildDate=$(cat SOURCE_DATE_EPOCH)"
'';
# tests require a running docker instance

6
pkgs/tools/graphics/svg2pdf/default.nix
View file

@ -5,15 +5,15 @@
rustPlatform.buildRustPackage rec {
pname = "svg2pdf";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "typst";
repo = "svg2pdf";
rev = "v${version}";
hash = "sha256-X5L3UA/BJw8M2G35biCQjExYe68fB14meW4ILPEyesc=";
hash = "sha256-XTOGxuytbkaq4ZV6rXKJF9A/KSX6naYQ3kdICDQU4JA=";
};
cargoHash = "sha256-zR4nKzbbCzSM1JVxj3nk6yQAfpPmfVQGabkU7lzLAi0=";
cargoHash = "sha256-CQPkVJ3quQlnIS05tAj+i7kGk2l0RvGM/FRNvgQ0mHM=";
buildFeatures = [ "cli" ];
meta = with lib; {

6
pkgs/tools/package-management/home-manager/default.nix
View file

@ -16,14 +16,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "2023-05-30";
version = "2023-09-14";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "54a9d6456eaa6195998a0f37bdbafee9953ca0fb";
hash = "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=";
rev = "d9b88b43524db1591fb3d9410a21428198d75d49";
hash = "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=";
};
nativeBuildInputs = [

6
pkgs/tools/package-management/nix-update/default.nix
View file

@ -10,7 +10,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-update";
version = "0.19.3";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "Mic92";
@ -19,6 +19,10 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-+WD+SV/L3TvksWBIg6jk+T0dUTNdp4VKONzdzVT+pac=";
};
nativeBuildInputs = [
python3.pkgs.setuptools
];
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch-git nixpkgs-fmt nixpkgs-review ])
];

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

@ -5219,7 +5219,7 @@ with pkgs;
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_25;
electron = electron_26;
};
element-desktop-wayland = writeScriptBin "element-desktop" ''
#!/bin/sh
@ -13654,7 +13654,9 @@ with pkgs;
systrayhelper = callPackage ../tools/misc/systrayhelper { };
syft = callPackage ../tools/admin/syft { };
syft = callPackage ../tools/admin/syft {
buildGoModule = buildGo121Module;
};
Sylk = callPackage ../applications/networking/Sylk { };

2
pkgs/top-level/ocaml-packages.nix
View file

@ -1396,6 +1396,8 @@ let
pbkdf = callPackage ../development/ocaml-modules/pbkdf { };
pbrt = callPackage ../development/ocaml-modules/pbrt { };
pcap-format = callPackage ../development/ocaml-modules/pcap-format { };
pecu = callPackage ../development/ocaml-modules/pecu { };

2
pkgs/top-level/release.nix
View file

@ -26,7 +26,7 @@
# for no real reason.
# Remove them for 23.11.
"nodejs-16.20.2"
"openssl-1.1.1v"
"openssl-1.1.1w"
];
}; }
}: