On Mon, Feb 05, 2018 at 05:39:50PM -0500, dpg wrote: > Sending a new patch, this will apply cleaner and has an actually good commit > message :-)
Thanks! But it still didn't apply :) > From 300c37a8d9818cfc1a6315d2113cf58b110e1664 Mon Sep 17 00:00:00 2001 > From: DoublePlusGood <[email protected]> > Date: Mon, 5 Feb 2018 17:26:34 -0500 > Subject: [PATCH] gnu: python: Add python2-gyp > > * gnu/packages/python.scm: Added python2-gyp library. > + ;; Google does not release versions, > + ;; based on second most recent commit date. > + (version "2017-10-11") As described in the manual section Version Numbers, we handle versioning of version control checkouts in a specific way: https://www.gnu.org/software/guix/manual/html_node/Version-Numbers.html#Version-Numbers This allows us to ensure that the versions always increase and can be used to refer back to the upstream version control repository. At least in Git, dates are not meaningful. They can be set to anything with the --date parameter. We also have the special helper functions git-version and git-file-name to make it easy to use the standard versioning scheme. I standardized the version and source file-name as in the attached diff, standardized the commit message, updated the copyright date, and pushed the result as commit 956ba99cb799889e0a0bc0f657f4e31b4f830775.
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f77491a90..45ef7b5b6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -46,7 +46,7 @@ ;;; Copyright © 2017 Muriithi Frederick Muriuki <[email protected]> ;;; Copyright © 2017 Brendan Tildesley <[email protected]> ;;; Copyright © 2018 Fis Trivial <[email protected]> -;;; Copyright © 2017 Ethan R. Jones <[email protected]> +;;; Copyright © 2018 Ethan R. Jones <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -12420,30 +12420,31 @@ style guide, even if the original code didn't violate the style guide.") (package-with-python2 python-yapf)) (define-public python-gyp - (package - (name "python-gyp") - ;; Google does not release versions, - ;; based on second most recent commit date. - (version "2017-10-11") - (source - (origin - ;; Google does not release tarballs, - ;; git checkout is needed. - (method git-fetch) - (uri (git-reference - (url "https://chromium.googlesource.com/external/gyp";) - (commit "5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f"))) - (sha256 - (base32 - "0fr7nxcrk292djmxzpcjaphnsd123k31gp8jnd91vwknhq6snmv9")))) - (build-system python-build-system) - (home-page "https://gyp.gsrc.io/";) - (synopsis "GYP is a Meta-Build system") - (description - "GYP builds build systems for large, cross platform applications. -It can be used to generate XCode projects, Visual Studio projects, -Ninja build files, and Makefiles.") - (license license:bsd-3))) + (let ((commit "5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f") + (revision "0")) + (package + (name "python-gyp") + (version (git-version "0.0.0" revision commit)) + (source + (origin + ;; Google does not release tarballs, + ;; git checkout is needed. + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/external/gyp";) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fr7nxcrk292djmxzpcjaphnsd123k31gp8jnd91vwknhq6snmv9")))) + (build-system python-build-system) + (home-page "https://gyp.gsrc.io/";) + (synopsis "GYP is a Meta-Build system") + (description + "GYP builds build systems for large, cross platform applications. +It can be used to generate XCode projects, Visual Studio projects, Ninja build +files, and Makefiles.") + (license license:bsd-3)))) (define-public python2-gyp (package-with-python2 python-gyp))
signature.asc
Description: PGP signature
