diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/os-specific/linux/openvswitch | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/os-specific/linux/openvswitch')
-rw-r--r-- | pkgs/os-specific/linux/openvswitch/default.nix | 14 | ||||
-rw-r--r-- | pkgs/os-specific/linux/openvswitch/lts.nix | 17 |
2 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index f0fb0a834ff..5faccc14ce7 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python3 , perl , kernel ? null }: -with stdenv.lib; +with lib; let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.13.0"; + version = "2.14.2"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0cd5vmfr6zwgcnkwys6rag6cmz68v0librpaplianv734xs74pyx"; + sha256 = "sha256-ZfQg+VTiUNiV+y2yKhMuHLVgvF4rkFHoNFETSBCOWXo="; }; kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper utillinux openssl libcap_ng pythonEnv + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ util-linux openssl libcap_ng pythonEnv perl procps which ]; configureFlags = [ @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # bash-completion test fails with "compgen: command not found" - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; description = "A multilayer virtual switch"; longDescription = diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 358a8b39917..15c6c05b061 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which -, procps, libcap_ng, openssl, python2, iproute , perl +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which +, procps, libcap_ng, openssl, python2, perl , automake, autoconf, libtool, kernel ? null }: -with stdenv.lib; +with lib; let _kernel = kernel; in stdenv.mkDerivation rec { - version = "2.5.9"; + version = "2.5.12"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0iv0ncwl6s4qyyb655yj5xvqrjr1zbymmab96q259wa09xnyw7b7"; + sha256 = "0a8wa1lj5p28x3vq0yaxjhqmppp4hvds6hhm0j3czpp8mc09fsfq"; }; patches = [ ./patches/lts-ssl.patch ]; kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ autoconf libtool automake pkgconfig ]; - buildInputs = [ makeWrapper utillinux openssl libcap_ng python2 - perl procps which ]; + nativeBuildInputs = [ autoconf libtool automake pkg-config makeWrapper ]; + buildInputs = [ util-linux openssl libcap_ng python2 perl procps which ]; preConfigure = "./boot.sh"; @@ -61,7 +60,7 @@ in stdenv.mkDerivation rec { --replace "self.cert_dir" "root_prefix + self.cert_dir" ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; description = "A multilayer virtual switch"; longDescription = |