TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert parts of "gnu: Add i7z."

Browse source 
This reverts parts of commit a8b705252b,
because it's apparently revert things day, and also I'm an idiot
This commit is contained in:
Tobias Geerinckx-Rice 2021-06-29 01:13:06 +02:00
parent 98a85c78af
commit 54f0468fb5
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/radio.scm
View file

@ -481,13 +481,11 @@ (define-public gnuradio
(version "3.9.0.0") (version "3.9.0.0")
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append "https://www.gnuradio.org/releases/gnuradio/"
(url "https://github.com/gnuradio/gnuradio") "gnuradio-" version ".tar.xz"))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "1fbl8lslzrkx7lpkibhvs6gvhqnn8yrrq3n6irybfnifh2536d36")))) (base32 "1jvm9xd0l2pz1fww4zii6hl7ccnvy256nrf70ljb594n7j9j49ha"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -552,11 +550,6 @@ (define-public gnuradio
"/share/javascript/mathjax")) "/share/javascript/mathjax"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'make-source-writable
(lambda _
;; The test_add and test_newmod open(sources, "w") for some reason.
(for-each make-file-writable
(find-files "." ".*"))))
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((qwt (assoc-ref inputs "qwt"))) (let ((qwt (assoc-ref inputs "qwt")))

5
gnu/packages/shells.scm
View file

@ -945,7 +945,7 @@ (define-public gash-utils
(define-public nushell (define-public nushell
(package (package
(name "nushell") (name "nushell")
(version "0.33.0") (version "0.32.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -954,7 +954,7 @@ (define-public nushell
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0rdvvg6hf01bljq0zz0c66kbzy5ggbcbil1j45hklzq0ibffdj02")))) (base32 "1wj054rzv88ys4ask4zp7crrw0dxrck8svlj3i16qqd8x5dnyhqs"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:rust ,rust-1.47 `(#:rust ,rust-1.47
@ -995,7 +995,6 @@ (define-public nushell
("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.32) ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.32)
("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.32) ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.32)
("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.32) ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.32)
("rust-polars-0.13" ,rust-polars-0.13)
("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-dunce" ,rust-dunce-1) (("rust-dunce" ,rust-dunce-1)