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

Merge release-22.11 into staging-next-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-01-18 00:13:43 +00:00
committed by GitHub
parent 681024d4bf b83e7f5a04
commit ad99769e60
8 changed files with 434 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/blockchains/exodus/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "22.8.12";
src = fetchzip {
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
sha256 = "sha256-jNzHh4zYhFzpFZAC9rHmwjTdFkbpROSEN3qpL7geiOU=";
};

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "108.0.2";
version = "109.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "f856ef034fa4a526e19968aed092c9ee99e124d2d271ec1c1bbd091d9a03e23293d69c7a9ae17c43258cde7e73c294534b471e36441e576377854f607c9bfa3a";
sha512 = "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7";
};
meta = {
@@ -29,11 +29,11 @@ rec {
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.6.0esr";
version = "102.7.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308";
sha512 = "2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b";
};
meta = {

35
pkgs/servers/etebase/default.nix
View File

@@ -1,18 +1,29 @@
{ lib, fetchFromGitHub, buildPythonPackage, aiofiles, django_3
, fastapi, msgpack, pynacl, redis, typing-extensions
, withLdap ? true, python-ldap
, withPostgres ? true, psycopg2 }:
{ lib
, fetchFromGitHub
, buildPythonPackage
, aiofiles
, django_3
, fastapi
, msgpack
, pynacl
, redis
, typing-extensions
, withLdap ? true
, python-ldap
, withPostgres ? true
, psycopg2
}:
buildPythonPackage rec {
pname = "etebase-server";
version = "0.10.0";
version = "0.11.0";
format = "other";
src = fetchFromGitHub {
owner = "etesync";
repo = "server";
rev = "v${version}";
sha256 = "sha256-z6aiXSWdLcDfOpqC5epsclXWxJq59MqWDQOnnFqGwz4=";
rev = "refs/tags/${version}";
hash = "sha256-+MSNX+CFmIQII+SFjM2TQKCgRMOTdsOIVAP8ur4WjQY=";
};
patches = [ ./secret.patch ];
@@ -25,8 +36,11 @@ buildPythonPackage rec {
pynacl
redis
typing-extensions
] ++ lib.optional withLdap python-ldap
++ lib.optional withPostgres psycopg2;
] ++ lib.optional withLdap [
python-ldap
] ++ lib.optional withPostgres [
psycopg2
];
installPhase = ''
mkdir -p $out/bin $out/lib
@@ -38,7 +52,8 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/etesync/server";
description = "An Etebase (EteSync 2.0) server so you can run your own.";
description = "An Etebase (EteSync 2.0) server so you can run your own";
changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md";
license = licenses.agpl3Only;
maintainers = with maintainers; [ felschr ];
};

4
pkgs/servers/keycloak/default.nix
View File

@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "keycloak";
version = "20.0.1";
version = "20.0.3";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
sha256 = "sha256-UriiCCVKxdcaKEcDyn8HsS1S4zJAUC2chYu6iiNsJwA=";
sha256 = "sha256-dDB3jG3k3ZkAzsG4p3VHpMBM8nxvxQ2sxGeRXWI1Wm0=";
};
nativeBuildInputs = [ makeWrapper jre ];

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

@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
hash = "sha256-shCFKTS6ArvjecokNSrgOBr5jO+64+d6OdubTHOWiws=";
hash = "sha256-fLYc0Z9lgNYjv4D+TpKP1+sBuILV1lf1IEDRYc8fUY4=";
};
buildInputs = [ olm ];
vendorSha256 = "sha256-BD1DBzr8iwVq2Qe7Zz1i871ysAYJ7iUlcBftjDYreeM=";
vendorSha256 = "sha256-RUTImaiiCsNHZHGTAXPXySP3tlEUJr6DLhmNA3ubgFs=";
doCheck = false;

4
pkgs/tools/misc/memtest86+/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "memtest86+";
version = "6.00";
version = "6.01";
src = fetchFromGitHub {
owner = "memtest86plus";
repo = "memtest86plus";
rev = "v${finalAttrs.version}";
hash = "sha256-m9oGLXTCaE5CgA4o8MGdjQTQSz/j8kC9BJ84RVcBZjs=";
hash = "sha256-BAY8hR8Sl9Hp9Zps0INL43cNqJwXX689m9rfa4dHrqs=";
};
# Binaries are booted directly by BIOS/UEFI or bootloader

8
pkgs/tools/security/yubikey-agent/default.nix
View File

@@ -3,12 +3,12 @@
buildGoModule rec {
pname = "yubikey-agent";
version = "unstable-2022-03-17";
version = "0.1.6";
src = fetchFromGitHub {
owner = "FiloSottile";
repo = "yubikey-agent";
rev = "205a7ef2554625c7494038600d963123d6311873";
sha256 = "sha256-wJpN63KY5scmez6yYFsIr3JLEUB+YSl/XvoatIIeRI0=";
rev = "v${version}";
sha256 = "sha256-Knk1ipBOzjmjrS2OFUMuxi1TkyDcSYlVKezDWT//ERY=";
};
buildInputs =
@@ -21,7 +21,7 @@ buildGoModule rec {
substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
'';
vendorSha256 = "sha256-SnjbkDPVjAnCbM2nLqBsuaPZwOmvDTKiUbi/93BlWVQ=";
vendorSha256 = "sha256-+IRPs3wm3EvIgfQRpzcVpo2JBaFQlyY/RI1G7XfVS84=";
doCheck = false;