summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--nixos/modules/services/networking/yggdrasil.nix19
-rw-r--r--nixos/tests/yggdrasil.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix46
-rw-r--r--pkgs/development/compilers/hare/hare/setup-hook.sh2
-rw-r--r--pkgs/development/node-packages/node-packages.nix6
-rw-r--r--pkgs/development/python-modules/colormath/default.nix12
-rw-r--r--pkgs/development/python-modules/openai/default.nix4
-rw-r--r--pkgs/development/python-modules/sphinx-fortran/default.nix44
-rw-r--r--pkgs/tools/system/systeroid/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
12 files changed, 132 insertions, 21 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c35d0df8f056..253691fb2c6a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1273,6 +1273,12 @@
githubId = 1217745;
name = "Aldwin Vlasblom";
};
+ aveltras = {
+ email = "romain.viallard@outlook.fr";
+ github = "aveltras";
+ githubId = 790607;
+ name = "Romain Viallard";
+ };
avery = {
email = "averyl+nixos@protonmail.com";
github = "AveryLychee";
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix
index 7a0b5b4d3d4c..81ed6d1dd566 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixos/modules/services/networking/yggdrasil.nix
@@ -4,16 +4,23 @@ let
keysPath = "/var/lib/yggdrasil/keys.json";
cfg = config.services.yggdrasil;
- configProvided = cfg.config != { };
+ settingsProvided = cfg.settings != { };
configFileProvided = cfg.configFile != null;
+ format = pkgs.formats.json { };
in {
+ imports = [
+ (mkRenamedOptionModule
+ [ "services" "yggdrasil" "config" ]
+ [ "services" "yggdrasil" "settings" ])
+ ];
+
options = with types; {
services.yggdrasil = {
enable = mkEnableOption "the yggdrasil system service";
- config = mkOption {
- type = attrs;
+ settings = mkOption {
+ type = format.type;
default = {};
example = {
Peers = [
@@ -138,11 +145,11 @@ in {
wantedBy = [ "multi-user.target" ];
preStart =
- (if configProvided || configFileProvided || cfg.persistentKeys then
+ (if settingsProvided || configFileProvided || cfg.persistentKeys then
"echo "
- + (lib.optionalString configProvided
- "'${builtins.toJSON cfg.config}'")
+ + (lib.optionalString settingsProvided
+ "'${builtins.toJSON cfg.settings}'")
+ (lib.optionalString configFileProvided "$(cat ${cfg.configFile})")
+ (lib.optionalString cfg.persistentKeys "$(cat ${keysPath})")
+ " | ${pkgs.jq}/bin/jq -s add | ${binYggdrasil} -normaliseconf -useconf"
diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix
index b409d9ed7853..b60a0e6b06cc 100644
--- a/nixos/tests/yggdrasil.nix
+++ b/nixos/tests/yggdrasil.nix
@@ -42,7 +42,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : {
services.yggdrasil = {
enable = true;
- config = {
+ settings = {
Listen = ["tcp://0.0.0.0:12345"];
MulticastInterfaces = [ ];
};
@@ -112,7 +112,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : {
services.yggdrasil = {
enable = true;
denyDhcpcdInterfaces = [ "ygg0" ];
- config = {
+ settings = {
IfTAPMode = true;
IfName = "ygg0";
MulticastInterfaces = [ "eth1" ];
diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix
new file mode 100644
index 000000000000..c6d135a02892
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, lib
+, dpkg
+, fetchurl
+, autoPatchelfHook
+, glib-networking
+, openssl
+, webkitgtk
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ name = "cinny-desktop";
+ version = "2.1.1";
+
+ src = fetchurl {
+ url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb";
+ sha256 = "sha256-4jd+N3a+u+c+XLwgr8BvvdkVLzo+xTBKFdjiQeu7NJU=";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ dpkg
+ ];
+
+ buildInputs = [
+ glib-networking
+ openssl
+ webkitgtk
+ wrapGAppsHook
+ ];
+
+ unpackCmd = "dpkg-deb -x $curSrc source";
+
+ installPhase = "mv usr $out";
+
+ meta = with lib; {
+ description = "Yet another matrix client for desktop";
+ homepage = "https://github.com/cinnyapp/cinny-desktop";
+ maintainers = [ maintainers.aveltras ];
+ license = licenses.mit;
+ sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+ platforms = platforms.linux;
+ mainProgram = "cinny";
+ };
+}
diff --git a/pkgs/development/compilers/hare/hare/setup-hook.sh b/pkgs/development/compilers/hare/hare/setup-hook.sh
index 999b91df122f..d2d2c34354d6 100644
--- a/pkgs/development/compilers/hare/hare/setup-hook.sh
+++ b/pkgs/development/compilers/hare/hare/setup-hook.sh
@@ -1,5 +1,3 @@
-export HARECACHE="$NIX_BUILD_TOP/.harecache"
-
addHarepath () {
for haredir in third-party stdlib; do
if [[ -d "$1/src/hare/$haredir" ]]; then
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 59afda3b5009..b59709a3850d 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -118873,10 +118873,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "7.8.0";
+ version = "7.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/pnpm/-/pnpm-7.8.0.tgz";
- sha512 = "jzb9/gto4nwuVA2itTRk0PJhuaZcA1NBRB298UzXhqKZQMjtHCS+KLzh7RWk5n3g+KnMg5FHr6Mwg1L62dBz1A==";
+ url = "https://registry.npmjs.org/pnpm/-/pnpm-7.9.1.tgz";
+ sha512 = "5vyV+FwZj5y31UDDsiq9xcVzF+mvS+IPdgAgkZ9rVxYPNKCCVwVn5LsHh9jcfuApiKYVgpyisAMcuSDbe1/C0Q==";
};
buildInputs = globalBuildInputs;
meta = {
diff --git a/pkgs/development/python-modules/colormath/default.nix b/pkgs/development/python-modules/colormath/default.nix
index b749761da06c..7f9f9f1a9ce7 100644
--- a/pkgs/development/python-modules/colormath/default.nix
+++ b/pkgs/development/python-modules/colormath/default.nix
@@ -8,20 +8,26 @@
buildPythonPackage rec {
pname = "colormath";
- version = "3.0.0";
+ # Switch to unstable which fixes an deprecation issue with newer numpy
+ # versions, should be included in versions > 3.0
+ # https://github.com/gtaylor/python-colormath/issues/104
+ version = "unstable-2021-04-17";
src = fetchFromGitHub {
owner = "gtaylor";
- rev = "3.0.0";
repo = "python-colormath";
- sha256 = "1nqf5wy8ikx2g684khzvjc4iagkslmbsxxwilbv4jpaznr9lahdl";
+ rev = "4a076831fd5136f685aa7143db81eba27b2cd19a";
+ sha256 = "sha256-eACVPIQFgiGiVmQ/PjUxP/UH/hBOsCywz5PlgpA4dk4=";
};
propagatedBuildInputs = [ networkx numpy ];
checkInputs = [ nose ];
+
checkPhase = "nosetests";
+ pythonImportsCheck = [ "colormath" ];
+
meta = with lib; {
description = "Color math and conversion library";
homepage = "https://github.com/gtaylor/python-colormath";
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 40645c19373c..a95d63b830b3 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "openai";
- version = "0.22.0";
+ version = "0.22.1";
disabled = pythonOlder "3.7.1";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "v${version}";
- sha256 = "sha256-4FKFcUiY17hEiOGFP1fPBtcvcM19hFrHXX3ZLxgdJHI=";
+ sha256 = "sha256-QUnsm0ui1BFlLqAlH1bp7uDbhiRigePrAPAkSRjftM4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sphinx-fortran/default.nix b/pkgs/development/python-modules/sphinx-fortran/default.nix
new file mode 100644
index 000000000000..748e4c6948bc
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-fortran/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, future
+, numpy
+, sphinx
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-fortran";
+ version = "unstable-2022-03-02";
+
+ src = fetchFromGitHub {
+ owner = "VACUMM";
+ repo = pname;
+ rev = "394ae990b43ed43fcff8beb048632f5e99794264";
+ sha256 = "sha256-IVKu5u9gqs7/9EZrf4ZYd12K6J31u+/B8kk4+8yfohM=";
+ };
+
+ propagatedBuildInputs = [
+ future
+ numpy
+ sphinx
+ six
+ ];
+
+ pythonImportsCheck = [ "sphinxfortran" ];
+
+ # Tests are failing because reference files are not updated
+ doCheck = false;
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ description = "Fortran domain and autodoc extensions to Sphinx";
+ homepage = "http://sphinx-fortran.readthedocs.org/";
+ license = licenses.cecill21;
+ maintainers = with maintainers; [ loicreynier ];
+ };
+}
diff --git a/pkgs/tools/system/systeroid/default.nix b/pkgs/tools/system/systeroid/default.nix
index 25d1a5342773..39cca93b9883 100644
--- a/pkgs/tools/system/systeroid/default.nix
+++ b/pkgs/tools/system/systeroid/default.nix
@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "systeroid";
- version = "0.1.1";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
- sha256 = "0xf81wyp5qg67r0vyqg0209pcabx70vvxx4nrg2y7qa0mhvf6p94";
+ sha256 = "sha256-o72tjYc+1dBLAIG75Fyt2UubjeK6j/nufjiz3wn2SdI=";
};
postPatch = ''
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
--replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",'
'';
- cargoSha256 = "sha256-D/sSeMR1Zg3OH1fdSVKdxdIcoP4OLp3T8mwQ28O8rfk=";
+ cargoSha256 = "sha256-8DGAiPAq+L1aWleeWEl95+hcgT+PHsxdg118U8IDyOA=";
buildInputs = [
xorg.libxcb
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e343708626f..b0ad84a9e997 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3186,6 +3186,8 @@ with pkgs;
cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; };
+ cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { };
+
ckbcomp = callPackage ../tools/X11/ckbcomp { };
clac = callPackage ../tools/misc/clac {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f94580e2664..b3baadb27cdb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10129,6 +10129,8 @@ in {
sphinx-external-toc = callPackage ../development/python-modules/sphinx-external-toc { };
+ sphinx-fortran = callPackage ../development/python-modules/sphinx-fortran { };
+
sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { };
sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { };
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 19:18:15 +0000