From 09dc46b5bd9da174e4d9b16d907b3574708c7cd6 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 26 Dec 2023 10:37:57 +0100 Subject: [PATCH 1/6] dune3d: init at 0.9.3 --- pkgs/by-name/du/dune3d/package.nix | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 pkgs/by-name/du/dune3d/package.nix diff --git a/pkgs/by-name/du/dune3d/package.nix b/pkgs/by-name/du/dune3d/package.nix new file mode 100644 index 000000000000..315463627e52 --- /dev/null +++ b/pkgs/by-name/du/dune3d/package.nix @@ -0,0 +1,65 @@ +{ + cmake, + eigen, + fetchFromGitHub, + glm, + gobject-introspection, + gtkmm4, + lib, + libepoxy, + librsvg, + libspnav, + libuuid, + meson, + ninja, + opencascade-occt, + pkg-config, + python3, + stdenv, + wrapGAppsHook, +}: + +stdenv.mkDerivation rec { + pname = "dune3d"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "dune3d"; + repo = "dune3d"; + rev = "v${version}"; + hash = "sha256-9eH5fM0zdI6BrWTujpqTuBE2pkgAEooKYiWl692HV48="; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook + ]; + buildInputs = [ + cmake + eigen + glm + gtkmm4 + libepoxy + librsvg + libspnav + libuuid + opencascade-occt + (python3.withPackages (pp: [ + pp.pygobject3 + ])) + ]; + + env.CASROOT = opencascade-occt; + + meta = with lib; { + description = "3D CAD application"; + homepage = "https://dune3d.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ _0x4A6F jue89 ]; + mainProgram = "dune3d"; + platforms = platforms.linux; + }; +} From 85fe7c5226ca94d635596bf62f3c8cda70bfb12f Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Thu, 1 Feb 2024 08:46:41 +0100 Subject: [PATCH 2/6] dune3d: 0.9.3 -> 1.0.0 --- pkgs/by-name/du/dune3d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/dune3d/package.nix b/pkgs/by-name/du/dune3d/package.nix index 315463627e52..797819354a1b 100644 --- a/pkgs/by-name/du/dune3d/package.nix +++ b/pkgs/by-name/du/dune3d/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "dune3d"; - version = "0.9.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "dune3d"; repo = "dune3d"; rev = "v${version}"; - hash = "sha256-9eH5fM0zdI6BrWTujpqTuBE2pkgAEooKYiWl692HV48="; + hash = "sha256-y7jlqH1p2vCFTM14rFURxTkrWUT5hNkCseC3xB6bFFo="; }; nativeBuildInputs = [ From bdc79efc2b1e1eb4503589e6c362ccc9e10e9298 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 11 Feb 2024 14:28:14 -0500 Subject: [PATCH 3/6] nixos/lxd/vm: fix network config --- .../scripts/lxd/lxd-virtual-machine-image-inner.nix | 7 ++++--- .../maintainers/scripts/lxd/lxd-virtual-machine-image.nix | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix index 2d1761401fcd..d1264fa04304 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix @@ -14,14 +14,15 @@ ]; networking = { - dhcdpcd.enable = false; + dhcpcd.enable = false; useDHCP = false; + useHostResolvConf = false; }; systemd.network = { enable = true; - networks."50-eth0" = { - matchConfig.Name = "eth0"; + networks."50-enp5s0" = { + matchConfig.Name = "enp5s0"; networkConfig = { DHCP = "ipv4"; IPv6AcceptRA = true; diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix index a58579914465..bbbdd1f3fa17 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix @@ -27,8 +27,9 @@ # Network networking = { - dhcdpcd.enable = false; + dhcpcd.enable = false; useDHCP = false; + useHostResolvConf = false; }; systemd.network = { From cf68af8561b4624738f10158960ce2748fa75877 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 11 Feb 2024 14:28:31 -0500 Subject: [PATCH 4/6] nixos/lxc/container: switch to networkd by default --- .../scripts/lxd/lxd-container-image-inner.nix | 19 ++++++++++++++++-- .../scripts/lxd/lxd-container-image.nix | 20 ++++++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix index ef00c6f86cbd..4698971de8ff 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -13,8 +13,23 @@ ./lxd.nix ]; - networking.useDHCP = false; - networking.interfaces.eth0.useDHCP = true; + networking = { + dhcpcd.enable = false; + useDHCP = false; + useHostResolvConf = false; + }; + + systemd.network = { + enable = true; + networks."50-eth0" = { + matchConfig.Name = "eth0"; + networkConfig = { + DHCP = "ipv4"; + IPv6AcceptRA = true; + }; + linkConfig.RequiredForOnline = "routable"; + }; + }; system.stateVersion = "@stateVersion@"; # Did you read the comment? } diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix index b77f9f5aabe0..3f330952d695 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -25,7 +25,21 @@ fi ''; - # Network - networking.useDHCP = false; - networking.interfaces.eth0.useDHCP = true; + networking = { + dhcpcd.enable = false; + useDHCP = false; + useHostResolvConf = false; + }; + + systemd.network = { + enable = true; + networks."50-eth0" = { + matchConfig.Name = "eth0"; + networkConfig = { + DHCP = "ipv4"; + IPv6AcceptRA = true; + }; + linkConfig.RequiredForOnline = "routable"; + }; + }; } From 1b71ae2afadc70ee65a4698c2104bd3a09a70a1a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 12 Feb 2024 22:47:52 +0100 Subject: [PATCH 5/6] offpunk: 2.1 -> 2.2 Changelog: https://lists.sr.ht/~lioploum/offpunk-users/%3C170777385215.6.13512070620790331499.266071897%40ploum.eu%3E --- pkgs/by-name/of/offpunk/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/of/offpunk/package.nix b/pkgs/by-name/of/offpunk/package.nix index 72642b17b540..935d4c0a6140 100644 --- a/pkgs/by-name/of/offpunk/package.nix +++ b/pkgs/by-name/of/offpunk/package.nix @@ -32,7 +32,7 @@ let in python3Packages.buildPythonApplication rec { pname = "offpunk"; - version = "2.1"; + version = "2.2"; pyproject = true; disabled = python3Packages.pythonOlder "3.7"; @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { owner = "~lioploum"; repo = "offpunk"; rev = "v${version}"; - hash = "sha256-IFqasTI2dZCauLUAq6/rvwkfraVK7SGUXpHCPEgSPGk="; + hash = "sha256-ygVL17qqmNB7hzw1VuYIAbirbaq4EVppWCHSvTl+/Jw="; }; nativeBuildInputs = [ python3Packages.hatchling installShellFiles ]; @@ -53,11 +53,12 @@ python3Packages.buildPythonApplication rec { passthru.tests.version = testers.testVersion { package = offpunk; }; - meta = with lib; { + meta = { description = "A command-line and offline-first smolnet browser/feed reader"; homepage = src.meta.homepage; - maintainers = with maintainers; [ DamienCassou ]; - platforms = platforms.linux; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; + mainProgram = "offpunk"; + maintainers = with lib.maintainers; [ DamienCassou ]; + platforms = lib.platforms.linux; }; } From 8601deaed1bfe5893016310fe7c25885d8f55106 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 8 Feb 2024 02:59:47 +0100 Subject: [PATCH 6/6] =?UTF-8?q?cryptoverif:=202.07=20=E2=86=92=202.08pl1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/cryptoverif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 66ba807c8dd8..5c15b8a17241 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cryptoverif"; - version = "2.07"; + version = "2.08pl1"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - hash = "sha256-GXXql4+JZ396BM6W2I3kN0u59xos7UCAtzR0IjMIETY="; + hash = "sha256-rmORSZuhds9W2WpNgYf4AJM2jgEUPoJit4G64qLqj5w="; }; /* Fix up the frontend to load the 'default' cryptoverif library