Commit 9b846c35 authored by kurogeek's avatar kurogeek
Browse files

inventree: 1.1.10

parent 1d300413
Loading
Loading
Loading
Loading
+5 −16
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ let

in
{
  meta.buildDocsInSandbox = false;
  meta.maintainers = with lib.maintainers; [
    kurogeek
  ];
@@ -65,6 +66,7 @@ in
    secretKeyFile = mkOption {
      type = types.path;
      default = "${cfg.dataDir}/secret_key.txt";
      defaultText = lib.literalExpression ''"''${cfg.dataDir}/secret_key.txt"'';
      example = "/run/keys/inventree-secret-key";
      description = ''
        Path to a file containing the secret key
@@ -113,7 +115,6 @@ in
      dbuser = mkOption {
        type = types.str;
        default = "inventree";
        defaultText = lib.literalExpression "inventree";
        description = "Database username.";
      };
      passwordFile = mkOption {
@@ -122,7 +123,7 @@ in
        example = "/run/keys/inventree-dbpassword";
        description = ''
          A file containing the password corresponding to
          <option>database.user</option>.
          <option>database.dbuser</option>.
        '';
      };
      createLocally = mkOption {
@@ -136,7 +137,7 @@ in
      type = types.str;
      default = "localhost";
      example = "inventree.example.com";
      description = mdDoc ''
      description = ''
        The INVENTREE_SITE_URL option defines the base URL for the
        InvenTree server. This is a critical setting, and it is required
        for correct operation of the server. If not specified, the
@@ -175,19 +176,7 @@ in
            str
          ])
        );
      default = {
        INVENTREE_CONFIG_FILE = lib.mkDefault "${cfg.dataDir}/config/config.yaml";
        INVENTREE_OIDC_PRIVATE_KEY_FILE = lib.mkDefault "${cfg.dataDir}/config/oidc_private_key.txt";
        INVENTREE_STATIC_ROOT = lib.mkDefault "${cfg.dataDir}/data/static_root";
        INVENTREE_MEDIA_ROOT = lib.mkDefault "${cfg.dataDir}/data/media";
        INVENTREE_BACKUP_DIR = lib.mkDefault "${cfg.dataDir}/data/backups";
        INVENTREE_SITE_URL = lib.mkDefault "http://${cfg.domain}";
        INVENTREE_PLUGIN_FILE = lib.mkDefault "${cfg.dataDir}/data/plugins/plugins.txt";
        INVENTREE_PLUGIN_DIR = lib.mkDefault "${cfg.dataDir}/data/plugins";
        INVENTREE_ADMIN_PASSWORD_FILE = lib.mkDefault cfg.adminPasswordFile;
        INVENTREE_SECRET_KEY_FILE = lib.mkDefault cfg.secretKeyFile;
        INVENTREE_AUTO_UPDATE = lib.mkDefault "false";
      };
      default = { };
      description = ''
        InvenTree config options.

+8 −4
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ let
    };
  };

  version = "0.18.0";
  version = "1.1.10";
  src = fetchFromGitHub {
    owner = "inventree";
    repo = "inventree";
    rev = "d6c722041987d13a4e596711aafa0f30cde3f9a0";
    hash = "sha256-BnRE6BM6/LHUtP3H0L8qh3LAxFphNlpll+r1oH4sGuQ=";
    tag = "${version}";
    hash = "sha256-TPB/3pFIU+ui4c+CbqIKTyAfJ/Xepm/RIhZeYhTrgI4=";
  };

  frontend =
@@ -38,7 +38,7 @@ let

      yarnOfflineCache = fetchYarnDeps {
        yarnLock = finalAttrs.src + "/yarn.lock";
        hash = "sha256-wXIVtW1dMxhyuZ1LmuYZ2IwUbRZwbYmdRkiribMbK20=";
        hash = "sha256-Ijbkx+INZgsvMhkzo8h/FUY75W3UHnKAdUjQRD8kJZw=";
      };

      nativeBuildInputs = [
@@ -93,6 +93,7 @@ python3.pkgs.buildPythonApplication rec {
      django-sql-utils
      django-sslserver
      django-stdimage
      django-storages
      django-structlog
      django-taggit
      django-oauth-toolkit
@@ -131,6 +132,7 @@ python3.pkgs.buildPythonApplication rec {
      ppf-datamatrix
      psycopg2
      mysqlclient
      requests-mock

      opentelemetry-api
      opentelemetry-sdk
@@ -185,6 +187,8 @@ python3.pkgs.buildPythonApplication rec {
        "test_package_loading"
        "test_export"
        "test_users_exist"
        "test_import_part"
        "test_model_names"
      ];
      skippedFuncScripts = builtins.map (funcName: ''
        grep -rlZ ${funcName} . | while IFS= read -r -d "" file; do
+0 −2
Original line number Diff line number Diff line
@@ -12517,6 +12517,4 @@ with pkgs;
  gpac-unstable = callPackage ../by-name/gp/gpac/package.nix {
    releaseChannel = "unstable";
  };

  inventree = callPackage ../by-name/in/inventree/package.nix { };
}