Merge pull request #33024 from peterhoeg/u/sblim

openwsman: 2.6.0 -> 2.6.5
This commit is contained in:
Graham Christensen 2017-12-24 08:30:57 -05:00 committed by GitHub
commit 63ac0b0114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 68 deletions

View File

@ -1,16 +1,20 @@
{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, libxml2, curl, cmake, pam, sblim-sfcc }: { stdenv, fetchFromGitHub, cmake, pkgconfig
, curl, libxml2, pam, sblim-sfcc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.6.0";
name = "openwsman-${version}"; name = "openwsman-${version}";
version = "2.6.5";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/Openwsman/openwsman/archive/v${version}.tar.gz"; owner = "Openwsman";
sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4"; repo = "openwsman";
rev = "v${version}";
sha256 = "1r0zslgpcr4m20car4s3hsccy10xcb39qhpw3dhpjv42xsvvs5xv";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ autoconf automake libtool libxml2 curl cmake pam sblim-sfcc ];
buildInputs = [ curl libxml2 pam sblim-sfcc ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_RUBY_GEM=no" "-DCMAKE_BUILD_RUBY_GEM=no"
@ -22,18 +26,13 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-more-warnings"; configureFlags = "--disable-more-warnings";
meta = { meta = with stdenv.lib; {
description = "Openwsman server implementation and client api with bindings"; description = "Openwsman server implementation and client API with bindings";
downloadPage = https://github.com/Openwsman/openwsman/releases;
homepage = https://github.com/Openwsman/openwsman; homepage = https://openwsman.github.io;
downloadPage = "https://github.com/Openwsman/openwsman/releases"; license = licenses.bsd3;
maintainers = with maintainers; [ deepfire ];
maintainers = [ stdenv.lib.maintainers.deepfire ]; platforms = platforms.unix;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
inherit version; inherit version;
}; };
} }

View File

@ -1,30 +1,28 @@
{ fetchgit, stdenv, autoconf, automake, libtool, curl }: { stdenv, fetchFromGitHub, autoreconfHook, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.2.9";
name = "sblim-sfcc-${version}"; name = "sblim-sfcc-${version}";
version = "2.2.9"; # this is technically 2.2.9-preview
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/kkaempf/sblim-sfcc.git"; owner = "kkaempf";
rev = "f70fecb410a53531e4fe99d39cf81b581819cac9"; repo = "sblim-sfcc";
sha256 = "1hsxim284qzldh599gf6khxj80g8q5263xl3lj3hdndxbhbs843v"; rev = "514a76af2020fd6dc6fc380df76cbe27786a76a2";
sha256 = "06c1mskl9ixbf26v88w0lvn6v2xd6n5f0jd5mckqrn9j4vmh70hs";
}; };
preConfigure = "./autoconfiscate.sh"; buildInputs = [ curl ];
buildInputs = [ autoconf automake libtool curl ]; nativeBuildInputs = [ autoreconfHook ];
meta = { enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Small Footprint CIM Client Library"; description = "Small Footprint CIM Client Library";
homepage = https://sourceforge.net/projects/sblim/;
homepage = https://sourceforge.net/projects/sblim/; license = licenses.cpl10;
maintainers = with maintainers; [ deepfire ];
maintainers = [ stdenv.lib.maintainers.deepfire ]; platforms = platforms.unix;
license = stdenv.lib.licenses.cpl10;
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
inherit version; inherit version;
}; };
} }

View File

@ -1,45 +1,36 @@
{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, openwsman, openssl }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, openssl, openwsman }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.6.0";
name = "wsmancli-${version}"; name = "wsmancli-${version}";
version = "2.6.0";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/Openwsman/wsmancli/archive/v${version}.tar.gz"; owner = "Openwsman";
sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn"; repo = "wsmancli";
rev = "v${version}";
sha256 = "0a67fz9lj7xkyfqim6ai9kj7v6hzx94r1bg0g0l5dymgng648b9j";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ autoconf automake libtool openwsman openssl ];
preConfigure = '' buildInputs = [ openwsman openssl ];
./bootstrap
configureFlagsArray=( postPatch = ''
LIBS="-L${openssl.out}/lib -lssl -lcrypto" touch AUTHORS NEWS README
)
''; '';
meta = { meta = with stdenv.lib; {
description = "Openwsman command-line client"; description = "Openwsman command-line client";
longDescription = ''
longDescription = Openwsman provides a command-line tool, wsman, to perform basic
'' Openwsman provides a command-line tool, wsman, to perform basic operations on the command-line. These operations include Get, Put,
operations on the command-line. These operations include Get, Put, Invoke, Identify, Delete, Create, and Enumerate. The command-line tool
Invoke, Identify, Delete, Create, and Enumerate. The command-line tool also has several switches to allow for optional features of the
also has several switches to allow for optional features of the WS-Management specification and Testing.
WS-Management specification and Testing. '';
''; downloadPage = https://github.com/Openwsman/wsmancli/releases;
inherit (openwsman.meta) homepage license maintainers platforms;
homepage = https://github.com/Openwsman/wsmancli;
downloadPage = "https://github.com/Openwsman/wsmancli/releases";
maintainers = [ stdenv.lib.maintainers.deepfire ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
inherit version; inherit version;
}; };
} }