Unverified Commit a084e920 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

ocis_5-bin: rename from ocis-bin (#394598)

parents 971eb630 2db95477

doc/release-notes/rl-2505.section.md

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ 


- `i3status-rust`-package no longer enables `notmuch` by default. It can be enabled via `withNotmuch`.



- `ocis-bin` has been renamed to `ocis_5-bin`. Future versions will have the major version suffix.



- Default ICU version updated from 74 to 76



- Apache Kafka was updated to `>= 4.0.0`. Please note that this is the first release which operates

nixos/modules/services/web-apps/ocis.md

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ However to make this configuration work you will need generate a configuration. 
You can do this with:



```console

$ nix-shell -p ocis-bin

$ nix-shell -p ocis_5-bin

$ mkdir scratch/

$ cd scratch/

$ ocis init --config-path . --admin-password "changeme"

nixos/modules/services/web-apps/ocis.nix

+7 −1
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ in 
    services.ocis = {

      enable = lib.mkEnableOption "ownCloud Infinite Scale";



      package = lib.mkPackageOption pkgs "ocis-bin" { };

      package = lib.mkOption {

        type = types.package;

        description = "Which package to use for the ownCloud Infinite Scale instance.";

        relatedPackages = [ "ocis_5-bin" ];

      };



      configDir = lib.mkOption {

        type = types.nullOr types.path;
@@ -137,6 +141,8 @@ in 
  };



  config = lib.mkIf cfg.enable {

    services.ocis.package = lib.mkDefault pkgs.ocis_5-bin;



    users.users.${defaultUser} = lib.mkIf (cfg.user == defaultUser) {

      group = cfg.group;

      home = cfg.stateDir;

nixos/tests/ocis.nix

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ import ./make-test-python.nix ( 
      machine.sleep(5)



      with subtest("ocis bin works"):

          machine.succeed("${lib.getExe pkgs.ocis-bin} version")

          machine.succeed("${lib.getExe pkgs.ocis_5-bin} version")



      with subtest("use the web interface to log in with a demo user"):

          machine.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner ${demoUser} ${demoPassword}")

pkgs/by-name/oc/ocis-bin/package.nix→pkgs/by-name/oc/ocis_5-bin/package.nix

+8 −8
Original line number Diff line number Diff line
@@ -27,18 +27,18 @@ let 


  hash =

    {

      hash_386-linux = "sha256-4yEgg0Ve8tjNn2weH9d91tfRaU1TE569VvZLxzuzXsw=";

      hash_amd64-linux = "sha256-YAIhtHv/cO4yFpkWoRNMf6t4+ifMtGPTcYu84ZMvfD4=";

      hash_arm64-linux = "sha256-OdtT9NOhh0Fkk+8CDic0NWWbGflk3FcuKB60OycJU5E=";

      hash_arm-linux = "sha256-foMsZ8Nq+Q5lqt2XZCDvQ+/sFM8/1/rPfogzsyrQHqs=";

      hash_amd64-darwin = "sha256-6jaX9iqyqztykeXZX3YqwRV/silFiyfeB9gJyreAfF8=";

      hash_arm64-darwin = "sha256-KJqMJct7YWocE4eVjMF36adqTIf7WcutZlG3QEoMhCI=";

      hash_386-linux = "sha256-2RtkxtVk7YN7CfsIBpMP85g84MNTzrnEgk10eFdfyyw=";

      hash_amd64-linux = "sha256-tmUfDKLO35qCs1hauJQKhJhcnMhqOpcqDFtAggMFhLE=";

      hash_arm64-linux = "sha256-ggRDW1cnTHMQKvOvCDH3eptH3O3PgYaondlzOGHTjio=";

      hash_arm-linux = "sha256-uMLRow1NeHufSI5B4k5qSIfH3lTxg+WxzLxgdedAz40=";

      hash_amd64-darwin = "sha256-LZ6n/f2MdbFaPnBCoJqZZ7HQiLG3Z6ZoatgFsxaFvMc=";

      hash_arm64-darwin = "sha256-k5X2ZInFS/HlToOZPX23TRJqlx/XM1ZG++Xr4BHn8SY=";

    }

    ."hash_${arch}-${os}";

in

stdenv.mkDerivation (finalAttrs: {

  pname = "ocis-bin";

  version = "5.0.5";

  pname = "ocis_5-bin";

  version = "5.0.9";



  src = fetchurl {

    url = "https://github.com/owncloud/ocis/releases/download/v${finalAttrs.version}/ocis-${finalAttrs.version}-${os}-${arch}";