From patchwork Tue Apr 30 13:44:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Note X-Patchwork-Id: 63700 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6001427BBEA; Tue, 30 Apr 2024 14:46:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F420127BBE2 for ; Tue, 30 Apr 2024 14:46:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1no6-0006q0-Ln; Tue, 30 Apr 2024 09:46:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1nni-0006j3-S5 for guix-patches@gnu.org; Tue, 30 Apr 2024 09:45:49 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1nni-0008VQ-Hl; Tue, 30 Apr 2024 09:45:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1no2-0003f8-1M; Tue, 30 Apr 2024 09:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70672] ["PATCH core-updates" 1/1] gnu: python: Fix python's idle installation. Resent-From: Jean-Baptiste Note Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 30 Apr 2024 13:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70672@debbugs.gnu.org Cc: Jean-Baptiste Note , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 70672-submit@debbugs.gnu.org id=B70672.171448475414072 (code B ref 70672); Tue, 30 Apr 2024 13:46:01 +0000 Received: (at 70672) by debbugs.gnu.org; 30 Apr 2024 13:45:54 +0000 Received: from localhost ([127.0.0.1]:59507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1nnt-0003eu-MZ for submit@debbugs.gnu.org; Tue, 30 Apr 2024 09:45:54 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:42208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1nns-0003em-H2 for 70672@debbugs.gnu.org; Tue, 30 Apr 2024 09:45:52 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41adf3580dbso34055325e9.0 for <70672@debbugs.gnu.org>; Tue, 30 Apr 2024 06:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=m4x.org; s=gapps; t=1714484725; x=1715089525; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d0/zkE7KMPi+QAKtBMT8QDaWwyO9ebejGIKY+G5rMHE=; b=Mf/T1r1JXMdUQwaDw5w8LYviUYbaWc5N0rgHDvflAUZxMQUO3PJBo2dTGQi1RasUA4 neGh4aAILQmPKlN0/AOyVDeagWlNZvdm65HYdhdqDj9BelWXOQt0oJj3o6O0RQ2es+tG zn1fYeyfCb74SK6DO4Ly8A5e37L0joRQP9agM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714484725; x=1715089525; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d0/zkE7KMPi+QAKtBMT8QDaWwyO9ebejGIKY+G5rMHE=; b=XEpLgv0WaC8Mc43+lGmsqM/kZg4V5ydJgNO34umgW0b40pQxDe8rUtKg4oYrj0UWb2 rRAP200LrsHY4cpy64OWE2FifMe+dWE4hPVxikeB6NZmNIgcjxqLerahWrRezVsFZ/nJ 2TdIDq4R42V6MiPtk+dAlMQcInB755Xfwx6DsaPx25zstnJAHbJAMWo7W/2m69UTJT0K yLScx6BQS0P69lyEa/W+wMqZIiT0oabVSNSSYAAWO+49Mx+YJPZdib0fszdjsbGWaUdh P37rdF9j1+flTaOSj1L343nPfTP49nRtglm+qnyuR43TAQyeyX6C0/9vG/kQ3NlrLXvN a0CQ== X-Gm-Message-State: AOJu0YzxoQYJEH5PnK5xhge+9iQgkOo56iOOuiMEtW7C//nrJnXbEsEq ric1Frh9J2UkPJJzzePU6KWDSA8LSFjETP3svnV+hTelqkwgnKQRsstBQUCoTE3aHD9OzIJnYae CawjHZJMIFLTfQClr59pg6SJDcvMohxskNU0d9HjIsWX7b63wPGqaVm+kv/yFDxE2ZW3c7F3fSE QjqXbM7NISIb6V0lmIVKHqj0fvdpWj+lhXQmGBYVTrc12KbCZGbEAGAA1SoOiH7ic= X-Google-Smtp-Source: AGHT+IHpEr8pZb6KLQehtBRQA9aW5Kw4hl9lbKIy2u4O10W/N9Ij8Cd+ckgtUBSDMSOf6NDz6hgYQA== X-Received: by 2002:a05:600c:1391:b0:41c:a9:26b3 with SMTP id u17-20020a05600c139100b0041c00a926b3mr2944978wmf.19.1714484725315; Tue, 30 Apr 2024 06:45:25 -0700 (PDT) Received: from guixrules.lan (lfbn-idf3-1-1143-125.w90-46.abo.wanadoo.fr. [90.46.90.125]) by smtp.gmail.com with ESMTPSA id n26-20020a05600c3b9a00b0041bf87e702asm11146566wms.10.2024.04.30.06.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 06:45:24 -0700 (PDT) From: Jean-Baptiste Note Date: Tue, 30 Apr 2024 13:44:59 +0000 Message-ID: <5f443c4e6f3ce7a489a8ab71e5d65b1fe7dd68c8.1714483770.git.jean-baptiste.note@m4x.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python.scm (python-2.7): Fix idle output for python-2.7. --- gnu/packages/python.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b2757c651e..b41e75ed45 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -345,12 +345,15 @@ (define-public python-2.7 (install-file file (dirname target)) (delete-file file))) (find-files (string-append out "/bin") "^idle")) + ;; The idlelib directory is in OUT/lib/pythonX.Y, but we + ;; want it under IDLE/lib/pythonX.Y/site-packages. (match (find-files out "^idlelib$" #:directories? #t) ((idlelib) (let* ((len (string-length out)) (target (string-append idle "/" - (string-drop idlelib len) - "/site-packages"))) + (string-drop + (dirname idlelib) len) + "/site-packages/idlelib"))) (mkdir-p (dirname target)) (rename-file idlelib target)))))))) (add-after 'move-idle 'rebuild-bytecode