Unverified Commit f0040a9e authored by Nikolay Korotkiy's avatar Nikolay Korotkiy Committed by GitHub
Browse files

Merge pull request #225427 from r-ryantm/auto-update/o 

o: 2.58.0 -> 2.60.5
parents 03417384 b96d7b5e

pkgs/applications/editors/o/default.nix→pkgs/applications/editors/orbiton/default.nix

+8 −6
Original line number Diff line number Diff line
@@ -3,17 +3,17 @@ 
}:



buildGoModule rec {

  pname = "o";

  version = "2.58.0";

  pname = "orbiton";

  version = "2.60.5";



  src = fetchFromGitHub {

    owner = "xyproto";

    repo = "o";

    repo = "orbiton";

    rev = "v${version}";

    hash = "sha256-oYWlciTQ/4mm/gTSQEkD/xPeLfDjIAMksjj1DVodZW4=";

    hash = "sha256-gCE4mrZXLFteZKUPDsAc1hS1I/WTns9I9oZE5bAF7fU=";

  };



  vendorSha256 = null;

  vendorHash = null;



  postPatch = lib.optionalString stdenv.isDarwin ''

    substituteInPlace Makefile \
@@ -33,6 +33,7 @@ buildGoModule rec { 
  postInstall = ''

    cd ..

    installManPage o.1

    mv $out/bin/{orbiton,o}

  '' + lib.optionalString withGui ''

    make install-gui PREFIX=$out

    wrapProgram $out/bin/og --prefix PATH : $out/bin
@@ -40,8 +41,9 @@ buildGoModule rec { 


  meta = with lib; {

    description = "Config-free text editor and IDE limited to VT100";

    homepage = "https://github.com/xyproto/o";

    homepage = "https://github.com/xyproto/orbiton";

    license = licenses.bsd3;

    maintainers = with maintainers; [ sikmir ];

    mainProgram = "o";

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1121,6 +1121,7 @@ mapAliases ({ 


  ### O ###



  o = orbiton; # Added 2023-04-09

  oathToolkit = oath-toolkit; # Added 2022-04-04

  oci-image-tool = throw "oci-image-tool is no longer actively maintained, and has had major deficiencies for several years."; # Added 2022-05-14;

  oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -29680,9 +29680,7 @@ with pkgs; 














  edlin = callPackage ../applications/editors/edlin { };



























  o = callPackage ../applications/editors/o {













    buildGoModule = buildGo119Module; # go 1.20 build failure













  };













  orbiton = callPackage ../applications/editors/orbiton { };





























  oed = callPackage ../applications/editors/oed { };