nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 03:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-23.05 into staging-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-07-18 00:20:04 +00:00
committed by GitHub
parent c3f1611b75 6dc808fd4e
commit b3dc16f781
8 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/standardnotes/src.json
View File

@@ -1,13 +1,13 @@
{
"version": "3.165.9",
"version": "3.166.9",
"deb": {
"x86_64-linux": {
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-amd64.deb",
"hash": "sha512-DR2wxCi0RgEeAQWbegJv7Zhp6rtO2PWF7RceVNd2KBrLigsRZbRfLVsPLesprKexZoGIryhYvOksecpX51VdUA=="
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-amd64.deb",
"hash": "sha512-D85W50K3jRBKhrPz3Wa9aClnHFMRPQ0YgP71uypfcCcuKVnKd3Ol1sFzsyMzl2uhB0aGOkpd2OB+OHceVFqmag=="
},
"aarch64-linux": {
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-arm64.deb",
"hash": "sha512-ACYzEHQgw4pPZNgOUSDihAFY1dJ91Tmw3y2Lf1iihiOVcGn4qt5XJS2BG0+/bEWZjp0iuBKsfrlfWfSi6c95Sg=="
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-arm64.deb",
"hash": "sha512-pbBLqIaDjQoVGCOfpOxwjWRSMoQsefsYOHTRNTNlDDNO7DRUa/WeSbOYOgLJM5yGIBVXQoRmO7ycWfAWVAPIDQ=="
}
}
}

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

@@ -166,9 +166,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.5.2";
hash = "sha256-Ri2nWLjPPBINXyPIQSbnd1L+t7QLgXiTOgqX8Dk/rXg=";
vendorHash = "sha256-tfCfJj39VP+P4qhJTpEIAi4XB+6VYtVKkV/bTrtnFA0=";
version = "1.5.3";
hash = "sha256-4TnTYzjy8v5+mcV/JIiMPLCTPSanfmbTGzwlMovwlOo=";
vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -1,7 +1,7 @@
{ branch ? "stable", callPackage, fetchurl, lib, stdenv }:
let
versions = if stdenv.isLinux then {
stable = "0.0.27";
stable = "0.0.28";
ptb = "0.0.44";
canary = "0.0.162";
development = "0.0.217";
@@ -16,7 +16,7 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "sha256-6fHaiPBcv7TQVh+TatIEYXZ/LwPmnCmU/QWXKFgUR7U=";
sha256 = "sha256-JwxVVm/QIBLoVyQ2Ff/MX06UNgZ+dAsD960GsCg1M+U=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

7
pkgs/development/ocaml-modules/gsl/default.nix
View File

@@ -1,4 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
{ lib, stdenv, ocaml, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"gsl is not available for OCaml ${ocaml.version}"
buildDunePackage rec {
pname = "gsl";
@@ -36,8 +39,6 @@ buildDunePackage rec {
})
];
duneVersion = "3";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator gsl ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ];

5
pkgs/development/ocaml-modules/printbox/text.nix
View File

@@ -1,11 +1,12 @@
{ buildDunePackage, printbox, uucp, uutf, mdx }:
{ buildDunePackage, lib, ocaml, printbox, uucp, uutf, mdx }:
buildDunePackage {
pname = "printbox-text";
inherit (printbox) src version useDune2 doCheck;
inherit (printbox) src version;
propagatedBuildInputs = [ printbox uucp uutf ];
doCheck = printbox.doCheck && lib.versionOlder ocaml.version "5.0";
nativeCheckInputs = [ mdx.bin ];
meta = printbox.meta // {

6
pkgs/servers/mautrix-whatsapp/default.nix
View File

@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.8.6";
version = "0.9.0";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
hash = "sha256-+uMpAsIadkdUrKkAr6ejOc1NfRIISA2R0AOjIXGXVpY=";
hash = "sha256-9o8AjZclSVzpAIqnW28/iaP10pA5cg7eC1q/kbMI3jI=";
};
buildInputs = [ olm ];
vendorSha256 = "sha256-emUCf6ZKFjBDr5WEKzYfbBNR44FDbjedmCgHfkjHQtw=";
vendorSha256 = "sha256-Gnr3+653gy3C8G0NSYsjsQFkfDPs013pyl/ARD5yweM=";
doCheck = false;

6
pkgs/servers/nosql/ferretdb/default.nix
View File

@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ferretdb";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "FerretDB";
repo = "FerretDB";
rev = "v${version}";
sha256 = "sha256-WSjIUnjMdrRsdygDqQaxNosc/XGrSz/Yx3xauDkQDzU=";
hash = "sha256-PBxpb6lXLtOM9nxw2rNlMoevyWbmuTZMIjzr4y3UCMc=";
};
postPatch = ''
@@ -19,7 +19,7 @@ buildGoModule rec {
echo nixpkgs > build/version/package.txt
'';
vendorSha256 = "sha256-xWmzTqy0yoOZRvMllsVaRkUmAUWE/Nn4UFyT+0JiCFU=";
vendorSha256 = "sha256-AsjKqlUwP+IgTErsGhBrELhVHMJ88twU3U4E9U/rP24=";
CGO_ENABLED = 0;

5
pkgs/tools/networking/inadyn/default.nix
View File

@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
buildInputs = [ gnutls libite libconfuse ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
];
enableParallelBuilding = true;
meta = with lib; {