Merge pull request #337008 from adamcstephens/ovn/24.03.3

ovn: 24.03.2 -> 24.03.3, drop lts

pkgs/by-name/ov/ovn/generic.nix

@@ -1,101 +0,0 @@
-{
-  version,
-  hash,
-  updateScriptArgs ? "",
-}:
-
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  gnused,
-  libbpf,
-  libcap_ng,
-  numactl,
-  openssl,
-  pkg-config,
-  procps,
-  python3,
-  unbound,
-  xdp-tools,
-  writeScript,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ovn";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "ovn-org";
-    repo = "ovn";
-    rev = "refs/tags/v${version}";
-    inherit hash;
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    python3
-  ];
-
-  buildInputs = [
-    libbpf
-    libcap_ng
-    numactl
-    openssl
-    unbound
-    xdp-tools
-  ];
-
-  # need to build the ovs submodule first
-  preConfigure = ''
-    pushd ovs
-    ./boot.sh
-    ./configure
-    make -j $NIX_BUILD_CORES
-    popd
-  '';
-
-  configureFlags = [
-    "--localstatedir=/var"
-  ];
-
-  enableParallelBuilding = true;
-
-  # disable tests due to networking issues and because individual tests can't be skipped easily
-  doCheck = false;
-
-  nativeCheckInputs = [
-    gnused
-    procps
-  ];
-
-  # https://docs.ovn.org/en/latest/topics/testing.html
-  preCheck = ''
-    export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
-    # allow rechecks to retry flaky tests
-    export RECHECK=yes
-
-    # hack to stop tests from trying to read /etc/resolv.conf
-    export OVS_RESOLV_CONF="$PWD/resolv.conf"
-    touch $OVS_RESOLV_CONF
-  '';
-
-  passthru.updateScript = writeScript "ovs-update.nu" ''
-    ${./update.nu} ${updateScriptArgs}
-  '';
-
-  meta = with lib; {
-    description = "Open Virtual Network";
-    longDescription = ''
-      OVN (Open Virtual Network) is a series of daemons that translates virtual network configuration into OpenFlow, and installs them into Open vSwitch.
-    '';
-    homepage = "https://github.com/ovn-org/ovn";
-    changelog = "https://github.com/ovn-org/ovn/blob/${src.rev}/NEWS";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ adamcstephens ];
-    platforms = platforms.linux;
-  };
-}

pkgs/by-name/ov/ovn/lts.nix

@@ -1,5 +0,0 @@
-import ./generic.nix {
-  version = "24.03.3";
-  hash = "sha256-W25Tq5Z7SYIBkq6doNz9WPiPsdDhnbys03rmF4m02eM=";
-  updateScriptArgs = "--lts=true --regex '24.03.*'";
-}

pkgs/by-name/ov/ovn/package.nix

@@ -1,4 +1,91 @@
-import ./generic.nix {
+{
-  version = "24.03.2";
+  lib,
-  hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ=";
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  gnused,
+  libbpf,
+  libcap_ng,
+  nix-update-script,
+  numactl,
+  openssl,
+  pkg-config,
+  procps,
+  python3,
+  unbound,
+  xdp-tools,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ovn";
+  version = "24.03.3";
+
+  src = fetchFromGitHub {
+    owner = "ovn-org";
+    repo = "ovn";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-W25Tq5Z7SYIBkq6doNz9WPiPsdDhnbys03rmF4m02eM=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    python3
+  ];
+
+  buildInputs = [
+    libbpf
+    libcap_ng
+    numactl
+    openssl
+    unbound
+    xdp-tools
+  ];
+
+  # need to build the ovs submodule first
+  preConfigure = ''
+    pushd ovs
+    ./boot.sh
+    ./configure
+    make -j $NIX_BUILD_CORES
+    popd
+  '';
+
+  configureFlags = [ "--localstatedir=/var" ];
+
+  enableParallelBuilding = true;
+
+  # disable tests due to networking issues and because individual tests can't be skipped easily
+  doCheck = false;
+
+  nativeCheckInputs = [
+    gnused
+    procps
+  ];
+
+  # https://docs.ovn.org/en/latest/topics/testing.html
+  preCheck = ''
+    export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
+    # allow rechecks to retry flaky tests
+    export RECHECK=yes
+
+    # hack to stop tests from trying to read /etc/resolv.conf
+    export OVS_RESOLV_CONF="$PWD/resolv.conf"
+    touch $OVS_RESOLV_CONF
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Open Virtual Network";
+    longDescription = ''
+      OVN (Open Virtual Network) is a series of daemons that translates virtual network configuration into OpenFlow, and installs them into Open vSwitch.
+    '';
+    homepage = "https://github.com/ovn-org/ovn";
+    changelog = "https://github.com/ovn-org/ovn/blob/${src.rev}/NEWS";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ adamcstephens ];
+    platforms = platforms.linux;
+  };
 }

pkgs/by-name/ov/ovn/update.nu

@@ -1,19 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i nu -p nushell common-updater-scripts
-
-def main [--lts = false, --regex: string] {
-  let tags = list-git-tags --url=https://github.com/ovn-org/ovn | lines | sort --natural | str replace v ''
-
-  let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last
-  let current_version = nix eval --raw -f default.nix $"ovn(if $lts {"-lts"}).version" | str trim
-
-  if $latest_tag != $current_version {
-    if $lts {
-      update-source-version ovn-lts $latest_tag $"--file=(pwd)/pkgs/by-name/ov/ovn/lts.nix"
-    } else {
-      update-source-version ovn $latest_tag $"--file=(pwd)/pkgs/by-name/ov/ovn/package.nix"
-    }
-  }
-
-  {"lts?": $lts, before: $current_version, after: $latest_tag}
-}

pkgs/top-level/aliases.nix

@@ -1127,6 +1127,7 @@ mapAliases ({
   onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
   oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10
   osxfuse = macfuse-stubs; # Added 2021-03-20
+  ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
   oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09
 
   ### P ###

pkgs/top-level/all-packages.nix

@@ -11113,8 +11113,6 @@ with pkgs;
   openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { };
   openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; };
 
-  ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { };
-
   optifinePackages = callPackage ../tools/games/minecraft/optifine { };
 
   optifine = optifinePackages.optifine-latest;