about summary refs log tree commit diff
path: root/pkgs/by-name/lx
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/by-name/lx')
-rw-r--r--pkgs/by-name/lx/lxc/4428.diff78
-rw-r--r--pkgs/by-name/lx/lxc/package.nix11
-rw-r--r--pkgs/by-name/lx/lxcfs/package.nix9
-rw-r--r--pkgs/by-name/lx/lxd-ui/package.nix6
-rw-r--r--pkgs/by-name/lx/lxd-unwrapped-lts/package.nix36
-rw-r--r--pkgs/by-name/lx/lxgw-neoxihei/package.nix4
6 files changed, 35 insertions, 109 deletions
diff --git a/pkgs/by-name/lx/lxc/4428.diff b/pkgs/by-name/lx/lxc/4428.diff
deleted file mode 100644
index 05f0c660c5662..0000000000000
--- a/pkgs/by-name/lx/lxc/4428.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
-index 92d6f01c3d..d2b67d8d6f 100644
---- a/.github/workflows/build.yml
-+++ b/.github/workflows/build.yml
-@@ -50,6 +50,7 @@ jobs:
-           meson setup build \
-                 -Dtests=true \
-                 -Dpam-cgroup=true \
-+                -Dtools-multicall=true \
-                 -Dwerror=true \
-                 -Db_lto_mode=default
-           ninja -C build
-diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build
-index 3ed3670e4b..edfb986622 100644
---- a/src/lxc/cmd/meson.build
-+++ b/src/lxc/cmd/meson.build
-@@ -46,7 +46,7 @@ cmd_lxc_init_static_sources = files(
-     '../string_utils.c',
-     '../string_utils.h') + include_sources
- 
--cmd_lxc_monitord_sources = files('lxc_monitord.c') + include_sources + netns_ifaddrs_sources
-+cmd_lxc_monitord_sources = files('lxc_monitord.c')
- cmd_lxc_user_nic_sources = files('lxc_user_nic.c') + cmd_common_sources + netns_ifaddrs_sources
- cmd_lxc_usernsexec_sources = files('lxc_usernsexec.c') + cmd_common_sources + netns_ifaddrs_sources
- 
-@@ -88,8 +88,8 @@ cmd_programs += executable(
-     'lxc-monitord',
-     cmd_lxc_monitord_sources,
-     include_directories: liblxc_includes,
--    dependencies: liblxc_dep,
--    link_with: [liblxc_static],
-+    dependencies: liblxc_dependencies,
-+    link_whole: [liblxc_static],
-     install: true,
-     install_dir: lxclibexec)
- 
-diff --git a/src/lxc/tools/meson.build b/src/lxc/tools/meson.build
-index 00a863d936..6d317fc80b 100644
---- a/src/lxc/tools/meson.build
-+++ b/src/lxc/tools/meson.build
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: LGPL-2.1+
- 
--tools_common_sources = files('arguments.c', 'arguments.h') + include_sources + netns_ifaddrs_sources
-+tools_common_sources = files('arguments.c', 'arguments.h') + include_sources
-+tools_common_sources_for_dynamic_link = tools_common_sources + netns_ifaddrs_sources
- 
- tools_commands_dynamic_link = ['attach', 'autostart', 'cgroup', 'checkpoint', 'config',
-     'console', 'copy', 'create', 'destroy', 'device', 'execute', 'freeze',
-@@ -15,7 +16,7 @@ if want_tools
-     foreach cmd : tools_commands_dynamic_link
-         public_programs += executable(
-             'lxc-' + cmd,
--            files('lxc_' + cmd + '.c') + tools_common_sources + liblxc_ext_sources,
-+            files('lxc_' + cmd + '.c') + tools_common_sources_for_dynamic_link + liblxc_ext_sources,
-             dependencies: liblxc_dependencies,
-             include_directories: liblxc_includes,
-             c_args: ['-DNO_LXC_CONF'],
-@@ -26,16 +27,16 @@ if want_tools
-     foreach cmd : tools_commands_static_link
-         public_programs += executable(
-             'lxc-' + cmd,
--            files('lxc_' + cmd + '.c') + tools_common_sources,
-+            files('lxc_' + cmd + '.c') + files('arguments.c', 'arguments.h'),
-             dependencies: liblxc_dependencies,
-             include_directories: liblxc_includes,
--            link_with: [liblxc_static],
-+            link_whole: [liblxc_static],
-             install: true)
-     endforeach
- endif
- 
- if want_tools_multicall
--    tools_all_sources = files('lxc_multicall.c') + tools_common_sources
-+    tools_all_sources = files('lxc_multicall.c') + tools_common_sources_for_dynamic_link
-     foreach cmd : tools_commands
-         tools_all_sources += files('lxc_' + cmd + '.c')
-     endforeach
diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix
index ba817c1e2e50e..7b24d70b5d0ac 100644
--- a/pkgs/by-name/lx/lxc/package.nix
+++ b/pkgs/by-name/lx/lxc/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxc";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxc";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-D994gekFgW/1Q4iVFM/3Zi0JXKn9Ghfd3UcjckVfoFY=";
+    hash = "sha256-fJMNdMXlV1z9q1pMDh046tNmLDuK6zh6uPahTWzWMvc=";
   };
 
   nativeBuildInputs = [
@@ -48,17 +48,14 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # fix docbook2man version detection
     ./docbook-hack.patch
-
-    # fix linking
-    ./4428.diff
   ];
 
   mesonFlags = [
     "-Dinstall-init-files=false"
     "-Dinstall-state-dirs=false"
     "-Dspecfile=false"
-    # re-enable when fixed https://github.com/lxc/lxc/issues/4427
-    # "-Dtools-multicall=true"
+    "-Dtools-multicall=true"
+    "-Dtools=false"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index 67562ddc7baa2..db006cea566d9 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -12,17 +12,18 @@
   pkg-config,
   python3,
   util-linux,
+  coreutils,
 }:
 
 stdenv.mkDerivation rec {
   pname = "lxcfs";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = "v${version}";
-    sha256 = "sha256-Mx2ZTul3hUEL9SloYSOh+MGoc2QmZg88MTsfIOvaIZU=";
+    sha256 = "sha256-kJ9QaNI8v03E0//UyU6fsav1YGOlKGMxsbE8Pr1Dtic=";
   };
 
   patches = [
@@ -51,8 +52,8 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    # `mount` hook requires access to the `mount` command from `util-linux`:
-    wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : "${util-linux}/bin"
+    # `mount` hook requires access to the `mount` command from `util-linux` and `readlink` from `coreutils`:
+    wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : ${lib.makeBinPath [ coreutils util-linux ]}
   '';
 
   postFixup = ''
diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix
index a436f32e7d50d..70b85e236488e 100644
--- a/pkgs/by-name/lx/lxd-ui/package.nix
+++ b/pkgs/by-name/lx/lxd-ui/package.nix
@@ -12,18 +12,18 @@
 
 stdenv.mkDerivation rec {
   pname = "lxd-ui";
-  version = "0.9";
+  version = "0.12";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lxd-ui";
     rev = "refs/tags/${version}";
-    hash = "sha256-4TIi/LPm35W86p+l5eYU0VETjno8TKmp43m2SReKElM=";
+    hash = "sha256-dVTUme+23HaONcvfcgen/y1S0D91oYmgGLGfRcAMJSw=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-wExAVEl745X4O9hYhKYX2BjmW494Vr13X8bDmVxKMT4=";
+    hash = "sha256-lPBkGKK6C6C217wqvOoC7on/Dzmk3NkdIkMDMF9CRNQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
index 41b20f4860687..6b812bb752ba2 100644
--- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
+++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
@@ -3,8 +3,8 @@
   hwdata,
   pkg-config,
   lxc,
-  buildGo122Module,
-  fetchurl,
+  buildGoModule,
+  fetchFromGitHub,
   acl,
   libcap,
   dqlite,
@@ -13,21 +13,22 @@
   udev,
   installShellFiles,
   nixosTests,
-  gitUpdater,
-  callPackage,
+  nix-update-script,
 }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "lxd-unwrapped-lts";
   # major/minor are used in updateScript to pin to LTS
-  version = "5.21.0";
+  version = "5.21.2";
 
-  src = fetchurl {
-    url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz";
-    hash = "sha256-vnh+8Jm4Olg+VdAPpGboLSbChdnwsU84IgyzGe4ltg8=";
+  src = fetchFromGitHub {
+    owner = "canonical";
+    repo = "lxd";
+    rev = "refs/tags/lxd-${version}";
+    hash = "sha256-3C5pLvO7oABWFhFiWtBr5ohFFWm20Gg36WBfVVJgKdc=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-W7+Z2o5cw3u0DbTZA+a3pRXt9zRggUUjFTUTtQ7B22A=";
 
   postPatch = ''
     substituteInPlace shared/usbid/load.go \
@@ -87,11 +88,16 @@ buildGo122Module rec {
     installShellCompletion --bash --name lxd ./scripts/bash/lxd-client
   '';
 
-  passthru.tests.lxd = nixosTests.lxd;
-  passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus;
-  passthru.updateScript = gitUpdater {
-    url = "https://github.com/canonical/lxd.git";
-    rev-prefix = "lxd-5.21";
+  passthru = {
+    tests.lxd = nixosTests.lxd;
+    tests.lxd-to-incus = nixosTests.incus.lxd-to-incus;
+
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "lxd-(5.21.*)"
+      ];
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index e6aa12fc5c2fd..f1f4b5a5e587a 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -5,11 +5,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.123.2";
+  version = "1.124";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-soVFPeoU4Rovk4xpXd90CjzQ1y1rx1OT/4eKCZNTd4Q=";
+    hash = "sha256-dvdzbUYFOuqBww03Dh8t3ocTJBzvZPlcAjwdFbDm9Ys=";
   };
 
   dontUnpack = true;
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-11 09:28:08 +0000