From c7ba3deafe006379f386fe336065c29cd2587ddd Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sun, 23 Feb 2025 09:52:57 +0700
Subject: [PATCH] :wastebasket: clean up legacy packages
---
flake.lock | 34 -----------------------------
flake.nix | 16 --------------
homes/palo/packages/development.nix | 2 --
homes/palo/packages/graphics.nix | 3 ++-
homes/palo/packages/nextcloud.nix | 2 +-
homes/palo/packages/social.nix | 2 --
homes/palo/taskwarrior.nix | 1 -
nix/packages/default.nix | 3 ---
8 files changed, 3 insertions(+), 60 deletions(-)
diff --git a/flake.lock b/flake.lock
index 8c10190..0eeeb1f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -822,38 +822,6 @@
"type": "github"
}
},
- "nixpkgs-legacy_2211": {
- "locked": {
- "lastModified": 1688392541,
- "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-22.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-legacy_2311": {
- "locked": {
- "lastModified": 1720535198,
- "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-23.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-legacy_2405": {
"locked": {
"lastModified": 1735563628,
@@ -1224,8 +1192,6 @@
"nixos-anywhere": "nixos-anywhere",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5",
- "nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
- "nixpkgs-legacy_2311": "nixpkgs-legacy_2311",
"nixpkgs-legacy_2405": "nixpkgs-legacy_2405",
"nixpkgs-legacy_2411": "nixpkgs-legacy_2411",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
diff --git a/flake.nix b/flake.nix
index 8c7618b..1dbc7b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,8 +22,6 @@
nix-topology.url = "github:oddlama/nix-topology";
nixos-anywhere.url = "github:nix-community/nixos-anywhere";
nixos-hardware.url = "github:nixos/nixos-hardware";
- nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11";
- nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-legacy_2405.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-legacy_2411.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
@@ -72,8 +70,6 @@
nixos-anywhere,
nixos-hardware,
nixpkgs,
- nixpkgs-legacy_2211,
- nixpkgs-legacy_2311,
nixpkgs-legacy_2405,
nixpkgs-legacy_2411,
nixpkgs-unstable-small,
@@ -124,18 +120,6 @@
inherit allowUnfree permittedInsecurePackages;
};
};
- legacy_2211 = import nixpkgs-legacy_2211 {
- inherit system;
- config = {
- inherit allowUnfree permittedInsecurePackages;
- };
- };
- legacy_2311 = import nixpkgs-legacy_2311 {
- inherit system;
- config = {
- inherit allowUnfree permittedInsecurePackages;
- };
- };
legacy_2405 = import nixpkgs-legacy_2405 {
inherit system;
config = {
diff --git a/homes/palo/packages/development.nix b/homes/palo/packages/development.nix
index 95c05e7..64bf82c 100644
--- a/homes/palo/packages/development.nix
+++ b/homes/palo/packages/development.nix
@@ -47,8 +47,6 @@ with lib;
termtosvg
vhs
- #legacy_2311.blockdiag
-
# nomad
#nomad
#vault
diff --git a/homes/palo/packages/graphics.nix b/homes/palo/packages/graphics.nix
index bede073..920a383 100644
--- a/homes/palo/packages/graphics.nix
+++ b/homes/palo/packages/graphics.nix
@@ -26,7 +26,8 @@ with lib;
# CAD & 3D Plotting
openscad
fstl
- legacy_2311.cura
+
+ # cura
qrencode
diff --git a/homes/palo/packages/nextcloud.nix b/homes/palo/packages/nextcloud.nix
index fe0b8f5..751b160 100644
--- a/homes/palo/packages/nextcloud.nix
+++ b/homes/palo/packages/nextcloud.nix
@@ -7,7 +7,7 @@
with pkgs;
with lib;
let
- nextcloud-client = pkgs.legacy_2311.nextcloud-client;
+ nextcloud-client = pkgs.nextcloud-client;
nextcloudSync =
folder:
diff --git a/homes/palo/packages/social.nix b/homes/palo/packages/social.nix
index 64b48ca..8c6945a 100644
--- a/homes/palo/packages/social.nix
+++ b/homes/palo/packages/social.nix
@@ -13,8 +13,6 @@ with lib;
home.packages = [
emoji-picker
signal-desktop
- #legacy_2311.fluffychat
- #fluffychat
];
};
diff --git a/homes/palo/taskwarrior.nix b/homes/palo/taskwarrior.nix
index e2e8d8d..35ccb6f 100644
--- a/homes/palo/taskwarrior.nix
+++ b/homes/palo/taskwarrior.nix
@@ -8,7 +8,6 @@ with lib;
with types;
let
- #taskwarrior-tui = pkgs.legacy_2311.taskwarrior-tui;
taskwarrior-tui = pkgs.taskwarrior-tui;
taskwarrior = pkgs.taskwarrior3;
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
index 27a370d..d7c3131 100644
--- a/nix/packages/default.nix
+++ b/nix/packages/default.nix
@@ -4,9 +4,6 @@
perSystem =
{ pkgs, system, ... }:
with pkgs;
- let
- legacy_2311 = import inputs.nixpkgs-legacy_2311 { inherit system; };
- in
{
packages.pkl = callPackage ./pkl { };
packages.otpmenu = callPackage ./otpmenu { };