diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch b/pkgs/by-name/ne/nemo-python/load-extensions-from-env.patch similarity index 100% rename from pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch rename to pkgs/by-name/ne/nemo-python/load-extensions-from-env.patch diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/pkgs/by-name/ne/nemo-python/package.nix similarity index 86% rename from pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix rename to pkgs/by-name/ne/nemo-python/package.nix index f2a872b71e96..867000c8d71d 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix +++ b/pkgs/by-name/ne/nemo-python/package.nix @@ -10,12 +10,16 @@ , python3 }: -let - srcs = import ../srcs.nix { inherit fetchFromGitHub; }; -in stdenv.mkDerivation rec { pname = "nemo-python"; - inherit (srcs) version src; + version = "6.2.0"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "nemo-extensions"; + rev = version; + sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; + }; sourceRoot = "${src.name}/nemo-python"; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch b/pkgs/by-name/ne/nemo-python/python-path.patch similarity index 100% rename from pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch rename to pkgs/by-name/ne/nemo-python/python-path.patch diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 91383d68fb37..72ebc54624f5 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { }; cinnamon-screensaver = callPackage ./cinnamon-screensaver { }; cinnamon-session = callPackage ./cinnamon-session { }; - nemo-python = callPackage ./nemo-extensions/nemo-python { }; nemo-with-extensions = callPackage ./nemo/wrapper.nix { }; muffin = callPackage ./muffin { }; }) // lib.optionalAttrs config.allowAliases { @@ -30,6 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; { nemo = lib.warn "cinnamon.nemo was moved to top-level. Please use pkgs.nemo directly." pkgs.nemo; # Added on 2024-07-22 nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22 nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22 + nemo-python = lib.warn "cinnamon.nemo-python was moved to top-level. Please use pkgs.nemo-python directly." pkgs.nemo-python; # Added on 2024-07-22 nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14 pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14 warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14 diff --git a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix deleted file mode 100644 index 3629b84b4a59..000000000000 --- a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ fetchFromGitHub }: - -rec { - # When you bump this, you should make sure all nemo-extensions - # are actually using this file since we try to deal with tags - # like nemo-fileroller-5.6.1 according to upstream's wishes. - version = "6.2.0"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = "nemo-extensions"; - rev = version; - sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; - }; -}