From 8ea14f4ba1e09a5d675eaa29c68a7655b6752648 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 30 Dec 2024 22:26:28 +0100 Subject: [PATCH] rustpython: move to by-name --- .../interpreters/python => by-name/ru}/rustpython/Cargo.lock | 0 .../default.nix => by-name/ru/rustpython/package.nix} | 0 pkgs/development/interpreters/python/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 6 deletions(-) rename pkgs/{development/interpreters/python => by-name/ru}/rustpython/Cargo.lock (100%) rename pkgs/{development/interpreters/python/rustpython/default.nix => by-name/ru/rustpython/package.nix} (100%) diff --git a/pkgs/development/interpreters/python/rustpython/Cargo.lock b/pkgs/by-name/ru/rustpython/Cargo.lock similarity index 100% rename from pkgs/development/interpreters/python/rustpython/Cargo.lock rename to pkgs/by-name/ru/rustpython/Cargo.lock diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/by-name/ru/rustpython/package.nix similarity index 100% rename from pkgs/development/interpreters/python/rustpython/default.nix rename to pkgs/by-name/ru/rustpython/package.nix diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 3ca7ce093f22..7acfabc25255 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -206,9 +206,4 @@ in { pythonVersion = "3.9"; inherit passthruFun; }; - - rustpython = darwin.apple_sdk_11_0.callPackage ./rustpython/default.nix { - inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; - }; - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65e0026d344..844ba5a100d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7398,7 +7398,7 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python314 python3Minimal pypy27 pypy310 pypy39 rustpython; + inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python314 python3Minimal pypy27 pypy310 pypy39; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ];