gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging-next' into staging

Browse Source 
Conflicts:
	pkgs/development/tools/misc/indent/default.nix
This commit is contained in:
Alyssa Ross
2023-10-13 12:14:37 +00:00
parent 49523dec15 4645621691
commit 64a55ddd40
30 changed files with 1220 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/lxc-container.nix
+12 -9
View File
@@ -9,15 +9,16 @@ in {
options = {
virtualisation.lxc = {
privilegedContainer = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc ''
Whether this LXC container will be running as a privileged container or not. If set to `true` then
additional configuration will be applied to the `systemd` instance running within the container as
recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/).
'';
};
nestedContainer = lib.mkEnableOption (lib.mdDoc ''
Whether this container is configured as a nested container. On LXD containers this is recommended
for all containers and is enabled with `security.nesting = true`.
'');
privilegedContainer = lib.mkEnableOption (lib.mdDoc ''
Whether this LXC container will be running as a privileged container or not. If set to `true` then
additional configuration will be applied to the `systemd` instance running within the container as
recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/).
'');
};
};
@@ -68,6 +69,8 @@ in {
ln -fs "$1/init" /sbin/init
'';
systemd.additionalUpstreamSystemUnits = lib.mkIf cfg.nestedContainer ["systemd-udev-trigger.service"];
# Add the overrides from lxd distrobuilder
# https://github.com/lxc/distrobuilder/blob/05978d0d5a72718154f1525c7d043e090ba7c3e0/distrobuilder/main.go#L630
systemd.packages = [
pkgs/applications/editors/vim/plugins/generated.nix
+12
View File
@@ -6574,6 +6574,18 @@ final: prev:
meta.homepage = "https://github.com/folke/noice.nvim/";
};
none-ls-nvim = buildVimPlugin {
pname = "none-ls.nvim";
version = "2023-10-01";
src = fetchFromGitHub {
owner = "nvimtools";
repo = "none-ls.nvim";
rev = "f39f627bbdfb33cc4ae4a95b4708e7dba7b9aafc";
sha256 = "1qh9bdxhs0c5mxyyv3dkmiyr03qi8g4rsbjcgzkprk4v5pz04g1v";
};
meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
};
nord-nvim = buildVimPlugin {
pname = "nord.nvim";
version = "2023-08-30";
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -551,6 +551,7 @@ https://github.com/tjdevries/nlua.nvim/,,
https://github.com/mcchrish/nnn.vim/,,
https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
https://github.com/folke/noice.nvim/,HEAD,
https://github.com/nvimtools/none-ls.nvim/,HEAD,
https://github.com/shaunsingh/nord.nvim/,,
https://github.com/andersevenrud/nordic.nvim/,,
https://github.com/vigoux/notifier.nvim/,HEAD,
pkgs/applications/kde/angelfish.nix
+1 -1
View File
@@ -24,7 +24,7 @@
, srcs
# provided as callPackage input to enable easier overrides through overlays
, cargoSha256 ? "sha256-ggYQ2cUwTnqFdoBlTar5zCWtUQGsWAAtWCcebtovF/k="
, cargoSha256 ? "sha256-po/CzUnUFh1saJuw8CVk4zeWsVAgw2iPdfq81t0zwU8="
}:
mkDerivation rec {
pkgs/applications/kde/fetch.sh
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.1/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.2/src -A '*.tar.xz' )
pkgs/applications/kde/srcs.nix
+976 -976
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/misc/mediainfo/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediainfo";
version = "23.07";
version = "23.10";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
hash = "sha256-ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA=";
hash = "sha256-t0OuJSHZ2Oi5pYUNfCop3jC6d321JzjQ37oXzARnduc=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/development/compilers/purescript/purescript/default.nix
+4 -4
View File
@@ -15,7 +15,7 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
version = "0.15.11";
version = "0.15.12";
# These hashes can be updated automatically by running the ./update.sh script.
src =
@@ -25,17 +25,17 @@ in stdenv.mkDerivation rec {
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz";
sha256 = "1ffhcwzb4cazxviqdl9zwg0jnbhsisg2pbxkqbk63zj2grjcpg86";
sha256 = "0s8j9svgxir0rb0wxkshwal60962g5z0pysdyrjgcr9r77y5gffk";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
sha256 = "0h923269zb9hwlifcv8skz17zlggh8hsxhrgf33h2inl1midvgq5";
sha256 = "13d2mmphxy9f9yy242qsm58hipr612jymwy7lhf0is4y4m2lvrk2";
})
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
sha256 = "0vrbgmgmmwbyxl969k59zkfrq5dxshspnzskx8zmhcy4flamz8av";
sha256 = "05xwplibkv86iiwpv29vg3zxp5yw7waw86zh08q3p0qx355wjy73";
};
pkgs/development/coq-modules/iris/default.nix
+3 -1
View File
@@ -6,11 +6,13 @@ mkCoqDerivation rec {
owner = "iris";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.16" "8.18"; out = "4.1.0"; }
{ case = range "8.13" "8.17"; out = "4.0.0"; }
{ case = range "8.12" "8.14"; out = "3.5.0"; }
{ case = range "8.11" "8.13"; out = "3.4.0"; }
{ case = range "8.9" "8.10"; out = "3.3.0"; }
] null;
release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo=";
release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg=";
release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj";
release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70";
@@ -29,6 +31,6 @@ mkCoqDerivation rec {
meta = with lib; {
description = "The Coq development of the Iris Project";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
maintainers = [ maintainers.vbgl maintainers.ineol ];
};
}
pkgs/development/coq-modules/stdpp/default.nix
+3 -1
View File
@@ -6,11 +6,13 @@ mkCoqDerivation rec {
domain = "gitlab.mpi-sws.org";
owner = "iris";
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.16" "8.18"; out = "1.9.0"; }
{ case = range "8.13" "8.17"; out = "1.8.0"; }
{ case = range "8.12" "8.14"; out = "1.6.0"; }
{ case = range "8.11" "8.13"; out = "1.5.0"; }
{ case = range "8.8" "8.10"; out = "1.4.0"; }
] null;
release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI=";
release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU=";
release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y";
release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v";
@@ -27,6 +29,6 @@ mkCoqDerivation rec {
meta = with lib; {
description = "An extended “Standard Library” for Coq";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
maintainers = [ maintainers.vbgl maintainers.ineol ];
};
}
pkgs/development/libraries/kerberos/krb5.nix
+4 -8
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds
, openssl, openldap, libedit, keyutils, libverto, darwin
, openssl, openldap, libedit, keyutils, libverto
# for passthru.tests
, bind
@@ -27,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
pname = "${type}krb5";
version = "1.21.2";
version = "1.20.2";
src = fetchurl {
url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz";
sha256 = "sha256-lWCUGp2EPAJDpxsXp6xv4xx867W845g9t55Srn6FBJE=";
sha256 = "sha256-fY1ofUKu01DCUly2mk/DqnkWlNpnYdzMHELC7neWtd0=";
};
outputs = [ "out" "dev" ];
@@ -56,11 +56,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ]
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ]
++ lib.optionals (!libOnly) [ openldap libedit ]
++ lib.optionals withVerto [ libverto ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [
libs.xpc
frameworks.Kerberos
]);
++ lib.optionals withVerto [ libverto ];
sourceRoot = "krb5-${version}/src";
pkgs/development/libraries/mesa/default.nix
+2 -2
View File
@@ -86,8 +86,8 @@
*/
let
version = "23.1.8";
hash = "sha256-RUNP+RpwmEQTCjF02cDvOca1ByWyuwwT5zbzYTTbFK0=";
version = "23.1.9";
hash = "sha256-KVuifCgUbtCSFOjOea+hZZ7fnRQt7MPJH4BFUtZPdRA=";
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
pkgs/development/libraries/nghttp2/default.nix
+2 -2
View File
@@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp;
stdenv.mkDerivation rec {
pname = "nghttp2";
version = "1.54.0";
version = "1.57.0";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-nZ0esJm0kvr6Gtn31pZZU3WP3vmtDPZaTQvcI3OAPa0=";
sha256 = "sha256-xjdnfLrESU6q+LDgOGFzFGhFgw76/+To3JL7O0KOWtI=";
};
outputs = [ "out" "dev" "lib" "doc" "man" ];
pkgs/development/ocaml-modules/repr/default.nix
+2 -4
View File
@@ -2,18 +2,16 @@
buildDunePackage rec {
pname = "repr";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "mirage";
repo = "repr";
rev = version;
hash = "sha256-jF8KmaG07CT26O/1ANc6s1yHFJqhXDtd0jgTA04tIgw=";
hash = "sha256-SM55m5NIaQ2UKAtznNFSt3LN4QA7As0DyTxVeQjOTjI=";
};
minimalOCamlVersion = "4.08";
duneVersion = "3";
strictDeps = true;
propagatedBuildInputs = [
base64
pkgs/development/ocaml-modules/repr/ppx.nix
+2 -3
View File
@@ -3,8 +3,7 @@
buildDunePackage {
pname = "ppx_repr";
inherit (repr) src version strictDeps;
duneVersion = "3";
inherit (repr) src version;
propagatedBuildInputs = [
ppx_deriving
@@ -12,7 +11,7 @@ buildDunePackage {
repr
];
doCheck = false; # tests fail with ppxlib >= 0.23.0
doCheck = true;
checkInputs = [
alcotest
hex
pkgs/development/python-modules/adafruit-platformdetect/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.52.3";
version = "3.53.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-5JEnsTvY4PgAuaoIyTHriJVJUPAHMYETgqbhAuAPJcI=";
hash = "sha256-P6oR9Aszj2yj2w+2hAjCMDwngJ+uuUNLpgZooYImzyk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/aiowithings/default.nix
+60
View File
@@ -0,0 +1,60 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, syrupy
, yarl
}:
buildPythonPackage rec {
pname = "aiowithings";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "joostlek";
repo = "python-withings";
rev = "refs/tags/v${version}";
hash = "sha256-oIFgPO5gmg09QOs94TUTfMAslMI2kpvenyOxQ4SvC/4=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
yarl
];
nativeCheckInputs = [
aresponses
pytest-asyncio
pytestCheckHook
syrupy
];
pythonImportsCheck = [
"aiowithings"
];
meta = with lib; {
description = "Module to interact with Withings";
homepage = "https://github.com/joostlek/python-withings";
changelog = "https://github.com/joostlek/python-withings/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/anywidget/default.nix
+2 -2
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "anywidget";
version = "0.6.5";
version = "0.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-prriSqvy2S9URnXfTEY88lssU71/cV38egSIqnLHE+Q=";
hash = "sha256-OxwCnCGvSwrVxBzQwxMBqESsETu2q1vdevJHDr/IfUI=";
};
# We do not need the jupyterlab build dependency, because we do not need to
pkgs/development/python-modules/libnacl/default.nix
+12 -14
View File
@@ -2,39 +2,37 @@
, stdenv
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, libsodium
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "libnacl";
version = "1.7.2";
version = "2.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "saltstack";
repo = pname;
rev = "v${version}";
hash = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc=";
hash = "sha256-phECLGDcBfDi/r2y0eGtqgIX/hvirtBqO8UUvEJ66zo=";
};
patches = [
# Fixes build on 32-bit platforms
(fetchpatch {
name = "fix-crypto_kdf_derive_from_key-32bit.patch";
url = "https://github.com/saltstack/libnacl/commit/e8a1f95ee1d4d0806fb6aee793dcf308b05d485d.patch";
hash = "sha256-z6TAVNfPcuWZ/hRgk6Aa8I1IGzne7/NYnUOOQ3TjGVU=";
})
];
nativeBuildInputs = [ poetry-core ];
buildInputs = [ libsodium ];
postPatch =
let soext = stdenv.hostPlatform.extensions.sharedLibrary; in
''
substituteInPlace "./libnacl/__init__.py" --replace \
"ctypes.cdll.LoadLibrary('libsodium${soext}')" \
"ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')"
substituteInPlace "./libnacl/__init__.py" \
--replace \
"l_path = ctypes.util.find_library('sodium')" \
"l_path = None" \
--replace \
"ctypes.cdll.LoadLibrary('libsodium${soext}')" \
"ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')"
'';
nativeCheckInputs = [ pytestCheckHook ];
pkgs/development/python-modules/spdx-tools/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "spdx-tools";
version = "0.8.1";
version = "0.8.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "spdx";
repo = "tools-python";
rev = "refs/tags/v${version}";
hash = "sha256-/iBy6i4J/IiJzfNdW6pN3VTE9PVED4ckoe4OBlw8wnI=";
hash = "sha256-KB+tfuz0ZnoQcMX3H+IZXjcmPZ4x2ecl8ofz1/3r0/8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/tools/misc/indent/darwin.patch
-15
View File
@@ -1,15 +0,0 @@
diff --git a/config.h.in b/config.h.in
index 07e6fce..0c57e2a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -432,8 +432,8 @@
# endif
# define _GL_EXTERN_INLINE extern
#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
+# define _GL_INLINE static
+# define _GL_EXTERN_INLINE static
#endif
#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
pkgs/development/tools/misc/indent/default.nix
+27 -4
View File
@@ -1,19 +1,40 @@
{ lib, stdenv, fetchurl, texinfo, buildPackages, pkgsStatic }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, libintl
, texinfo
, buildPackages
, pkgsStatic
}:
stdenv.mkDerivation rec {
pname = "indent";
version = "2.2.12";
version = "2.2.13";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7";
hash = "sha256-nmRjT8TOZ5eyBLy4iXzhT90KtIyldpb3h2fFnK5XgJU=";
};
patches = [ ./darwin.patch ];
patches = [
(fetchpatch {
name = "CVE-2023-40305.part-1.patch";
url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=df4ab2d19e247d059e0025789ba513418073ab6f";
hash = "sha256-OLXBlYTdEuFK8SIsyC5Xr/hHWlvXiRqY2h79w+H5pGk=";
})
(fetchpatch {
name = "CVE-2023-40305.part-2.patch";
url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=2685cc0bef0200733b634932ea7399b6cf91b6d7";
hash = "sha256-t+QF7N1aqQ28J2O8esZ2bc5K042cUuZR4MeMeuWIgPw=";
})
];
makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ];
strictDeps = true;
nativeBuildInputs = [ texinfo ];
buildInputs = [ libintl ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling
env.NIX_CFLAGS_COMPILE = toString (
@@ -23,6 +44,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
doCheck = true;
passthru.tests.static = pkgsStatic.indent;
meta = {
homepage = "https://www.gnu.org/software/indent/";
pkgs/os-specific/linux/kernel/hardened/patches.json
+30 -30
View File
@@ -12,61 +12,61 @@
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.295-hardened1.patch",
"sha256": "0jfsbg8b3h1swb46p4lnsc0b5z8b5j9jjy2fi8fy0762v4g7ps7c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.295-hardened1/linux-hardened-4.19.295-hardened1.patch"
"name": "linux-hardened-4.19.296-hardened1.patch",
"sha256": "0yzxnh2gdrbz9dspw3xbsrqhcdsk0pl938w229kccps9klg9s7lb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.296-hardened1/linux-hardened-4.19.296-hardened1.patch"
},
"sha256": "1b1qslpk1kka7nxam48s22xsqd9qmp716hmibgfsjxl5y3jc4cmp",
"version": "4.19.295"
"sha256": "1bk051canr4fb00j6x9ff2wam2f20whw4h4z767x2cn2kmv6cqb3",
"version": "4.19.296"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.197-hardened1.patch",
"sha256": "0h0yarjpc2syg2rdp7ipz0cr466mgm85ii8y5g0dbj9wkflrl54g",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.197-hardened1/linux-hardened-5.10.197-hardened1.patch"
"name": "linux-hardened-5.10.198-hardened1.patch",
"sha256": "0xvpq41nslrdz7w39glswibj6aywny06rvxwqks2sgcbwbggldi6",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.198-hardened1/linux-hardened-5.10.198-hardened1.patch"
},
"sha256": "1awkm7lln5gf6kld9z5h4mg39bd778jsdswwlwb7iv7bn03lafhq",
"version": "5.10.197"
"sha256": "01gsw96anw44nh8ii3zipp6vh61m1n8yf0bv2fzznr23k771y51b",
"version": "5.10.198"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.134-hardened1.patch",
"sha256": "1q8vfffiwp3zwrjh7r8q4yn9hybswfl41kz4s97jckf90x84xj8d",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.134-hardened1/linux-hardened-5.15.134-hardened1.patch"
"name": "linux-hardened-5.15.135-hardened1.patch",
"sha256": "0ld2apj2nc6y5c8h60cczjpi2vdz3askmpsjv7glfrqfqlw1a680",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.135-hardened1/linux-hardened-5.15.135-hardened1.patch"
},
"sha256": "1lxra3h8pq41hdr1acazwcqk6r8alv9p840ys19nivaprfp84wgk",
"version": "5.15.134"
"sha256": "0w3i8jvzqvfnlarcvg89k1144ln96fszv16lzrn16zr3kri5x0ql",
"version": "5.15.135"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.257-hardened1.patch",
"sha256": "0kf0s69yl9xwnmjk312gphj9fsz1jxcfivwhg10hdvw3cfhjq2dn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.257-hardened1/linux-hardened-5.4.257-hardened1.patch"
"name": "linux-hardened-5.4.258-hardened1.patch",
"sha256": "1c6m65m3cjx1nbaqilkiqhwb143rd2zwy8mkxxdrm1916cs5hvbk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.258-hardened1/linux-hardened-5.4.258-hardened1.patch"
},
"sha256": "1w1x91slzg9ggakqhyxnmvz77v2cwfk8bz0knrpgz9qya9q5jxrf",
"version": "5.4.257"
"sha256": "0gk2xav1ng565l1qsqlr8ja6m4j5g8rfj66vad1fmdd1lwaihw1r",
"version": "5.4.258"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.56-hardened1.patch",
"sha256": "01j6qi94wr8bm1vnyw8108as94xiwa92vhh860b4gk71msz7carg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.56-hardened1/linux-hardened-6.1.56-hardened1.patch"
"name": "linux-hardened-6.1.57-hardened1.patch",
"sha256": "0cjcjphl2val9kl9vn37yvgd1k02pn2qm6g7dnfpzph4mxg17ap4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.57-hardened1/linux-hardened-6.1.57-hardened1.patch"
},
"sha256": "1327in80nl0ghbjignjsdw0w5crj4d06d5fivj4q6af26bggvply",
"version": "6.1.56"
"sha256": "1ccidrxswblxw9yaa45y6ds16pc7647f6fz36xxxhljivhyzxszr",
"version": "6.1.57"
},
"6.5": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.5.6-hardened1.patch",
"sha256": "12xvphbs2i9a262117lfxs9gz0ckfspdv74y5jjkjbmw5gx26fgg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.6-hardened1/linux-hardened-6.5.6-hardened1.patch"
"name": "linux-hardened-6.5.7-hardened1.patch",
"sha256": "0l0psja9zaw8b1bqw19nf1pjf4syxzh0gqjrfppyv40wbf5lsgjn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.7-hardened1/linux-hardened-6.5.7-hardened1.patch"
},
"sha256": "1xnjjm50ks18ifrp36md2p2xca4lw160y57j9p152w2l2i16vqvq",
"version": "6.5.6"
"sha256": "135v3y2vgc83dca4xi7q52wqi4dkfal74k1y73jwzj85h12fl28d",
"version": "6.5.7"
}
}
pkgs/servers/mail/smtprelay/default.nix
+39
View File
@@ -0,0 +1,39 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "smtprelay";
version = "1.10.0";
src = fetchFromGitHub {
owner = "decke";
repo = "smtprelay";
rev = "refs/tags/v${version}";
hash = "sha256-zZ3rgbo8nvrpFMtUmhyXnTgoVd0FIh1kWzuM2hCh5gY=";
};
vendorHash = "sha256-assGzM8/APNVVm2vZapPK6sh3tWNTnw6PSFwvEqNDPk=";
subPackages = [
"."
];
CGO_ENABLED = 0;
# We do not supply the build time as the build wouldn't be reproducible otherwise.
ldflags = [
"-s"
"-w"
"-X=main.appVersion=v${version}"
];
meta = with lib; {
homepage = "https://github.com/decke/smtprelay";
description = "Simple Golang SMTP relay/proxy server";
changelog = "https://github.com/decke/smtprelay/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ juliusrickert ];
};
}
pkgs/tools/graphics/oxipng/default.nix
+6 -6
View File
@@ -1,22 +1,22 @@
{ lib, stdenv, fetchCrate, rustPlatform }:
rustPlatform.buildRustPackage rec {
version = "8.0.0";
version = "9.0.0";
pname = "oxipng";
src = fetchCrate {
inherit version pname;
hash = "sha256-stTwsU9XK3lF4q2sDgb9A1KG1NnhCfVxYWRiBvlmiqQ=";
hash = "sha256-1OpSweosYiqtLqCcAw1EsAtBAYVc/VH8kRtVSpmTytM=";
};
cargoHash = "sha256-XMIsdv2AHMGs0tDEWe3cfplZU9CbqEkHd7L5eS+V7j0=";
cargoHash = "sha256-kPdAfqMNOoQPSdv+VLRDUr6AXGPy47UnldXwvpwKp6s=";
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
meta = with lib; {
meta = {
homepage = "https://github.com/shssoichiro/oxipng";
description = "A multithreaded lossless PNG compression optimizer";
license = licenses.mit;
maintainers = with maintainers; [ dywedir ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dywedir ];
};
}
pkgs/tools/networking/curl-impersonate/default.nix
+1
View File
@@ -153,6 +153,7 @@ let
maintainers = with maintainers; [ deliciouslytyped lilyinstarlight ];
platforms = platforms.unix;
knownVulnerabilities = [
"CVE-2023-38545" # SOCKS5 heap buffer overflow - https://curl.se/docs/CVE-2023-38545.html
"CVE-2023-32001" # fopen TOCTOU race condition - https://curl.se/docs/CVE-2023-32001.html
"CVE-2022-43551" # HSTS bypass - https://curl.se/docs/CVE-2022-43551.html
"CVE-2022-42916" # HSTS bypass - https://curl.se/docs/CVE-2022-42916.html
pkgs/tools/networking/curl/default.nix
+6
View File
@@ -26,6 +26,8 @@
, zlibSupport ? true, zlib
, zstdSupport ? false, zstd
, darwin
# for passthru.tests
, coeurl
, curlpp
@@ -70,6 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config perl ];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
# "-lz -lssl", which aren't necessary direct build inputs of
# applications that use Curl.
pkgs/tools/security/fingerprintx/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "fingerprintx";
version = "1.1.9";
version = "1.1.10";
src = fetchFromGitHub {
owner = "praetorian-inc";
repo = "fingerprintx";
rev = "refs/tags/v${version}";
hash = "sha256-XWZzLVY+Vw8x8anFQ+P0FVbHgCuMTvV+fEJ2OmDdkQU=";
hash = "sha256-WwIIZlO310519aEPpvi3pY2Jn3HRNUZNiwoAyZ4VP1A=";
};
vendorHash = "sha256-TMy6FwAFlo+ARvm+RiRqly0xIk4lBCXuZrtdnNSMSxw=";
pkgs/top-level/all-packages.nix
+2
View File
@@ -26831,6 +26831,8 @@ with pkgs;
quark = callPackage ../servers/http/quark { };
smtprelay = callPackage ../servers/mail/smtprelay { };
soft-serve = callPackage ../servers/soft-serve { };
sympa = callPackage ../servers/mail/sympa { };
pkgs/top-level/python-packages.nix
+2
View File
@@ -420,6 +420,8 @@ self: super: with self; {
aiowinreg = callPackage ../development/python-modules/aiowinreg { };
aiowithings = callPackage ../development/python-modules/aiowithings { };
aioxmpp = callPackage ../development/python-modules/aioxmpp { };
aioymaps = callPackage ../development/python-modules/aioymaps { };