Remove obsolete and unused packages
This commit is contained in:
parent
fae8f8c929
commit
981bfcdd3b
SSH key fingerprint:
SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
25 changed files with 4 additions and 14635 deletions
14
flake.nix
14
flake.nix
|
|
@ -224,7 +224,6 @@
|
|||
|
||||
perSystem =
|
||||
{
|
||||
self',
|
||||
inputs',
|
||||
pkgs,
|
||||
config,
|
||||
|
|
@ -269,22 +268,9 @@
|
|||
};
|
||||
|
||||
packages = {
|
||||
coredns = pkgs.callPackage ./pkgs/coredns { };
|
||||
dnspyre = pkgs.callPackage ./pkgs/dnspyre { };
|
||||
git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
|
||||
gitu = pkgs.callPackage ./pkgs/gitu { };
|
||||
headscale-ui = pkgs.callPackage ./pkgs/headscale-ui { };
|
||||
incus-ui = pkgs.callPackage ./pkgs/incus-ui { };
|
||||
openfga = pkgs.callPackage ./pkgs/openfga { };
|
||||
tinyows = pkgs.callPackage ./pkgs/tinyows { };
|
||||
zed = pkgs.callPackage ./pkgs/zed { };
|
||||
};
|
||||
|
||||
apps = {
|
||||
zed = {
|
||||
type = "app";
|
||||
program = "${self'.packages.zed}/bin/Zed";
|
||||
};
|
||||
};
|
||||
|
||||
devShells.default =
|
||||
|
|
|
|||
|
|
@ -17,13 +17,14 @@ in
|
|||
programs.obs-studio = {
|
||||
enable = true;
|
||||
plugins =
|
||||
[ pkgs.obs-backgroundremoval ]
|
||||
[ ]
|
||||
++ (with pkgs.obs-studio-plugins; [
|
||||
wlrobs
|
||||
obs-vaapi
|
||||
obs-backgroundremoval
|
||||
obs-gstreamer
|
||||
obs-pipewire-audio-capture
|
||||
obs-vaapi
|
||||
obs-vkcapture
|
||||
wlrobs
|
||||
]);
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
_final: prev: {
|
||||
rofi-wayland = prev.pkgs.callPackage ../pkgs/rofi-wayland { };
|
||||
nix-plugins = prev.pkgs.callPackage ../pkgs/nix-plugins { };
|
||||
lunarvim = prev.pkgs.callPackage ../pkgs/lunarvim { };
|
||||
backscrub = prev.pkgs.callPackage ../pkgs/backscrub {
|
||||
inherit (prev.pkgs)
|
||||
gcc
|
||||
|
|
@ -14,27 +11,6 @@ _final: prev: {
|
|||
flatbuffers
|
||||
;
|
||||
};
|
||||
onnx-runtime = prev.pkgs.callPackage ../pkgs/onnx-runtime { inherit (prev.pkgs) stdenv; };
|
||||
obs-backgroundremoval = prev.pkgs.callPackage ../pkgs/obs-backgroundremoval {
|
||||
inherit (prev.pkgs)
|
||||
stdenv
|
||||
fetchFromGitHub
|
||||
cmake
|
||||
obs-studio
|
||||
opencv
|
||||
onnx-runtime
|
||||
;
|
||||
};
|
||||
|
||||
# swaynotificationcenter = prev.swaynotificationcenter.overrideAttrs (finalAttrs: prevAttrs: {
|
||||
# postInstall = ''
|
||||
# ${prev.pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
|
||||
# '';
|
||||
# });
|
||||
|
||||
bl3auto = prev.pkgs.callPackage ../pkgs/bl3auto {
|
||||
inherit (prev.pkgs) lib buildGoModule fetchFromGitHub;
|
||||
};
|
||||
|
||||
ddccontrol-db = prev.ddccontrol-db.overrideAttrs (
|
||||
_finalAttrs: prevAttrs: {
|
||||
|
|
@ -42,9 +18,5 @@ _final: prev: {
|
|||
}
|
||||
);
|
||||
|
||||
incus-ui = prev.pkgs.callPackage ../pkgs/incus-ui { };
|
||||
openfga = prev.pkgs.callPackage ../pkgs/openfga { };
|
||||
gitu = prev.pkgs.callPackage ../pkgs/gitu { };
|
||||
zed = prev.pkgs.callPackage ../pkgs/zed { };
|
||||
git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
{ buildGoModule, fetchFromGitHub, ... }:
|
||||
let
|
||||
version = "2.2.18";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "bl3auto";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jauderho";
|
||||
repo = "bl3auto";
|
||||
# rev = "c3126afa420a0d2117c473ef66564dfdb35d483c";
|
||||
rev = "v${version}";
|
||||
sha256 = "RaRND4HBBIjkz65k/1Xtb9nsJD82jEBkMoFPgelCJ4s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "Xfv6usoIkug7scM1ilzlIALfJd+fqiQlM9BY10EZdTU=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cmd $out/bin/bl3auto
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
gnused,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
version = "1.11.3";
|
||||
|
||||
externalPlugins = [
|
||||
{
|
||||
name = "tailscale";
|
||||
repo = "github.com/damomurf/coredns-tailscale";
|
||||
version = "c1a2b9d941edc6f701223d6e31be4edf46c9746f";
|
||||
}
|
||||
];
|
||||
|
||||
attrsToPlugins =
|
||||
attrs: builtins.map ({ name, repo, ... }: lib.escapeShellArg "${name}:${repo}") attrs;
|
||||
attrsToSources =
|
||||
attrs: builtins.map ({ repo, version, ... }: lib.escapeShellArg "${repo}@${version}") attrs;
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "coredns";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coredns";
|
||||
repo = "coredns";
|
||||
rev = "v${version}";
|
||||
# sha256 = lib.fakeSha256;
|
||||
sha256 = "8LZMS1rAqEZ8k1IWSRkQ2O650oqHLP0P31T8oUeE4fw=";
|
||||
};
|
||||
|
||||
# vendorHash = lib.fakeHash;
|
||||
vendorHash = "sha256-9oq+oNxOmHuFDIn1hQu7BBb76s615B6Mm3JxqSpEOuI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
# Override the go-modules fetcher derivation to fetch plugins
|
||||
modBuildPhase = ''
|
||||
for plugin in ${builtins.toString (attrsToPlugins externalPlugins)}; do
|
||||
echo "Adding plugin $plugin"
|
||||
${gnused}/bin/sed -i "/forward:forward/i$plugin" plugin.cfg
|
||||
done
|
||||
|
||||
for src in ${builtins.toString (attrsToSources externalPlugins)}; do
|
||||
echo "Retrieving $src"
|
||||
go get $src
|
||||
done
|
||||
|
||||
go generate
|
||||
go mod tidy
|
||||
go mod vendor
|
||||
'';
|
||||
|
||||
modInstallPhase = ''
|
||||
mv -t vendor go.mod go.sum plugin.cfg
|
||||
cp -r --reflink=auto vendor "$out"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
chmod -R u+w vendor
|
||||
mv -t . vendor/go.{mod,sum} vendor/plugin.cfg
|
||||
|
||||
go generate
|
||||
'';
|
||||
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace test/file_cname_proxy_test.go \
|
||||
--replace "TestZoneExternalCNAMELookupWithProxy" \
|
||||
"SkipZoneExternalCNAMELookupWithProxy"
|
||||
|
||||
substituteInPlace test/readme_test.go \
|
||||
--replace "TestReadme" "SkipReadme"
|
||||
|
||||
# this test fails if any external plugins were imported.
|
||||
# it's a lint rather than a test of functionality, so it's safe to disable.
|
||||
substituteInPlace test/presubmit_test.go \
|
||||
--replace "TestImportOrdering" "SkipImportOrdering"
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
# loopback interface is lo0 on macos
|
||||
sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/*
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libgit2,
|
||||
openssl,
|
||||
zlib,
|
||||
stdenv,
|
||||
darwin,
|
||||
git,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitu";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altsem";
|
||||
repo = "gitu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a4hNgEizxanYE3XuHSCmbV6CkOqhXkznP3Sp0KLFFQs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+CA3UG32oZedzRbt7b0wOlhH/subuym4BCL5SMNzrr8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
git
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgit2
|
||||
openssl
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI Git client inspired by Magit";
|
||||
homepage = "https://github.com/altsem/gitu";
|
||||
changelog = "https://github.com/altsem/gitu/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "gitu";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
nodejs,
|
||||
prefetch-yarn-deps,
|
||||
fixup-yarn-lock,
|
||||
yarn,
|
||||
gnused,
|
||||
rsync,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "incus-ui";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "lxd-ui";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-oD/GPm84oFXHcZ8vTUzNgQinrHwNuvpeVjsrp8ibIZY=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-hRZ0vbksxnUv4XMrbhP2PI94UYYzwrydJHSx+uf+MbI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./ui-canonical-0001-Branding.patch
|
||||
./ui-canonical-0002-Update-navigation.patch
|
||||
./ui-canonical-0003-Update-certificate-generation.patch
|
||||
./ui-canonical-0004-Remove-external-links.patch
|
||||
./ui-canonical-0005-Remove-Canonical-image-servers.patch
|
||||
./ui-canonical-0006-Remove-version-check.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
prefetch-yarn-deps
|
||||
fixup-yarn-lock
|
||||
yarn
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
${gnused}/bin/sed -e "s/devlxd/guestapi/g" \
|
||||
-e "s/dev\/lxd/dev\/incus/g" \
|
||||
-e "s/LXD/Incus/g" \
|
||||
-e "s/Lxd/Incus_/g" \
|
||||
-e "s/lxd/incus/g" -i src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
yarn config --offline set yarn-offline-mirror "$offlineCache"
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install
|
||||
patchShebangs node_modules
|
||||
cp ${./favicon-32x32.png} public/assets/img/favicon-32x32.png
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
yarn --offline build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
${rsync}/bin/rsync -a build/ui/ $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easy and accessible container and virtual machine management. A browser interface for LXD";
|
||||
homepage = "https://github.com/canonical/lxd-ui";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB |
|
|
@ -1,338 +0,0 @@
|
|||
From a8ffa74e0da8a565020fb1ebebd58f23235f19ff Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 22:59:56 +0000
|
||||
Subject: [PATCH 1/8] Branding
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
index.html | 2 +-
|
||||
public/assets/img/favicon-32x32.png | Bin 1361 -> 2506 bytes
|
||||
public/assets/img/incus-logo.svg | 129 ++++++++++++++++++++++++++++
|
||||
public/assets/img/lxd-logo.svg | 34 --------
|
||||
src/components/Logo.tsx | 6 +-
|
||||
src/pages/login/Login.tsx | 1 -
|
||||
src/sass/_pattern_icon.scss | 11 ---
|
||||
src/sass/_pattern_navigation.scss | 8 +-
|
||||
src/sass/styles.scss | 5 --
|
||||
src/util/title.tsx | 2 +-
|
||||
10 files changed, 138 insertions(+), 60 deletions(-)
|
||||
create mode 100644 public/assets/img/incus-logo.svg
|
||||
delete mode 100644 public/assets/img/lxd-logo.svg
|
||||
|
||||
diff --git a/index.html b/index.html
|
||||
index 6aa1283..85b46bd 100644
|
||||
--- a/index.html
|
||||
+++ b/index.html
|
||||
@@ -5,7 +5,7 @@
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
|
||||
- <title>LXD UI</title>
|
||||
+ <title>Incus UI</title>
|
||||
<link rel="shortcut icon" href="/assets/img/favicon-32x32.png" type="image/x-icon">
|
||||
|
||||
<script>const global = globalThis;</script>
|
||||
diff --git a/public/assets/img/incus-logo.svg b/public/assets/img/incus-logo.svg
|
||||
new file mode 100644
|
||||
index 0000000..9caf711
|
||||
--- /dev/null
|
||||
+++ b/public/assets/img/incus-logo.svg
|
||||
@@ -0,0 +1,129 @@
|
||||
+<?xml version="1.0" encoding="utf-8"?>
|
||||
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
+ width="165.754px" height="152.992px" viewBox="134.113 113.05 165.754 152.992"
|
||||
+ enable-background="new 134.113 113.05 165.754 152.992" xml:space="preserve">
|
||||
+<polygon fill="#DD4814" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
|
||||
+ 299.088,189.546 299.018,218.023 217.256,265.542 217.326,237.066 "/>
|
||||
+<polygon fill="#DD4814" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
|
||||
+ 217.326,237.066 217.256,265.542 134.971,218.023 135.041,189.546 "/>
|
||||
+<polygon fill="#333333" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
|
||||
+ 299.157,161.07 258.277,184.829 175.991,137.31 216.872,113.55 "/>
|
||||
+<g enable-background="new ">
|
||||
+ <polygon fill="#333333" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
|
||||
+ 299.367,161.175 299.262,189.651 258.382,213.411 258.486,184.934 "/>
|
||||
+</g>
|
||||
+<g enable-background="new ">
|
||||
+ <g>
|
||||
+ <polygon id="SVGID_1_" fill="#333333" points="258.277,184.829 258.207,213.306 175.922,165.787 175.991,137.31 "/>
|
||||
+ </g>
|
||||
+ <g>
|
||||
+ <defs>
|
||||
+ <polygon id="SVGID_4_" points="258.277,184.829 258.207,213.306 175.922,165.787 175.991,137.31 "/>
|
||||
+ </defs>
|
||||
+ <clipPath id="SVGID_6_">
|
||||
+ <use xlink:href="#SVGID_4_" overflow="visible"/>
|
||||
+ </clipPath>
|
||||
+ <polygon clip-path="url(#SVGID_6_)" fill="#333333" stroke="#FFFFFF" stroke-miterlimit="10" points="258.277,184.829
|
||||
+ 258.207,213.306 175.922,165.787 175.991,137.31 "/>
|
||||
+ </g>
|
||||
+ <g>
|
||||
+ <polygon id="SVGID_2_" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="258.277,184.829 258.207,213.306
|
||||
+ 175.922,165.787 175.991,137.31 "/>
|
||||
+ </g>
|
||||
+</g>
|
||||
+<polygon fill="#888888" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
|
||||
+ 258.242,199.05 217.361,222.81 135.076,175.326 175.956,151.566 "/>
|
||||
+<polygon fill="#888888" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
|
||||
+ 217.361,222.81 217.326,237.066 135.041,189.546 135.076,175.326 "/>
|
||||
+<polygon fill="#888888" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
|
||||
+ 258.242,199.05 258.207,213.306 217.326,237.066 217.361,222.81 "/>
|
||||
+<polygon fill="#2C001E" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
|
||||
+ 216.802,161.14 216.767,175.326 176.061,198.98 176.096,184.794 "/>
|
||||
+<polygon fill="#CDCDCD" points="216.802,161.14 176.096,184.794 135.111,161.14 175.991,137.31 "/>
|
||||
+<polygon fill="#CDCDCD" points="176.096,184.794 176.061,198.98 135.076,175.326 135.111,161.14 "/>
|
||||
+<polygon fill="#CDCDCD" points="216.802,161.14 216.767,175.326 176.061,198.98 176.096,184.794 "/>
|
||||
+<g>
|
||||
+ <g enable-background="new ">
|
||||
+ <g>
|
||||
+ <defs>
|
||||
+ <polygon id="SVGID_8_" points="216.802,175.326 176.061,198.98 135.111,175.326 175.991,151.566 "/>
|
||||
+ </defs>
|
||||
+ <clipPath id="SVGID_10_">
|
||||
+ <use xlink:href="#SVGID_8_" overflow="visible"/>
|
||||
+ </clipPath>
|
||||
+ <polygon clip-path="url(#SVGID_10_)" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="216.802,175.326
|
||||
+ 176.096,198.98 135.111,175.326 175.991,151.566 "/>
|
||||
+ </g>
|
||||
+ <g>
|
||||
+ <polygon id="SVGID_3_" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="216.802,175.326 176.061,198.98
|
||||
+ 135.111,175.326 175.991,151.566 "/>
|
||||
+ </g>
|
||||
+ </g>
|
||||
+ <g enable-background="new ">
|
||||
+ <g>
|
||||
+ <defs>
|
||||
+ <polygon id="SVGID_12_" points="216.837,161.14 176.131,184.794 135.146,161.14 176.026,137.31 "/>
|
||||
+ </defs>
|
||||
+ <clipPath id="SVGID_13_">
|
||||
+ <use xlink:href="#SVGID_12_" overflow="visible"/>
|
||||
+ </clipPath>
|
||||
+ <polygon clip-path="url(#SVGID_13_)" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="216.837,161.14
|
||||
+ 176.131,184.794 135.146,161.14 176.026,137.31 "/>
|
||||
+ </g>
|
||||
+ <g>
|
||||
+ <polygon id="SVGID_5_" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="216.837,161.14 176.131,184.794
|
||||
+ 135.146,161.14 176.026,137.31 "/>
|
||||
+ </g>
|
||||
+ </g>
|
||||
+ <g enable-background="new ">
|
||||
+ <g>
|
||||
+ <defs>
|
||||
+ <polygon id="SVGID_14_" points="176.131,184.794 176.061,198.98 135.111,175.326 135.146,161.14 "/>
|
||||
+ </defs>
|
||||
+ <clipPath id="SVGID_15_">
|
||||
+ <use xlink:href="#SVGID_14_" overflow="visible"/>
|
||||
+ </clipPath>
|
||||
+ <polygon clip-path="url(#SVGID_15_)" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="176.131,184.794
|
||||
+ 176.096,198.98 135.111,175.326 135.146,161.14 "/>
|
||||
+ </g>
|
||||
+ <g>
|
||||
+ <polygon id="SVGID_7_" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="176.131,184.794 176.061,198.98
|
||||
+ 135.111,175.326 135.146,161.14 "/>
|
||||
+ </g>
|
||||
+ </g>
|
||||
+ <g enable-background="new ">
|
||||
+ <g>
|
||||
+ <defs>
|
||||
+ <polygon id="SVGID_16_" points="135.146,161.14 176.026,137.31 175.991,151.566 135.111,175.326 "/>
|
||||
+ </defs>
|
||||
+ <clipPath id="SVGID_17_">
|
||||
+ <use xlink:href="#SVGID_16_" overflow="visible"/>
|
||||
+ </clipPath>
|
||||
+ <polygon clip-path="url(#SVGID_17_)" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="135.146,161.14
|
||||
+ 176.026,137.31 175.991,151.566 135.111,175.326 "/>
|
||||
+ </g>
|
||||
+ <g>
|
||||
+ <polygon id="SVGID_9_" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="135.146,161.14 176.026,137.31
|
||||
+ 175.991,151.566 135.111,175.326 "/>
|
||||
+ </g>
|
||||
+ </g>
|
||||
+ <g enable-background="new ">
|
||||
+ <g>
|
||||
+ <defs>
|
||||
+ <polygon id="SVGID_18_" points="176.026,137.31 216.837,161.14 216.802,175.326 175.991,151.566 "/>
|
||||
+ </defs>
|
||||
+ <clipPath id="SVGID_19_">
|
||||
+ <use xlink:href="#SVGID_18_" overflow="visible"/>
|
||||
+ </clipPath>
|
||||
+ <polygon clip-path="url(#SVGID_19_)" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="176.026,137.31
|
||||
+ 216.837,161.14 216.802,175.326 175.817,151.671 "/>
|
||||
+ </g>
|
||||
+ <g>
|
||||
+ <polygon id="SVGID_11_" fill="none" stroke="#FFFFFF" stroke-miterlimit="10" points="176.026,137.31 216.837,161.14
|
||||
+ 216.802,175.326 175.991,151.566 "/>
|
||||
+ </g>
|
||||
+ </g>
|
||||
+</g>
|
||||
+</svg>
|
||||
diff --git a/public/assets/img/lxd-logo.svg b/public/assets/img/lxd-logo.svg
|
||||
deleted file mode 100644
|
||||
index 272ef59..0000000
|
||||
--- a/public/assets/img/lxd-logo.svg
|
||||
+++ /dev/null
|
||||
@@ -1,34 +0,0 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1900 400">
|
||||
- <defs>
|
||||
- <style>
|
||||
- .cls-1 {
|
||||
- fill: none;
|
||||
- }
|
||||
-
|
||||
- .cls-2 {
|
||||
- fill: #e95420;
|
||||
- }
|
||||
-
|
||||
- .cls-3 {
|
||||
- fill: #fff;
|
||||
- }
|
||||
- </style>
|
||||
- </defs>
|
||||
- <g>
|
||||
- <rect class="cls-2" width="252.43" height="400"/>
|
||||
- <rect class="cls-1" x="30.05" y="168.29" width="192.33" height="192.33"/>
|
||||
- <g>
|
||||
- <path class="cls-3" d="m173.07,243.26v-47.87l-46.86-27.1-46.86,27.1v47.87l-41.66,24.05v54.19l46.86,27.1,41.66-24.16,41.66,24.05,46.86-27.1v-54.19l-41.66-23.94Zm-46.86-62.77l36.36,21v41.77l-36.36,21.11-36.47-21v-41.77l36.47-21.11Zm-41.66,155.92l-36.36-21v-42l36.24-20.89,36.58,21.11v41.77l-36.47,21Zm119.68-21l-36.36,21-36.36-21v-41.77l36.58-21.11,36.24,20.89v42h-.11Z"/>
|
||||
- <polygon class="cls-3" points="171.49 319.69 191.47 307.84 191.47 284.35 171.49 296.1 171.49 319.69"/>
|
||||
- <polygon class="cls-3" points="167.76 266.97 147.78 278.48 167.88 289.89 187.86 278.14 167.76 266.97"/>
|
||||
- <polygon class="cls-3" points="144.28 308.18 164.38 319.92 164.38 296.1 144.05 284.69 144.28 308.18"/>
|
||||
- <polygon class="cls-3" points="84.44 266.97 64.46 278.48 84.55 289.89 104.54 278.14 84.44 266.97"/>
|
||||
- <polygon class="cls-3" points="60.96 308.18 81.05 319.92 81.05 296.1 60.84 284.69 60.96 308.18"/>
|
||||
- <polygon class="cls-3" points="88.17 319.69 108.26 307.84 108.26 284.35 88.17 296.1 88.17 319.69"/>
|
||||
- <polygon class="cls-3" points="146.09 206.11 126.1 195.05 106.12 206.56 126.1 217.85 146.09 206.11"/>
|
||||
- <polygon class="cls-3" points="122.6 247.89 122.6 224.06 102.51 212.66 102.62 236.26 122.6 247.89"/>
|
||||
- <polygon class="cls-3" points="129.72 247.77 149.81 235.92 149.81 212.21 129.72 224.06 129.72 247.77"/>
|
||||
- </g>
|
||||
- </g>
|
||||
-</svg>
|
||||
\ No newline at end of file
|
||||
diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx
|
||||
index cf7faa8..b1b06d2 100644
|
||||
--- a/src/components/Logo.tsx
|
||||
+++ b/src/components/Logo.tsx
|
||||
@@ -15,11 +15,11 @@ const Logo: FC = () => {
|
||||
return (
|
||||
<NavLink className="p-panel__logo" to={getLogoLink()}>
|
||||
<img
|
||||
- src="/ui/assets/img/lxd-logo.svg"
|
||||
- alt="LXD-UI logo"
|
||||
+ src="/ui/assets/img/incus-logo.svg"
|
||||
+ alt="Incus-UI logo"
|
||||
className="p-panel__logo-image"
|
||||
/>
|
||||
- <div className="logo-text p-heading--4">Canonical LXD</div>
|
||||
+ <div className="logo-text p-heading--4">Incus UI</div>
|
||||
</NavLink>
|
||||
);
|
||||
};
|
||||
diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx
|
||||
index c283cd5..9307844 100644
|
||||
--- a/src/pages/login/Login.tsx
|
||||
+++ b/src/pages/login/Login.tsx
|
||||
@@ -23,7 +23,6 @@ const Login: FC = () => {
|
||||
return (
|
||||
<CustomLayout>
|
||||
<div className="empty-state login">
|
||||
- <Icon name="containers" className="empty-state-icon lxd-icon" />
|
||||
<h1 className="p-heading--4 u-sv-2">Login</h1>
|
||||
{hasOidc && (
|
||||
<>
|
||||
diff --git a/src/sass/_pattern_icon.scss b/src/sass/_pattern_icon.scss
|
||||
index 21254c8..f6da7f9 100644
|
||||
--- a/src/sass/_pattern_icon.scss
|
||||
+++ b/src/sass/_pattern_icon.scss
|
||||
@@ -1,14 +1,3 @@
|
||||
-@mixin lxdui-icon-sidebar-collapse() {
|
||||
- background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 16 16' width='16px' height='16px' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M 0 7.743 L 6.742 14.485 L 7.899 13.329 L 2.311 7.743 L 7.899 2.157 L 6.742 1 L 0 7.743 Z M 7.899 7.743 L 14.642 14.485 L 15.797 13.329 L 10.21 7.743 L 15.797 2.157 L 14.642 1 L 7.899 7.743 Z' fill='%23FFF' style=''/%3E%3C/svg%3E");
|
||||
-}
|
||||
-
|
||||
-@mixin lxdui-p-icon {
|
||||
- .p-icon--sidebar-toggle {
|
||||
- @extend %icon;
|
||||
- @include lxdui-icon-sidebar-collapse;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
.p-icon--info--notification {
|
||||
@extend %icon;
|
||||
@include vf-icon-info-coloured-themed;
|
||||
diff --git a/src/sass/_pattern_navigation.scss b/src/sass/_pattern_navigation.scss
|
||||
index 92236ef..1373ab0 100644
|
||||
--- a/src/sass/_pattern_navigation.scss
|
||||
+++ b/src/sass/_pattern_navigation.scss
|
||||
@@ -5,20 +5,20 @@
|
||||
|
||||
.p-panel__logo-image {
|
||||
height: 36px;
|
||||
- margin-top: -3px;
|
||||
+ margin-top: 2px;
|
||||
max-width: inherit;
|
||||
}
|
||||
|
||||
.logo-text {
|
||||
color: #fff;
|
||||
- left: 47px;
|
||||
+ left: 70px;
|
||||
position: absolute;
|
||||
top: $spv--x-small;
|
||||
}
|
||||
|
||||
@include mobile {
|
||||
.logo-text {
|
||||
- left: 38px;
|
||||
+ left: 66px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
}
|
||||
|
||||
.logo-text {
|
||||
- left: 52px;
|
||||
+ left: 80px;
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/src/sass/styles.scss b/src/sass/styles.scss
|
||||
index 34d155d..1f37774 100644
|
||||
--- a/src/sass/styles.scss
|
||||
+++ b/src/sass/styles.scss
|
||||
@@ -4,7 +4,6 @@
|
||||
@import "vanilla-framework/scss/build";
|
||||
@import "./breakpoints";
|
||||
@import "pattern_icon";
|
||||
-@include lxdui-p-icon;
|
||||
@include vf-p-icon-add-canvas;
|
||||
@include vf-p-icon-applications;
|
||||
@include vf-p-icon-begin-downloading;
|
||||
@@ -148,10 +147,6 @@ body {
|
||||
@include vf-icon-external-link($color-link);
|
||||
}
|
||||
|
||||
-.lxd-icon {
|
||||
- background-image: url("data:image/svg+xml,%0A%3Csvg width='38' height='38' viewBox='0 0 38 38' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M28.5311 15.7998V5.71128L18.6554 0L8.77977 5.71128V15.7998L0 20.8683V32.2887L9.87566 38L18.6554 32.9083L27.4352 37.9768L37.3108 32.2655V20.8451L28.5311 15.7998ZM18.6554 2.57113L26.3182 6.99684V15.7998L18.6554 20.2487L10.9694 15.823V7.02002L18.6554 2.57113ZM9.87566 35.431L2.21286 31.0053V22.1538L9.85037 17.7513L17.5595 22.2002V31.0032L9.87355 35.4289L9.87566 35.431ZM35.098 31.0053L27.4352 35.431L19.7724 31.0053V22.2023L27.4816 17.7534L35.1191 22.156V31.0074H35.0959L35.098 31.0053Z' fill='%23D9D9D9'/%3E%3Cpath d='M28.1978 31.9072L32.4085 29.4099V24.4594L28.1978 26.9357V31.9072Z' fill='%23D9D9D9'/%3E%3Cpath d='M27.4119 20.7966L23.2012 23.2223L27.4372 25.627L31.648 23.1507L27.4119 20.7966Z' fill='%23D9D9D9'/%3E%3Cpath d='M22.4635 29.4816L26.6995 31.9558V26.9357L22.415 24.5311L22.4635 29.4816Z' fill='%23D9D9D9'/%3E%3Cpath d='M9.85235 20.7966L5.6416 23.2223L9.87553 25.627L14.0884 23.1507L9.85235 20.7966Z' fill='%23D9D9D9'/%3E%3Cpath d='M4.90371 29.4816L9.13764 31.9558V26.9357L4.87842 24.5311L4.90371 29.4816Z' fill='%23D9D9D9'/%3E%3Cpath d='M10.6387 31.9072L14.8726 29.4099V24.4594L10.6387 26.9357V31.9072Z' fill='%23D9D9D9'/%3E%3Cpath d='M22.8455 7.97052L18.6326 5.63965L14.4219 8.06536L18.6326 10.4447L22.8455 7.97052Z' fill='%23D9D9D9'/%3E%3Cpath d='M17.8946 16.7755V11.7534L13.6606 9.35083L13.6838 14.3245L17.8946 16.7755Z' fill='%23D9D9D9'/%3E%3Cpath d='M19.3955 16.7503L23.6294 14.2529V9.2561L19.3955 11.7535V16.7503Z' fill='%23D9D9D9'/%3E%3C/svg%3E%0A");
|
||||
-}
|
||||
-
|
||||
.actions-list {
|
||||
display: inline-block;
|
||||
min-width: 8.5rem;
|
||||
diff --git a/src/util/title.tsx b/src/util/title.tsx
|
||||
index 3ef659b..879efb9 100644
|
||||
--- a/src/util/title.tsx
|
||||
+++ b/src/util/title.tsx
|
||||
@@ -6,6 +6,6 @@ export const setTitle = (): void => {
|
||||
|
||||
useEffect(() => {
|
||||
const host = settings?.config?.["user.ui_title"] ?? location.hostname;
|
||||
- document.title = `${host} | LXD UI`;
|
||||
+ document.title = `${host} | Incus UI`;
|
||||
}, [settings?.config]);
|
||||
};
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
From 4a477c328eada5d3b3dfee39b6949dc97c36f813 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 23:02:27 +0000
|
||||
Subject: [PATCH 2/8] Update navigation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/components/Navigation.tsx | 4 ++--
|
||||
src/components/NoMatch.tsx | 2 +-
|
||||
src/context/useDocs.tsx | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
|
||||
index 147676a..64a97d3 100644
|
||||
--- a/src/components/Navigation.tsx
|
||||
+++ b/src/components/Navigation.tsx
|
||||
@@ -261,7 +261,7 @@ const Navigation: FC = () => {
|
||||
<li className="p-side-navigation__item">
|
||||
<a
|
||||
className="p-side-navigation__link"
|
||||
- href="https://discourse.ubuntu.com/c/lxd/126"
|
||||
+ href="https://discuss.linuxcontainers.org"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
title="Discussion"
|
||||
@@ -276,7 +276,7 @@ const Navigation: FC = () => {
|
||||
<li className="p-side-navigation__item">
|
||||
<a
|
||||
className="p-side-navigation__link"
|
||||
- href="https://github.com/canonical/lxd-ui/issues/new"
|
||||
+ href="https://github.com/zabbly/incus/issues/new"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
title="Report a bug"
|
||||
diff --git a/src/components/NoMatch.tsx b/src/components/NoMatch.tsx
|
||||
index a088c54..65216fa 100644
|
||||
--- a/src/components/NoMatch.tsx
|
||||
+++ b/src/components/NoMatch.tsx
|
||||
@@ -13,7 +13,7 @@ const NoMatch: FC = () => {
|
||||
<br />
|
||||
If you think this is an error in our product, please{" "}
|
||||
<a
|
||||
- href="https://github.com/canonical/lxd-ui/issues/new"
|
||||
+ href="https://github.com/zabbly/incus/issues/new"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
title="Report a bug"
|
||||
diff --git a/src/context/useDocs.tsx b/src/context/useDocs.tsx
|
||||
index 900688f..be3e593 100644
|
||||
--- a/src/context/useDocs.tsx
|
||||
+++ b/src/context/useDocs.tsx
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useSupportedFeatures } from "./useSupportedFeatures";
|
||||
|
||||
export const useDocs = (): string => {
|
||||
- const remoteBase = "https://documentation.ubuntu.com/lxd/en/latest";
|
||||
+ const remoteBase = "/documentation";
|
||||
const localBase = "/documentation";
|
||||
|
||||
const { hasLocalDocumentation } = useSupportedFeatures();
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,195 +0,0 @@
|
|||
From 767dff6c01f0c8195f4044beb3059533a814212a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 23:03:33 +0000
|
||||
Subject: [PATCH 3/8] Update certificate generation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/pages/login/BrowserImport.tsx | 18 +++++++++---------
|
||||
src/pages/login/CertificateAdd.tsx | 4 ++--
|
||||
src/pages/login/CertificateGenerate.tsx | 12 ++++++------
|
||||
src/util/certificate.tsx | 4 ++--
|
||||
4 files changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/src/pages/login/BrowserImport.tsx b/src/pages/login/BrowserImport.tsx
|
||||
index cc9c87a..d8ff1a4 100644
|
||||
--- a/src/pages/login/BrowserImport.tsx
|
||||
+++ b/src/pages/login/BrowserImport.tsx
|
||||
@@ -25,7 +25,7 @@ const BrowserImport: FC<Props> = ({ sendPfx }) => {
|
||||
<>
|
||||
<li className="p-list__item">
|
||||
This opens a certificate management dialog. Click <code>Import...</code>
|
||||
- then <code>Next</code> and select the <code>lxd-ui.pfx</code> file you
|
||||
+ then <code>Next</code> and select the <code>incus-ui.pfx</code> file you
|
||||
just downloaded. Enter your password, or leave the field empty if you
|
||||
have not set one. Click <code>Next</code>.
|
||||
</li>
|
||||
@@ -34,14 +34,14 @@ const BrowserImport: FC<Props> = ({ sendPfx }) => {
|
||||
<code>Next</code>, then click <code>Finish</code>.
|
||||
</li>
|
||||
<li className="p-list__item">
|
||||
- Restart the browser and open LXD-UI. Select the LXD-UI certificate.
|
||||
+ Restart the browser and open Incus-UI. Select the Incus-UI certificate.
|
||||
</li>
|
||||
</>
|
||||
);
|
||||
|
||||
const downloadPfx = (
|
||||
<li className="p-list__item u-clearfix">
|
||||
- Download <code>lxd-ui.pfx</code>
|
||||
+ Download <code>incus-ui.pfx</code>
|
||||
{sendPfx && (
|
||||
<div className="u-float-right--large">
|
||||
<Button onClick={sendPfx}>Download pfx</Button>
|
||||
@@ -82,12 +82,12 @@ const BrowserImport: FC<Props> = ({ sendPfx }) => {
|
||||
<code>Import</code>.
|
||||
</li>
|
||||
<li className="p-list__item">
|
||||
- Select the <code>lxd-ui.pfx</code> file you just downloaded.
|
||||
+ Select the <code>incus-ui.pfx</code> file you just downloaded.
|
||||
Enter your password, or leave the field empty if you have not
|
||||
set one.
|
||||
</li>
|
||||
<li className="p-list__item">
|
||||
- Restart the browser and open LXD-UI. Select the LXD-UI
|
||||
+ Restart the browser and open Incus-UI. Select the Incus-UI
|
||||
certificate.
|
||||
</li>
|
||||
</ul>
|
||||
@@ -108,11 +108,11 @@ const BrowserImport: FC<Props> = ({ sendPfx }) => {
|
||||
</li>
|
||||
<li className="p-list__item">
|
||||
Click the <code>Import</code> button and select the{" "}
|
||||
- <code>lxd-ui.pfx</code> file you just downloaded. Enter your
|
||||
+ <code>incus-ui.pfx</code> file you just downloaded. Enter your
|
||||
password, or leave the field empty if you have not set one.
|
||||
</li>
|
||||
<li className="p-list__item">
|
||||
- Restart the browser and open LXD-UI. Select the LXD-UI
|
||||
+ Restart the browser and open Incus-UI. Select the Incus-UI
|
||||
certificate.
|
||||
</li>
|
||||
</ul>
|
||||
@@ -179,7 +179,7 @@ const BrowserImport: FC<Props> = ({ sendPfx }) => {
|
||||
keychain.
|
||||
</li>
|
||||
<li className="p-list__item">
|
||||
- Drag the <code>lxd-ui.pfx</code> file onto the Keychain Access
|
||||
+ Drag the <code>incus-ui.pfx</code> file onto the Keychain Access
|
||||
app.
|
||||
</li>
|
||||
<li className="p-list__item">
|
||||
@@ -187,7 +187,7 @@ const BrowserImport: FC<Props> = ({ sendPfx }) => {
|
||||
and password for an administrator user on this computer.
|
||||
</li>
|
||||
<li className="p-list__item">
|
||||
- Restart the browser and open LXD-UI. Select the LXD-UI
|
||||
+ Restart the browser and open Incus-UI. Select the Incus-UI
|
||||
certificate.
|
||||
</li>
|
||||
</ul>
|
||||
diff --git a/src/pages/login/CertificateAdd.tsx b/src/pages/login/CertificateAdd.tsx
|
||||
index 0e86797..9d227e5 100644
|
||||
--- a/src/pages/login/CertificateAdd.tsx
|
||||
+++ b/src/pages/login/CertificateAdd.tsx
|
||||
@@ -52,7 +52,7 @@ const CertificateAdd: FC = () => {
|
||||
<p>Generate a token on the command line</p>
|
||||
<div className="p-code-snippet">
|
||||
<pre className="p-code-snippet__block--icon">
|
||||
- <code>lxc config trust add --name lxd-ui</code>
|
||||
+ <code>incus config trust add incus-ui</code>
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
@@ -78,7 +78,7 @@ const CertificateAdd: FC = () => {
|
||||
</Col>
|
||||
<Col size={6}>
|
||||
<div className="p-stepped-list__content">
|
||||
- <p>Enjoy LXD UI.</p>
|
||||
+ <p>Enjoy Incus UI.</p>
|
||||
</div>
|
||||
</Col>
|
||||
</Row>
|
||||
diff --git a/src/pages/login/CertificateGenerate.tsx b/src/pages/login/CertificateGenerate.tsx
|
||||
index 2ea99de..39dce9f 100644
|
||||
--- a/src/pages/login/CertificateGenerate.tsx
|
||||
+++ b/src/pages/login/CertificateGenerate.tsx
|
||||
@@ -82,7 +82,7 @@ const CertificateGenerate: FC = () => {
|
||||
mainClassName="certificate-generate"
|
||||
header={
|
||||
<div className="p-panel__header is-sticky">
|
||||
- <h1 className="p-panel__title">Setup LXD UI</h1>
|
||||
+ <h1 className="p-panel__title">Setup Incus UI</h1>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
@@ -137,12 +137,12 @@ const CertificateGenerate: FC = () => {
|
||||
<Col size={6}>
|
||||
<div className="p-stepped-list__content">
|
||||
<p>
|
||||
- Download <code>lxd-ui.crt</code> and add it to the LXD
|
||||
+ Download <code>incus-ui.crt</code> and add it to the Incus
|
||||
trust store
|
||||
</p>
|
||||
<div className="p-code-snippet">
|
||||
<pre className="p-code-snippet__block--icon">
|
||||
- <code>lxc config trust add Downloads/lxd-ui.crt</code>
|
||||
+ <code>incus config trust add-certificate Downloads/incus-ui.crt</code>
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
@@ -152,7 +152,7 @@ const CertificateGenerate: FC = () => {
|
||||
<Button
|
||||
onClick={() =>
|
||||
downloadText(
|
||||
- `lxd-ui-${location.hostname}.crt`,
|
||||
+ `incus-ui.crt`,
|
||||
certs.crt,
|
||||
)
|
||||
}
|
||||
@@ -174,7 +174,7 @@ const CertificateGenerate: FC = () => {
|
||||
certs
|
||||
? () =>
|
||||
downloadBase64(
|
||||
- `lxd-ui-${location.hostname}.pfx`,
|
||||
+ `incus-ui.pfx`,
|
||||
certs.pfx,
|
||||
)
|
||||
: undefined
|
||||
@@ -190,7 +190,7 @@ const CertificateGenerate: FC = () => {
|
||||
</Col>
|
||||
<Col size={6}>
|
||||
<div className="p-stepped-list__content">
|
||||
- <p>Enjoy LXD UI.</p>
|
||||
+ <p>Enjoy Incus UI.</p>
|
||||
</div>
|
||||
</Col>
|
||||
</Row>
|
||||
diff --git a/src/util/certificate.tsx b/src/util/certificate.tsx
|
||||
index b409147..a802f5d 100644
|
||||
--- a/src/util/certificate.tsx
|
||||
+++ b/src/util/certificate.tsx
|
||||
@@ -26,7 +26,7 @@ const details = [
|
||||
},
|
||||
{
|
||||
name: "organizationName",
|
||||
- value: `LXD UI ${location.hostname} (Browser Generated)`,
|
||||
+ value: `Incus UI ${location.hostname} (Browser Generated)`,
|
||||
},
|
||||
];
|
||||
|
||||
@@ -51,7 +51,7 @@ const generateCert = (password: string) => {
|
||||
const asn1 = forge.pkcs12.toPkcs12Asn1(keys.privateKey, [cert], password, {
|
||||
algorithm: "3des", // would like to use aes, but macOS keychain only supports 3des
|
||||
generateLocalKeyId: true,
|
||||
- friendlyName: "LXD-UI",
|
||||
+ friendlyName: "Incus-UI",
|
||||
});
|
||||
const der = forge.asn1.toDer(asn1).getBytes();
|
||||
const pfx = forge.util.encode64(der);
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 5e04b21d7e49cc36115687ba8806cacf2fb03512 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 23:12:29 +0000
|
||||
Subject: [PATCH 4/8] Remove external links
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/pages/storage/UploadCustomImageHint.tsx | 11 -----------
|
||||
1 file changed, 11 deletions(-)
|
||||
|
||||
diff --git a/src/pages/storage/UploadCustomImageHint.tsx b/src/pages/storage/UploadCustomImageHint.tsx
|
||||
index dcad010..eedb1a3 100644
|
||||
--- a/src/pages/storage/UploadCustomImageHint.tsx
|
||||
+++ b/src/pages/storage/UploadCustomImageHint.tsx
|
||||
@@ -9,17 +9,6 @@ const UploadCustomImageHint: FC = () => {
|
||||
<h3 className="p-notification__title">
|
||||
Some image formats need to be modified in order to work with LXD.
|
||||
</h3>
|
||||
- <p>
|
||||
- <a
|
||||
- className="p-notification__action"
|
||||
- href="https://ubuntu.com/tutorials/how-to-install-a-windows-11-vm-using-lxd#1-overview"
|
||||
- target="_blank"
|
||||
- rel="noopener noreferrer"
|
||||
- >
|
||||
- Windows ISO images
|
||||
- <Icon className="external-link-icon" name="external-link" />
|
||||
- </a>
|
||||
- </p>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
From e36304b2f02f3bb6bb9bc80482afc9b36df2d3c1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 23:16:13 +0000
|
||||
Subject: [PATCH 5/8] Remove Canonical image servers
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/pages/images/ImageSelector.tsx | 51 ++++++------------------------
|
||||
1 file changed, 10 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/src/pages/images/ImageSelector.tsx b/src/pages/images/ImageSelector.tsx
|
||||
index ca10169..2123eb4 100644
|
||||
--- a/src/pages/images/ImageSelector.tsx
|
||||
+++ b/src/pages/images/ImageSelector.tsx
|
||||
@@ -33,16 +33,9 @@ interface Props {
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
-const canonicalJson =
|
||||
- "https://cloud-images.ubuntu.com/releases/streams/v1/com.ubuntu.cloud:released:download.json";
|
||||
-const canonicalServer = "https://cloud-images.ubuntu.com/releases";
|
||||
-
|
||||
-const minimalJson =
|
||||
- "https://cloud-images.ubuntu.com/minimal/releases/streams/v1/com.ubuntu.cloud:released:download.json";
|
||||
-const minimalServer = "https://cloud-images.ubuntu.com/minimal/releases/";
|
||||
-
|
||||
-const imagesLxdJson = "https://images.lxd.canonical.com/streams/v1/images.json";
|
||||
-const imagesLxdServer = "https://images.lxd.canonical.com/";
|
||||
+const linuxContainersJson =
|
||||
+ "https://images.linuxcontainers.org/streams/v1/images.json";
|
||||
+const linuxContainersServer = "https://images.linuxcontainers.org";
|
||||
|
||||
const ANY = "any";
|
||||
const CONTAINER = "container";
|
||||
@@ -75,33 +68,17 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
|
||||
const { data: settings, isLoading: isSettingsLoading } = useSettings();
|
||||
|
||||
- const { data: canonicalImages = [], isLoading: isCiLoading } = useQuery({
|
||||
- queryKey: [queryKeys.images, canonicalServer],
|
||||
- queryFn: () => loadImages(canonicalJson, canonicalServer),
|
||||
- });
|
||||
-
|
||||
- const { data: minimalImages = [], isLoading: isMinimalLoading } = useQuery({
|
||||
- queryKey: [queryKeys.images, minimalServer],
|
||||
- queryFn: () => loadImages(minimalJson, minimalServer),
|
||||
+ const { data: linuxContainerImages = [], isLoading: isLciLoading } = useQuery({
|
||||
+ queryKey: [queryKeys.images, linuxContainersServer],
|
||||
+ queryFn: () => loadImages(linuxContainersJson, linuxContainersServer),
|
||||
});
|
||||
|
||||
- const { data: imagesLxdImages = [], isLoading: isImagesLxdLoading } =
|
||||
- useQuery({
|
||||
- queryKey: [queryKeys.images, imagesLxdServer],
|
||||
- queryFn: () => loadImages(imagesLxdJson, imagesLxdServer),
|
||||
- });
|
||||
-
|
||||
const { data: localImages = [], isLoading: isLocalImageLoading } = useQuery({
|
||||
queryKey: [queryKeys.images, project],
|
||||
queryFn: () => fetchImageList(project ?? ""),
|
||||
});
|
||||
|
||||
- const isLoading =
|
||||
- isCiLoading ||
|
||||
- isMinimalLoading ||
|
||||
- isImagesLxdLoading ||
|
||||
- isLocalImageLoading ||
|
||||
- isSettingsLoading;
|
||||
+ const isLoading = isLciLoading || isLocalImageLoading || isSettingsLoading;
|
||||
const archSupported = getArchitectureAliases(
|
||||
settings?.environment?.architectures ?? [],
|
||||
);
|
||||
@@ -110,9 +87,7 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
: localImages
|
||||
.filter((image) => !image.cached)
|
||||
.map(localLxdToRemoteImage)
|
||||
- .concat([...canonicalImages].reverse().sort(byLtsFirst))
|
||||
- .concat([...minimalImages].reverse().sort(byLtsFirst))
|
||||
- .concat([...imagesLxdImages])
|
||||
+ .concat(linuxContainerImages)
|
||||
.filter((image) => archSupported.includes(image.arch));
|
||||
|
||||
const archAll = [...new Set(images.map((item) => item.arch))]
|
||||
@@ -213,14 +188,8 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
if (item.created_at) {
|
||||
return "Local";
|
||||
}
|
||||
- if (item.server === canonicalServer) {
|
||||
- return "Ubuntu";
|
||||
- }
|
||||
- if (item.server === minimalServer) {
|
||||
- return "Ubuntu Minimal";
|
||||
- }
|
||||
- if (item.server === imagesLxdServer) {
|
||||
- return "LXD Images";
|
||||
+ if (item.server === linuxContainersServer) {
|
||||
+ return "Linux Containers";
|
||||
}
|
||||
return "Custom";
|
||||
};
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 9929fa50a7631de81f1d16895f67612555b6c9af Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Fri, 16 Feb 2024 17:32:51 +0000
|
||||
Subject: [PATCH 6/8] Remove version check
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/components/Version.tsx | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/components/Version.tsx b/src/components/Version.tsx
|
||||
index a9b0741..24bd540 100644
|
||||
--- a/src/components/Version.tsx
|
||||
+++ b/src/components/Version.tsx
|
||||
@@ -14,9 +14,7 @@ const Version: FC = () => {
|
||||
const serverMajor = serverVersion.includes(".")
|
||||
? serverVersion.split(".")[0]
|
||||
: undefined;
|
||||
- const isOutdated = serverMajor
|
||||
- ? parseInt(serverMajor) < RECENT_MAJOR_SERVER_VERSION
|
||||
- : false;
|
||||
+ const isOutdated = false;
|
||||
|
||||
return (
|
||||
<>
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From 22fc5a8ae2726d0f3dfdbef2f1e228f7dcd3162f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Thu, 28 Mar 2024 15:54:43 +0000
|
||||
Subject: [PATCH 7/8] Improve OpenFGA support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This makes a few changes to better work with OpenFGA:
|
||||
- Don't expect a clear 404 on a non-existing object
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/util/helpers.tsx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/util/helpers.tsx b/src/util/helpers.tsx
|
||||
index 2825a67..a5e8680 100644
|
||||
--- a/src/util/helpers.tsx
|
||||
+++ b/src/util/helpers.tsx
|
||||
@@ -171,7 +171,7 @@ export const checkDuplicateName = (
|
||||
const signal = deduplicateController.signal;
|
||||
return fetch(`/1.0/${target}/${candidate}?project=${project}`, {
|
||||
signal,
|
||||
- }).then((response) => response.status === 404);
|
||||
+ }).then((response) => response.status === 404 || response.status === 403);
|
||||
};
|
||||
|
||||
export const getUrlParam = (paramName: string, url?: string): string | null => {
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
with pkgs;
|
||||
let
|
||||
nvim-customized = wrapNeovim neovim-unwrapped { };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lunarvim";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LunarVim";
|
||||
repo = "LunarVim";
|
||||
rev = "0e531891b1dfd04fa02a22b48ce075120b512277";
|
||||
sha256 = "0yfr3vh8p1s9wy21s6bgpp6kp6s9pqlb6k66s76sa22vz4sjiyxb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
nvim-customized
|
||||
];
|
||||
buildInputs = [ nvim-customized ];
|
||||
|
||||
buildPhase = ''
|
||||
echo "hello"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp -r $(pwd) $out/lvim
|
||||
export shim="$out/lvim/utils/bin/lvim"
|
||||
substituteInPlace "$shim" \
|
||||
--replace "exec nvim" "exec ${nvim-customized}/bin/nvim"
|
||||
chmod +x "$shim"
|
||||
makeWrapper "$shim" "$out/bin/lvim" \
|
||||
--set LUNARVIM_RUNTIME_DIR "$out" \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
fzf
|
||||
git
|
||||
ripgrep
|
||||
]
|
||||
}
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nixUnstable,
|
||||
cmake,
|
||||
pkg-config,
|
||||
boost,
|
||||
nlohmann_json,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-plugins";
|
||||
version = "d0df32b31f3054180741adf5865fd56d6731c572";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shlevy";
|
||||
repo = "nix-plugins";
|
||||
rev = version;
|
||||
sha256 = "sha256-Zbc0iq5ZAr73B+NJvpBHm9GIJhb9qrq0vFmV/ucNT5I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nixUnstable
|
||||
boost
|
||||
nlohmann_json
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Collection of miscellaneous plugins for the nix expression language";
|
||||
homepage = "https://github.com/shlevy/nix-plugins";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3bcbad2..cd79570 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -73,9 +73,6 @@ set(USE_SYSTEM_OPENCV
|
||||
if(USE_SYSTEM_OPENCV)
|
||||
if(OS_LINUX)
|
||||
find_package(OpenCV REQUIRED COMPONENTS core imgproc)
|
||||
- add_library(OpenCV SHARED IMPORTED)
|
||||
- set_target_properties(OpenCV PROPERTIES IMPORTED_LOCATION ${OpenCV_LIBRARIES})
|
||||
- set_target_properties(OpenCV PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenCV_INCLUDE_DIRS}")
|
||||
else()
|
||||
message(FATAL_ERROR "System OpenCV is only supported on Linux!")
|
||||
endif()
|
||||
@@ -86,7 +83,7 @@ endif()
|
||||
if(OS_WINDOWS)
|
||||
install(IMPORTED_RUNTIME_ARTIFACTS Onnxruntime::DirectML DESTINATION "${OBS_PLUGIN_DESTINATION}")
|
||||
endif()
|
||||
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Onnxruntime OpenCV)
|
||||
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Onnxruntime ${OpenCV_LIBRARIES})
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin|iOS")
|
||||
foreach(flags CMAKE_CXX_FLAGS CMAKE_OBJC_FLAGS CMAKE_OBJCXX_FLAGS)
|
||||
string(APPEND ${flags} " -fvisibility=hidden -fvisibility-inlines-hidden")
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c470020..c3849c7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,7 +1,9 @@
|
||||
cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
+option(GIT_TAG "The current git tag")
|
||||
+
|
||||
include(external/MunkeiVersionFromGit.cmake)
|
||||
-version_from_git()
|
||||
+version_from_git(${GIT_TAG})
|
||||
|
||||
# Change obs-plugintemplate to your plugin's name in a machine-readable format
|
||||
# (e.g.: obs-myawesomeplugin) and set
|
||||
diff --git a/external/MunkeiVersionFromGit.cmake b/external/MunkeiVersionFromGit.cmake
|
||||
index 15ab0d2..48c48bd 100644
|
||||
--- a/external/MunkeiVersionFromGit.cmake
|
||||
+++ b/external/MunkeiVersionFromGit.cmake
|
||||
@@ -24,64 +24,8 @@ cmake_minimum_required( VERSION 3.0.0 )
|
||||
|
||||
include( CMakeParseArguments )
|
||||
|
||||
-function( version_from_git )
|
||||
+function( version_from_git git_tag )
|
||||
# Parse arguments
|
||||
- set( options OPTIONAL FAST )
|
||||
- set( oneValueArgs
|
||||
- GIT_EXECUTABLE
|
||||
- INCLUDE_HASH
|
||||
- LOG
|
||||
- TIMESTAMP
|
||||
- )
|
||||
- set( multiValueArgs )
|
||||
- cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
|
||||
-
|
||||
- # Defaults
|
||||
- if( NOT DEFINED ARG_INCLUDE_HASH )
|
||||
- set( ARG_INCLUDE_HASH ON )
|
||||
- endif()
|
||||
-
|
||||
- if( DEFINED ARG_GIT_EXECUTABLE )
|
||||
- set( GIT_EXECUTABLE "${ARG_GIT_EXECUTABLE}" )
|
||||
- else ()
|
||||
- # Find Git or bail out
|
||||
- find_package( Git )
|
||||
- if( NOT GIT_FOUND )
|
||||
- message( FATAL_ERROR "[MunkeiVersionFromGit] Git not found" )
|
||||
- endif( NOT GIT_FOUND )
|
||||
- endif()
|
||||
-
|
||||
- # Git describe
|
||||
- execute_process(
|
||||
- COMMAND "${GIT_EXECUTABLE}" describe --tags
|
||||
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
- RESULT_VARIABLE git_result
|
||||
- OUTPUT_VARIABLE git_describe
|
||||
- ERROR_VARIABLE git_error
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- ERROR_STRIP_TRAILING_WHITESPACE
|
||||
- )
|
||||
- if( NOT git_result EQUAL 0 )
|
||||
- message( FATAL_ERROR
|
||||
- "[MunkeiVersionFromGit] Failed to execute Git: ${git_error}"
|
||||
- )
|
||||
- endif()
|
||||
-
|
||||
- # Get Git tag
|
||||
- execute_process(
|
||||
- COMMAND "${GIT_EXECUTABLE}" describe --tags --abbrev=0
|
||||
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
- RESULT_VARIABLE git_result
|
||||
- OUTPUT_VARIABLE git_tag
|
||||
- ERROR_VARIABLE git_error
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- ERROR_STRIP_TRAILING_WHITESPACE
|
||||
- )
|
||||
- if( NOT git_result EQUAL 0 )
|
||||
- message( FATAL_ERROR
|
||||
- "[MunkeiVersionFromGit] Failed to execute Git: ${git_error}"
|
||||
- )
|
||||
- endif()
|
||||
|
||||
if( git_tag MATCHES "^v(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)(-[.0-9A-Za-z-]+)?([+][.0-9A-Za-z-]+)?$" )
|
||||
set( version_major "${CMAKE_MATCH_1}" )
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
cmake,
|
||||
obs-studio,
|
||||
opencv,
|
||||
onnx-runtime,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "obs-backgroundremoval";
|
||||
version = "0.5.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "royshil";
|
||||
repo = "obs-backgroundremoval";
|
||||
rev = "a42c888ed578e026b31813fc5103ebfe48befebb";
|
||||
sha256 = "wCuvWn8BCzi/OrQnfXeUO2oJbw/wH1SUz1d2E/m8u9c=";
|
||||
};
|
||||
|
||||
# cmakeFlags = [ "-DGIT_TAG=v${version}" ];
|
||||
cmakeFlags = [
|
||||
"-DUSE_SYSTEM_ONNXRUNTIME=ON"
|
||||
"-DUSE_SYSTEM_OPENCV=ON"
|
||||
];
|
||||
patches = [ ./cmake_fix_opencv_link.patch ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/obs-plugins
|
||||
cp rundir/Release/obs-plugins/64bit/obs-backgroundremoval.so $out/lib/obs-plugins/
|
||||
|
||||
mkdir -p $out/share/obs/obs-plugins/obs-backgroundremoval
|
||||
cp -r rundir/Release/data/obs-plugins/obs-backgroundremoval/data/* $out/share/obs/obs-plugins/obs-backgroundremoval/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
opencv
|
||||
onnx-runtime
|
||||
obs-studio
|
||||
];
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{ stdenv }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "onnx-runtime";
|
||||
version = "1.14.1";
|
||||
# phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
src = builtins.fetchTarball {
|
||||
url = "https://github.com/microsoft/onnxruntime/releases/download/v1.14.1/onnxruntime-linux-x64-gpu-1.14.1.tgz";
|
||||
sha256 = "1hcxyhldxy5q0x50f96ni3p9v1n5qljarx7fvs63r6sk6j4yr2kv";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/include/onnxruntime/core/session
|
||||
mkdir -p $out/include/onnxruntime/core/providers/cpu
|
||||
mkdir -p $out/include/onnxruntime/core/providers/gpu
|
||||
|
||||
cp -r lib $out/
|
||||
cp -r include/ $out/
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "openfga";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfga";
|
||||
repo = "openfga";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fWSsTmb/vwoZ5CTsOOITZC/ZOEoAtWI42KSbTDKNdDY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/110Ocvcj/WRpqth6RFQQ0xj2WAkW/psDQcFZO2parI=";
|
||||
|
||||
subPackages = [ "cmd/openfga" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/openfga/openfga/internal/build.Version=v${version}"
|
||||
"-X=github.com/openfga/openfga/internal/build.Commit=${src.rev}"
|
||||
"-X=github.com/openfga/openfga/internal/build.Date=1970-01-01T00:00:00Z"
|
||||
"-X=github.com/openfga/openfga/internal/build.ProjectName=${pname}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high performance and flexible authorization/permission engine built for developers and inspired by Google Zanzibar";
|
||||
homepage = "https://github.com/openfga/openfga";
|
||||
changelog = "https://github.com/openfga/openfga/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "openfga";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
with pkgs;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-wayland-unwrapped";
|
||||
version = "1.7.5+wayland2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lbonn";
|
||||
repo = "rofi";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs "script"
|
||||
# root not present in build /etc/passwd
|
||||
sed -i 's/~root/~nobody/g' test/helper-expand.c
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = with pkgs; [
|
||||
libxkbcommon
|
||||
pango
|
||||
cairo
|
||||
git
|
||||
bison
|
||||
flex
|
||||
librsvg
|
||||
check
|
||||
libstartup_notification
|
||||
xorg.libxcb
|
||||
xorg.xcbutil
|
||||
xorg.xcbutilwm
|
||||
xcb-util-cursor
|
||||
xcbutilxrm
|
||||
which
|
||||
wayland-protocols
|
||||
wayland
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Window switcher, run dialog and dmenu replacement";
|
||||
homepage = "https://github.com/davatorium/rofi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ c0deaddict ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
13007
pkgs/zed/Cargo.lock
generated
13007
pkgs/zed/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,174 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
xcbuild,
|
||||
fontconfig,
|
||||
freetype,
|
||||
libgit2,
|
||||
openssl,
|
||||
sqlite,
|
||||
zlib,
|
||||
zstd,
|
||||
alsa-lib,
|
||||
libxkbcommon,
|
||||
wayland,
|
||||
xorg,
|
||||
stdenv,
|
||||
darwin,
|
||||
vulkan-loader,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed";
|
||||
version = "0.127.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-clMPXz6htCGoX7wcONo68kacPSvgrAd6SH5VDHSGyOM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"alacritty_terminal-0.22.1-dev" = "sha256-mWdZsKx7cNoyEdXyhOXsbS0L14H2uHYGWGBaRjNXJic=";
|
||||
"async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
|
||||
"blade-graphics-0.3.0" = "sha256-KgWcwgVd72Qi6KVlbwXiBDhgojumqWT5vtks7EGaRxc=";
|
||||
"bromberg_sl2-0.6.0" = "sha256-+bwdnk3EgYEAxQSP4KpEPicCfO+r2er1DRZjvfF4jSM=";
|
||||
"font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8=";
|
||||
"lsp-types-0.94.1" = "sha256-kplgPsafrgZFMI1D9pQCwmg+FKMn5HNWLbcgdXHUFVU=";
|
||||
"nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8=";
|
||||
"pathfinder_simd-0.5.2" = "sha256-fvMDo1U5Bh9Apa85pX882v4k7ST5Bw44Kt8jNk++FAw=";
|
||||
"taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw=";
|
||||
"tree-sitter-0.20.100" = "sha256-OQp3BMUgfLYlc9SdN+DNKN4g/CR63DibztbU3DTkNpw=";
|
||||
"tree-sitter-astro-0.0.1" = "sha256-FNnkti4Ypw4RGIrIL9GtgjlYFMmOWZ2f8uQg/h3xesA=";
|
||||
"tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=";
|
||||
"tree-sitter-c-sharp-0.20.0" = "sha256-DlnGIky33CuRKkVVS+tOTBLVOVzASXqdaUrZawh6LZc=";
|
||||
"tree-sitter-clojure-0.0.9" = "sha256-H0OEnsoJxcDqlJ32ac7KCS2stT02XKrZ/v4mGMoN2EI=";
|
||||
"tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM=";
|
||||
"tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU=";
|
||||
"tree-sitter-dart-0.0.1" = "sha256-FE6zXy0lAUWWayrM3urZFnQaEYBcnmaVANcUUnvw1q4=";
|
||||
"tree-sitter-dockerfile-0.1.0" = "sha256-uCKzTTbJL9Ans3lCQbt2zApF+ERLbbu5D1WcyWJ6Gf4=";
|
||||
"tree-sitter-elixir-0.1.0" = "sha256-hBHqQ3eBjknRPJjP+lQJU6NPFhUMtiv4FbKsTw28Bog=";
|
||||
"tree-sitter-elm-5.6.4" = "sha256-0LpuyebOB5ew9fULBcaw8aUbF7HM5sXQpv+Jroz4tXg=";
|
||||
"tree-sitter-gleam-0.34.0" = "sha256-VtuGsa8jKndxlyJKy9UHfZXvAgr63Q0iwceXKfEUAYE=";
|
||||
"tree-sitter-glsl-0.1.4" = "sha256-TRuiT3ndCeDCsCFokAN8cosNKccB0NjWVRiBJuBJXZw=";
|
||||
"tree-sitter-go-0.19.1" = "sha256-5+L5QqVjZyeh+sKfxKZWrjIBFE5xM9KZlHcLiHzJCIA=";
|
||||
"tree-sitter-gomod-1.0.2" = "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI=";
|
||||
"tree-sitter-gowork-0.0.1" = "sha256-lM4L4Ap/c8uCr4xUw9+l/vaGb3FxxnuZI0+xKYFDPVg=";
|
||||
"tree-sitter-haskell-0.14.0" = "sha256-QIGLxc2BPGqglvpInjmmP/9gUoPEX21WrxsoGOKP03o=";
|
||||
"tree-sitter-hcl-0.0.1" = "sha256-saVKSYUJY7OuIuNm9EpQnhFO/vQGKxCXuv3EKYOJzfs=";
|
||||
"tree-sitter-heex-0.0.1" = "sha256-6LREyZhdTDt3YHVRPDyqCaDXqcsPlHOoMFDb2B3+3xM=";
|
||||
"tree-sitter-json-0.20.0" = "sha256-fZNftzNavJQPQE4S1VLhRyGQRoJgbWA5xTPa8ZI5UX4=";
|
||||
"tree-sitter-markdown-0.0.1" = "sha256-F8VVd7yYa4nCrj/HEC13BTC7lkV3XSb2Z3BNi/VfSbs=";
|
||||
"tree-sitter-nix-0.0.1" = "sha256-+o+f1TlhcrcCB3TNw1RyCjVZ+37e11nL+GWBPo0Mxxg=";
|
||||
"tree-sitter-nu-0.0.1" = "sha256-V6EZfba5e0NdOG4n3DNI25luNXfcCN3+/vNYuz9llUk=";
|
||||
"tree-sitter-ocaml-0.20.4" = "sha256-ycmjIKfrsVSVHmPP3HCxfk5wcBIF/JFH8OnU8mY1Cc8=";
|
||||
"tree-sitter-prisma-io-1.4.0" = "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c=";
|
||||
"tree-sitter-proto-0.0.2" = "sha256-W0diP2ByAXYrc7Mu/sbqST6lgVIyHeSBmH7/y/X3NhU=";
|
||||
"tree-sitter-purescript-0.1.0" = "sha256-vnOeOeo3LjZbfj0C061oopjDpCOGv0TVg5nXuPcH29w=";
|
||||
"tree-sitter-racket-0.0.1" = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8=";
|
||||
"tree-sitter-scheme-0.2.0" = "sha256-K3+zmykjq2DpCnk17Ko9LOyGQTBZb1/dgVXIVynCYd4=";
|
||||
"tree-sitter-svelte-0.10.2" = "sha256-FZuzbTOP9LokPb77DSUwIXCFvMmDQPyyLKt7vNtEuAY=";
|
||||
"tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ=";
|
||||
"tree-sitter-typescript-0.20.2" = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
|
||||
"tree-sitter-vue-0.0.1" = "sha256-8v2e03A/Uj6zCJTH4j6TPwDQcNFeze1jepMADT6UVis=";
|
||||
"tree-sitter-yaml-0.0.1" = "sha256-S59jLlipBI2kwFuZDMmpv0TOZpGyXpbAizN3yC6wJ5I=";
|
||||
"tree-sitter-zig-0.0.1" = "sha256-a3W7eBUN4V3HD3YPr1+3tpuWQfIQy1Wu8qxCQx0hEnI=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
pkg-config
|
||||
protobuf
|
||||
rustPlatform.bindgenHook
|
||||
] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
curl
|
||||
fontconfig
|
||||
freetype
|
||||
libgit2
|
||||
openssl
|
||||
sqlite
|
||||
zlib
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
libxkbcommon
|
||||
wayland
|
||||
xorg.libxcb
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
AppKit
|
||||
CoreAudio
|
||||
CoreFoundation
|
||||
CoreGraphics
|
||||
CoreMedia
|
||||
CoreServices
|
||||
CoreText
|
||||
Foundation
|
||||
IOKit
|
||||
Metal
|
||||
Security
|
||||
SystemConfiguration
|
||||
VideoToolbox
|
||||
]
|
||||
);
|
||||
|
||||
buildFeatures = [ "gpui/runtime_shaders" ];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf --add-rpath ${vulkan-loader}/lib $out/bin/*
|
||||
'';
|
||||
|
||||
# Fail with "unimplemented error"
|
||||
checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"--skip=test_base_keymap"
|
||||
"--skip=test_bundled_settings_and_themes"
|
||||
"--skip=test_disabled_keymap_binding"
|
||||
"--skip=test_navigation"
|
||||
"--skip=test_new_empty_workspace"
|
||||
"--skip=test_open_and_save_new_file"
|
||||
"--skip=test_open_entry"
|
||||
"--skip=test_opening_excluded_paths"
|
||||
"--skip=test_open_paths"
|
||||
"--skip=test_open_paths_action"
|
||||
"--skip=test_pane_actions"
|
||||
"--skip=test_reopening_closed_items"
|
||||
"--skip=test_save_conflicting_item"
|
||||
"--skip=test_setting_language_when_saving_as_single_file_worktree"
|
||||
"--skip=test_window_edit_state"
|
||||
"--skip=test_open_add_new"
|
||||
"--skip=test_open_file_in_many_spaces"
|
||||
"--skip=test_open_non_existing_file"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
|
||||
homepage = "https://zed.dev";
|
||||
changelog = "https://github.com/zed-industries/zed/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [
|
||||
GaetanLepage
|
||||
niklaskorz
|
||||
];
|
||||
mainProgram = "zed";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
Loading…
Reference in a new issue