Unverified Commit fb250ff2 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #172340 from 06kellyjac/k3d 

k3d: rename kube3d to k3d
parents 43aabff9 6b78c0b8

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -343,6 +343,8 @@ In addition to numerous new and upgraded packages, this release has the followin 
  `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches

  end of life.



- `kube3d` has now been renamed to `k3d` since the 3d editor that originally took that name has been dropped from nixpkgs. `kube3d` will continue to work as an alias for now.



- The `dokuwiki` service is now configured via `services.dokuwiki.sites.<name>.settings` attribute set; `extraConfig` has been removed.

  The `{aclUse,superUser,disableActions}` attributes have been renamed accordingly. `pluginsConfig` now only accepts an attribute set of booleans.

  Passing plain PHP is no longer possible.

pkgs/applications/networking/cluster/kube3d/default.nix→pkgs/applications/networking/cluster/k3d/default.nix

+4 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ let 
      false;

in

buildGoModule rec {

  pname = "kube3d";

  pname = "k3d";

  version = "5.4.4";



  src = fetchFromGitHub {
@@ -30,7 +30,7 @@ buildGoModule rec { 
  excludedPackages = [ "tools" "docgen" ];



  ldflags =

    let t = "github.com/k3d-io/k3d/v5/version"; in

    let t = "github.com/k3d-io/k3d/v${lib.versions.major version}/version"; in

    [ "-s" "-w" "-X ${t}.Version=v${version}" ] ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ];



  preCheck = ''
@@ -57,7 +57,7 @@ buildGoModule rec { 
  meta = with lib; {

    homepage = "https://github.com/k3d-io/k3d/";

    changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";

    description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";

    description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";

    longDescription = ''

      k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
@@ -67,6 +67,5 @@ buildGoModule rec { 
    license = licenses.mit;

    maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ];

    platforms = platforms.linux ++ platforms.darwin;

    mainProgram = "k3d";

  };

}

pkgs/top-level/aliases.nix

+3 −1
Original line number Diff line number Diff line
@@ -769,7 +769,9 @@ mapAliases ({ 


  ### K ###



  k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # Added 2022-01-04

  # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04

  # now kube3d/k3d will take it's place

  kube3d = k3d; # Added 2022-0705

  k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06

  kafkacat = kcat; # Added 2021-10-07

  kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -40106,7 +40106,7 @@ with pkgs; 














  dapper = callPackage ../development/tools/dapper { };



























  kube3d =  callPackage ../applications/networking/cluster/kube3d {













  k3d = callPackage ../applications/networking/cluster/k3d {















    buildGoModule = buildGo118Module; # tests fail with 1.19















  };