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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jörg Thalheim
2024-09-22 15:51:19 +02:00
committed by GitHub
parent 45aea99233 81ea4e40bf
commit 7d751654ec
17 changed files with 175 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-apps/davis.nix
+2 -2
View File
@@ -493,7 +493,7 @@ in
};
"~* ^/.well-known/(caldav|carddav)$" = {
extraConfig = ''
return 302 $http_x_forwarded_proto://$host/dav/;
return 302 https://$host/dav/;
'';
};
"~ ^(.+\.php)(.*)$" = {
@@ -505,7 +505,7 @@ in
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_split_path_info ^(.+\.php)(.*)$;
fastcgi_param X-Forwarded-Proto $http_x_forwarded_proto;
fastcgi_param X-Forwarded-Proto https;
fastcgi_param X-Forwarded-Port $http_x_forwarded_port;
'';
};
pkgs/applications/graphics/gimp/plugins/default.nix
+2 -2
View File
@@ -155,7 +155,7 @@ in
};
};
farbfeld = pluginDerivation rec {
farbfeld = pluginDerivation {
pname = "farbfeld";
version = "unstable-2019-08-12";
@@ -309,7 +309,7 @@ in
variant = "gimp";
};
gimplensfun = pluginDerivation rec {
gimplensfun = pluginDerivation {
version = "unstable-2018-10-21";
pname = "gimplensfun";
pkgs/by-name/ca/capslock/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "capslock";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "google";
repo = "capslock";
rev = "v${version}";
hash = "sha256-xeezGU9bI1MwonSGv+XimSfboMQr/1TPMTduDQ+MP1g=";
hash = "sha256-w2dB8DUCjbuzdEfX4nmaGbf9TZH58t+NZtyMoBHVG8I=";
};
vendorHash = "sha256-Z4oj+af8jqqhgHQrTb+lkbIMMa/yOnvkMti/s+wiQsI=";
vendorHash = "sha256-ZRDoKB3/oxJhVFNWT71sKu8WbvIUyvXNKY1hD8ljo5U=";
subPackages = [ "cmd/capslock" ];
pkgs/by-name/do/dotenvx/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "dotenvx";
version = "1.14.0";
version = "1.14.1";
src = fetchFromGitHub {
owner = "dotenvx";
repo = "dotenvx";
rev = "refs/tags/v${version}";
hash = "sha256-UVev21LZ2y0C8BCSm6I8BTQziSDZUXP3A/ThOpKtsrQ=";
hash = "sha256-PdX8picIFqeZZCMP0ABoWpySERSy0leAvp0XyjTW1Rc=";
};
npmDepsHash = "sha256-ehWHIKYkSAkdTLGpBOU7lJoWNa5uv9Zy0+2qwnCv0m8=";
npmDepsHash = "sha256-lo+R0YP50FIN+syj6VqCeEBFr7EZ6NSVXAhafG5JsI0=";
dontNpmBuild = true;
pkgs/by-name/du/dumbpipe/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "dumbpipe";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-gv6V5I9LPNfXyuopo8BaYRELxzTfNhTG1EBWoZ/4cpc=";
hash = "sha256-7OHghotSibkGRrcsh7CqZBp94FY6RKZvcn8QW+dTH1I=";
};
cargoHash = "sha256-t6w2XrMSm5g6dmYQ5gX+w8M3pPzWDytGY9uSuXYgnDA=";
cargoHash = "sha256-rlhfGw/b0HnV1Xl9VWIqEuyM9pq29O6bpaawk2hnG+o=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [
pkgs/by-name/re/renovate/package.nix
+3 -3
View File
@@ -21,13 +21,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "renovate";
version = "38.73.5";
version = "38.93.1";
src = fetchFromGitHub {
owner = "renovatebot";
repo = "renovate";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-+kracgelM8VOIgEtDfaXWokNZgiwl+s/k1yx6RxQk0c=";
hash = "sha256-4NvFS4WWdV3Csuv28/wq6EvB+in5bo1N4Fn602bi4rE=";
};
postPatch = ''
@@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-J61fOjANS7WKd3HLaqJZE1m2jFrMTknW6SGdy/yVIKg=";
hash = "sha256-cjk7PS4DUAgmg+mLUaWJFTjQv2GcPdr1VchNRjJgqsk=";
};
env.COREPACK_ENABLE_STRICT = 0;
pkgs/development/emilua-plugins/botan/default.nix
+62
View File
@@ -0,0 +1,62 @@
{
lib,
stdenv,
meson,
ninja,
fetchFromGitLab,
gperf,
gawk,
gitUpdater,
pkg-config,
boost,
luajit_openresty,
asciidoctor,
emilua,
liburing,
openssl,
fmt,
botan3,
}:
stdenv.mkDerivation rec {
pname = "emilua-botan";
version = "1.1.0";
src = fetchFromGitLab {
owner = "emilua";
repo = "botan";
rev = "v${version}";
hash = "sha256-5/vcm6vNucBhl1Aki+OFNjAU7Hvc7OLAAH4CYchlBIY=";
};
buildInputs = [
emilua
liburing
fmt
botan3
luajit_openresty
openssl
boost
];
nativeBuildInputs = [
gperf
gawk
pkg-config
asciidoctor
meson
ninja
];
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };
};
meta = with lib; {
description = "Securely clears secrets from memory in Emilua";
homepage = "https://emilua.org/";
license = licenses.mit;
maintainers = with maintainers; [ manipuladordedados ];
platforms = platforms.linux;
};
}
pkgs/development/emilua-plugins/secp256k1/default.nix
+62
View File
@@ -0,0 +1,62 @@
{
lib,
stdenv,
meson,
ninja,
fetchFromGitLab,
gperf,
gawk,
gitUpdater,
pkg-config,
boost,
luajit_openresty,
asciidoctor,
emilua,
liburing,
openssl,
fmt,
secp256k1,
}:
stdenv.mkDerivation rec {
pname = "emilua-secp256k1";
version = "0.5.0";
src = fetchFromGitLab {
owner = "emilua";
repo = "secp256k1";
rev = "v${version}";
hash = "sha256-xbyDKxuU03U0k4YSD7Sahw2Z4ZSpQHwrpWcSN0F5CCw=";
};
buildInputs = [
emilua
liburing
fmt
secp256k1
luajit_openresty
openssl
boost
];
nativeBuildInputs = [
gperf
gawk
pkg-config
asciidoctor
meson
ninja
];
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };
};
meta = with lib; {
description = "Emilua bindings to libsecp256k1";
homepage = "https://emilua.org/";
license = licenses.mit;
maintainers = with maintainers; [ manipuladordedados ];
platforms = platforms.linux;
};
}
pkgs/development/haskell-modules/configuration-common.nix
+4 -4
View File
@@ -12,8 +12,8 @@
{ pkgs, haskellLib }:
let
inherit (pkgs) fetchpatch fetchpatch2 lib;
inherit (lib) throwIfNot versionOlder versions;
inherit (pkgs) fetchpatch lib;
inherit (lib) throwIfNot versionOlder;
in
with haskellLib;
@@ -2649,7 +2649,7 @@ self: super: {
purescript =
lib.pipe
(super.purescript.overrideScope purescriptOverlay)
([
[
# https://github.com/purescript/purescript/pull/4547
(appendPatches [
(pkgs.fetchpatch {
@@ -2668,7 +2668,7 @@ self: super: {
doJailbreak
# Generate shell completions
(self.generateOptparseApplicativeCompletions [ "purs" ])
]);
];
purenix =
lib.pipe
pkgs/development/python-modules/nbdev/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "nbdev";
version = "2.3.29";
version = "2.3.31";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-N5oO77DiLMzybQiE45mIIfu5DoT3/nR0iejB/SPpWLQ=";
hash = "sha256-a0BOBwzlZ1HFvpamqQHn8rtgghdkTfr9778wW84q7Xo=";
};
pkgs/development/tools/doctl/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.112.0";
version = "1.114.0";
vendorHash = null;
@@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "sha256-+s5kxP79ZWpJsm6yk26jLGSPJ3GkToPXfl2tX+a1A1U=";
sha256 = "sha256-E+/rfOpUDBvHaVVN7xhhcFd1W1X6cSEWpxjqoKoQR80=";
};
meta = with lib; {
pkgs/os-specific/linux/nfs-utils/default.nix
+6 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent
, sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, python3, buildPackages, nixosTests, rpcsvc-proto, openldap, libxml2
, python3, buildPackages, nixosTests, rpcsvc-proto, openldap, cyrus_sasl, libxml2
, enablePython ? true, enableLdap ? true
}:
@@ -27,7 +27,10 @@ stdenv.mkDerivation rec {
libtirpc libcap libevent sqlite lvm2
libuuid keyutils libkrb5 tcp_wrappers libxml2
] ++ lib.optional enablePython python3
++ lib.optional enableLdap openldap;
++ lib.optionals enableLdap [
openldap
cyrus_sasl
];
enableParallelBuilding = true;
@@ -48,7 +51,7 @@ stdenv.mkDerivation rec {
"--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
"--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen"
"--with-modprobedir=${placeholder "out"}/etc/modprobe.d"
] ++ lib.optional enableLdap "--with-ldap";
] ++ lib.optional enableLdap "--enable-ldap";
patches = lib.optionals stdenv.hostPlatform.isMusl [
# http://openwall.com/lists/musl/2015/08/18/10
pkgs/tools/security/sslscan/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "sslscan";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
rev = "refs/tags/${version}";
hash = "sha256-we55Oo9sIZ1FQn94xejlCKwlZBDMrQs/1f++blXTTUM=";
hash = "sha256-K0OJvb9jym7P6ehtV5M/edq4ZKwacn8D5IC4PyttqZY=";
};
buildInputs = [ openssl ];
pkgs/tools/text/riffdiff/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "riffdiff";
version = "3.2.1";
version = "3.3.0";
src = fetchFromGitHub {
owner = "walles";
repo = "riff";
rev = version;
hash = "sha256-UjuJTA+MP5EItLD2z/THeh+6dJ2byIrOBqQfUiAWSvk=";
hash = "sha256-Vbze2WSrZOboLFcsnRYbfsWz6gbMEszDWEMQUNZAzLY=";
};
cargoHash = "sha256-2J+7uwDzoviytbPQ+B36/oJwysBtbiJXKU7zW5vCCEU=";
cargoHash = "sha256-/R2RSsNRpCI/LTXlF0UtdIjWrBDJaEOASTeAtyNwS0M=";
meta = with lib; {
description = "Diff filter highlighting which line parts have changed";
pkgs/top-level/aliases.nix
+2 -2
View File
@@ -55,7 +55,7 @@ let
aliases;
in
mapAliases ({
mapAliases {
# Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
forceSystem = system: _:
(import self.path { localSystem = { inherit system; }; });
@@ -1821,4 +1821,4 @@ mapAliases ({
purple-facebook
;
})
}
pkgs/top-level/all-packages.nix
+8 -8
View File
@@ -3532,7 +3532,7 @@ with pkgs;
ecdsautils = callPackage ../tools/security/ecdsautils { };
echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { });
echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/security/echidna { });
sedutil = callPackage ../tools/security/sedutil { };
@@ -7606,9 +7606,9 @@ with pkgs;
fingerprintx = callPackage ../tools/security/fingerprintx { };
bsd-fingerd = bsd-finger.override({
bsd-fingerd = bsd-finger.override {
buildProduct = "daemon";
});
};
iprange = callPackage ../applications/networking/firehol/iprange.nix { };
@@ -8549,9 +8549,9 @@ with pkgs;
hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
highlight = callPackage ../tools/text/highlight ({
highlight = callPackage ../tools/text/highlight {
lua = lua5;
});
};
hockeypuck = callPackage ../servers/hockeypuck/server.nix { };
@@ -15419,12 +15419,12 @@ with pkgs;
stdenv.targetPlatform));
in pkgs.${"llvmPackages_${minSupported}"};
llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({
llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_12.tools;
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries;
targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm;
}));
});
inherit (rec {
llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { });
@@ -37891,7 +37891,7 @@ with pkgs;
/*
A NixOS/home-manager/arion/... module that sets the `pkgs` module argument.
*/
pkgsModule = { lib, options, ... }: {
pkgsModule = { options, ... }: {
config =
if options?nixpkgs.pkgs then {
# legacy / nixpkgs.nix style
pkgs/top-level/emilua-plugins.nix
+6
View File
@@ -9,6 +9,12 @@ emilua:
(lib.makeScope newScope (self: {
inherit emilua;
beast = self.callPackage ../development/emilua-plugins/beast { };
botan = self.callPackage ../development/emilua-plugins/botan {
inherit (pkgs) botan3;
};
qt5 = self.callPackage ../development/emilua-plugins/qt5 { };
qt6 = self.callPackage ../development/emilua-plugins/qt6 { };
secp256k1 = self.callPackage ../development/emilua-plugins/secp256k1 {
inherit (pkgs) secp256k1;
};
}))