summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKasper GaƂkowski <k@galkowski.xyz>2023-05-23 21:29:05 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-05-29 08:39:03 +0000
commit698710b1b5c21ceef9bf8353446a02c06dab317a (patch)
tree696b08f44262b4e20c4677293df1421f87e7cf9c
parentstumpwm: Fix package conflict and HOME errors when loading modules (diff)
downloadnixpkgs-origin/backport-232913-to-release-23.05.tar.gz
(cherry picked from commit eb1c777cef1c21767aa27ae69d09733f785a6f7a)
-rw-r--r--pkgs/development/lisp-modules/packages.nix2
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index db6251ee7e6a..3bc7e276122d 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -350,6 +350,8 @@ let
'';
});
+ stumpwm-unwrapped = super.stumpwm;
+
ltk = super.ltk.overrideLispAttrs (o: {
src = pkgs.fetchzip {
url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f23cb279bd5..c93509506bee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34293,6 +34293,8 @@ with pkgs;
stumpwm = sbclPackages.stumpwm;
+ stumpwm-unwrapped = sbclPackages.stumpwm-unwrapped;
+
sublime = callPackage ../applications/editors/sublime/2 { };
sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });