diff options
| author | Rutherther <rutherther@ditigal.xyz> | 2025-11-20 22:47:11 +0100 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-11-22 15:32:22 +0000 |
| commit | d5b980cfa1cdfd29b9f99e74760eaa55eb765df4 (patch) | |
| tree | 80e1371e50752d2fb674c9f2a42fa99e88e236e6 | |
| parent | b5da2b372d45019d1914c9595352540ba316ce0c (diff) | |
gnu: Remove store path occurrences.
When running `make dist`, it is checked that there are no store paths in
the resulting dist folder. Specifically through the
`assert-no-store-file-names` target.
I think that this target makes sense and this commit has workarounds for
currently embedded store paths. Two of those are comments. Maybe the
target could be changed to ignore those in the future. But the hash is
not important, so just replace it with <hash>.
As for crate tests, I decided to split the string instead of removing
it, although it seems to me it might safely be removed, but I am not
completely sure about the intent here.
* gnu/packages/astronomy.scm (python-jplephem-2.22): Remove store hash
from comment.
* gnu/packages/golang-build.scm (golang-org-x-exp): Likewise.
* tests/import/crate.scm (temp-file): Split store path's hash.
Change-Id: I709f29a9dfab626d194c41d12e53e0380a148217
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
| -rw-r--r-- | gnu/packages/astronomy.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/golang-build.scm | 2 | ||||
| -rw-r--r-- | tests/import/crate.scm | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 52b3f1aada2..d43f7f67746 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -5361,7 +5361,7 @@ milliarcsecond).") (arguments (list ;; FIXME: OSError: [Errno 30] Read-only file system: - ;; '/gnu/store/4az2pl6mslrdh9wcxd5r3dmr4spr5y94-python-3.11.11/lib/python3.11/@test_43_tmpæ.pyc' + ;; '/gnu/store/<hash>-python-3.11.11/lib/python3.11/@test_43_tmpæ.pyc' #:tests? #f #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index f0a7f9c95a1..f2b91a0e030 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -766,7 +766,7 @@ language.") ;; modules disabled by GO111MODULE=off; see 'go help modules' "TestRelease_gitRepo_uncommittedChanges" ;; constraints_test.go:104: - ;; /gnu/store/vr0097qq0kl1ansn6iv5smysjh9v7ycd-go-1.24.3/lib/go/bin/go + ;; /gnu/store/<hash>-go-1.24.3/lib/go/bin/go ;; mod tidy: exit status 1 go: modules disabled by ;; GO111MODULE=off; see 'go help modules' "TestFailure") diff --git a/tests/import/crate.scm b/tests/import/crate.scm index b5599e5d482..d0fa582ad1a 100644 --- a/tests/import/crate.scm +++ b/tests/import/crate.scm @@ -293,8 +293,9 @@ version = \"25.2.0\"\n" port))) (mock ((guix scripts download) guix-download (lambda _ - (format #t "~a~%~a~%" - "/gnu/store/in056fyrz6nvy3jpxrxglgj30g0lwniv-smithay-0cd3345" + (format #t "~a/~a~%~a~%" + "/gnu/store" + "in056fyrz6nvy3jpxrxglgj30g0lwniv-smithay-0cd3345" "191h87bpzg0l1ihfb4hmx00b86pfb5mwwc6s8i49al0vigc14l37"))) (let-values (((source-expressions cargo-inputs-entry) |