From d4bd55db8fa213c5a455c78f92fb24c8bfea44d3 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Sat, 14 Oct 2023 17:01:51 +0200 Subject: home: cleaned up old mu version --- flake.lock | 14 +++++--------- flake.nix | 6 ++---- home/newsboat-public.nix | 2 +- pkgs/overlay.nix | 3 --- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 0acb27b..7d02973 100644 --- a/flake.lock +++ b/flake.lock @@ -235,7 +235,7 @@ "type": "github" } }, - "nixpkgs-oldstable": { + "nixpkgs-22_11": { "locked": { "lastModified": 1688392541, "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", @@ -245,10 +245,9 @@ "type": "github" }, "original": { - "owner": "NixOS", - "ref": "release-22.11", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" } }, "nixpkgs-unstable": { @@ -295,7 +294,6 @@ "isabelle-utils": "isabelle-utils", "nix-gleam": "nix-gleam", "nixpkgs": "nixpkgs", - "nixpkgs-oldstable": "nixpkgs-oldstable", "nixpkgs-unstable": "nixpkgs-unstable", "playground": "playground", "rust-overlay": "rust-overlay", @@ -353,9 +351,7 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "nixpkgs-22_11": [ - "nixpkgs-oldstable" - ], + "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index d6e466b..318a804 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,12 @@ { description = '' - stuebinm's flake stuff. re-use of packages defined here is free, - but perhaps don't depend on anything actually working or being maintained + stuebinm's flake stuff. feel free to reuse parts you find useful, but + I suggest you don't depend on any of them actually working. ''; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nixpkgs-oldstable.url = "github:NixOS/nixpkgs/release-22.11"; home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -17,7 +16,6 @@ "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs-unstable"; simple-nixos-mailserver.inputs.nixpkgs-23_05.follows = "nixpkgs"; - simple-nixos-mailserver.inputs.nixpkgs-22_11.follows = "nixpkgs-oldstable"; rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix index 7d355d5..87a87ea 100644 --- a/home/newsboat-public.nix +++ b/home/newsboat-public.nix @@ -177,7 +177,7 @@ with import ./newsboat-lib.nix; (btag "https://linus.dev/feed.xml" "comp") (btag "https://www.dianeduane.com/outofambit/feed/" "books") (btag "https://going-medieval.com/atom.xml" "history") - + (btag "https://blog.briancmoses.com/atom.xml" "comp") # paper (btag "http://arxiv.org/rss/cs.PL" "paper") diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 15781d9..cf1f7e5 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -3,7 +3,6 @@ self: super: let unstable = inputs.nixpkgs-unstable.legacyPackages.${self.system}; - oldstable = inputs.nixpkgs-oldstable.legacyPackages.${self.system}; crs-tools = self.callPackage ./crs-tools.nix {}; rustPlatform = self.makeRustPlatform { cargo = self.rust-bin.stable.latest.minimal; @@ -100,8 +99,6 @@ in ''; }; - mu = oldstable.mu; - matrix-to = self.callPackage ./matrix-to.nix {}; inherit (unstable) lean4; -- cgit v1.2.3