From 792d0477fd7c4aa98b408419f00d3780f2836400 Mon Sep 17 00:00:00 2001 From: traxys Date: Sun, 4 Jun 2023 12:01:07 +0200 Subject: [PATCH] pkgs: Remove packages introduced in nixpkgs --- flake.lock | 34 ---------------------------------- flake.nix | 10 +--------- pkgs/default.nix | 4 ---- pkgs/dotacat.nix | 7 ------- 4 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/dotacat.nix diff --git a/flake.lock b/flake.lock index 9f52901..062066d 100644 --- a/flake.lock +++ b/flake.lock @@ -45,22 +45,6 @@ "type": "github" } }, - "dotacat": { - "flake": false, - "locked": { - "lastModified": 1674819296, - "narHash": "sha256-y+u9PO01W+IzBatGHZpgOD7cRKjdeuy4/VX7/V9cu3Q=", - "ref": "refs/heads/master", - "rev": "f3b7e7816bed6b84123e066c57cf4003d77a85f1", - "revCount": 31, - "type": "git", - "url": "https://gitlab.scd31.com/stephen/dotacat.git" - }, - "original": { - "type": "git", - "url": "https://gitlab.scd31.com/stephen/dotacat.git" - } - }, "fast-syntax-highlighting": { "flake": false, "locked": { @@ -941,22 +925,6 @@ "type": "github" } }, - "oscclip": { - "flake": false, - "locked": { - "lastModified": 1685688144, - "narHash": "sha256-SCozOb6fbExYF81GZlZApHv1XmufXDUcUllqQ/gd+cY=", - "owner": "rumpelsepp", - "repo": "oscclip", - "rev": "bb9d35e1b27bd6f61627000dfcc03534514c3eb3", - "type": "github" - }, - "original": { - "owner": "rumpelsepp", - "repo": "oscclip", - "type": "github" - } - }, "plugin:clangd_extensions-nvim": { "flake": false, "locked": { @@ -1794,7 +1762,6 @@ "root": { "inputs": { "comma": "comma", - "dotacat": "dotacat", "fast-syntax-highlighting": "fast-syntax-highlighting", "home-manager": "home-manager", "kabalist": "kabalist", @@ -1806,7 +1773,6 @@ "nixpkgs": "nixpkgs_6", "nur": "nur", "nvim-traxys": "nvim-traxys", - "oscclip": "oscclip", "powerlevel10k": "powerlevel10k", "raclette": "raclette", "roaming_proxy": "roaming_proxy", diff --git a/flake.nix b/flake.nix index 8e45a74..37693ee 100644 --- a/flake.nix +++ b/flake.nix @@ -29,19 +29,11 @@ url = "github:simulationcraft/simc"; flake = false; }; - oscclip = { - url = "github:rumpelsepp/oscclip"; - flake = false; - }; kabalist = { url = "github:traxys/kabalist"; flake = false; }; roaming_proxy.url = "github:traxys/roaming_proxy"; - dotacat = { - url = "git+https://gitlab.scd31.com/stephen/dotacat.git"; - flake = false; - }; zsh-nix-shell = { url = "github:chisui/zsh-nix-shell"; flake = false; @@ -64,7 +56,7 @@ } @ inputs: let sources = system: { - inherit (inputs) oscclip simulationcraft kabalist dotacat; + inherit (inputs) simulationcraft kabalist; } // (nixpkgs.legacyPackages."${system}".callPackage ./_sources/generated.nix {}); diff --git a/pkgs/default.nix b/pkgs/default.nix index b7bdb10..2c79a6c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,10 +12,6 @@ kabalist-src = sources.kabalist; }; warcraftlogs = callPackage ./warcraftlogs.nix {warcraftlogs-src = sources.warcraftlogs;}; - dotacat = callPackage ./dotacat.nix { - inherit naersk; - dotacatSrc = sources.dotacat; - }; frg = callPackage ./frg.nix {}; lemminx-bin = callPackage ./lemminx-bin.nix {}; bonnie = callPackage ./bonnie {}; diff --git a/pkgs/dotacat.nix b/pkgs/dotacat.nix deleted file mode 100644 index 6e13ec9..0000000 --- a/pkgs/dotacat.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - naersk, - dotacatSrc, -}: -naersk.buildPackage { - root = dotacatSrc; -}