From fe576da503a424e8ca28b17127cb7a2680c6582e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Dec 2023 15:09:10 +0200 Subject: [PATCH] gnu: rust-ipconfig: Move to (gnu packages crates-windows). * gnu/packages/crates-io.scm (rust-ipconfig-0.3, rust-ipconfig-0.2): Move from here ... * gnu/packages/crates-windows.scm: ... to here. Change-Id: Ic4e968f6a7bc22cf92646e75f451de03e76112ed --- gnu/packages/crates-io.scm | 46 ------------------------------- gnu/packages/crates-web.scm | 1 + gnu/packages/crates-windows.scm | 48 +++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 46 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 237fd23875..7ed3a6f05c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33420,52 +33420,6 @@ library.") (license (list license:asl2.0 license:expat)))) -(define-public rust-ipconfig-0.3 - (package - (name "rust-ipconfig") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "ipconfig" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1gn5j5sp58mz0630dhs1b8by7j0jqagldbd5iyln690gp7qjlc5x")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-socket2" ,rust-socket2-0.4) - ("rust-widestring" ,rust-widestring-0.5) - ("rust-winapi" ,rust-winapi-0.3) - ("rust-winreg" ,rust-winreg-0.10)))) - (home-page "https://github.com/liranringel/ipconfig") - (synopsis "Get network adapters and configuration information for Windows") - (description "This package lets you get network adapters information and -network configuration for Windows.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-ipconfig-0.2 - (package - (inherit rust-ipconfig-0.3) - (name "rust-ipconfig") - (version "0.2.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "ipconfig" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1mzsagc6bk3i3fpggqlq8am5rxn4hgs297rsaya90w79xj5g3qpp")))) - (arguments - `(#:tests? #f ; failed to resolve: could not find `computer` in `ipconfig` - #:cargo-inputs - (("rust-socket2" ,rust-socket2-0.3) - ("rust-widestring" ,rust-widestring-0.4) - ("rust-winapi" ,rust-winapi-0.3) - ("rust-winreg" ,rust-winreg-0.6)))))) - (define-public rust-is-ci-1 (package (name "rust-is-ci") diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm index a1c0de634f..e25abcb085 100644 --- a/gnu/packages/crates-web.scm +++ b/gnu/packages/crates-web.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-gtk) #:use-module (gnu packages crates-tls) + #:use-module (gnu packages crates-windows) #:use-module (gnu packages gtk) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm index 923070c9af..576bfbe807 100644 --- a/gnu/packages/crates-windows.scm +++ b/gnu/packages/crates-windows.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Valentin Ignatev +;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2021 Nicolas Goaziou ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> @@ -261,6 +262,53 @@ inclusion of Windows resources in the most resilient fashion imaginable.") API library @code{gdi32}.") (license license:expat))) +(define-public rust-ipconfig-0.3 + (package + (name "rust-ipconfig") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ipconfig" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gn5j5sp58mz0630dhs1b8by7j0jqagldbd5iyln690gp7qjlc5x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-socket2" ,rust-socket2-0.4) + ("rust-widestring" ,rust-widestring-0.5) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winreg" ,rust-winreg-0.10)))) + (home-page "https://github.com/liranringel/ipconfig") + (synopsis "Get network adapters and configuration information for Windows") + (description "This package lets you get network adapters information and +network configuration for Windows.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-ipconfig-0.2 + (package + (inherit rust-ipconfig-0.3) + (name "rust-ipconfig") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "ipconfig" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mzsagc6bk3i3fpggqlq8am5rxn4hgs297rsaya90w79xj5g3qpp")))) + (arguments + `(#:tests? #f ; failed to resolve: could not find `computer` in `ipconfig` + #:cargo-inputs + (("rust-socket2" ,rust-socket2-0.3) + ("rust-widestring" ,rust-widestring-0.4) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winreg" ,rust-winreg-0.6)))))) + + (define-public rust-windows-0.48 (package (name "rust-windows")