summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Kądziołka <kuba@kadziolka.net>2020-08-03 19:11:41 +0200
committerJakub Kądziołka <kuba@kadziolka.net>2020-08-04 15:57:31 +0200
commitb79e249aa028a4f3c7e0bf7fc47927aac2f6aae3 (patch)
tree1279c33fb41339bbe5b24a09eb36b8db6d5f0392
parentea660581c727086fa0f2ea54aa0df30c90cec46c (diff)
downloadguix-b79e249aa028a4f3c7e0bf7fc47927aac2f6aae3.tar.gz
gnu: Add rust-nix-0.17.
* gnu/packages/crates-io.scm (rust-nix-0.17): New variable.
  (rust-nix-0.15): Inherit from rust-nix-0.17.
-rw-r--r--gnu/packages/crates-io.scm42
1 files changed, 28 insertions, 14 deletions
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3cb97caf8a..3a8ca14bb6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14472,10 +14472,10 @@ cryptographic library.")
 release (fork of debug_unreachable)")
     (license license:expat)))
 
-(define-public rust-nix-0.15
+(define-public rust-nix-0.17
   (package
     (name "rust-nix")
-    (version "0.15.0")
+    (version "0.17.0")
     (source
      (origin
        (method url-fetch)
@@ -14484,16 +14484,7 @@ release (fork of debug_unreachable)")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0aa2l7wg9pzx24ks4p97gdy09a4hhs1sr9drxnm75v906d7hnbiv"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Unpin the dependency on tempfile, as it was withheld for MSRV
-           ;; concerns, which don't matter for Guix:
-           ;; https://github.com/nix-rust/nix/commit/98531c8f04bc23fb632c08e06dc4e56284b9c027
-           (substitute* "Cargo.toml"
-             (("version = \">= 3.0.5, < 3.0.9\"") "version = \"3.0.5\""))
-           #t))))
+         "0qvk09kib3jpvpbaps0682nav20ibql61pf1s2h8jx9v5igpir2h"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; test suite hangs
@@ -14512,10 +14503,33 @@ release (fork of debug_unreachable)")
         ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/nix-rust/nix")
     (synopsis "Rust friendly bindings to *nix APIs")
-    (description
-     "Rust friendly bindings to *nix APIs.")
+    (description "Rust friendly bindings to *nix APIs.")
     (license license:expat)))
 
+(define-public rust-nix-0.15
+  (package
+    (inherit rust-nix-0.17)
+    (name "rust-nix")
+    (version "0.15.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nix" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0aa2l7wg9pzx24ks4p97gdy09a4hhs1sr9drxnm75v906d7hnbiv"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Unpin the dependency on tempfile, as it was withheld for MSRV
+           ;; concerns, which don't matter for Guix:
+           ;; https://github.com/nix-rust/nix/commit/98531c8f04bc23fb632c08e06dc4e56284b9c027
+           (substitute* "Cargo.toml"
+             (("version = \">= 3.0.5, < 3.0.9\"") "version = \"3.0.5\""))
+           #t))))))
+
 (define-public rust-nix-0.14
   (package
     (inherit rust-nix-0.15)