From a873cead74057063088a03db3db20a26f4685947 Mon Sep 17 00:00:00 2001 From: guolin Date: Tue, 20 Oct 2026 17:46:04 +0800 Subject: [PATCH] chore: drop the unused Nix and Renovate files Remove the flake, Nix packaging, Garnix CI and Renovate config; this repository does not use them. --- .envrc | 2 - .gitignore | 5 --- REUSE.toml | 8 +--- flake.lock | 104 ------------------------------------------------ flake.nix | 50 ----------------------- garnix.yaml | 4 -- nix/default.nix | 90 ----------------------------------------- renovate.json | 14 ------- 8 files changed, 1 insertion(+), 276 deletions(-) delete mode 100644 .envrc delete mode 100644 flake.lock delete mode 100644 flake.nix delete mode 100644 garnix.yaml delete mode 100644 nix/default.nix delete mode 100644 renovate.json diff --git a/.envrc b/.envrc deleted file mode 100644 index 3bb5244..0000000 --- a/.envrc +++ /dev/null @@ -1,2 +0,0 @@ -watch_file nix/default.nix -use flake diff --git a/.gitignore b/.gitignore index da01e77..e2094f0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,6 @@ build/ *.user -# nix -.direnv/ -result -result-* - # clangd compile_commands.json diff --git a/REUSE.toml b/REUSE.toml index f9b8f63..536008e 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -3,7 +3,7 @@ SPDX-PackageName = "ddm" SPDX-PackageDownloadLocation = "https://github.com/linuxdeepin/ddm" [[annotations]] -path = [".github/**", "garnix.yaml"] +path = [".github/**"] precedence = "aggregate" SPDX-FileCopyrightText = "None" SPDX-License-Identifier = "CC0-1.0" @@ -20,12 +20,6 @@ precedence = "aggregate" SPDX-FileCopyrightText = "None" SPDX-License-Identifier = "CC0-1.0" -[[annotations]] -path = ["**.nix", ".envrc", "flake.lock", "renovate.json"] -precedence = "aggregate" -SPDX-FileCopyrightText = "None" -SPDX-License-Identifier = "CC0-1.0" - [[annotations]] path = "docs/**" precedence = "aggregate" diff --git a/flake.lock b/flake.lock deleted file mode 100644 index b10bcc8..0000000 --- a/flake.lock +++ /dev/null @@ -1,104 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "treeland-protocols": "treeland-protocols" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treeland-protocols": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nix-filter": [ - "nix-filter" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756440142, - "narHash": "sha256-wO89wmKLMnHvjB19vPMGetutdPlji32ZHSnTll3+eFY=", - "owner": "linuxdeepin", - "repo": "treeland-protocols", - "rev": "d8d6294b133aa7b02229e4311085773f623fe46f", - "type": "github" - }, - "original": { - "owner": "linuxdeepin", - "repo": "treeland-protocols", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 847f62b..0000000 --- a/flake.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - description = "A basic flake to help develop treeland"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - nix-filter.url = "github:numtide/nix-filter"; - treeland-protocols = { - url = "github:linuxdeepin/treeland-protocols"; - inputs = { - nixpkgs.follows = "nixpkgs"; - nix-filter.follows = "nix-filter"; - flake-utils.follows = "flake-utils"; - }; - }; - }; - - outputs = { self, nixpkgs, flake-utils, nix-filter, treeland-protocols }@input: - flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" "riscv64-linux" ] - (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - - ddm = pkgs.qt6Packages.callPackage ./nix { - nix-filter = nix-filter.lib; - treeland-protocols = treeland-protocols.packages.${system}.default; - }; - in - { - packages = { - default = ddm; - }; - - devShells.default = pkgs.mkShell { - inputsFrom = [ - self.packages.${system}.default - ]; - - shellHook = - let - makeQtpluginPath = pkgs.lib.makeSearchPathOutput "out" pkgs.qt6.qtbase.qtPluginPrefix; - in - '' - #export WAYLAND_DEBUG=1 - export QT_PLUGIN_PATH=${makeQtpluginPath (with pkgs.qt6; [ qtbase ])} - ''; - }; - } - ); -} diff --git a/garnix.yaml b/garnix.yaml deleted file mode 100644 index aac3532..0000000 --- a/garnix.yaml +++ /dev/null @@ -1,4 +0,0 @@ -builds: - exclude: - - 'nixosConfigurations.*' - - 'packages.*.qemu' diff --git a/nix/default.nix b/nix/default.nix deleted file mode 100644 index f82aec0..0000000 --- a/nix/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ stdenv -, lib -, nix-filter -, cmake -, extra-cmake-modules -, pkg-config -, wayland-scanner -, qttools -, wrapQtAppsHook -, qtbase -, pam -, libxcrypt -, treeland-protocols -, wayland -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ddm"; - version = "0.2.0"; - - src = nix-filter.filter { - root = ./..; - - exclude = [ - ".git" - "debian" - "LICENSES" - "README.md" - "README.zh_CN.md" - (nix-filter.matchExt "nix") - ]; - }; - - postPatch = '' - for file in $(grep -rl "/usr/bin") - do - substituteInPlace $file \ - --replace-fail "/usr/bin" "/run/current-system/sw/bin" - done - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - qttools - wrapQtAppsHook - wayland-scanner - ]; - - buildInputs = [ - qtbase - pam - libxcrypt - treeland-protocols - wayland - ]; - - cmakeFlags = [ - "-DCONFIG_FILE=/etc/ddm.conf" - "-DCONFIG_DIR=/etc/ddm.conf.d" - - # Set UID_MIN and UID_MAX so that the build script won't try - # to read them from /etc/login.defs (fails in chroot). - # The values come from NixOS; they may not be appropriate - # for running DDM outside NixOS, but that configuration is - # not supported anyway. - "-DUID_MIN=1000" - "-DUID_MAX=29999" - - # we still want to run the DM on VT 7 for the time being, as 1-6 are - # occupied by getties by default - "-DDDM_INITIAL_VT=7" - - "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" - "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system" - "-DSYSTEMD_SYSUSERS_DIR=${placeholder "out"}/lib/sysusers.d" - "-DSYSTEMD_TMPFILES_DIR=${placeholder "out"}/lib/tmpfiles.d" - "-DDBUS_CONFIG_DIR=${placeholder "out"}/share/dbus-1/system.d" - ]; - - meta = { - description = "DDM is a fork of SDDM"; - homepage = "https://github.com/linuxdeepin/ddm"; - license = with lib.licenses; [ gpl2Only ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ rewine ]; - }; -}) - diff --git a/renovate.json b/renovate.json deleted file mode 100644 index bd185ea..0000000 --- a/renovate.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:base"], - "lockFileMaintenance": { - "enabled": true, - "extends": ["schedule:daily"] - }, - "nix": { - "enabled": true - }, - "git-submodules": { - "enabled": true - } -}