cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into haskell-updates

Browse source
This commit is contained in:
maralorn 2022-09-18 11:56:30 +02:00
commit 4198b51c50
27 changed files with 110 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/matrix/synapse.xml
View file

@ -30,7 +30,7 @@
synapse server for the <literal>example.org</literal> domain, served from
the host <literal>myhostname.example.org</literal>. For more information,
please refer to the
<link xlink:href="https://github.com/matrix-org/synapse#synapse-installation">
<link xlink:href="https://matrix-org.github.io/synapse/latest/setup/installation.html">
installation instructions of Synapse </link>.
<programlisting>
{ pkgs, lib, config, ... }:

9
nixos/tests/libvirtd.nix
View file

@ -12,6 +12,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
libvirtd.enable = true;
};
boot.supportedFilesystems = [ "zfs" ];
networking.hostId = "deadbeef"; # needed for zfs
networking.nameservers = [ "192.168.122.1" ];
security.polkit.enable = true;
environment.systemPackages = with pkgs; [ virt-manager ];
@ -37,6 +39,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
virthost.succeed("virsh vol-create-as foo loop0p1 25MB")
virthost.succeed("virsh vol-create-as foo loop0p2 50MB")
with subtest("check if virsh zfs pools work"):
virthost.succeed("fallocate -l100m /tmp/zfs; losetup /dev/loop1 /tmp/zfs;")
virthost.succeed("zpool create zfs_loop /dev/loop1")
virthost.succeed("virsh pool-define-as --name zfs_storagepool --source-name zfs_loop --type zfs")
virthost.succeed("virsh pool-start zfs_storagepool")
virthost.succeed("virsh vol-create-as zfs_storagepool disk1 25MB")
with subtest("check if nixos install iso boots and network works"):
virthost.succeed(
"virt-install -n nixos --osinfo=nixos-unstable --ram=1024 --graphics=none --disk=`find ${nixosInstallISO}/iso -type f | head -n1`,readonly=on --import --noautoconsole"

10
pkgs/applications/networking/instant-messengers/element/pin.json
View file

@ -1,7 +1,7 @@
{
"version": "1.11.4",
"desktopSrcHash": "lIyx1gpPkuOGzHTbkHKNiGsVKEkKUIz/8sj/KZ9XK9o=",
"desktopYarnHash": "0m0zzq2wbk7h7anjmj586089j2qgsd5cj99rmi2hmsmssq63fmwk",
"webSrcHash": "bZ5SKydrQE+qLQEZ5qS7F1RC33nHZneUd8OwrV1H2T4=",
"webYarnHash": "1yji94xcigz54bbhvssj2pgncw9fgal7mzw9h9bfwmny0pjh8c4p"
"version": "1.11.5",
"desktopSrcHash": "JbkB+J2KgHcT8rYv8ovC1r325U5NIHo8Wkh0BogLB+w=",
"desktopYarnHash": "1bfpd4a0xrlhm7zq2xz5f184mfp6w4glgyfm4r0y3bi06i4my8vc",
"webSrcHash": "XOFgJGnQ85bvkqnwke5Hww658bpBXkUspk46cqvf5AY=",
"webYarnHash": "0ab49y2xj8cy4ibcckvd6xhhvkv3fa8kwwlmhxvas2racx51wfnh"
}

4
pkgs/applications/science/math/mathematica/generic.nix
View file

@ -41,6 +41,8 @@
, pciutils
, tre
, unixODBC
, xcbutilimage
, xcbutilkeysyms
, xkeyboard_config
, xorg
, zlib
@ -94,6 +96,8 @@ in stdenv.mkDerivation {
pciutils
tre
unixODBC
xcbutilimage
xcbutilkeysyms
xkeyboard_config
] ++ (with xorg; [
libICE

7
pkgs/applications/science/math/mathematica/versions.nix
View file

@ -1,6 +1,13 @@
{ lib, requireFile }:
let versions = [
{
version = "13.1.0";
lang = "en";
language = "English";
sha256 = "sha256-LIpGAJ3uTkZgjc0YykwusyyHQKlCnTvrZGStFfSOz60=";
installer = "Mathematica_13.1.0_BNDL_LINUX.sh";
}
{
version = "13.0.1";
lang = "en";

15
pkgs/development/libraries/SDL_compat/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, SDL2
@ -19,25 +18,15 @@ let
in
stdenv.mkDerivation rec {
pname = "SDL_compat";
version = "1.2.52";
version = "1.2.56";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "sdl12-compat";
rev = "release-" + version;
hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg=";
hash = "sha256-qd+hdJygJ+D2Ult6kmhUJmoPjasOFnBziTI8QtNiclI=";
};
patches = optionals stdenv.hostPlatform.isDarwin [
# Fix broken install name in dylib, https://github.com/libsdl-org/sdl12-compat/issues/194
# Remove when bump > 1.2.52
(fetchpatch {
name = "SDL_compat-fix-install-name.patch";
url = "https://github.com/libsdl-org/sdl12-compat/commit/5642d47ae489f2eb362cece2464ecc466a700ed5.patch";
sha256 = "sha256-kQ5H8gXjTZVHHRF6UpgXKl3NIy87iULcc2iCsYt5Hqo=";
})
];
nativeBuildInputs = [ cmake pkg-config ];
propagatedBuildInputs = [ SDL2 ]

4
pkgs/development/libraries/kddockwidgets/default.nix
View file

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "KDDockWidgets";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "KDAB";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7jC0zl5ESwqZXzvFJYmPvRhwFitse05NuYoTgFWiHac=";
sha256 = "sha256-rAv0P7tRcgCTB/ZM93wKF8oRZc7KqPyoDcnRn5Rel/k=";
};
nativeBuildInputs = [ cmake ];

27
pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch Normal file
View file

@ -0,0 +1,27 @@
From dc5e3df2fd29a547ef0f9545e190a0ce3a73c95c Mon Sep 17 00:00:00 2001
From: Tako Marks <me@github.tako.mx>
Date: Tue, 6 Sep 2022 20:19:26 +0200
Subject: [PATCH] substitute zfs and zpool commands
---
src/storage/storage_backend_zfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c
index 2a5d74357d..460b3025c4 100644
--- a/src/storage/storage_backend_zfs.c
+++ b/src/storage/storage_backend_zfs.c
@@ -33,8 +33,8 @@
VIR_LOG_INIT("storage.storage_backend_zfs");
-#define ZFS "zfs"
-#define ZPOOL "zpool"
+#define ZFS "@zfs@"
+#define ZPOOL "@zpool@"
/*
* Some common flags of zfs and zpool commands we use:
--
2.36.2

6
pkgs/development/libraries/libvirt/default.nix
View file

@ -33,6 +33,7 @@
, readline
, rpcsvc-proto
, stdenv
, substituteAll
, xhtml1
, yajl
, writeScript
@ -126,6 +127,11 @@ stdenv.mkDerivation rec {
patches = [
./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
(substituteAll {
src = ./0002-substitute-zfs-and-zpool-commands.patch;
zfs = "${zfs}/bin/zfs";
zpool = "${zfs}/bin/zpool";
})
];
# remove some broken tests

4
pkgs/development/python-modules/aioecowitt/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aioecowitt";
version = "2022.08.3";
version = "2022.09.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-rJcSw0umUVj7kPzc8tUidEWV91wkK19rFJY+Gi/NyH0=";
hash = "sha256-U9Qg0kOeqLihw5YAZSy7zk39NKj48nOiwqIlHqffZi0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/crownstone-sse/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "crownstone-sse";
version = "2.0.3";
version = "2.0.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "crownstone";
repo = "crownstone-lib-python-sse";
rev = version;
sha256 = "sha256-O1joOH7HCXYCro26p6foMMpg0UXfOgXD0BXuN50OK7U=";
sha256 = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/gehomesdk/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "gehomesdk";
version = "0.5.6";
version = "0.5.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EW26TzmD+F2IkzJkcoUdfYIJ3vkBYQhIFiEqnfDSmiw=";
sha256 = "sha256-FmCoryNX1DnqMlGalad5iWO2ZRZwXgWgARQMYlJ6yVo=";
};
propagatedBuildInputs = [

9
pkgs/development/python-modules/pep440/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pep440";
version = "0.1.1";
version = "0.1.2";
format = "flit";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-E9F4mHaavQKK8PYnRcnOdfW7mXcBKn1dTInCknLeNO4=";
hash = "sha256-WLNyRswrE/7hyio8CSyzcE0h7PYhpb27Fo5E5pf20E0=";
};
nativeBuildInputs = [
@ -26,6 +26,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTestPaths = [
# Don't run CLI tests
"tests/test_cli.py"
];
pythonImportsCheck = [
"pep440"
];

4
pkgs/development/python-modules/pyvicare/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyvicare";
version = "2.16.4";
version = "2.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "somm15";
repo = "PyViCare";
rev = version;
sha256 = "sha256-RFnQKGISPMrC53yAv3fu7FpbDNugLPQILXCPi5ik2qU=";
sha256 = "sha256-MlGohD9W1HNLz6ZPawt55127S3zPSA1tFLNs2gu7hLk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/tools/analysis/actionlint/default.nix
View file

@ -10,7 +10,7 @@
buildGoModule rec {
pname = "actionlint";
version = "1.6.17";
version = "1.6.18";
subPackages = [ "cmd/actionlint" ];
@ -18,7 +18,7 @@ buildGoModule rec {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
sha256 = "sha256-Nt8t+tI4FjNLEo2zEkC7NNVH/hBsxXZmSUqr4KIh1wo=";
sha256 = "sha256-tRR7Pjxo4UdKklTMFDRW6Xi81IhH+NV3BbgWpgFd1zY=";
};
vendorSha256 = "sha256-icl6z41Y5H47U3EgFHL9/xJrfdk43ZfAPbWkKM73sa0=";

6
pkgs/development/tools/dprint/default.nix
View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.31.1";
version = "0.32.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-NgUc3QrH7y72DS01ypfnifHzQeFCogPa+8+Kzv4i4xE=";
sha256 = "sha256-CZSGE9HsxBX7vqLLPTLWFi/NGHa1FXA6YWqFHvzVeAQ=";
};
cargoSha256 = "sha256-0BIkO9sMQbQTONSsNgR5UFPIkA0mzADqHxlEhHlIG0Y=";
cargoSha256 = "sha256-vYiCSU02mHUKKe0tyB+byhNZhZ+d8yhQf8IKI5r/qYU=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

4
pkgs/development/tools/misc/devspace/default.nix
View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "devspace";
version = "6.1.0";
version = "6.1.1";
src = fetchFromGitHub {
owner = "loft-sh";
repo = "devspace";
rev = "v${version}";
sha256 = "sha256-pbI49oklxTu02YNIA1uxcDqWwGf3LaKipErDHCVxRRc=";
sha256 = "sha256-2LSRmTWbG7sxV5e6N44HAPdqIL/O2UxcnuHXmbTooWs=";
};
vendorSha256 = null;

4
pkgs/games/openxcom/default.nix
View file

@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, libGLU
, libGL
, zlib
@ -25,7 +26,8 @@ stdenv.mkDerivation rec {
hash = "sha256-APv49ZT94oeM4KVKGtUdoQ1t8Ly8lsocr+FqXiRXbk0=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ];
meta = with lib; {

11
pkgs/os-specific/linux/bpftools/default.nix
View file

@ -1,14 +1,19 @@
{ lib, stdenv
{ lib, stdenv, fetchurl
, libopcodes, libopcodes_2_38
, libbfd, libbfd_2_38
, elfutils, readline
, linuxPackages_latest, zlib
, zlib
, python3, bison, flex
}:
stdenv.mkDerivation rec {
pname = "bpftools";
inherit (linuxPackages_latest.kernel) version src;
version = "5.19.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1";
};
nativeBuildInputs = [ python3 bison flex ];
buildInputs = (if (lib.versionAtLeast version "5.20")

1
pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
View file

@ -2,7 +2,6 @@
, fetchFromGitHub
, python3Packages
, prometheus-alertmanager
, unittestCheckHook
}:
python3Packages.buildPythonApplication rec {

4
pkgs/servers/pocketbase/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "pocketbase";
repo = pname;
rev = "v${version}";
sha256 = "sha256-T7gK3UycEUVKKNklLzcH1ST0x4KzqOUGz8zJCimNcjY=";
sha256 = "sha256-SWVmcNL/Ye7eLVXIi6wDYabACYLaEaYYH68M6L9JCQI=";
};
vendorSha256 = "sha256-Ty06TegTT4BILgH0MpnxINxBQMW0zi0ItptHmDqKW1k=";

4
pkgs/tools/misc/instaloader/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "instaloader";
version = "4.9.3";
version = "4.9.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "instaloader";
repo = "instaloader";
rev = "refs/tags/v${version}";
sha256 = "sha256-lxfnVqAFlMNjtuqtq2iJ2QwPrWskxNCRIAWEwVGr33s=";
sha256 = "sha256-R26+ZvbUs4b5X1+wn6V7K7JqJsP31x7x5HVh+aPi8VU=";
};
propagatedBuildInputs = [

6
pkgs/tools/misc/lnav/default.nix
View file

@ -15,19 +15,19 @@
stdenv.mkDerivation rec {
pname = "lnav";
version = "0.10.1";
version = "0.11.0";
src = fetchFromGitHub {
owner = "tstack";
repo = "lnav";
rev = "v${version}";
sha256 = "sha256-1b4mVKIUotMSK/ADHnpiM42G98JF0abL8sXXGFyS3sw=";
sha256 = "sha256-SkaJvIfFKD7xzxm3qnYUltKEpQRNNn6KkRwMP6eWte4=";
};
patches = [ ./0001-Forcefully-disable-docs-build.patch ];
postPatch = ''
substituteInPlace Makefile.am \
--replace "SUBDIRS = src test" "SUBDIRS = src"
--replace "SUBDIRS = tools src test" "SUBDIRS = tools src"
'';
enableParallelBuilding = true;

6
pkgs/tools/networking/minio-client/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2022-08-28T20-08-11Z";
version = "2022-09-16T09-16-47Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-1Cwvuyy0TRKNnhkpuXdr6ZenDa5pNjsOJA8/sczM22A=";
sha256 = "sha256-8oy61ueCXJTV58CxtsB8uiKS5NVaomICu8yQ1wSxl7s=";
};
vendorSha256 = "sha256-rGIy+qw+n/WCJ/3rviYjz9uffSP/rcJRvPda+Hm1G3s=";
vendorSha256 = "sha256-1jws2is/n3+l7ULTgBfO2glq4l9GzOP5AJ2wwhluQb8=";
subPackages = [ "." ];

4
pkgs/tools/security/otpauth/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "otpauth";
version = "0.4.3";
version = "0.5.0";
src = fetchFromGitHub {
owner = "dim13";
repo = "otpauth";
rev = "v${version}";
sha256 = "sha256-x5/OVUxuNjK05D8n1l5F6qT/wmrBYnOSEoSL0c0fsqc=";
sha256 = "sha256-toFBkUssU10ejoZzWnrm5o2P0p5Oq8kKP4vb2ASDC0s=";
};
vendorSha256 = "sha256-jnIq7Zc2MauJReJ9a8TeqXXsvHixsBB+znmXAxcpqUQ=";

1
pkgs/top-level/aliases.nix
View file

@ -913,6 +913,7 @@ mapAliases ({
multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
mumble_git = pkgs.mumble; # Added 2019-08-01
murmur_git = pkgs.murmur; # Added 2019-08-01
mutt-with-sidebar = mutt; # Added 2022-09-17
mysql-client = hiPrio mariadb.client;
mysql = mariadb; # moved from top-level 2021-03-14

4
pkgs/top-level/all-packages.nix
View file

@ -29881,9 +29881,7 @@ with pkgs;
mmh = callPackage ../applications/networking/mailreaders/mmh { };
mutt = callPackage ../applications/networking/mailreaders/mutt { };
mutt-with-sidebar = mutt.override {
withSidebar = true;
};
mutt-wizard = callPackage ../tools/misc/mutt-wizard { };
mutt-ics = callPackage ../tools/networking/mutt-ics { };