Re: Re: [PATCH] gnu: Add python2-gyp
On February 5, 2018 6:11:25 PM EST, Leo Famulari wrote: >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 >> 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. Wow, thank you! I have a couple other patches on my personal branch and I'll be sure to apply similar changes. -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: Re: [PATCH] gnu: Add python2-gyp
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 > 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 ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2017 Ethan R. Jones +;;; Copyright © 2018 Ethan R. Jones ;;; ;;; 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
Re: Re: [PATCH] gnu: Add python2-gyp
Sending a new patch, this will apply cleaner and has an actually good commit message :-) Thanks!From 300c37a8d9818cfc1a6315d2113cf58b110e1664 Mon Sep 17 00:00:00 2001 From: DoublePlusGood Date: Mon, 5 Feb 2018 17:26:34 -0500 Subject: [PATCH] gnu: python: Add python2-gyp * gnu/packages/python.scm: Added python2-gyp library. --- gnu/packages/python.scm | 30 ++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 832afe835..967aad50a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Ethan R. Jones ;;; ;;; This file is part of GNU Guix. ;;; @@ -12180,3 +12181,32 @@ such as figshare or Zenodo.") (define-public python2-semver (package-with-python2 python-semver)) + +(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))) + +(define-public python2-gyp + (package-with-python2 python-gyp)) -- 2.14.1 signature.asc Description: This is a digitally signed message part
Re: Re: [PATCH] gnu: Add python2-gyp
> Hi doubleplusgood23, > > doubleplusgoo...@gmail.com skribis: > > > From 1eff5aea55f171a09ab65bd7f75e39cd05ffd88b Mon Sep 17 00:00:00 2001 > > From: dpg > > Date: Fri, 2 Feb 2018 20:44:32 -0500 > > Subject: [PATCH 1/2] Initial changes (not tested) > > Not very confidence-inspiring. :-) > > Please take a look at: > > https://www.gnu.org/software/guix/manual/html_node/Submitting-Patches.html > > It’s a good idea to send patches that you think are ready. If you have > issues while packaging, it’s better to ask for help on specific issues > on help-g...@gnu.org and/or IRC. > > Thanks, > Ludo’. Hello! Thanks for looking at my patch. The initial patch there was just uploading a skeleton over git so I could debug on my guix laptop. I was trying to squash the commit properly but clearly I messed up. I can assure you the commit has been through the linter, has had repeated builds, and is functional as a library. This is just a single patch for my larger goal to package Telegram, so it can sit on the backburner for a bit. Thanks! -- dpg PGP Key: DA3ABDDC176CEF90 signature.asc Description: This is a digitally signed message part
Re: [PATCH] gnu: Add python2-gyp
Hi doubleplusgood23, doubleplusgoo...@gmail.com skribis: > From 1eff5aea55f171a09ab65bd7f75e39cd05ffd88b Mon Sep 17 00:00:00 2001 > From: dpg > Date: Fri, 2 Feb 2018 20:44:32 -0500 > Subject: [PATCH 1/2] Initial changes (not tested) Not very confidence-inspiring. :-) Please take a look at: https://www.gnu.org/software/guix/manual/html_node/Submitting-Patches.html It’s a good idea to send patches that you think are ready. If you have issues while packaging, it’s better to ask for help on specific issues on help-g...@gnu.org and/or IRC. Thanks, Ludo’.
[PATCH] gnu: Add python2-gyp
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 - From 1eff5aea55f171a09ab65bd7f75e39cd05ffd88b Mon Sep 17 00:00:00 2001 From: dpg Date: Fri, 2 Feb 2018 20:44:32 -0500 Subject: [PATCH 1/2] Initial changes (not tested) - --- gnu/packages/python.scm | 28 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 832afe835..690666e1d 100644 - --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Ethan R. Jones ;;; ;;; This file is part of GNU Guix. ;;; @@ -12180,3 +12181,30 @@ such as figshare or Zenodo.") (define-public python2-semver (package-with-python2 python-semver)) + +(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 + "1xpswckilk29v5rkrkzy9w2ahbvqywp5j6l4c4ix57z360w1f4xi" +(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)) - -- 2.14.1 - From dc8cc1e5fbc8211fc691530291428acc71274b3a Mon Sep 17 00:00:00 2001 From: DoublePlusGood Date: Fri, 2 Feb 2018 23:02:37 -0500 Subject: [PATCH 2/2] gnu: Added python2-gyp * gnu/packages/python.scm: New copyright * gnu/packages/python.scm (python2-gyp): Added meta-builder gyp - --- gnu/packages/python.scm | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 690666e1d..967aad50a 100644 - --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12185,25 +12185,27 @@ such as figshare or Zenodo.") (define-public python-gyp (package (name "python-gyp") - -;; Google does not release versions, based on second most recent commit date. +;; 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. + ;; 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 + (uri (git-reference + (url "https://chromium.googlesource.com/external/gyp";) + (commit "5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f"))) + (sha256 (base32 - - "1xpswckilk29v5rkrkzy9w2ahbvqywp5j6l4c4ix57z360w1f4xi" + "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."). + "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 - -- 2.14.1 -BEGIN PGP SIGNATURE- iQIcBAEBCgAGBQJadTh3AAoJEJER+4l63L/ceAoP/jRCyLl8jHxZEHpkob1zndtw wVCsAuNRN/7Nl3mejnNUCjKP59oN5RajcqxzYnD/peA/C8HWOWbVmSU3tIAMep5z SxRq/Hcu9l/5xuuqBXDrdC72CwUvajN8bswOUoBZ1nyL1v9jw3+Cm9Rkn2mB8BV9 toS/ehNSLslfs2ewSvnRO5LZ19oexUrCzYZpp7RG5OjsdJVnc06QgEjkI72XUNqO 5vU5yysl3kdCHB1QN3e+njX/zeqyhqVvSblnblgSkm00C328A/lec40SuHlIJN4f Py0IJNZwHiV7YDB1rP3im2bPHm0pVrry9dVO/Wm4po/Qs+WzqrUm4k9PEITsO8BC eeuAoBMlkLKSoMo0bTFxVqfVhMpxhBbvtZ0r7/JGThWvKhzBLOaaovUYIyd6atBn l1J49sPOtiM7HJK8ZyLUFhK1omq84wpUltaGRJZgebDqd1WkdC6Oe8sGQNeLMCGk 6IhK9sBPb4dB2AJ2Lw6bOpN2mMiJMg6sVE/kCFkoZ4dcc5iHSzTlTyXxYZvctx5n uGq3QSWEhu6Rol/kFr2VR+l19Fd5ZsGtcZdXiYj+duzi0EI0c6ch2dbynxFWlM/R GklCPYqNhHFdA7bC1bENxtg7zucKnor7e+z8C0Qly9Hu8OU79LCgQ6LMnS1wuI1H Ct446mlfqxoxrxCISTRr =s201 -END PGP SIGNATURE-