From 3709a4a9229b73d8134217ffcdb839d2b9632dcb Mon Sep 17 00:00:00 2001 From: Leon Schumacher Date: Wed, 12 Jun 2024 15:47:55 +0200 Subject: [PATCH] Remove stuff that is cached elsewhere Lanzaboote v0.4.1 is in nix-community.cachix.org. XWaylandVideoBridge and gtk4-layer-shell are in nixpkgs. --- README.md | 3 -- flake.nix | 16 ++--------- packages/XWaylandVideoBridge.nix | 47 -------------------------------- packages/gtk4-layer-shell.nix | 42 ---------------------------- 4 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 packages/XWaylandVideoBridge.nix delete mode 100644 packages/gtk4-layer-shell.nix diff --git a/README.md b/README.md index 3d4561b..bd9e0b7 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ A personal collection of unusual things | Name | Description | Homepage | |------|-------------|----------| |`9mount`|A set of SUID tools for mounting 9p filesystems via v9fs|https://sqweek.net/code/9mount| -|`XWaylandVideoBridge`|Utility to allow streaming Wayland windows to X applications|https://invent.kde.org/system/xwaylandvideobridge| |`agregore`|A minimal browser for the distributed web|https://github.com/AgregoreWeb/agregore-browser| |`bedrockdb`|Rock solid distributed database specializing in active/active automatic failover and WAN replication|https://bedrockdb.com| |`capnp-go`|Cap'n Proto library and code generator for Go|https://github.com/capnproto/go-capnp| @@ -18,7 +17,6 @@ A personal collection of unusual things |`flameshot-fixed`|A fork of Flameshot without selection lag, configured to work with Wayland|https://github.com/lbatalha/flameshot| |`foot-transparent`|A patched version of the foot terminal emulator that brings back fullscreen transparency|https://github.com/NotAShelf/nyxpkgs/blob/main/pkgs/applications/terminal-emulators/foot-transparent/default.nix| |`fusepod`|A userspace filesystem which mounts your iPod.|https://github.com/keegancsmith/FUSEPod| -|`gtk4-layer-shell`|A library to desktop components for Wayland using the Layer Shell protocol and GTK4|https://github.com/wmww/gtk4-layer-shell| |`jade`|Pug template engine for Go|https://github.com/Joker/jade| |`libhpke`|HPKE implementation in C|https://github.com/oktaysm/hpke| |`lone`|The standalone Linux Lisp|https://github.com/lone-lang/lone| @@ -26,7 +24,6 @@ A personal collection of unusual things |`msp-cgt`|MSP430 code generation tools|https://www.ti.com/tool/MSP-CGT| |`mspgcc-ti`|Open Source Compiler for MSP Microcontrollers|https://www.ti.com/tool/MSP430-GCC-OPENSOURCE| |`my-htop`|htop with sorting in tree mode fixed|https://htop.dev| -|`my-lzbt`|Secure Boot for NixOS - pinned to v0.3.0|https://github.com/nix-community/lanzaboote| |`my-ncmpcpp`|ncmpcpp except the media library always shows Albums - Songs|https://rybczak.net/ncmpcpp/| |`photoview`|Photo gallery for self-hosted personal servers|https://photoview.github.io| |`prettier-plugin-go-template`|Fixes prettier formatting for go templates|https://github.com/NiklasPor/prettier-plugin-go-template| diff --git a/flake.nix b/flake.nix index 780c2a9..c00edb3 100644 --- a/flake.nix +++ b/flake.nix @@ -11,19 +11,16 @@ inherit (nixpkgs-pin.lib) mapAttrsToList pipe recursiveUpdate; nyx = builtins.getFlake "github:notashelf/nyxpkgs/a9c2ef2ea7c4b7e5036f7c60108df2bbcfc9a3c4?narHash=sha256-NiL7KfpHhUx7zLVFKtwPz7d9uJq/ABQEqf1y/lTWSGI="; - lanza030 = builtins.getFlake "github:nix-community/lanzaboote/64b903ca87d18cef2752c19c098af275c6e51d63?narHash=sha256-Fb5TeRTdvUlo/5Yi2d%2BFC8a6KoRLk2h1VE0/peMhWPs%3D"; mkPackages = system: - let pkgs = import nixpkgs-pin { inherit system; }; in rec { + let pkgs = import nixpkgs-pin { inherit system; }; in { "9mount" = pkgs.callPackage ./packages/9mount { }; - XWaylandVideoBridge = pkgs.callPackage ./packages/XWaylandVideoBridge.nix { }; agregore = pkgs.callPackage ./packages/agregore { }; bedrockdb = pkgs.callPackage ./packages/bedrockdb { }; capnp-go = pkgs.callPackage ./packages/capnp-go.nix { }; e2eirc = pkgs.callPackage ./packages/e2eirc { }; flameshot-fixed = pkgs.callPackage ./packages/flameshot-fixed.nix { }; fusepod = pkgs.callPackage ./packages/fusepod.nix { }; - gtk4-layer-shell = pkgs.callPackage ./packages/gtk4-layer-shell.nix { }; jade = pkgs.callPackage ./packages/jade.nix { }; libhpke = pkgs.callPackage ./packages/libhpke { }; lone = pkgs.callPackage ./packages/lone { }; @@ -36,7 +33,7 @@ redis-json = pkgs.callPackage ./packages/redis-json { }; sae_pk_gen = pkgs.callPackage ./packages/sae_pk_gen.nix { }; samloader = pkgs.callPackage ./packages/samloader.nix { }; - wayland-shell = pkgs.callPackage ./packages/wayland-shell.nix { inherit gtk4-layer-shell; }; + wayland-shell = pkgs.callPackage ./packages/wayland-shell.nix { }; foot-transparent = nyx.packages.${system}.foot-transparent // { meta.description = "A patched version of the foot terminal emulator that brings back fullscreen transparency"; @@ -55,13 +52,6 @@ }; }); - my-lzbt = lanza030.packages.${system}.lzbt.overrideAttrs (_: { - meta = { - description = "Secure Boot for NixOS - pinned to v0.3.0"; - homepage = "https://github.com/nix-community/lanzaboote"; - }; - }); - my-ncmpcpp = pkgs.ncmpcpp.overrideAttrs (old: { patches = [ ./packages/my-ncmpcpp.patch ]; meta = old.meta // { @@ -100,8 +90,6 @@ "9mount" = import ./packages/9mount/module.nix { packages = self.outputs.packages; }; - - inherit (lanza030.nixosModules) lanzaboote; }; templates = let dir = ./templates; in pipe dir [ diff --git a/packages/XWaylandVideoBridge.nix b/packages/XWaylandVideoBridge.nix deleted file mode 100644 index 2c4c358..0000000 --- a/packages/XWaylandVideoBridge.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ fetchgit -, stdenv - -, cmake -, extra-cmake-modules -, libsForQt5 -}: -let - kpipewire-custom = libsForQt5.kpipewire.overrideAttrs (old: { - src = fetchgit { - url = "https://invent.kde.org/plasma/kpipewire"; - rev = "31b24a4cfc021d7f077499dc8af71b4a22b51ffc"; - hash = "sha256-ML1MYNWph/EXgou7Jn3tSfp6m1C32oIRi9Fi4AXQNIg="; - }; - }); -in -stdenv.mkDerivation rec { - pname = "XWaylandVideoBridge"; - version = "4a72e7c19884c5a87a2cbfcf01c5293199196e1e"; - - src = fetchgit { - url = "https://invent.kde.org/system/xwaylandvideobridge"; - rev = version; - hash = "sha256-tkLvKZ52bbcHrTSEciSlTv5UVncJsnFW7IoWWiTsols="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = with libsForQt5; [ - ki18n - knotifications - kpipewire-custom - kwidgetsaddons - kwindowsystem - qt5.qtx11extras.dev - wrapQtAppsHook - ]; - - meta = { - description = "Utility to allow streaming Wayland windows to X applications"; - homepage = "https://invent.kde.org/system/xwaylandvideobridge"; - mainProgram = "xwaylandvideobridge"; - }; -} diff --git a/packages/gtk4-layer-shell.nix b/packages/gtk4-layer-shell.nix deleted file mode 100644 index bbe7263..0000000 --- a/packages/gtk4-layer-shell.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ fetchFromGitHub -, stdenv - -, meson -, ninja -, pkg-config -, vala - -, gobject-introspection -, gtk4 -}: stdenv.mkDerivation rec { - pname = "gtk4-layer-shell"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "wmww"; - repo = pname; - rev = "v${version}"; - hash = "sha256-MG/YW4AhC2joUX93Y/pzV4s8TrCo5Z/I3hAT70jW8dw="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - gobject-introspection - gtk4 - ]; - - mesonFlags = [ "-Dexamples=true" ]; - - meta = { - description = "A library to desktop components for Wayland using the Layer Shell protocol and GTK4"; - homepage = "https://github.com/wmww/gtk4-layer-shell"; - pkgConfigModules = [ "gtk4-layer-shell-0" ]; - mainProgram = "gtk4-layer-demo"; - }; -}