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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-23 06:01:41 +00:00 committed by GitHub
commit e424324159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 159 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/blockchain/ethereum/lighthouse.nix
View File

@ -247,6 +247,7 @@ in {
DynamicUser = true;
Restart = "on-failure";
StateDirectory = "lighthouse-beacon";
ReadWritePaths = [ cfg.beacon.dataDir ];
NoNewPrivileges = true;
PrivateTmp = true;
ProtectHome = true;
@ -287,6 +288,7 @@ in {
serviceConfig = {
Restart = "on-failure";
StateDirectory = "lighthouse-validator";
ReadWritePaths = [ cfg.validator.dataDir ];
CapabilityBoundingSet = "";
DynamicUser = true;
NoNewPrivileges = true;

36
pkgs/applications/misc/gpxsee/default.nix
View File

@ -1,16 +1,33 @@
{ lib, stdenv, fetchFromGitHub, nix-update-script, substituteAll
, qmake, qttools, qttranslations, qtlocation, qtpbfimageplugin, wrapQtAppsHook
{ lib
, stdenv
, fetchFromGitHub
, qmake
, nix-update-script
, substituteAll
, qtbase
, qttools
, qttranslations
, qtlocation ? null # qt5 only
, qtpositioning ? null # qt6 only
, qtpbfimageplugin
, qtsvg
, qt5compat ? null # qt6 only
, wrapQtAppsHook
}:
let
isQt6 = lib.versions.major qtbase.version == "6";
in
stdenv.mkDerivation rec {
pname = "gpxsee";
version = "11.6";
version = "11.9";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ=";
hash = "sha256-R/Kuk4nRJg3ozNNmzzNDnGcsmBmlk0g9d+F8JwLFz98=";
};
patches = (substituteAll {
@ -19,7 +36,15 @@ stdenv.mkDerivation rec {
inherit qttranslations;
});
buildInputs = [ qtlocation qtpbfimageplugin ];
buildInputs = [ qtpbfimageplugin ]
++ (if isQt6 then [
qtbase
qtpositioning
qtsvg
qt5compat
] else [
qtlocation
]);
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
@ -49,5 +74,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only;
maintainers = with maintainers; [ womfoo sikmir ];
platforms = platforms.unix;
broken = isQt6 && stdenv.isDarwin;
};
}

6
pkgs/applications/networking/cluster/nomad/1.2.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.2.14";
sha256 = "sha256-BEbRXakMbgE44z1NOGThUuT1FukFUc1cnPkV5PXAY+4=";
vendorSha256 = "sha256-bOJ/qlvY3NHlR9C08vwfVn4Z/bSH15EPs3vvq78JoKs=";
version = "1.2.15";
sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI=";
vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto=";
}

6
pkgs/applications/networking/cluster/nomad/1.3.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.3.7";
sha256 = "sha256-hMMR7PdCViZdePXy9aFqTFBxoiuuXqIldXyCGkkr5MA=";
vendorSha256 = "sha256-unw2/E048jzDHj7glXc61UNZIr930UpU9RrXI6DByj4=";
version = "1.3.8";
sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I=";
vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00=";
}

6
pkgs/applications/networking/cluster/nomad/1.4.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.4.2";
sha256 = "sha256-GGLy/6FgMTSZ701F0QGwcw1EFZSUMyPOlokThOTtdJg=";
vendorSha256 = "sha256-dd8rTGcO4GVMRuABwT4HeucZqYKxrgRUkua/bSPLNH0=";
version = "1.4.3";
sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg=";
vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A=";
}

6
pkgs/applications/networking/cluster/talosctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "talosctl";
version = "1.2.6";
version = "1.2.7";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
sha256 = "sha256-KvwW5VJ5HDXDxaPssmVnqBWmk3Y1qbu9PcZsd+CLeXE=";
sha256 = "sha256-AQTBiHlaVFV1fvZ278DYf2XnktnLNa1Hb4qS2D2r/fM=";
};
vendorSha256 = "sha256-i+SUDFOffh4Ky2kawIb3M6M2Han25yYQbWI0wFjZwtU=";
vendorSha256 = "sha256-GKDhqIfYmPwbxt+hId3Axr64xOTXkLklZzNYWDo9SG8=";
ldflags = [ "-s" "-w" ];

66
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -231,13 +231,13 @@
"version": "3.28.0"
},
"cloudfoundry": {
"hash": "sha256-VfGB0NkT36oYT5F1fh1N/2rlZdfhk+K76AXNh0NkO50=",
"hash": "sha256-sg8Ulq3fPZrW+Wuf5/IYLgqtGMkuK3Euudf+L6kx38Q=",
"owner": "cloudfoundry-community",
"provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry",
"repo": "terraform-provider-cloudfoundry",
"rev": "v0.15.5",
"vendorHash": "sha256-dj0XBy3dvpn9aEt+Xab6ZelvXZmt2+BX6qytdsMbIXo=",
"version": "0.15.5"
"rev": "v0.50.0",
"vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=",
"version": "0.50.0"
},
"cloudinit": {
"hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=",
@ -331,13 +331,13 @@
"version": "3.2.3"
},
"dnsimple": {
"hash": "sha256-dge7slNS1EkWwjt3+WS8tlKjFHw6LV/q1Bxrl1RflBw=",
"hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=",
"owner": "dnsimple",
"provider-source-address": "registry.terraform.io/dnsimple/dnsimple",
"repo": "terraform-provider-dnsimple",
"rev": "v0.14.1",
"rev": "v0.15.0",
"vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=",
"version": "0.14.1"
"version": "0.15.0"
},
"docker": {
"hash": "sha256-/vz4rjENlVl9gqtxfqCV+k2SgsHZBcmA9Mz10Y2ay/E=",
@ -385,13 +385,13 @@
"version": "2.2.3"
},
"fastly": {
"hash": "sha256-Zcev9EegZ/LVRGcjn1rHbp+jdZ5x4OowCD23E/MEYQA=",
"hash": "sha256-cLiR9QAhIJCGHDGNZo2P3seqsAd9VibSb+7HKZwMS9Q=",
"owner": "fastly",
"provider-source-address": "registry.terraform.io/fastly/fastly",
"repo": "terraform-provider-fastly",
"rev": "v3.0.0",
"rev": "v3.0.1",
"vendorHash": null,
"version": "3.0.0"
"version": "3.0.1"
},
"flexibleengine": {
"hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=",
@ -423,13 +423,13 @@
"version": "2.2.0"
},
"github": {
"hash": "sha256-3ivfHKoj7jXQ3WsoTNSCL1zD93Pr0pjtZ9LneW9My4o=",
"hash": "sha256-+I2h3wQnLd9EX99begsj4CI5R5i93JowBbGydYQNJHg=",
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v5.9.0",
"rev": "v5.9.1",
"vendorHash": null,
"version": "5.9.0"
"version": "5.9.1"
},
"gitlab": {
"hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=",
@ -441,24 +441,24 @@
"version": "3.19.0"
},
"google": {
"hash": "sha256-etTMRjQeZoLNpFlKBWa63eowXQC8wDP/O0YdwzbmFK0=",
"hash": "sha256-e2jVnL13j4iSb288CB/H6G3vR58bjwi+2ZHzve1tuUo=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.44.0",
"rev": "v4.44.1",
"vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=",
"version": "4.44.0"
"version": "4.44.1"
},
"google-beta": {
"hash": "sha256-AD2ZtjjlmYZYmBA3csjIDH+4g7DTskaLeuBGjqIKpbU=",
"hash": "sha256-ejMWZTSrkGMAKr02TIg0yngzpqEVL8y56JSoQrCJ7lA=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.44.0",
"rev": "v4.44.1",
"vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=",
"version": "4.44.0"
"version": "4.44.1"
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -470,13 +470,13 @@
"version": "0.7.0"
},
"grafana": {
"hash": "sha256-HeUPa0xMQx5n1Wnv58v8Wi6VWbIWmfVwyO5badxi7Qo=",
"hash": "sha256-DAuG1VYLYr3cz+PR5wNlPBKuUcnbYAO0d9tNxnBiGuU=",
"owner": "grafana",
"provider-source-address": "registry.terraform.io/grafana/grafana",
"repo": "terraform-provider-grafana",
"rev": "v1.30.0",
"vendorHash": "sha256-Mc8BkC7ZhTmmWYKAMR+aQ9lBr7IFll7vAIWFbZc/Rqw=",
"version": "1.30.0"
"rev": "v1.31.1",
"vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo=",
"version": "1.31.1"
},
"gridscale": {
"hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=",
@ -842,13 +842,13 @@
"version": "4.100.0"
},
"okta": {
"hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=",
"hash": "sha256-2AR416LkqgfHdY18m4k/jqSet7G77HwHuGKilvS3Yig=",
"owner": "okta",
"provider-source-address": "registry.terraform.io/okta/okta",
"repo": "terraform-provider-okta",
"rev": "v3.38.0",
"vendorHash": "sha256-iGQ3JPJ78Qhj+izR8D4H5oWGq4fF5lXuNHQCmpr7zFE=",
"version": "3.38.0"
"rev": "v3.39.0",
"vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=",
"version": "3.39.0"
},
"oktaasa": {
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
@ -896,13 +896,13 @@
"version": "0.6.17"
},
"ovh": {
"hash": "sha256-QaJZQU6bnjXoTCxfP1NcsPqegFyZ6JwP2QgN7zrE0z0=",
"hash": "sha256-6lBhEmeAvTv8xRMi5ZabcJg/59xJ9o4/MaAJP+H7pqk=",
"owner": "ovh",
"provider-source-address": "registry.terraform.io/ovh/ovh",
"repo": "terraform-provider-ovh",
"rev": "v0.22.0",
"rev": "v0.23.0",
"vendorHash": null,
"version": "0.22.0"
"version": "0.23.0"
},
"pagerduty": {
"hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=",
@ -986,13 +986,13 @@
"version": "0.4.3"
},
"scaleway": {
"hash": "sha256-HQljeUvK010LSWObuZmTkkB6ByrtgBRAeZPYv3d/KSs=",
"hash": "sha256-0NQRAv05GuVRAkZd580TINEur/G+c0jUmMtyMv05+PY=",
"owner": "scaleway",
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.6.0",
"rev": "v2.7.1",
"vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=",
"version": "2.6.0"
"version": "2.7.1"
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",

4
pkgs/desktops/cinnamon/warpinator/default.nix
View File

@ -15,7 +15,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "warpinator";
version = "1.2.14";
version = "1.2.15";
format = "other";
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-0OmrviDti843c+nvpt7ennSrso0PD7eZOJ94JiWJT58=";
hash = "sha256-WLeJTSf8906CjvJvBWnmFRVV1ngOuIK0V/3qZ82Bx7s=";
};
nativeBuildInputs = [

7
pkgs/development/libraries/qt-6/modules/qttools.nix
View File

@ -3,9 +3,16 @@
, lib
, qtbase
, qtdeclarative
, substituteAll
}:
qtModule {
pname = "qttools";
qtInputs = [ qtbase qtdeclarative ];
patches = [
../patches/qttools-paths.patch
];
NIX_CFLAGS_COMPILE = [
"-DNIX_OUTPUT_DEV=\"${placeholder "dev"}\""
];
}

27
pkgs/development/libraries/qt-6/patches/qttools-paths.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/src/linguist/shared/runqttool.cpp b/src/linguist/shared/runqttool.cpp
index d355b9dc..94fef33f 100644
--- a/src/linguist/shared/runqttool.cpp
+++ b/src/linguist/shared/runqttool.cpp
@@ -20,9 +20,21 @@ class FMT {
Q_DECLARE_TR_FUNCTIONS(Linguist)
};
+static QString qtBasePath(QLibraryInfo::LibraryPath location)
+{
+ switch (location) {
+ case QLibraryInfo::BinariesPath:
+ return QLatin1String(NIX_OUTPUT_DEV) + QLatin1String("/bin");
+ case QLibraryInfo::LibraryExecutablesPath:
+ return QLatin1String(NIX_OUTPUT_DEV) + QLatin1String("/libexec");
+ default:
+ return QLibraryInfo::path(location);
+ }
+}
+
static QString qtToolFilePath(const QString &toolName, QLibraryInfo::LibraryPath location)
{
- QString filePath = QLibraryInfo::path(location) + QLatin1Char('/') + toolName;
+ QString filePath = qtBasePath(location) + QLatin1Char('/') + toolName;
#ifdef Q_OS_WIN
filePath.append(QLatin1String(".exe"));
#endif

9
pkgs/development/ocaml-modules/janestreet/0.15.nix
View File

@ -248,7 +248,8 @@ with self;
core = janePackage {
pname = "core";
hash = "1m2ybvlz9zlb2d0jc0j7wdgd18mx9sh3ds2ylkv0cfjx1pzi0l25";
version = "0.15.1";
hash = "sha256-SHjnNFl+JAjdgVoRgmnz0wqrrc3zoh0ZyG2UhUsUbJ8=";
meta.description = "Industrial strength alternative to OCaml's standard library";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ];
@ -592,7 +593,8 @@ with self;
ppx_expect = janePackage {
pname = "ppx_expect";
hash = "134dl5qhjxsj2mcmrx9f3m0iys0n5mjfpz9flj8zn8d2jir43776";
version = "0.15.1";
hash = "sha256-qlOipzTTdN9yQ35sItKmWpCv74kbuJLDg4IHNVTKvow=";
minimumOCamlVersion = "4.04.2";
meta.description = "Cram like framework for OCaml";
propagatedBuildInputs = [ ppx_here ppx_inline_test re ];
@ -922,7 +924,8 @@ with self;
sexplib = janePackage {
pname = "sexplib";
hash = "05h34fm3p0179xivc14bixc50pzc8zws46l5gsq310kpm37srq3c";
version = "0.15.1";
hash = "sha256-LkGNnp717LMHeWe1Ka6qUZcpw8fKSsd5MusaLgFjm70=";
minimumOCamlVersion = "4.04.2";
meta.description = "Library for serializing OCaml values to and from S-expressions";
propagatedBuildInputs = [ num parsexp ];

27
pkgs/development/tools/rust/typeshare/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, rustPlatform, fetchCrate }:
rustPlatform.buildRustPackage rec {
pname = "typeshare";
version = "1.0.0";
src = fetchCrate {
inherit version;
pname = "typeshare-cli";
sha256 = "sha256-KDmE5f9B2lNVbjdF8d81NTJIwpvPhsoLMA8w7iYIIl8=";
};
cargoSha256 = "sha256-b983tSue9WHkPrcIhp5QSjwj+lESURUYueebjXUWMJY=";
buildFeatures = [ "go" ];
postInstall = ''
ln -s $out/bin/typeshare{-cli,}
'';
meta = with lib; {
description = "Command Line Tool for generating language files with typeshare";
homepage = "https://github.com/1password/typeshare";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ figsoda ];
};
}

6
pkgs/servers/monitoring/telegraf/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.24.2";
version = "1.24.3";
excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
sha256 = "sha256-2DUP3g7k0DLXlmhCZH0IUgWpYbdUnRjtsc7uEioYzrE=";
sha256 = "sha256-3KQJRapgl36+QwWHjh+nri3FcFtXhre7l3XN8Oj9t+0=";
};
vendorSha256 = "sha256-q6NMzfXoUYpv/BF6ddiQTPq6Xf3oKuUWrEF6fTDvkZI=";
vendorSha256 = "sha256-0PQYnJKDR/CtZviy0FXvVja7fvcvY+BH8zQXiGdKqRg=";
proxyVendor = true;
ldflags = [

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

@ -9646,7 +9646,7 @@ with pkgs;
noip = callPackage ../tools/networking/noip { };
nomad = nomad_1_3;
nomad = nomad_1_4;
# Nomad never updates major go versions within a release series and is unsupported
# on Go versions that it did not ship with. Due to historic bugs when compiled
@ -15254,6 +15254,7 @@ with pkgs;
openssl = openssl_1_1;
};
rusty-man = callPackage ../development/tools/rust/rusty-man { };
typeshare = callPackage ../development/tools/rust/typeshare { };
sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {};
@ -29150,7 +29151,11 @@ with pkgs;
gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { };
gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { };
gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { };
gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { };
gpxsee = gpxsee-qt5;
gspell = callPackage ../development/libraries/gspell { };

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

@ -28,6 +28,8 @@ in
inherit (kdeFrameworks) kcoreaddons;
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
quazip = callPackage ../development/libraries/quazip { };
qxlsx = callPackage ../development/libraries/qxlsx { };