diff options
author | Graham Christensen <graham@grahamc.com> | 2017-12-24 08:30:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-24 08:30:57 -0500 |
commit | 63ac0b0114be31e9dc73294abb478dd015db052a (patch) | |
tree | d1339b6ec0e5d9513bdb7610d07b9d3cc272db92 /pkgs/development/libraries | |
parent | b792b3ca614ebccf1f92b686e57999ecbb2f2775 (diff) | |
parent | da0d8e2174785f2ebe69fe884102ab8f6fcba985 (diff) | |
download | nixlib-63ac0b0114be31e9dc73294abb478dd015db052a.tar nixlib-63ac0b0114be31e9dc73294abb478dd015db052a.tar.gz nixlib-63ac0b0114be31e9dc73294abb478dd015db052a.tar.bz2 nixlib-63ac0b0114be31e9dc73294abb478dd015db052a.tar.lz nixlib-63ac0b0114be31e9dc73294abb478dd015db052a.tar.xz nixlib-63ac0b0114be31e9dc73294abb478dd015db052a.tar.zst nixlib-63ac0b0114be31e9dc73294abb478dd015db052a.zip |
Merge pull request #33024 from peterhoeg/u/sblim
openwsman: 2.6.0 -> 2.6.5
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/openwsman/default.nix | 37 | ||||
-rw-r--r-- | pkgs/development/libraries/sblim-sfcc/default.nix | 34 |
2 files changed, 34 insertions, 37 deletions
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index b179ca8803c1..df2c23266c50 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -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 { - version = "2.6.0"; name = "openwsman-${version}"; + version = "2.6.5"; - src = fetchurl { - url = "https://github.com/Openwsman/openwsman/archive/v${version}.tar.gz"; - sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4"; + src = fetchFromGitHub { + owner = "Openwsman"; + repo = "openwsman"; + rev = "v${version}"; + sha256 = "1r0zslgpcr4m20car4s3hsccy10xcb39qhpw3dhpjv42xsvvs5xv"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool libxml2 curl cmake pam sblim-sfcc ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ curl libxml2 pam sblim-sfcc ]; cmakeFlags = [ "-DCMAKE_BUILD_RUBY_GEM=no" @@ -22,18 +26,13 @@ stdenv.mkDerivation rec { configureFlags = "--disable-more-warnings"; - meta = { - description = "Openwsman server implementation and client api with bindings"; - - homepage = https://github.com/Openwsman/openwsman; - downloadPage = "https://github.com/Openwsman/openwsman/releases"; - - maintainers = [ stdenv.lib.maintainers.deepfire ]; - - license = stdenv.lib.licenses.bsd3; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - + meta = with stdenv.lib; { + description = "Openwsman server implementation and client API with bindings"; + downloadPage = https://github.com/Openwsman/openwsman/releases; + homepage = https://openwsman.github.io; + license = licenses.bsd3; + maintainers = with maintainers; [ deepfire ]; + platforms = platforms.unix; inherit version; }; } diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index 016cc6f0472f..ba0b8f4e996f 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -1,30 +1,28 @@ -{ fetchgit, stdenv, autoconf, automake, libtool, curl }: +{ stdenv, fetchFromGitHub, autoreconfHook, curl }: stdenv.mkDerivation rec { - version = "2.2.9"; name = "sblim-sfcc-${version}"; + version = "2.2.9"; # this is technically 2.2.9-preview - src = fetchgit { - url = "https://github.com/kkaempf/sblim-sfcc.git"; - rev = "f70fecb410a53531e4fe99d39cf81b581819cac9"; - sha256 = "1hsxim284qzldh599gf6khxj80g8q5263xl3lj3hdndxbhbs843v"; + src = fetchFromGitHub { + owner = "kkaempf"; + repo = "sblim-sfcc"; + rev = "514a76af2020fd6dc6fc380df76cbe27786a76a2"; + sha256 = "06c1mskl9ixbf26v88w0lvn6v2xd6n5f0jd5mckqrn9j4vmh70hs"; }; - preConfigure = "./autoconfiscate.sh"; + buildInputs = [ curl ]; - buildInputs = [ autoconf automake libtool curl ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { - description = "Small Footprint CIM Client Library"; - - homepage = https://sourceforge.net/projects/sblim/; - - maintainers = [ stdenv.lib.maintainers.deepfire ]; - - license = stdenv.lib.licenses.cpl10; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + enableParallelBuilding = true; + meta = with stdenv.lib; { + description = "Small Footprint CIM Client Library"; + homepage = https://sourceforge.net/projects/sblim/; + license = licenses.cpl10; + maintainers = with maintainers; [ deepfire ]; + platforms = platforms.unix; inherit version; }; } |