From patchwork Sun Apr 24 09:22:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 38776 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 C7FB127BBEA; Sun, 24 Apr 2022 10:23:33 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 38DCF27BBE9 for ; Sun, 24 Apr 2022 10:23:33 +0100 (BST) Received: from localhost ([::1]:42450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niYSq-0006zS-By for patchwork@mira.cbaines.net; Sun, 24 Apr 2022 05:23:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niYSS-0006zE-VJ for guix-patches@gnu.org; Sun, 24 Apr 2022 05:23:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1niYSM-0002kE-QE for guix-patches@gnu.org; Sun, 24 Apr 2022 05:23:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1niYSM-0000h5-H3 for guix-patches@gnu.org; Sun, 24 Apr 2022 05:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Apr 2022 09:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46848 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 46848@debbugs.gnu.org, Marius Bakke Received: via spool by 46848-submit@debbugs.gnu.org id=B46848.16507921712635 (code B ref 46848); Sun, 24 Apr 2022 09:23:02 +0000 Received: (at 46848) by debbugs.gnu.org; 24 Apr 2022 09:22:51 +0000 Received: from localhost ([127.0.0.1]:57613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niYS3-0000gH-3e for submit@debbugs.gnu.org; Sun, 24 Apr 2022 05:22:51 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:37401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niYS0-0000fy-1S for 46848@debbugs.gnu.org; Sun, 24 Apr 2022 05:22:41 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4KmN2x61Mjz9sTC; Sun, 24 Apr 2022 11:22:33 +0200 (CEST) Date: Sun, 24 Apr 2022 11:22:12 +0200 From: Lars-Dominik Braun Message-ID: References: <877daubeju.fsf@gnu.org> <87h78lwwfc.fsf@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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" X-getmail-retrieved-from-mailbox: Patches Hey again, sorry for the noise. During one of my many rebases I missed to add a file that should have been included in patch 3. See attached patch. Cheers, Lars From 6bb5578a47f795f54456d2f7e3c6949f5e0b3e13 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 24 Apr 2022 11:18:37 +0200 Subject: [PATCH v3 151/151] dirty: squash: Add missing file. --- gnu/packages/python-commencement.scm | 129 +++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 gnu/packages/python-commencement.scm diff --git a/gnu/packages/python-commencement.scm b/gnu/packages/python-commencement.scm new file mode 100644 index 0000000000..e0959c6e79 --- /dev/null +++ b/gnu/packages/python-commencement.scm @@ -0,0 +1,129 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2014 Andreas Enge +;;; Copyright © 2012 Nikita Karetnikov +;;; Copyright © 2014, 2015, 2017 Mark H Weaver +;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2020 Timothy Sample +;;; Copyright © 2020 Guy Fleury Iteriteka +;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Lars-Dominik Braun +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages python-commencement) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix build-system trivial) + #:use-module (gnu packages) + #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) + +(define-public python-toolchain + (package + (name "python-toolchain") + (version (package-version python)) + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder (begin + (use-modules (ice-9 match) + (srfi srfi-1) + (srfi srfi-26) + (guix build union)) + + (let ((out (assoc-ref %outputs "out"))) + (union-build out (filter-map (match-lambda + ((_ . directory) directory)) + %build-inputs)) + #t)))) + (inputs + `(("python" ,python-wrapper) + ("python-setuptools" ,python-setuptools) + ("python-pip" ,python-pip))) + (native-search-paths + (package-native-search-paths python)) + (search-paths + (package-search-paths python)) + (license (package-license python)) + (synopsis "Python toolchain") + (description + "Python toolchain including Python itself, setuptools and pip. Use this +package if you need a minimal Python toolchain instead of just the +interpreter.") + (home-page (package-home-page python)))) + +(define-public python2-toolchain + (package + (name "python2-toolchain") + (version (package-version python-2)) + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder (begin + (use-modules (ice-9 match) + (srfi srfi-1) + (srfi srfi-26) + (guix build union)) + + (let ((out (assoc-ref %outputs "out"))) + (union-build out (filter-map (match-lambda + ((_ . directory) directory)) + %build-inputs)) + #t)))) + (inputs + `(("python" ,python-2) + ("python2-setuptools" ,python2-setuptools) + ("python2-pip" ,python2-pip))) + (native-search-paths + (package-native-search-paths python-2)) + (search-paths + (package-search-paths python-2)) + (license (package-license python-2)) + (synopsis "Python toolchain") + (description + "Python toolchain including Python itself, setuptools and pip. Use this +package if you need a minimal Python toolchain instead of just the +interpreter.") + (home-page (package-home-page python-2)))) + +;; Python 3 toolchain for python-build-system. We cannot use python-toolchain +;; here, since we’d need to bootstrap python-pip somehow. +(define-public python-toolchain-for-build + (package + (inherit python-toolchain) + (name "python-toolchain-for-build") + (inputs + `(("python" ,python-wrapper) + ("python-setuptools" ,python-setuptools))))) + +(define-public python2-toolchain-for-build + (package + (inherit python2-toolchain) + (name "python2-toolchain-for-build") + (inputs + `(("python" ,python-2) + ("python2-setuptools" ,python2-setuptools))))) +