From 4f6a7598fd1f4c9e5c6b2cb8e8f226f54c53b68b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 1 Jan 2022 20:54:57 +0200 Subject: [PATCH] remove upstreamed packages --- wip/gitea.scm | 25 --------------- wip/utahfs.scm | 85 -------------------------------------------------- 2 files changed, 110 deletions(-) diff --git a/wip/gitea.scm b/wip/gitea.scm index 51b34c8..8c6c7c0 100644 --- a/wip/gitea.scm +++ b/wip/gitea.scm @@ -5038,31 +5038,6 @@ object storage.") (description "Package cutter provides a function to crop image.") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go - (package - (name "go-github-com-aws-aws-sdk-go") - (version "1.42.25") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "01y5cnhwwl8xka7hb8x3gjdc90f19j7myi3n89mghvxd6y42zjc6")))) - (build-system go-build-system) - (arguments '(#:import-path "github.com/aws/aws-sdk-go")) - (propagated-inputs - (list go-golang-org-x-net - go-github-com-pkg-errors - go-github-com-jmespath-go-jmespath)) - (home-page "https://github.com/aws/aws-sdk-go") - (synopsis "AWS SDK for Go") - (description - "Package sdk is the official AWS SDK for the Go programming language.") - (license license:asl2.0))) - (define-public go-github-com-fortytw2-leaktest (package (name "go-github-com-fortytw2-leaktest") diff --git a/wip/utahfs.scm b/wip/utahfs.scm index 2fac63b..b73aa28 100644 --- a/wip/utahfs.scm +++ b/wip/utahfs.scm @@ -124,91 +124,6 @@ what's being stored.") file systems from Go.") (license license:asl2.0)))) -;; TODO: Figure out which, if any, go files are pre-generated -(define-public go-github-com-aws-aws-sdk-go - (package - (name "go-github-com-aws-aws-sdk-go") - (version "1.20.20") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1mp0c9173328r67iica662013jnshiv8yg2p5zgs0kr5sh3ri0ws")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "vendor") #t)))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/aws/aws-sdk-go" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-files-writable - (lambda* (#:key import-path #:allow-other-keys) - (for-each make-file-writable - (find-files (string-append "src/" import-path))) - #t)) - (add-after 'unpack 'adjust-failing-tests - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (substitute* "aws/credentials/processcreds/provider_test.go" - (("/bin/sleep") (which "sleep"))) - ;; expects a git repository. - (delete-file "models/apis/check_collisions_test.go") - #t))) - (replace 'build - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (invoke "make" "generate")))) - (replace 'check - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (invoke "make" "unit"))))))) - (propagated-inputs - `(("go-github-com-jmespath-gojmespath" ,go-github-com-jmespath-gojmespath))) - (native-inputs - `(;; Needed to generate the code - ("go-golang-org-x-net" ,go-golang-org-x-net) - ;; Needed for the tests: - ("go-golang-org-x-text" ,go-golang-org-x-text))) - (home-page "https://aws.amazon.com/sdk-for-go/") - (synopsis "AWS SDK for the Go programming language") - (description - "@code{aws-sdk-go} is the official AWS SDK for the Go programming language.") - (license license:asl2.0))) - -(define-public go-github-com-jmespath-gojmespath - (let ((commit "c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5") - (revision "20180206201540")) - (package - (name "go-github-com-jmespath-gojmespath") - (version (git-version "0.2.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jmespath/go-jmespath") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/jmespath/go-jmespath")) - (native-inputs - `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) - (home-page "https://github.com/jmespath/go-jmespath") - (synopsis "Golang implementation of JMESPath") - (description "@code{go-jmespath} is a GO implementation of JMESPath, which -is a query language for JSON. It will take a JSON document and transform it -into another JSON document through a JMESPath expression.") - (license license:asl2.0)))) - (define-public go-gopkg-in-kothar-go-backblaze-v0 (let ((commit "7594ed38700f5ca3fc7da8f8c7b91b0526ee66f2") (revision "1"))