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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-07-12 12:01:23 +00:00 committed by GitHub
commit bc41da4eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 3632 additions and 3726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@ -2851,6 +2851,13 @@
githubId = 6608071;
name = "Charles Huyghues-Despointes";
};
chayleaf = {
email = "chayleaf-nix@pavluk.org";
github = "chayleaf";
githubId = 9590981;
matrix = "@chayleaf:matrix.pavluk.org";
name = "Anna Pavlyuk";
};
chekoopa = {
email = "chekoopa@mail.ru";
github = "chekoopa";

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

@ -76,6 +76,8 @@
- `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option.
- `services.outline.sequelizeArguments` has been removed, as `outline` no longer executes database migrations via the `sequelize` cli.
- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.
## Other Notable Changes {#sec-release-23.11-notable-changes}

2
nixos/lib/eval-config.nix
View File

@ -31,7 +31,7 @@ evalConfigArgs@
, prefix ? []
, lib ? import ../../lib
, extraModules ? let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
in if e == "" then [] else [(import e)]
in lib.optional (e != "") (import e)
}:
let pkgs_ = pkgs;

4
nixos/modules/installer/netboot/netboot.nix
View File

@ -39,9 +39,7 @@ with lib;
# !!! Hack - attributes expected by other modules.
environment.systemPackages = [ pkgs.grub2_efi ]
++ (if pkgs.stdenv.hostPlatform.system == "aarch64-linux"
then []
else [ pkgs.grub2 pkgs.syslinux ]);
++ (lib.optionals (pkgs.stdenv.hostPlatform.system != "aarch64-linux") [pkgs.grub2 pkgs.syslinux]);
fileSystems."/" = mkImageMediaOverride
{ fsType = "tmpfs";

2
nixos/modules/services/home-automation/evcc.nix
View File

@ -50,7 +50,7 @@ in
];
environment.HOME = "/var/lib/evcc";
path = with pkgs; [
glibc # requires getent
getent
];
serviceConfig = {
ExecStart = "${package}/bin/evcc --config ${configFile} ${escapeShellArgs cfg.extraArgs}";

2
nixos/modules/services/matrix/appservice-irc.nix
View File

@ -187,7 +187,7 @@ in {
sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile}
fi
# Allow synapse access to the registration
if ${getBin pkgs.glibc}/bin/getent group matrix-synapse > /dev/null; then
if ${pkgs.getent}/bin/getent group matrix-synapse > /dev/null; then
chgrp matrix-synapse ${registrationFile}
chmod g+r ${registrationFile}
fi

2
nixos/modules/services/misc/heisenbridge.nix
View File

@ -137,7 +137,7 @@ in
mv -f ${registrationFile}.new ${registrationFile}
# Grant Synapse access to the registration
if ${getBin pkgs.glibc}/bin/getent group matrix-synapse > /dev/null; then
if ${pkgs.getent}/bin/getent group matrix-synapse > /dev/null; then
chgrp -v matrix-synapse ${registrationFile}
chmod -v g+r ${registrationFile}
fi

2
nixos/modules/services/misc/zoneminder.nix
View File

@ -351,7 +351,7 @@ in {
CacheDirectory = dirs cacheDirs;
RuntimeDirectory = dirName;
ReadWriteDirectories = lib.mkIf useCustomDir [ cfg.storageDir ];
StateDirectory = dirs (if useCustomDir then [] else libDirs);
StateDirectory = dirs (lib.optional (!useCustomDir) libDirs);
LogsDirectory = dirName;
PrivateTmp = true;
ProtectSystem = "strict";

2
nixos/modules/services/networking/tailscale.nix
View File

@ -59,7 +59,7 @@ in {
path = [
config.networking.resolvconf.package # for configuring DNS in some configs
pkgs.procps # for collecting running services (opt-in feature)
pkgs.glibc # for `getent` to look up user shells
pkgs.getent # for `getent` to look up user shells
pkgs.kmod # required to pass tailscale's v6nat check
];
serviceConfig.Environment = [

4
nixos/modules/services/search/kibana.nix
View File

@ -130,9 +130,9 @@ in {
This defaults to the singleton list [ca] when the {option}`ca` option is defined.
'';
default = if cfg.elasticsearch.ca == null then [] else [ca];
default = lib.optional (cfg.elasticsearch.ca != null) ca;
defaultText = literalExpression ''
if config.${opt.elasticsearch.ca} == null then [ ] else [ ca ]
lib.optional (config.${opt.elasticsearch.ca} != null) ca
'';
type = types.listOf types.path;
};

2
nixos/modules/services/security/kanidm.nix
View File

@ -17,7 +17,7 @@ let
# If the new path is a prefix to some existing path, we need to filter it out
filteredPaths = lib.filter (p: !lib.hasPrefix (builtins.toString newPath) (builtins.toString p)) merged;
# If a prefix of the new path is already in the list, do not add it
filteredNew = if hasPrefixInList filteredPaths newPath then [] else [ newPath ];
filteredNew = lib.optional (!hasPrefixInList filteredPaths newPath) newPath;
in filteredPaths ++ filteredNew) [];
defaultServiceConfig = {

57
nixos/modules/services/web-apps/outline.nix
View File

@ -3,8 +3,12 @@
let
defaultUser = "outline";
cfg = config.services.outline;
inherit (lib) mkRemovedOptionModule;
in
{
imports = [
(mkRemovedOptionModule [ "services" "outline" "sequelizeArguments" ] "Database migration are run agains configurated database by outline directly")
];
# See here for a reference of all the options:
# https://github.com/outline/outline/blob/v0.67.0/.env.sample
# https://github.com/outline/outline/blob/v0.67.0/app.json
@ -25,7 +29,7 @@ in
# to still land in the same team. Note that this effectively makes
# Outline a single-team instance.
patchPhase = ${"''"}
sed -i 's/const domain = parts\.length && parts\[1\];/const domain = "example.com";/g' server/routes/auth/providers/oidc.ts
sed -i 's/const domain = parts\.length && parts\[1\];/const domain = "example.com";/g' plugins/oidc/server/auth/oidc.ts
${"''"};
})
'';
@ -51,15 +55,6 @@ in
'';
};
sequelizeArguments = lib.mkOption {
type = lib.types.str;
default = "";
example = "--env=production-ssl-disabled";
description = lib.mdDoc ''
Optional arguments to pass to `sequelize` calls.
'';
};
#
# Required options
#
@ -583,16 +578,6 @@ in
systemd.services.outline = let
localRedisUrl = "redis+unix:///run/redis-outline/redis.sock";
localPostgresqlUrl = "postgres://localhost/outline?host=/run/postgresql";
# Create an outline-sequalize wrapper (a wrapper around the wrapper) that
# has the config file's path baked in. This is necessary because there is
# at least two occurrences of outline calling this from its own code.
sequelize = pkgs.writeShellScriptBin "outline-sequelize" ''
exec ${cfg.package}/bin/outline-sequelize \
--config $RUNTIME_DIRECTORY/database.json \
${cfg.sequelizeArguments} \
"$@"
'';
in {
description = "Outline wiki and knowledge base";
wantedBy = [ "multi-user.target" ];
@ -603,7 +588,6 @@ in
++ lib.optional (cfg.redisUrl == "local") "redis-outline.service";
path = [
pkgs.openssl # Required by the preStart script
sequelize
];
@ -687,37 +671,6 @@ in
openssl rand -hex 32 > ${lib.escapeShellArg cfg.utilsSecretFile}
fi
# The config file is required for the sequelize CLI.
${if (cfg.databaseUrl == "local") then ''
cat <<EOF > $RUNTIME_DIRECTORY/database.json
{
"production-ssl-disabled": {
"host": "/run/postgresql",
"username": null,
"password": null,
"dialect": "postgres"
}
}
EOF
'' else ''
cat <<EOF > $RUNTIME_DIRECTORY/database.json
{
"production": {
"use_env_variable": "DATABASE_URL",
"dialect": "postgres",
"dialectOptions": {
"ssl": {
"rejectUnauthorized": false
}
}
},
"production-ssl-disabled": {
"use_env_variable": "DATABASE_URL",
"dialect": "postgres"
}
}
EOF
''}
'';
script = ''

4
nixos/modules/services/web-apps/restya-board.nix
View File

@ -263,8 +263,8 @@ in
serviceConfig.RemainAfterExit = true;
wantedBy = [ "multi-user.target" ];
requires = if cfg.database.host == null then [] else [ "postgresql.service" ];
after = [ "network.target" ] ++ (if cfg.database.host == null then [] else [ "postgresql.service" ]);
requires = lib.optional (cfg.database.host != null) "postgresql.service";
after = [ "network.target" ] ++ (lib.optional (cfg.database.host != null) "postgresql.service");
script = ''
rm -rf "${runDir}"

2
nixos/tests/common/resolver.nix
View File

@ -63,7 +63,7 @@
matched = builtins.match "[ \t]+(${reHost})(.*)" str;
continue = lib.singleton (lib.head matched)
++ matchAliases (lib.last matched);
in if matched == null then [] else continue;
in lib.optional (matched != null) continue;
matchLine = str: let
result = builtins.match "[ \t]*(${reIp})[ \t]+(${reHost})(.*)" str;

4
pkgs/applications/networking/flexget/default.nix
View File

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.7.7";
version = "3.7.9";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-NBuiAaD7V4qTujsN8hoBYWzCCEmOTQb5qbpE0erh4oI=";
hash = "sha256-TD57tGLTYy8E7lx6hzH1/00oWFYqCQ325UNEhgv/AEA=";
};
postPatch = ''

2
pkgs/build-support/nix-gitignore/default.nix
View File

@ -45,7 +45,7 @@ in rec {
escs = "\\*?";
splitString =
let recurse = str : [(substring 0 1 str)] ++
(if str == "" then [] else (recurse (substring 1 (stringLength(str)) str) ));
(lib.optionals (str != "") (recurse (substring 1 (stringLength(str)) str) ));
in str : recurse str;
chars = s: filter (c: c != "" && !isList c) (splitString s);
escape = s: map (c: "\\" + c) (chars s);

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
version = "6.0.2";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-hifEd2uL1sBLF8H8KwYoxCyVpGkv9f4SqD6WmB7xJ7I=";
sha256 = "sha256-gQyL8g4Y5kM9/1EDLAQYiTSZ6CxuvfQv7LBRZNcGPVk=";
};
nativeBuildInputs = [

3
pkgs/development/coq-modules/mathcomp-analysis/default.nix
View File

@ -40,8 +40,7 @@ let
mathcomp_ = package: let
classical-deps = [ mathcomp.algebra mathcomp-finmap ];
analysis-deps = [ mathcomp.field mathcomp-bigenough ];
intra-deps = if package == "single" then []
else map mathcomp_ (head (splitList (lib.pred.equal package) packages));
intra-deps = lib.optionals (package != "single") (map mathcomp_ (head (splitList (lib.pred.equal package) packages)));
pkgpath = if package == "single" then "."
else if package == "analysis" then "theories" else "${package}";
pname = if package == "single" then "mathcomp-analysis-single"

3
pkgs/development/coq-modules/mathcomp/default.nix
View File

@ -55,8 +55,7 @@ let
packages = [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ];
mathcomp_ = package: let
mathcomp-deps = if package == "single" then []
else map mathcomp_ (head (splitList (lib.pred.equal package) packages));
mathcomp-deps = lib.optionals (package != "single") (map mathcomp_ (head (splitList (lib.pred.equal package) packages)));
pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}";
pname = if package == "single" then "mathcomp" else "mathcomp-${package}";
pkgallMake = ''

3
pkgs/development/coq-modules/metacoq/default.nix
View File

@ -33,8 +33,7 @@ let
template-coq = metacoq_ "template-coq";
metacoq_ = package: let
metacoq-deps = if package == "single" then []
else map metacoq_ (head (splitList (lib.pred.equal package) packages));
metacoq-deps = lib.optionals (package != "single") (map metacoq_ (head (splitList (lib.pred.equal package) packages)));
pkgpath = if package == "single" then "./" else "./${package}";
pname = if package == "all" then "metacoq" else "metacoq-${package}";
pkgallMake = ''

2
pkgs/development/libraries/protobuf/generic-v3.nix
View File

@ -33,7 +33,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];
buildInputs = [ zlib ];
configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
configureFlags = lib.optional (buildProtobuf != null) "--with-protoc=${buildProtobuf}/bin/protoc";
enableParallelBuilding = true;

4
pkgs/development/ocaml-modules/cpdf/default.nix
View File

@ -6,13 +6,13 @@ else
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-cpdf";
version = "2.5";
version = "2.5.1";
src = fetchFromGitHub {
owner = "johnwhitington";
repo = "cpdf-source";
rev = "v${version}";
sha256 = "sha256:1qmx229nij7g6qmiacmyy4mcgx3k9509p4slahivshqm79d6wiwl";
hash = "sha256-B1wYLcxTRUyzREtE9uvPMwSiwtB+q0RQsY02F0u3aa0=";
};
nativeBuildInputs = [ ocaml findlib ];

6
pkgs/development/python-modules/pylion/default.nix
View File

@ -11,15 +11,15 @@
buildPythonPackage {
pname = "pylion";
version = "0.5.2";
version = "0.5.3";
format = "setuptools";
src = fetchFromBitbucket {
owner = "dtrypogeorgos";
repo = "pylion";
# Version is set in setup.cfg, but not in a git tag / bitbucket release
rev = "8945a7b6f1912ae6b9c705f8a2bd521101f5ba59";
hash = "sha256-4AdJkoQ1hAssDUpgmARGmN+ihQqRPPOncWJ5ErQyWII=";
rev = "3e6b96b542b97107c622d66b0be0551c3bd9f948";
hash = "sha256-c0UOv2Vlv9wJ6YW+QdHinhpdaclUh3As5TDvyoRhpSI=";
};
# Docs are not available online, besides the article:

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

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }:
let
version = "1.18.0";
version = "1.19.0";
in
buildGoModule {
pname = "sqlc";
@ -11,11 +11,11 @@ buildGoModule {
owner = "kyleconroy";
repo = "sqlc";
rev = "v${version}";
sha256 = "sha256-5MC7D9+33x/l76j186FCnzo0Hnx0wY6BPdneW7E7MpE=";
sha256 = "sha256-/6CqzkdZMog0ldoMN0PH8QhL1QsOBaDAnqTHlgtHdP8=";
};
proxyVendor = true;
vendorHash = "sha256-gDePB+IZSyVIILDAj+O0Q8hgL0N/0Mwp1Xsrlh3B914=";
vendorHash = "sha256-AsOm86apA5EiZ9Ss7RPgVn/b2/O6wPj/ur0zG91JoJo=";
subPackages = [ "cmd/sqlc" ];

46
pkgs/development/tools/lalrpop/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, rustPlatform
, rust
, fetchFromGitHub
, substituteAll
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "lalrpop";
version = "0.20.0";
src = fetchFromGitHub {
owner = "lalrpop";
repo = "lalrpop";
# there's no tag for 0.20.0
rev = "1584ddb243726195b540fdd2b3ccf693876288e0";
# rev = version;
hash = "sha256-aYlSR8XqJnj76Hm3MFqfA5d9L3SO/iCCKpzOES5YQGY=";
};
cargoHash = "sha256-JaU5ZJbmlV/HfFT/ODpB3xFjZc2XiljhEVz/dql8o/c=";
patches = [
(substituteAll {
src = ./use-correct-binary-path-in-tests.patch;
target_triple = rust.toRustTarget stdenv.hostPlatform;
})
];
buildAndTestSubdir = "lalrpop";
# there are some tests in lalrpop-test and some in lalrpop
checkPhase = ''
buildAndTestSubdir=lalrpop-test cargoCheckHook
cargoCheckHook
'';
meta = with lib; {
description = "LR(1) parser generator for Rust";
homepage = "https://github.com/lalrpop/lalrpop";
changelog = "https://github.com/lalrpop/lalrpop/blob/${src.rev}/RELEASES.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ chayleaf ];
};
}

13
pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/lalrpop-test/src/lib.rs b/lalrpop-test/src/lib.rs
index cb4f2b0..725b0d4 100644
--- a/lalrpop-test/src/lib.rs
+++ b/lalrpop-test/src/lib.rs
@@ -1089,7 +1089,7 @@ fn verify_lalrpop_generates_itself() {
// Don't remove the .rs file that already exist
fs::copy(&grammar_file, &copied_grammar_file).expect("no grammar file found");
- assert!(Command::new("../target/debug/lalrpop")
+ assert!(Command::new("../target/@target_triple@/release/lalrpop")
.args([
"--force",
"--no-whitespace",

8
pkgs/development/tools/pup/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pup";
version = "unstable-2019-09-19";
version = "unstable-2022-03-06";
src = fetchFromGitHub {
owner = "ericchiang";
repo = "pup";
rev = "681d7bb639334bf485476f5872c5bdab10931f9a";
sha256 = "1hx1k0qlc1bq6gg5d4yprn4d7kvqzagg6mi5mvb39zdq6c4y17vr";
rev = "5a57cf111366c7c08999a34b2afd7ba36d58a96d";
hash = "sha256-Ledg3xPbu71L5qUY033bru/lw03jws3s4YlAarIuqaA=";
};
vendorSha256 = null;
vendorHash = "sha256-/MDSWIuSYNxKbTslqIooI2qKA8Pye0yJF2dY8g8qbWI=";
meta = with lib; {
description = "Parsing HTML at the command line";

6
pkgs/development/web/flyctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.1.51";
version = "0.1.53";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-5wokG37aP15VGRbH14kyVVH1VfKbbvMZrZl7gP0WbSE=";
hash = "sha256-Fmfj7p8gnArUniI4fTPusspu2ZNjU9mpH2CckTdgiNQ=";
};
vendorHash = "sha256-7cwe0POozQeeabQQxtnJNWRmM5bWqmzVx/2TDPeoCx8=";
vendorHash = "sha256-bMuXqoxwwmMxo7RtbYnpfKuYYRXYdSF2p6oyBP6xJ40=";
subPackages = [ "." ];

2
pkgs/games/steam/fhsenv.nix
View File

@ -298,7 +298,7 @@ in buildFHSEnv rec {
name = "steam-run";
targetPkgs = commonTargetPkgs;
inherit multiPkgs profile extraInstallCommands;
inherit multiArch multiPkgs profile extraInstallCommands;
inherit unshareIpc unsharePid;
runScript = writeShellScript "steam-run" ''

7
pkgs/os-specific/linux/kvmfr/default.nix
View File

@ -1,11 +1,14 @@
{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }:
{ lib, stdenv, kernel, looking-glass-client }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "kvmfr";
version = looking-glass-client.version;
src = looking-glass-client.src;
sourceRoot = "source/module";
patches = lib.optional (kernel.kernelAtLeast "6.4") [
./linux-6-4-compat.patch
];
hardeningDisable = [ "pic" "format" ];
nativeBuildInputs = kernel.moduleBuildDependencies;

16
pkgs/os-specific/linux/kvmfr/linux-6-4-compat.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/kvmfr.c b/kvmfr.c
index 121aae5b..2f4c9e1a 100644
--- a/kvmfr.c
+++ b/kvmfr.c
@@ -539,7 +539,11 @@ static int __init kvmfr_module_init(void)
if (kvmfr->major < 0)
goto out_free;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
kvmfr->pClass = class_create(THIS_MODULE, KVMFR_DEV_NAME);
+#else
+ kvmfr->pClass = class_create(KVMFR_DEV_NAME);
+#endif
if (IS_ERR(kvmfr->pClass))
goto out_unreg;

46
pkgs/servers/mail/mailpit/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, buildGoModule
, nodejs
, python3
, libtool
, npmHooks
, fetchFromGitHub
, fetchNpmDeps
}:
buildGoModule rec {
pname = "mailpit";
version = "1.7.1";
src = fetchFromGitHub {
owner = "axllent";
repo = "mailpit";
rev = "v${version}";
hash = "sha256-jT9QE0ikp9cJlT8qtfPPjKOUuqWyQk94D3UbkyaGXa8=";
};
vendorHash = "sha256-XBYIO7fdo5EahJB7EcAuY9SGKZb8dsvoJHp/D5LO5Qo=";
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-6VCs8125fTJkZW+eZgK56j7ccK8tcGhIXiq2HkYp4XM=";
};
nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ];
preBuild = ''
npm run package
'';
CGO_ENABLED = 0;
ldflags = [ "-s" "-w" "-X github.com/axllent/mailpit/config.Version=${version}" ];
meta = with lib; {
description = "An email and SMTP testing tool with API for developers";
homepage = "https://github.com/axllent/mailpit";
changelog = "https://github.com/axllent/mailpit/releases/tag/v${version}";
maintainers = with maintainers; [ stephank ];
license = licenses.mit;
};
}

4
pkgs/servers/sql/postgresql/ext/repmgr.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "repmgr";
version = "5.4.0";
version = "5.4.1";
src = fetchFromGitHub {
owner = "EnterpriseDB";
repo = "repmgr";
rev = "v${version}";
sha256 = "sha256-QUxLqCZIopvqDncpaA8bxm9MHvO6R6jPrcd8hF8lqQs=";
sha256 = "sha256-OaEoP1BajVW9dt8On9Ppf8IXmAk47HHv8zKw3WlsLHw=";
};
nativeBuildInputs = [ flex ];

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

@ -10,23 +10,18 @@
stdenv.mkDerivation rec {
pname = "outline";
version = "0.69.2";
version = "0.70.2";
src = fetchFromGitHub {
owner = "outline";
repo = "outline";
rev = "v${version}";
hash = "sha256-XevrCUvPmAbPTysJ/o7i2xAZTQ+UFYtVal/aZKvt+Ls=";
hash = "sha256-y2VGWuwJX91Aa8Bs7YcT4MKOURrFKXUz9CcQkUI/U2s=";
};
nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ];
buildInputs = [ yarn nodejs ];
# Replace the inline calls to yarn with our sequalize wrapper. These should be
# the two occurrences:
# https://github.com/outline/outline/search?l=TypeScript&q=yarn
patches = [ ./sequelize-command.patch ];
yarnOfflineCache = yarn2nix-moretea.importOfflineCache ./yarn.nix;
configurePhase = ''
@ -66,14 +61,6 @@ stdenv.mkDerivation rec {
--set NODE_ENV production \
--set NODE_PATH $node_modules
makeWrapper ${nodejs}/bin/node $out/bin/outline-sequelize \
--add-flags $node_modules/.bin/sequelize \
--add-flags "--migrations-path $server/migrations" \
--add-flags "--models-path $server/models" \
--add-flags "--seeders-path $server/models/fixtures" \
--set NODE_ENV production \
--set NODE_PATH $node_modules
runHook postInstall
'';

22
pkgs/servers/web-apps/outline/sequelize-command.patch
View File

@ -1,22 +0,0 @@
diff --git a/server/utils/startup.ts b/server/utils/startup.ts
index 444de475..b883f71a 100644
--- a/server/utils/startup.ts
+++ b/server/utils/startup.ts
@@ -8,7 +8,7 @@ import Team from "@server/models/Team";
function getPendingMigrations() {
const commandResult = execSync(
- `yarn sequelize db:migrate:status${
+ `outline-sequelize db:migrate:status${
env.PGSSLMODE === "disable" ? " --env=production-ssl-disabled" : ""
}`
);
@@ -26,7 +26,7 @@ function getPendingMigrations() {
function runMigrations() {
Logger.info("database", "Running migrations...");
const cmdResult = execSync(
- `yarn db:migrate${
+ `outline-sequelize db:migrate${
env.PGSSLMODE === "disable" ? " --env=production-ssl-disabled" : ""
}`
);

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

4
pkgs/tools/filesystems/glusterfs/default.nix
View File

@ -2,7 +2,7 @@
autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite,
liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which,
openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
rsync, glibc, rpcsvc-proto, libtirpc, gperftools, nixosTests
rsync, getent, rpcsvc-proto, libtirpc, gperftools, nixosTests
}:
let
# NOTE: On each glusterfs release, it should be checked if gluster added
@ -42,7 +42,7 @@ let
e2fsprogs # tune2fs
findutils # find
gawk # awk
glibc # getent
getent # getent
gnugrep # grep
gnused # sed
lvm2 # lvs

41
pkgs/tools/misc/go-ios/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildGoModule
, fetchFromGitHub
, nix-update-script
}:
buildGoModule rec {
pname = "go-ios";
version = "1.0.115";
src = fetchFromGitHub {
owner = "danielpaulus";
repo = "go-ios";
rev = "v${version}";
sha256 = "sha256-pvgdGBLgRHvnGdAyA4Rrexkh5oRzVT7AYgKfLNfSf7M=";
};
vendorSha256 = "sha256-lLpvpT0QVVyy12HmtOQxagT0JNwRO7CcfkGhCpouH8w=";
excludedPackages = [
"restapi"
];
checkFlags = [
"-tags=fast"
];
postInstall = ''
# aligns the binary with what is expected from go-ios
mv $out/bin/go-ios $out/bin/ios
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "An operating system independent implementation of iOS device features";
homepage = "https://github.com/danielpaulus/go-ios";
license = licenses.mit;
maintainers = with maintainers; [ eyjhb ];
};
}

2867
pkgs/tools/misc/turbo/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

7
pkgs/tools/misc/turbo/default.nix
View File

@ -16,12 +16,12 @@
, turbo
}:
let
version = "1.8.3";
version = "1.8.8";
src = fetchFromGitHub {
owner = "vercel";
repo = "turbo";
rev = "v${version}";
sha256 = "sha256-aqe9ze6xZ5RUJJGT19nABhorrL9+ctSTS+ov97hG30o=";
sha256 = "sha256-Qn1qAdhzQrkdMbZs9zqZA0k7UTig39ljJ3DQn49pJf8=";
};
go-turbo = buildGoModule rec {
@ -29,7 +29,7 @@ let
pname = "go-turbo";
modRoot = "cli";
vendorSha256 = "sha256-lqumN+xqJXEPI+nVnWSNfAyvQQ6fS9ao8uhwA1EbWWM=";
vendorSha256 = "sha256-/C5zUQk8bJPBu1L9RYJh74haGkB+37fWldeg/2U8X9I=";
nativeBuildInputs = [
git
@ -76,6 +76,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
pkg-config
extra-cmake-modules
protobuf
];
buildInputs = [
openssl

6
pkgs/tools/networking/clash-meta/default.nix
View File

@ -4,7 +4,7 @@
}:
buildGoModule rec {
pname = "clash-meta";
version = "1.14.5";
version = "1.15.0";
src = fetchFromGitHub {
owner = "MetaCubeX";
@ -14,10 +14,10 @@ buildGoModule rec {
postFetch = ''
rm -f $out/.github/workflows/{Delete,delete}.yml
'';
hash = "sha256-4jhe+zhcRACcwwPWFd5oW8eIKTpPWfz0z5cnA9E8Wkc=";
hash = "sha256-trufMtk3t9jA6hc9CenHsd3k41nrCyJYyOuHzzWv+Jw=";
};
vendorHash = "sha256-VcT9dda5E9IMrDB/3QWBGWiNxGAEM2yKDbJwhGpN8og=";
vendorHash = "sha256-lMeJ3z/iTHIbJI5kTzkQjNPMv5tGMJK/+PM36BUlpjE=";
# Do not build testing suit
excludedPackages = [ "./test" ];

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2023-07-08";
version = "2023-07-12";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-hOPTK7nkKmLsVb6GJIE4FTdCGU6PdjQtUpTXzhsMXXo=";
hash = "sha256-ro17fRg9sw6+3ba6apIXtGwWvnPs0i6tMMJu6VwWPd0=";
};
nativeBuildInputs = [

2
pkgs/tools/system/netdata/default.nix
View File

@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
# to bootstrap tools:
# https://github.com/NixOS/nixpkgs/pull/175719
# We pick zlib.dev as a simple canary package with pkg-config input.
disallowedReferences = if withDebug then [] else [ zlib.dev ];
disallowedReferences = lib.optional (!withDebug) zlib.dev;
donStrip = withDebug;
env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";

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

@ -915,6 +915,8 @@ with pkgs;
gomi = callPackage ../tools/misc/gomi { };
go-ios = callPackage ../tools/misc/go-ios { };
graph-easy = callPackage ../tools/graphics/graph-easy { };
mangal = callPackage ../applications/misc/mangal { };
@ -2637,11 +2639,13 @@ with pkgs;
### APPLICATIONS/EMULATORS/YUZU
yuzu-mainline = qt6Packages.callPackage ../applications/emulators/yuzu {
yuzu-mainline = import ../applications/emulators/yuzu {
inherit qt6Packages fetchFromGitHub fetchgit fetchurl fetchzip runCommand gnutar;
branch = "mainline";
};
yuzu-early-access = qt6Packages.callPackage ../applications/emulators/yuzu {
yuzu-early-access = import ../applications/emulators/yuzu {
inherit qt6Packages fetchFromGitHub fetchgit fetchurl fetchzip runCommand gnutar;
branch = "early-access";
};
@ -9420,6 +9424,8 @@ with pkgs;
lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { };
lalrpop = callPackage ../development/tools/lalrpop { };
last-resort = callPackage ../data/fonts/last-resort { };
ldc = callPackage ../development/compilers/ldc { };
@ -10221,6 +10227,10 @@ with pkgs;
);
bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { };
mailpit = callPackage ../servers/mail/mailpit {
libtool = if stdenv.isDarwin then darwin.cctools else libtool;
};
mailsend = callPackage ../tools/networking/mailsend { };
mailutils = callPackage ../tools/networking/mailutils {