commit afd64ceb0a6525bebcffec8c3e1b969d43cb7063 · pyrox.dev/nixpkgs

+33 -8

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

···

       33
       33
        
           enable = lib.mkEnableOption "Photoprism web server";

     

       34
       34
        
       

     

       35
       35
        
           passwordFile = lib.mkOption {

     

       36
       36
       -
             type = lib.types.nullOr lib.types.path;

     

       36
       36
       +
             type = lib.types.nullOr (

     

       37
       37
       +
               lib.types.pathWith {

     

       38
       38
       +
                 inStore = false;

     

       39
       39
       +
                 absolute = true;

     

       40
       40
       +
               }

     

       41
       41
       +
             );

     

       37
       42
        
             default = null;

     

       38
       43
        
             description = ''

     

       39
       44
        
               Admin password file.

     

       45
       45
       +
             '';

     

       46
       46
       +
           };

     

       47
       47
       +
       

     

       48
       48
       +
           databasePasswordFile = lib.mkOption {

     

       49
       49
       +
             type = lib.types.nullOr (

     

       50
       50
       +
               lib.types.pathWith {

     

       51
       51
       +
                 inStore = false;

     

       52
       52
       +
                 absolute = true;

     

       53
       53
       +
               }

     

       54
       54
       +
             );

     

       55
       55
       +
             default = null;

     

       56
       56
       +
             description = ''

     

       57
       57
       +
               Database password file.

     

       40
       58
        
             '';

     

       41
       59
        
           };

     

       42
       60
        
       

     
···

       114
       132
        
                 cfg.storagePath

     

       115
       133
        
               ];

     

       116
       134
        
       

     

       117
       117
       -
               LoadCredential = lib.optionalString (

     

       118
       118
       -
                 cfg.passwordFile != null

     

       119
       119
       -
               ) "PHOTOPRISM_ADMIN_PASSWORD:${cfg.passwordFile}";

     

       135
       135
       +
               LoadCredential = [

     

       136
       136
       +
                 (lib.optionalString (cfg.passwordFile != null) "PHOTOPRISM_ADMIN_PASSWORD_FILE=${cfg.passwordFile}")

     

       137
       137
       +
                 (lib.optionalString (

     

       138
       138
       +
                   cfg.databasePasswordFile != null

     

       139
       139
       +
                 ) "PHOTOPRISM_DATABASE_PASSWORD=${cfg.databasePasswordFile}")

     

       140
       140
       +
               ];

     

       120
       141
        
       

     

       121
       142
        
               LockPersonality = true;

     

       122
       143
        
               PrivateDevices = true;

     
···

       146
       167
        
             wantedBy = [ "multi-user.target" ];

     

       147
       168
        
             environment = env;

     

       148
       169
        
       

     

       149
       149
       -
             # reminder: easier password configuration will come in https://github.com/photoprism/photoprism/pull/2302

     

       150
       170
        
             preStart = ''

     

       151
       171
        
               ln -sf ${manage} photoprism-manage

     

       152
       152
       -
       

     

       153
       172
        
               ${lib.optionalString (cfg.passwordFile != null) ''

     

       154
       154
       -
                 export PHOTOPRISM_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PHOTOPRISM_ADMIN_PASSWORD")

     

       173
       173
       +
                 export PHOTOPRISM_ADMIN_PASSWORD_FILE=$CREDENTIALS_DIRECTORY/PHOTOPRISM_ADMIN_PASSWORD_FILE

     

       174
       174
       +
               ''}

     

       175
       175
       +
               ${lib.optionalString (cfg.databasePasswordFile != null) ''

     

       176
       176
       +
                 export PHOTOPRISM_DATABASE_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PHOTOPRISM_DATABASE_PASSWORD")

     

       155
       177
        
               ''}

     

       156
       178
        
               exec ${cfg.package}/bin/photoprism migrations run -f

     

       157
       179
        
             '';

     

       158
       180
        
       

     

       159
       181
        
             script = ''

     

       160
       182
        
               ${lib.optionalString (cfg.passwordFile != null) ''

     

       161
       161
       -
                 export PHOTOPRISM_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PHOTOPRISM_ADMIN_PASSWORD")

     

       183
       183
       +
                 export PHOTOPRISM_ADMIN_PASSWORD_FILE=$CREDENTIALS_DIRECTORY/PHOTOPRISM_ADMIN_PASSWORD_FILE

     

       184
       184
       +
               ''}

     

       185
       185
       +
               ${lib.optionalString (cfg.databasePasswordFile != null) ''

     

       186
       186
       +
                 export PHOTOPRISM_DATABASE_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PHOTOPRISM_DATABASE_PASSWORD")

     

       162
       187
        
               ''}

     

       163
       188
        
               exec ${cfg.package}/bin/photoprism start

     

       164
       189
        
             '';

+18 -7

pkgs/by-name/ph/photoprism/backend.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildGoModule,

     

       4
       4
        
         coreutils,

     

       5
       5
       -
         libtensorflow,

     

       5
       5
       +
         python3,

     

       6
       6
        
         src,

     

       7
       7
        
         version,

     

       8
       8
        
         pkg-config,

     

       9
       9
        
         vips,

     

       10
       10
       +
         symlinkJoin,

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       12
       -
       buildGoModule rec {

     

       13
       13
       +
       let

     

       14
       14
       +
         # we need to copy these, to add the symlinks, so the linker actually finds these libraries

     

       15
       15
       +
         libtensorflow = symlinkJoin {

     

       16
       16
       +
           name = "libtensorflow";

     

       17
       17
       +
           paths = [ "${python3.pkgs.tensorflow-bin}/${python3.sitePackages}/tensorflow" ];

     

       18
       18
       +
           postBuild = ''

     

       19
       19
       +
             ln -s "$out/libtensorflow_cc.so.2" "$out/libtensorflow.so"

     

       20
       20
       +
             ln -s "$out/libtensorflow_framework.so.2" "$out/libtensorflow_framework.so"

     

       21
       21
       +
           '';

     

       22
       22
       +
         };

     

       23
       23
       +
       in

     

       24
       24
       +
       buildGoModule {

     

       13
       25
        
         inherit src version;

     

       14
       26
        
         pname = "photoprism-backend";

     

       15
       27
        
       

     
···

       30
       42
        
         ];

     

       31
       43
        
       

     

       32
       44
        
         postPatch = ''

     

       33
       33
       -
           substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty"

     

       45
       45
       +
           substituteInPlace internal/commands/passwd.go --replace-fail '/bin/stty' "${coreutils}/bin/stty"

     

       34
       46
        
         '';

     

       35
       47
        
       

     

       36
       36
       -
         vendorHash = "sha256-eHdnTpcVBSvGR9ZiK6A32jfjik8VClDTkv92bD8EIgA=";

     

       48
       48
       +
         vendorHash = "sha256-8uy0uLhGOyedqi3AvMsEdDQnFvGgeeZcL4tFgI6bzU8=";

     

       37
       49
        
       

     

       38
       50
        
         subPackages = [ "cmd/photoprism" ];

     

       39
       51
        
       

     

       40
       52
        
         # https://github.com/mattn/go-sqlite3/issues/822

     

       41
       41
       -
         CGO_CFLAGS = "-Wno-return-local-addr";

     

       53
       53
       +
         CGO_CFLAGS = "-Wno-return-local-addr -I${libtensorflow}/include";

     

       42
       54
        
       

     

       43
       43
       -
         # https://github.com/tensorflow/tensorflow/issues/43847

     

       44
       44
       -
         CGO_LDFLAGS = "-fuse-ld=gold";

     

       55
       55
       +
         CGO_LDFLAGS = "-L${libtensorflow} -ltensorflow_framework";

     

       45
       56
        
       

     

       46
       57
        
         meta = with lib; {

     

       47
       58
        
           homepage = "https://photoprism.app";

+1 -1

pkgs/by-name/ph/photoprism/frontend.nix

···

       13
       13
        
           cd frontend

     

       14
       14
        
         '';

     

       15
       15
        
       

     

       16
       16
       -
         npmDepsHash = "sha256-3cytU/QaPSsGu/984AEh3YsdV4H5cjf/br3NSc5Zd1M=";

     

       16
       16
       +
         npmDepsHash = "sha256-rfZ6VE3JRR8MrB61DqueXWNoOjDE+GJnyrNujGyc8wc=";

     

       17
       17
        
       

     

       18
       18
        
         installPhase = ''

     

       19
       19
        
           runHook preInstall

-104

pkgs/by-name/ph/photoprism/libtensorflow.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       5
       5
       -
         ...

     

       6
       6
       -
       }:

     

       7
       7
       -
       let

     

       8
       8
       -
         inherit (stdenv.hostPlatform) system;

     

       9
       9
       -
       in

     

       10
       10
       -
       stdenv.mkDerivation rec {

     

       11
       11
       -
         pname = "libtensorflow-photoprism";

     

       12
       12
       -
         version = "1.15.2";

     

       13
       13
       -
       

     

       14
       14
       -
         srcs = [

     

       15
       15
       -
           # Photoprism-packaged libtensorflow tarball (with pre-built libs for both arm64 and amd64)

     

       16
       16
       -
           # We need this specific version because of https://github.com/photoprism/photoprism/issues/222

     

       17
       17
       -
           (fetchurl {

     

       18
       18
       -
             sha256 =

     

       19
       19
       -
               {

     

       20
       20
       -
                 x86_64-linux = "sha256-bZAC3PJxqcjuGM4RcNtzYtkg3FD3SrO5beDsPoKenzc=";

     

       21
       21
       -
                 aarch64-linux = "sha256-qnj4vhSWgrk8SIjzIH1/4waMxMsxMUvqdYZPaSaUJRk=";

     

       22
       22
       -
               }

     

       23
       23
       -
               .${system};

     

       24
       24
       -
       

     

       25
       25
       -
             url =

     

       26
       26
       -
               let

     

       27
       27
       -
                 systemName =

     

       28
       28
       -
                   {

     

       29
       29
       -
                     x86_64-linux = "amd64";

     

       30
       30
       -
                     aarch64-linux = "arm64";

     

       31
       31
       -
                   }

     

       32
       32
       -
                   .${system};

     

       33
       33
       -
               in

     

       34
       34
       -
               "https://dl.photoprism.app/tensorflow/${systemName}/libtensorflow-${systemName}-${version}.tar.gz";

     

       35
       35
       -
           })

     

       36
       36
       -
           # Upstream tensorflow tarball (with .h's photoprism's tarball is missing)

     

       37
       37
       -
           (fetchurl {

     

       38
       38
       -
             url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.15.0.tar.gz";

     

       39
       39
       -
             sha256 = "sha256-3sv9WnCeztNSP1XM+iOTN6h+GrPgAO/aNhfbeeEDTe0=";

     

       40
       40
       -
           })

     

       41
       41
       -
         ];

     

       42
       42
       -
       

     

       43
       43
       -
         sourceRoot = ".";

     

       44
       44
       -
       

     

       45
       45
       -
         unpackPhase = ''

     

       46
       46
       -
           sources=($srcs)

     

       47
       47
       -
       

     

       48
       48
       -
           mkdir downstream upstream

     

       49
       49
       -
           tar xf ''${sources[0]} --directory downstream

     

       50
       50
       -
           tar xf ''${sources[1]} --directory upstream

     

       51
       51
       -
       

     

       52
       52
       -
           mv downstream/lib .

     

       53
       53
       -
           mv upstream/{include,LICENSE,THIRD_PARTY_TF_C_LICENSES} .

     

       54
       54
       -
           rm -r downstream upstream

     

       55
       55
       -
       

     

       56
       56
       -
           cd lib

     

       57
       57
       -
           ln -sT libtensorflow.so{,.1}

     

       58
       58
       -
           ln -sT libtensorflow_framework.so{,.1}

     

       59
       59
       -
           cd ..

     

       60
       60
       -
         '';

     

       61
       61
       -
       

     

       62
       62
       -
         # Patch library to use our libc, libstdc++ and others

     

       63
       63
       -
         patchPhase =

     

       64
       64
       -
           let

     

       65
       65
       -
             rpath = lib.makeLibraryPath [

     

       66
       66
       -
               stdenv.cc.libc

     

       67
       67
       -
               stdenv.cc.cc

     

       68
       68
       -
             ];

     

       69
       69
       -
           in

     

       70
       70
       -
           ''

     

       71
       71
       -
             chmod -R +w lib

     

       72
       72
       -
             patchelf --set-rpath "${rpath}:$out/lib" lib/libtensorflow.so

     

       73
       73
       -
             patchelf --set-rpath "${rpath}" lib/libtensorflow_framework.so

     

       74
       74
       -
           '';

     

       75
       75
       -
       

     

       76
       76
       -
         buildPhase = ''

     

       77
       77
       -
           # Write pkg-config file.

     

       78
       78
       -
           mkdir lib/pkgconfig

     

       79
       79
       -
           cat > lib/pkgconfig/tensorflow.pc << EOF

     

       80
       80
       -
           Name: TensorFlow

     

       81
       81
       -
           Version: ${version}

     

       82
       82
       -
           Description: Library for computation using data flow graphs for scalable machine learning

     

       83
       83
       -
           Requires:

     

       84
       84
       -
           Libs: -L$out/lib -ltensorflow

     

       85
       85
       -
           Cflags: -I$out/include/tensorflow

     

       86
       86
       -
           EOF

     

       87
       87
       -
         '';

     

       88
       88
       -
       

     

       89
       89
       -
         installPhase = ''

     

       90
       90
       -
           mkdir -p $out

     

       91
       91
       -
           cp -r LICENSE THIRD_PARTY_TF_C_LICENSES lib include $out

     

       92
       92
       -
         '';

     

       93
       93
       -
       

     

       94
       94
       -
         meta = with lib; {

     

       95
       95
       -
           homepage = "https://dl.photoprism.app/tensorflow/";

     

       96
       96
       -
           description = "Libtensorflow version for usage with photoprism backend";

     

       97
       97
       -
           platforms = [

     

       98
       98
       -
             "x86_64-linux"

     

       99
       99
       -
             "aarch64-linux"

     

       100
       100
       -
           ];

     

       101
       101
       -
           license = licenses.asl20;

     

       102
       102
       -
           maintainers = with maintainers; [ benesim ];

     

       103
       103
       -
         };

     

       104
       104
       -
       }

+3 -5

pkgs/by-name/ph/photoprism/package.nix

···

       17
       17
        
       }:

     

       18
       18
        
       

     

       19
       19
        
       let

     

       20
       20
       -
         version = "250321-57590c48b";

     

       20
       20
       +
         version = "250426-27ec7a128";

     

       21
       21
        
         pname = "photoprism";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "photoprism";

     

       25
       25
        
           repo = "photoprism";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           hash = "sha256-tJA1Q8kcX4UYDCV+rmHyd5gfEU8WkoaqNfx1/0Iy3l8=";

     

       27
       27
       +
           hash = "sha256-wsSWCTFfKQ+8aE8GKvXpA49LbBLMTE1lsJMYFLvquBM=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         libtensorflow = callPackage ./libtensorflow.nix { };

     

       31
       31
       -
         backend = callPackage ./backend.nix { inherit libtensorflow src version; };

     

       30
       30
       +
         backend = callPackage ./backend.nix { inherit src version; };

     

       32
       31
        
         frontend = callPackage ./frontend.nix { inherit src version; };

     

       33
       32
        
       

     

       34
       33
        
         fetchModel =

     
···

       99
       98
        
         meta = with lib; {

     

       100
       99
        
           homepage = "https://photoprism.app";

     

       101
       100
        
           description = "Personal Photo Management powered by Go and Google TensorFlow";

     

       102
       102
       -
           inherit (libtensorflow.meta) platforms;

     

       103
       101
        
           license = licenses.agpl3Only;

     

       104
       102
        
           maintainers = with maintainers; [ benesim ];

     

       105
       103
        
           mainProgram = "photoprism";