From 9db889ce0daa377882baf5aaeab7f41f5dfe98e3 Mon Sep 17 00:00:00 2001 From: derped Date: Thu, 10 Jul 2025 22:05:36 +0200 Subject: [PATCH] pkgsets: remove haskell, rustpkgs and uniProgs. --- machines/Lilim/options.nix | 1 - pkgsets/haskell.nix | 17 ----------- pkgsets/rustpkgs.nix | 59 -------------------------------------- pkgsets/uniProgs.nix | 8 ------ 4 files changed, 85 deletions(-) delete mode 100644 pkgsets/haskell.nix delete mode 100644 pkgsets/rustpkgs.nix delete mode 100644 pkgsets/uniProgs.nix diff --git a/machines/Lilim/options.nix b/machines/Lilim/options.nix index 93030dd..278636f 100644 --- a/machines/Lilim/options.nix +++ b/machines/Lilim/options.nix @@ -28,7 +28,6 @@ "cpp" "dict" "extra" - "haskell" "latex" "mail_utils" "nodejs" diff --git a/pkgsets/haskell.nix b/pkgsets/haskell.nix deleted file mode 100644 index fc59edb..0000000 --- a/pkgsets/haskell.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - config, - lib, - fn, - pkgs, - ... -}: -{ - config.machine.pkgsets.haskell.pkgwrap = pkgs.haskellPackages.ghcWithPackages ( - pkgs: (fn.pkgFilter config.machine.pkgsets.haskell.pkgs) - ); - config.machine.pkgsets.haskell.pkgs = with pkgs.haskellPackages; [ - hindent - mtl - random - ]; -} diff --git a/pkgsets/rustpkgs.nix b/pkgsets/rustpkgs.nix deleted file mode 100644 index d391192..0000000 --- a/pkgsets/rustpkgs.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ config, ... }: -let - mozRust = - with builtins; - (map ( - p: - import ( - (fetchTarball { - url = "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed4.tar.gz"; - sha256 = "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3"; - }) - + p - ) - )) - [ - (toPath "/lib-overlay.nix") - (toPath "/rust-overlay.nix") - ]; - stablepkgs = import { overlays = mozRust; }; - - # https://rust-lang.github.io/rustup-components-history - nightly = stablepkgs.rustChannelOf { - date = "2020-06-10"; - channel = "nightly"; - }; - rustNightly = { - rustc = - nightly.rust.override { - extensions = [ - "clippy-preview" - "rls-preview" - "rust-analysis" - "rust-src" - "rustfmt-preview" - ]; - } - // { - src = nightly.rust-src; - }; - inherit (nightly) cargo; - }; - rustPNightly = stablepkgs.recurseIntoAttrs ( - stablepkgs.makeRustPlatform { - inherit (rustNightly) rustc cargo; - } - ); -in -{ - config.machine.pkgsets.rustpkgs.pkgs = - (with stablepkgs; [ - diesel-cli - carnix - rustracer - ]) - ++ (with rustNightly; [ - rustc - cargo - ]); -} diff --git a/pkgsets/uniProgs.nix b/pkgsets/uniProgs.nix deleted file mode 100644 index 141b3ed..0000000 --- a/pkgsets/uniProgs.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - config, - pkgs, - ... -}: -{ - config.machine.pkgsets.uniProgs.pkgs = with pkgs; [ qucs ]; -}