commit 536476f3aaf249ae732df944973ab5a1a06017c4 · pyrox.dev/nixpkgs

+14

maintainers/maintainer-list.nix

···

       15213
       15213
        
           githubId = 59240843;

     

       15214
       15214
        
           name = "Mahyar Mirrashed";

     

       15215
       15215
        
         };

     

       15216
       15216
       +
         maikotan = {

     

       15217
       15217
       +
           email = "maiko.tan.coding@gmail.com";

     

       15218
       15218
       +
           github = "MaikoTan";

     

       15219
       15219
       +
           githubId = 19927330;

     

       15220
       15220
       +
           name = "Maiko Tan";

     

       15221
       15221
       +
           keys = [

     

       15222
       15222
       +
             { fingerprint = "9C68 989F ECF9 8993 3225  96DD 970A 6794 990C 52AE"; }

     

       15223
       15223
       +
           ];

     

       15224
       15224
       +
         };

     

       15216
       15225
        
         majesticmullet = {

     

       15217
       15226
        
           email = "hoccthomas@gmail.com.au";

     

       15218
       15227
        
           github = "MajesticMullet";

     
···

       19509
       19518
        
           email = "pete.perickson@gmail.com";

     

       19510
       19519
        
           github = "petee";

     

       19511
       19520
        
           githubId = 89916;

     

       19521
       19521
       +
         };

     

       19522
       19522
       +
         Peter3579 = {

     

       19523
       19523
       +
           github = "Peter3579";

     

       19524
       19524
       +
           githubId = 170885528;

     

       19525
       19525
       +
           name = "Peter3579";

     

       19512
       19526
        
         };

     

       19513
       19527
        
         peterhoeg = {

     

       19514
       19528
        
           email = "peter@hoeg.com";

+2

nixos/modules/services/misc/nix-gc.nix

···

       88
       88
        
             script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";

     

       89
       89
        
             serviceConfig.Type = "oneshot";

     

       90
       90
        
             startAt = lib.optionals cfg.automatic cfg.dates;

     

       91
       91
       +
             # do not start and delay when switching

     

       92
       92
       +
             restartIfChanged = false;

     

       91
       93
        
           };

     

       92
       94
        
       

     

       93
       95
        
           systemd.timers.nix-gc = lib.mkIf cfg.automatic {

+2

nixos/modules/services/misc/nix-optimise.nix

···

       69
       69
        
               unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket";

     

       70
       70
        
               serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise";

     

       71
       71
        
               startAt = lib.optionals cfg.automatic cfg.dates;

     

       72
       72
       +
               # do not start and delay when switching

     

       73
       73
       +
               restartIfChanged = false;

     

       72
       74
        
             };

     

       73
       75
        
       

     

       74
       76
        
             timers.nix-optimise = lib.mkIf cfg.automatic {

+25 -3

nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix

···

       15
       15
        
           mkEnableOption

     

       16
       16
        
           optionalString

     

       17
       17
        
           escapeShellArg

     

       18
       18
       +
           concatStringsSep

     

       19
       19
       +
           concatMapStringsSep

     

       18
       20
        
           ;

     

       19
       21
        
       in

     

       20
       22
        
       {

     

       21
       23
        
         port = 9586;

     

       22
       24
        
         imports = [

     

       23
       25
        
           (mkRenamedOptionModule [ "addr" ] [ "listenAddress" ])

     

       24
       24
       -
           ({

     

       26
       26
       +
           {

     

       25
       27
        
             options.warnings = options.warnings;

     

       26
       28
        
             options.assertions = options.assertions;

     

       27
       27
       -
           })

     

       29
       29
       +
           }

     

       28
       30
        
         ];

     

       29
       31
        
         extraOpts = {

     

       30
       32
        
           verbose = mkEnableOption "verbose logging mode for prometheus-wireguard-exporter";

     
···

       44
       46
        
             '';

     

       45
       47
        
           };

     

       46
       48
        
       

     

       49
       49
       +
           interfaces = mkOption {

     

       50
       50
       +
             type = types.listOf types.str;

     

       51
       51
       +
             default = [ ];

     

       52
       52
       +
             description = ''

     

       53
       53
       +
               Specifies the interface(s) passed to the wg show <interface> dump parameter.

     

       54
       54
       +
               By default all interfaces are used.

     

       55
       55
       +
             '';

     

       56
       56
       +
           };

     

       57
       57
       +
       

     

       47
       58
        
           singleSubnetPerField = mkOption {

     

       48
       59
        
             type = types.bool;

     

       49
       60
        
             default = false;

     
···

       70
       81
        
               Adds the `wireguard_latest_handshake_delay_seconds` metric that automatically calculates the seconds passed since the last handshake.

     

       71
       82
        
             '';

     

       72
       83
        
           };

     

       84
       84
       +
       

     

       85
       85
       +
           prependSudo = mkOption {

     

       86
       86
       +
             type = types.bool;

     

       87
       87
       +
             default = false;

     

       88
       88
       +
             description = ''

     

       89
       89
       +
               Whether or no to prepend sudo to wg commands.

     

       90
       90
       +
             '';

     

       91
       91
       +
           };

     

       73
       92
        
         };

     

       74
       93
        
         serviceOpts = {

     

       75
       94
        
           path = [ pkgs.wireguard-tools ];

     
···

       85
       104
        
                 ${optionalString cfg.singleSubnetPerField "-s true"} \

     

       86
       105
        
                 ${optionalString cfg.withRemoteIp "-r true"} \

     

       87
       106
        
                 ${optionalString cfg.latestHandshakeDelay "-d true"} \

     

       88
       88
       -
                 ${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"}

     

       107
       107
       +
                 ${optionalString cfg.prependSudo "-a true"} \

     

       108
       108
       +
                 ${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"} \

     

       109
       109
       +
                 ${concatMapStringsSep " " (i: "-i ${i}") cfg.interfaces} \

     

       110
       110
       +
                 ${concatStringsSep " " cfg.extraFlags}

     

       89
       111
        
             '';

     

       90
       112
        
             RestrictAddressFamilies = [

     

       91
       113
        
               # Need AF_NETLINK to collect data

+11 -11

nixos/modules/services/networking/xrdp.nix

···

       25
       25
        
           chmod +x $out/startwm.sh

     

       26
       26
        
       

     

       27
       27
        
           substituteInPlace $out/xrdp.ini \

     

       28
       28
       -
             --replace "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \

     

       29
       29
       -
             --replace "certificate=" "certificate=${cfg.sslCert}" \

     

       30
       30
       -
             --replace "key_file=" "key_file=${cfg.sslKey}" \

     

       31
       31
       -
             --replace LogFile=xrdp.log LogFile=/dev/null \

     

       32
       32
       -
             --replace EnableSyslog=true EnableSyslog=false

     

       28
       28
       +
             --replace-fail "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \

     

       29
       29
       +
             --replace-fail "certificate=" "certificate=${cfg.sslCert}" \

     

       30
       30
       +
             --replace-fail "key_file=" "key_file=${cfg.sslKey}" \

     

       31
       31
       +
             --replace-fail LogFile=xrdp.log LogFile=/dev/null \

     

       32
       32
       +
             --replace-fail EnableSyslog=true EnableSyslog=false

     

       33
       33
        
       

     

       34
       34
        
           substituteInPlace $out/sesman.ini \

     

       35
       35
       -
             --replace LogFile=xrdp-sesman.log LogFile=/dev/null \

     

       36
       36
       -
             --replace EnableSyslog=1 EnableSyslog=0 \

     

       37
       37
       -
             --replace startwm.sh $out/startwm.sh \

     

       38
       38
       -
             --replace reconnectwm.sh $out/reconnectwm.sh \

     

       35
       35
       +
             --replace-fail LogFile=xrdp-sesman.log LogFile=/dev/null \

     

       36
       36
       +
             --replace-fail EnableSyslog=true EnableSyslog=false \

     

       37
       37
       +
             --replace-fail startwm.sh $out/startwm.sh \

     

       38
       38
       +
             --replace-fail reconnectwm.sh $out/reconnectwm.sh \

     

       39
       39
        
       

     

       40
       40
        
           # Ensure that clipboard works for non-ASCII characters

     

       41
       41
        
           sed -i -e '/.*SessionVariables.*/ a\

     
···

       127
       127
        
               '';

     

       128
       128
        
               example = ''

     

       129
       129
        
                 substituteInPlace $out/sesman.ini \

     

       130
       130
       -
                   --replace LogLevel=INFO LogLevel=DEBUG \

     

       131
       131
       -
                   --replace LogFile=/dev/null LogFile=/var/log/xrdp.log

     

       130
       130
       +
                   --replace-fail LogLevel=INFO LogLevel=DEBUG \

     

       131
       131
       +
                   --replace-fail LogFile=/dev/null LogFile=/var/log/xrdp.log

     

       132
       132
        
               '';

     

       133
       133
        
             };

     

       134
       134
        
           };

+3 -3

pkgs/applications/emulators/libretro/cores/beetle-psx.nix

···

       8
       8
        
       }:

     

       9
       9
        
       mkLibretroCore {

     

       10
       10
        
         core = "mednafen-psx" + lib.optionalString withHw "-hw";

     

       11
       11
       -
         version = "0-unstable-2025-06-20";

     

       11
       11
       +
         version = "0-unstable-2025-06-27";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "libretro";

     

       15
       15
        
           repo = "beetle-psx-libretro";

     

       16
       16
       -
           rev = "22ba62e8a2e0fb7a8d05b4eec039e58de46924de";

     

       17
       17
       -
           hash = "sha256-Z+TMWxPWedZuqpGIfyN7hYC/S5RG1ENnWD2nUDDYDFU=";

     

       16
       16
       +
           rev = "27aa688076606a272d024fcad67b330fe434ff0d";

     

       17
       17
       +
           hash = "sha256-omr5k1NOB3RZVeQJj2hbK53hiQbJwu7utEnxqfFPqbU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         extraBuildInputs = lib.optionals withHw [

+9 -2

pkgs/applications/misc/input-leap/default.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         cmake,

     

       6
       6
        
       

     

       7
       7
       -
         withLibei ? true,

     

       7
       7
       +
         withLibei ? !stdenv.hostPlatform.isDarwin,

     

       8
       8
        
       

     

       9
       9
        
         avahi,

     

       10
       10
        
         curl,

     
···

       19
       19
        
         libei,

     

       20
       20
        
         libportal,

     

       21
       21
        
         openssl,

     

       22
       22
       +
         pkgsStatic,

     

       22
       23
        
         pkg-config,

     

       23
       24
        
         qtbase,

     

       24
       25
        
         qttools,

     
···

       38
       39
        
           fetchSubmodules = true;

     

       39
       40
        
         };

     

       40
       41
        
       

     

       42
       42
       +
         patches = [ ./macos-no-dmg.patch ];

     

       43
       43
       +
       

     

       41
       44
        
         nativeBuildInputs = [

     

       42
       45
        
           pkg-config

     

       43
       46
        
           cmake

     
···

       45
       48
        
           wrapQtAppsHook

     

       46
       49
        
           qttools

     

       47
       50
        
         ];

     

       51
       51
       +
       

     

       48
       52
        
         buildInputs =

     

       49
       53
        
           [

     

       50
       54
        
             curl

     
···

       62
       66
        
           ++ lib.optionals withLibei [

     

       63
       67
        
             libei

     

       64
       68
        
             libportal

     

       69
       69
       +
           ]

     

       70
       70
       +
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       71
       71
       +
             pkgsStatic.openssl

     

       65
       72
        
           ];

     

       66
       73
        
       

     

       67
       74
        
         cmakeFlags = [

     
···

       94
       101
        
             twey

     

       95
       102
        
             shymega

     

       96
       103
        
           ];

     

       97
       97
       -
           platforms = lib.platforms.linux;

     

       104
       104
       +
           platforms = lib.platforms.linux ++ lib.platforms.darwin;

     

       98
       105
        
         };

     

       99
       106
        
       }

+22

pkgs/applications/misc/input-leap/macos-no-dmg.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index ab4e56f2..d01d946d 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -289,17 +289,6 @@ endmacro (configure_files)

     

       6
       6
       +
        # Make a bundle for mac os

     

       7
       7
       +
        if (APPLE)

     

       8
       8
       +
            set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")

     

       9
       9
       +
       -    set(INPUTLEAP_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)

     

       10
       10
       +
       -    set(INPUTLEAP_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)

     

       11
       11
       +
       -    set(INPUTLEAP_BUNDLE_APP_DIR ${INPUTLEAP_BUNDLE_DIR}/InputLeap.app)

     

       12
       12
       +
       -    set(INPUTLEAP_BUNDLE_BINARY_DIR ${INPUTLEAP_BUNDLE_APP_DIR}/Contents/MacOS)

     

       13
       13
       +
       -

     

       14
       14
       +
       -    configure_files(${INPUTLEAP_BUNDLE_SOURCE_DIR} ${INPUTLEAP_BUNDLE_DIR})

     

       15
       15
       +
       -

     

       16
       16
       +
       -    add_custom_target(InputLeap_MacOS ALL

     

       17
       17
       +
       -                      bash build_dist.sh

     

       18
       18
       +
       -                      DEPENDS input-leap input-leaps input-leapc

     

       19
       19
       +
       -                      WORKING_DIRECTORY ${INPUTLEAP_BUNDLE_DIR})

     

       20
       20
       +
        elseif (UNIX AND NOT APPLE)

     

       21
       21
       +
            install(FILES doc/input-leapc.1 doc/input-leaps.1 DESTINATION share/man/man1)

     

       22
       22
       +

+2 -2

pkgs/by-name/bi/bind/package.nix

···

       27
       27
        
       

     

       28
       28
        
       stdenv.mkDerivation (finalAttrs: {

     

       29
       29
        
         pname = "bind";

     

       30
       30
       -
         version = "9.20.9";

     

       30
       30
       +
         version = "9.20.10";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchurl {

     

       33
       33
        
           url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";

     

       34
       34
       -
           hash = "sha256-PSaQDtnJqFkHP/6puX4pLBJI2tGCebF7BfyyPDCR+G0=";

     

       34
       34
       +
           hash = "sha256-D7O6LDN7tIjKaPXfKWxDXNJVBY+2PQgi6R2wI1yQVxY=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         outputs = [

+2 -2

pkgs/by-name/cb/cbmc/package.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation (finalAttrs: {

     

       19
       19
        
         pname = "cbmc";

     

       20
       20
       -
         version = "6.6.0";

     

       20
       20
       +
         version = "6.7.0";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "diffblue";

     

       24
       24
        
           repo = "cbmc";

     

       25
       25
        
           tag = "cbmc-${finalAttrs.version}";

     

       26
       26
       -
           hash = "sha256-ot0vVBgiSVru/RE7KeyTsXzDfs0CSa5vaFsON+PCZZo=";

     

       26
       26
       +
           hash = "sha256-a2Lc4Vou+tND/d8bRw9MpjWrPgdE9gwisfT+xbHUMjY=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         srcglucose = fetchFromGitHub {

+2 -2

pkgs/by-name/cl/closurecompiler/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "closure-compiler";

     

       11
       11
       -
         version = "20250407";

     

       11
       11
       +
         version = "20250528";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";

     

       15
       15
       -
           sha256 = "sha256-T9qZBdjeV+pa5d+wRGSAwmP1Kn7laZTuFuDOxqadhVQ=";

     

       15
       15
       +
           sha256 = "sha256-P7NzTMgMdvG4LMKcmJx+x2LsPvmjtrr+RC6Oy/CVvD0=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         dontUnpack = true;

+2 -2

pkgs/by-name/ct/ctags-lsp/package.nix

···

       11
       11
        
       }:

     

       12
       12
        
       buildGoModule rec {

     

       13
       13
        
         pname = "ctags-lsp";

     

       14
       14
       -
         version = "0.6.1";

     

       14
       14
       +
         version = "0.7.0";

     

       15
       15
        
         vendorHash = null;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "netmute";

     

       19
       19
        
           repo = "ctags-lsp";

     

       20
       20
        
           tag = "v${version}";

     

       21
       21
       -
           hash = "sha256-wSccfhVp1PDn/gj46r8BNskEuBuRIx1wydYAW1PV4cg=";

     

       21
       21
       +
           hash = "sha256-yueT8Q/mJTvQ3fqE4237E93W4ToEi0IzSus/xoto6vA=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ makeWrapper ];

+61

pkgs/by-name/gh/gh-signoff/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenvNoCC,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
       

     

       6
       6
       +
         bash,

     

       7
       7
       +
         gh,

     

       8
       8
       +
         git,

     

       9
       9
       +
         jq,

     

       10
       10
       +
       

     

       11
       11
       +
         makeWrapper,

     

       12
       12
       +
         nix-update-script,

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       16
       16
       +
         pname = "gh-signoff";

     

       17
       17
       +
         version = "0.2.1"; # version is in the script

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "basecamp";

     

       21
       21
       +
           repo = "gh-signoff";

     

       22
       22
       +
           rev = "24f274070c9dfbb3916347dbf6f9d38d4fb64eca"; # Repo didn't have a valid Git tag for specific version

     

       23
       23
       +
           hash = "sha256-jqRbh4To6uHoohkNZrzgmGWOBp/Mahmjm5NwXjmshhM=";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           makeWrapper

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [ bash ];

     

       31
       31
       +
       

     

       32
       32
       +
         strictDeps = true;

     

       33
       33
       +
       

     

       34
       34
       +
         runtimeDeps = [

     

       35
       35
       +
           gh

     

       36
       36
       +
           git

     

       37
       37
       +
           jq

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         installPhase = ''

     

       41
       41
       +
           runHook preInstall

     

       42
       42
       +
           install -D -m755 "gh-signoff" "$out/bin/gh-signoff"

     

       43
       43
       +
           runHook postInstall

     

       44
       44
       +
         '';

     

       45
       45
       +
       

     

       46
       46
       +
         postFixup = ''

     

       47
       47
       +
           wrapProgram "$out/bin/gh-signoff" \

     

       48
       48
       +
             --prefix PATH : "${lib.makeBinPath finalAttrs.runtimeDeps}"

     

       49
       49
       +
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         passthru.updateScript = nix-update-script { };

     

       52
       52
       +
       

     

       53
       53
       +
         meta = {

     

       54
       54
       +
           description = "GitHub CLI extension for local CI to sign off on your own work";

     

       55
       55
       +
           homepage = "https://github.com/basecamp/gh-signoff";

     

       56
       56
       +
           license = lib.licenses.mit;

     

       57
       57
       +
           maintainers = with lib.maintainers; [ maikotan ];

     

       58
       58
       +
           mainProgram = "gh-signoff";

     

       59
       59
       +
           inherit (gh.meta) platforms;

     

       60
       60
       +
         };

     

       61
       61
       +
       })

+23 -23

pkgs/by-name/go/gotify-server/package.nix

···

       8
       8
        
         nix-update-script,

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
       -
       buildGoModule rec {

     

       11
       11
       +
       buildGoModule (finalAttrs: {

     

       12
       12
        
         pname = "gotify-server";

     

       13
       13
        
         version = "2.6.3";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "gotify";

     

       17
       17
        
           repo = "server";

     

       18
       18
       -
           rev = "v${version}";

     

       18
       18
       +
           tag = "v${finalAttrs.version}";

     

       19
       19
        
           hash = "sha256-9vIReA29dWf3QwUYEW8JhzF9o74JZqG4zGobgI+gIWE=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         # With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath`

     

       23
       23
       -
         # argument for Go builds which apparently breaks the UI like this:

     

       24
       24
       -
         #

     

       25
       25
       -
         #   server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory

     

       26
       26
       -
         allowGoReference = true;

     

       27
       27
       -
       

     

       28
       22
        
         vendorHash = "sha256-rs6EfnJT6Jgif2TR5u5Tp5/Ozn+4uhSapksyKFnQiCo=";

     

       29
       23
        
       

     

       24
       24
       +
         # No test

     

       30
       25
        
         doCheck = false;

     

       31
       26
        
       

     

       32
       27
        
         buildInputs = [

     

       33
       28
        
           sqlite

     

       34
       29
        
         ];

     

       35
       30
        
       

     

       36
       36
       -
         ui = callPackage ./ui.nix { };

     

       31
       31
       +
         ui = callPackage ./ui.nix { inherit (finalAttrs) src version; };

     

       37
       32
        
       

     

       38
       38
       -
         preBuild = ''

     

       39
       39
       -
           if [ -n "$ui" ] # to make the preBuild a no-op inside the goModules fixed-output derivation, where it would fail

     

       40
       40
       -
           then

     

       41
       41
       -
             cp -r $ui ui/build

     

       42
       42
       -
           fi

     

       33
       33
       +
         # Use preConfigure instead of preBuild to keep goModules independent from ui

     

       34
       34
       +
         preConfigure = ''

     

       35
       35
       +
           cp -r ${finalAttrs.ui} ui/build

     

       43
       36
        
         '';

     

       44
       37
        
       

     

       45
       38
        
         passthru = {

     

       46
       46
       -
           # For nix-update to detect the location of this attribute from this

     

       47
       47
       -
           # derivation.

     

       48
       48
       -
           inherit (ui) offlineCache;

     

       49
       49
       -
           updateScript = nix-update-script { };

     

       39
       39
       +
           updateScript = nix-update-script {

     

       40
       40
       +
             extraArgs = [

     

       41
       41
       +
               "--subpackage"

     

       42
       42
       +
               "ui"

     

       43
       43
       +
             ];

     

       44
       44
       +
           };

     

       50
       45
        
           tests = {

     

       51
       46
        
             nixos = nixosTests.gotify-server;

     

       52
       47
        
           };

     
···

       56
       51
        
         # produce binaries which panic when executed and are not interesting at all

     

       57
       52
        
         subPackages = [ "." ];

     

       58
       53
        
       

     

       54
       54
       +
         # Based on LD_FLAGS in upstream's .github/workflows/build.yml:

     

       55
       55
       +
         # https://github.com/gotify/server/blob/v2.6.3/.github/workflows/build.yml#L33

     

       59
       56
        
         ldflags = [

     

       60
       60
       -
           "-X main.Version=${version}"

     

       57
       57
       +
           "-s"

     

       58
       58
       +
           "-X main.Version=${finalAttrs.version}"

     

       61
       59
        
           "-X main.Mode=prod"

     

       60
       60
       +
           "-X main.Commit=refs/tags/v${finalAttrs.version}"

     

       61
       61
       +
           "-X main.BuildDate=unknown"

     

       62
       62
        
         ];

     

       63
       63
        
       

     

       64
       64
       -
         meta = with lib; {

     

       64
       64
       +
         meta = {

     

       65
       65
        
           description = "Simple server for sending and receiving messages in real-time per WebSocket";

     

       66
       66
        
           homepage = "https://gotify.net";

     

       67
       67
       -
           license = licenses.mit;

     

       68
       68
       -
           maintainers = with maintainers; [ doronbehar ];

     

       67
       67
       +
           license = lib.licenses.mit;

     

       68
       68
       +
           maintainers = with lib.maintainers; [ doronbehar ];

     

       69
       69
        
           mainProgram = "server";

     

       70
       70
        
         };

     

       71
       71
       -
       }

     

       71
       71
       +
       })

+13 -27

pkgs/by-name/go/gotify-server/ui.nix

···

       1
       1
        
       {

     

       2
       2
       +
         src,

     

       3
       3
       +
         version,

     

       2
       4
        
         stdenv,

     

       3
       3
       -
         yarn,

     

       4
       4
       -
         fixup-yarn-lock,

     

       5
       5
       +
         yarnConfigHook,

     

       6
       6
       +
         yarnBuildHook,

     

       5
       7
        
         nodejs-slim,

     

       6
       8
        
         fetchYarnDeps,

     

       7
       7
       -
         gotify-server,

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       10
       -
       stdenv.mkDerivation rec {

     

       11
       11
       +
       stdenv.mkDerivation (finalAttrs: {

     

       11
       12
        
         pname = "gotify-ui";

     

       12
       12
       -
         inherit (gotify-server) version;

     

       13
       13
       +
         inherit version;

     

       13
       14
        
       

     

       14
       14
       -
         src = gotify-server.src + "/ui";

     

       15
       15
       +
         src = src + "/ui";

     

       15
       16
        
       

     

       16
       16
       -
         offlineCache = fetchYarnDeps {

     

       17
       17
       -
           yarnLock = "${src}/yarn.lock";

     

       17
       17
       +
         yarnOfflineCache = fetchYarnDeps {

     

       18
       18
       +
           yarnLock = "${finalAttrs.src}/yarn.lock";

     

       18
       19
        
           hash = "sha256-ejHzo6NHCMlNiYePWvfMY9Blb58pj3UQ5PFI0V84flI=";

     

       19
       20
        
         };

     

       20
       21
        
       

     

       21
       22
        
         nativeBuildInputs = [

     

       22
       22
       -
           yarn

     

       23
       23
       -
           fixup-yarn-lock

     

       23
       23
       +
           yarnConfigHook

     

       24
       24
       +
           yarnBuildHook

     

       24
       25
        
           nodejs-slim

     

       25
       26
        
         ];

     

       26
       27
        
       

     

       27
       27
       -
         postPatch = ''

     

       28
       28
       -
           export HOME=$NIX_BUILD_TOP/fake_home

     

       29
       29
       -
           yarn config --offline set yarn-offline-mirror $offlineCache

     

       30
       30
       -
           fixup-yarn-lock yarn.lock

     

       31
       31
       -
           yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive

     

       32
       32
       -
           patchShebangs node_modules/

     

       33
       33
       -
         '';

     

       34
       34
       -
       

     

       35
       35
       -
         buildPhase = ''

     

       36
       36
       -
           runHook preBuild

     

       37
       37
       -
       

     

       38
       38
       -
           export NODE_OPTIONS=--openssl-legacy-provider

     

       39
       39
       -
           yarn --offline build

     

       40
       40
       -
       

     

       41
       41
       -
           runHook postBuild

     

       42
       42
       -
         '';

     

       28
       28
       +
         env.NODE_OPTIONS = "--openssl-legacy-provider";

     

       43
       29
        
       

     

       44
       30
        
         installPhase = ''

     

       45
       31
        
           runHook preInstall

     
···

       48
       34
        
       

     

       49
       35
        
           runHook postInstall

     

       50
       36
        
         '';

     

       51
       51
       -
       }

     

       37
       37
       +
       })

+2 -2

pkgs/by-name/jr/jreleaser-cli/package.nix

···

       7
       7
        
       }:

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "jreleaser-cli";

     

       10
       10
       -
         version = "1.18.0";

     

       10
       10
       +
         version = "1.19.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";

     

       14
       14
       -
           hash = "sha256-rJYFoPPz1tR7LgcVfiRPFJHf1tMLhlxNQXsmutHZs3Q=";

     

       14
       14
       +
           hash = "sha256-tUliZBRHAXgv+FR5z298IAG3egTTqwhRYt8r96gdtdM=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ makeWrapper ];

+5 -4

pkgs/by-name/la/ladybird/package.nix

···

       35
       35
        
       

     

       36
       36
        
       let

     

       37
       37
        
         # Note: The cacert version is synthetic and must match the version in the package's CMake

     

       38
       38
       -
         cacert_version = "2023-12-12";

     

       38
       38
       +
         cacert_version = "2025-05-20";

     

       39
       39
        
       in

     

       40
       40
        
       stdenv.mkDerivation (finalAttrs: {

     

       41
       41
        
         pname = "ladybird";

     

       42
       42
       -
         version = "0-unstable-2025-06-18";

     

       42
       42
       +
         version = "0-unstable-2025-06-27";

     

       43
       43
        
       

     

       44
       44
        
         src = fetchFromGitHub {

     

       45
       45
        
           owner = "LadybirdWebBrowser";

     

       46
       46
        
           repo = "ladybird";

     

       47
       47
       -
           rev = "86c8dbbf902d5c84bdc90cd35d19cc167d5848bd";

     

       48
       48
       -
           hash = "sha256-CUVKrbpwPDMHPMHQfNSOQLQmRv7Fy4H/xsglZJaPZlI=";

     

       47
       47
       +
           rev = "831ba5d6550fd9dfaf90153876ff42396f7165ac";

     

       48
       48
       +
           hash = "sha256-7feXPFKExjuOGbitlAkSEEzYNEZb6hGSDUZW1EJGIW8=";

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
        
         postPatch = ''

     
···

       201
       201
        
             "aarch64-darwin"

     

       202
       202
        
           ];

     

       203
       203
        
           mainProgram = "Ladybird";

     

       204
       204
       +
           broken = stdenv.hostPlatform.isDarwin;

     

       204
       205
        
         };

     

       205
       206
        
       })

+3 -3

pkgs/by-name/me/mergiraf/package.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       13
       13
        
         pname = "mergiraf";

     

       14
       14
       -
         version = "0.10.0";

     

       14
       14
       +
         version = "0.11.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitea {

     

       17
       17
        
           domain = "codeberg.org";

     

       18
       18
        
           owner = "mergiraf";

     

       19
       19
        
           repo = "mergiraf";

     

       20
       20
        
           tag = "v${finalAttrs.version}";

     

       21
       21
       -
           hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4=";

     

       21
       21
       +
           hash = "sha256-nzWRMCIeZ1RmZO4v5UqX1JrbN1UjBHkl/bYaERCzfew=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         useFetchCargoVendor = true;

     

       25
       25
       -
         cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0=";

     

       25
       25
       +
         cargoHash = "sha256-9OjcEmed9nLM/fp6Qk/Gh9hTVnn5cqCxTUpAJUkI4/M=";

     

       26
       26
        
       

     

       27
       27
        
         nativeCheckInputs = [ git ];

     

       28
       28

+3 -3

pkgs/by-name/na/nak/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule (finalAttrs: {

     

       10
       10
        
         pname = "nak";

     

       11
       11
       -
         version = "0.14.2";

     

       11
       11
       +
         version = "0.14.4";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "fiatjaf";

     

       15
       15
        
           repo = "nak";

     

       16
       16
        
           tag = "v${finalAttrs.version}";

     

       17
       17
       -
           hash = "sha256-+91warH+uvQ5jkPIxkJxsS9R83cZ1u+FKMy3xgjHIAQ=";

     

       17
       17
       +
           hash = "sha256-MoH1jQP4X3DYri5+TfmjBh3+5jkyItgcS7+nOBSnRGI=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-HGZwcg8C9UuYu0+oPfJG4LEXIHqt+IRrDQdXtIjg0Hg=";

     

       20
       20
       +
         vendorHash = "sha256-5W7uqHT9iP5NbE3EFiFBSdjsINIWv5lIkz3K6yMcgrM=";

     

       21
       21
        
       

     

       22
       22
        
         ldflags = [

     

       23
       23
        
           "-s"

+2 -2

pkgs/by-name/nt/ntfs2btrfs/package.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "ntfs2btrfs";

     

       18
       18
       -
         version = "20240115";

     

       18
       18
       +
         version = "20250616";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "maharmstone";

     

       22
       22
        
           repo = "ntfs2btrfs";

     

       23
       23
        
           tag = version;

     

       24
       24
       -
           hash = "sha256-sZ8AWREe2jasy3hqLTjaLcOMCNsrDjz2eIuknA2TsEs=";

     

       24
       24
       +
           hash = "sha256-hRPidvpBVm42Rg+acwHQ6b8WHGMPbE6SHwlrQrB+fD8=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/pe/peergos/package.nix

···

       41
       41
        
       in

     

       42
       42
        
       stdenv.mkDerivation rec {

     

       43
       43
        
         pname = "peergos";

     

       44
       44
       -
         version = "1.6.0";

     

       44
       44
       +
         version = "1.7.1";

     

       45
       45
        
         src = fetchFromGitHub {

     

       46
       46
        
           owner = "Peergos";

     

       47
       47
        
           repo = "web-ui";

     

       48
       48
        
           rev = "v${version}";

     

       49
       49
       -
           hash = "sha256-Y2oGvYqLEAuF732DAOFLmXqwDX48/ZeYW0kPc17Z+oU=";

     

       49
       49
       +
           hash = "sha256-gafFkHgTDBBon5fxjZwDGhEPyk6bp2XL4DxAWKtpWzo=";

     

       50
       50
        
           fetchSubmodules = true;

     

       51
       51
        
         };

     

       52
       52

+2 -2

pkgs/by-name/po/portmidi/package.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "portmidi";

     

       12
       12
       -
         version = "2.0.4";

     

       12
       12
       +
         version = "2.0.6";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "portmidi";

     

       16
       16
        
           repo = "portmidi";

     

       17
       17
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-uqBeh9vBP6+V+FN4lfeGxePQcpZMDYUuAo/d9a5rQxU=";

     

       18
       18
       +
           sha256 = "sha256-ou+zN4XnR+QaWC/hzgtThVbeZ/3UVLTpZ9O+eQSGVBs=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         cmakeFlags = [

+21 -12

pkgs/by-name/re/redis/package.nix

···

       14
       14
        
         systemd,

     

       15
       15
        
         openssl,

     

       16
       16
        
         python3,

     

       17
       17
       -
       

     

       17
       17
       +
         nix-update-script,

     

       18
       18
       +
         versionCheckHook,

     

       18
       19
        
         withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,

     

       19
       20
        
         tlsSupport ? true,

     

       20
       21
        
         # Using system jemalloc fixes cross-compilation and various setups.

     
···

       25
       26
        
       

     

       26
       27
        
       stdenv.mkDerivation (finalAttrs: {

     

       27
       28
        
         pname = "redis";

     

       28
       28
       -
         version = "7.2.7";

     

       29
       29
       +
         version = "8.0.2";

     

       29
       30
        
       

     

       30
       31
        
         src = fetchFromGitHub {

     

       31
       32
        
           owner = "redis";

     

       32
       33
        
           repo = "redis";

     

       33
       33
       -
           rev = finalAttrs.version;

     

       34
       34
       -
           hash = "sha256-WZ89BUm3zz6n0dZKyODHCyMGExbqaPJJ1qxLvJKUSDI=";

     

       34
       34
       +
           tag = finalAttrs.version;

     

       35
       35
       +
           hash = "sha256-BZJEBp3M7Gw/6/fZjfaMfU777dFmMzAS4bDI06ErkSc=";

     

       35
       36
        
         };

     

       36
       37
        
       

     

       37
       38
        
         patches = lib.optional useSystemJemalloc (fetchpatch2 {

     
···

       65
       66
        
       

     

       66
       67
        
         hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];

     

       67
       68
        
       

     

       68
       68
       -
         env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);

     

       69
       69
        
         env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo";

     

       70
       70
        
       

     

       71
       71
        
         # darwin currently lacks a pure `pgrep` which is extensively used here

     
···

       81
       81
        
           # disable test "Connect multiple replicas at the same time": even

     

       82
       82
        
           # upstream find this test too timing-sensitive

     

       83
       83
        
           substituteInPlace tests/integration/replication.tcl \

     

       84
       84
       -
             --replace 'foreach mdl {no yes}' 'foreach mdl {}'

     

       84
       84
       +
             --replace-fail 'foreach sdl {disabled swapdb} {' 'foreach sdl {} {'

     

       85
       85
        
       

     

       86
       86
        
           substituteInPlace tests/support/server.tcl \

     

       87
       87
       -
             --replace 'exec /usr/bin/env' 'exec env'

     

       87
       87
       +
             --replace-fail 'exec /usr/bin/env' 'exec env'

     

       88
       88
        
       

     

       89
       89
       -
           sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \

     

       89
       89
       +
           sed -i -e '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \

     

       90
       90
       +
             -e  '/^proc wait_for_ofs_sync/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \

     

       90
       91
        
             tests/support/util.tcl

     

       91
       92
        
       

     

       92
       93
        
           ./runtest \

     
···

       100
       101
        
           runHook postCheck

     

       101
       102
        
         '';

     

       102
       103
        
       

     

       103
       103
       -
         passthru.tests.redis = nixosTests.redis;

     

       104
       104
       -
         passthru.serverBin = "redis-server";

     

       104
       104
       +
         doInstallCheck = true;

     

       105
       105
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       106
       106
       +
         versionCheckProgram = "${placeholder "out"}/bin/redis-server";

     

       107
       107
       +
         versionCheckProgramArg = "--version";

     

       108
       108
       +
       

     

       109
       109
       +
         passthru = {

     

       110
       110
       +
           tests.redis = nixosTests.redis;

     

       111
       111
       +
           serverBin = "redis-server";

     

       112
       112
       +
           updateScript = nix-update-script { };

     

       113
       113
       +
         };

     

       105
       114
        
       

     

       106
       115
        
         meta = {

     

       107
       116
        
           homepage = "https://redis.io";

     

       108
       117
        
           description = "Open source, advanced key-value store";

     

       109
       109
       -
           license = lib.licenses.bsd3;

     

       118
       118
       +
           license = lib.licenses.agpl3Only;

     

       110
       119
        
           platforms = lib.platforms.all;

     

       111
       111
       -
           changelog = "https://github.com/redis/redis/raw/${finalAttrs.version}/00-RELEASENOTES";

     

       120
       120
       +
           changelog = "https://github.com/redis/redis/releases/tag/${finalAttrs.version}";

     

       112
       121
        
           maintainers = with lib.maintainers; [

     

       113
       122
        
             berdario

     

       114
       123
        
             globin

+2 -2

pkgs/by-name/sn/snapcraft/package.nix

···

       14
       14
        
       

     

       15
       15
        
       python312Packages.buildPythonApplication rec {

     

       16
       16
        
         pname = "snapcraft";

     

       17
       17
       -
         version = "8.9.5";

     

       17
       17
       +
         version = "8.10.0";

     

       18
       18
        
       

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     
···

       22
       22
        
           owner = "canonical";

     

       23
       23
        
           repo = "snapcraft";

     

       24
       24
        
           tag = version;

     

       25
       25
       -
           hash = "sha256-bwk9wK8fIXhhmj4XdtpTzZfzZkAtETpfMleTrbYt6Ww=";

     

       25
       25
       +
           hash = "sha256-k48OgHg0Pm3WfjPex27UvMZBOq9708vGJy/rZvCZdbg=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         patches = [

+2 -2

pkgs/by-name/te/tevent/package.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "tevent";

     

       21
       21
       -
         version = "0.16.2";

     

       21
       21
       +
         version = "0.17.0";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "mirror://samba/tevent/${pname}-${version}.tar.gz";

     

       25
       25
       -
           sha256 = "sha256-8LvSnfq7y7zp9HGPwWVBDN1PfY7h89/FRhjUwDGZzqM=";

     

       25
       25
       +
           sha256 = "sha256-dwL7Nztp2ilguGE0tqnsb6C5SaAXVv7ACkpqQ1dcg2E=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+4 -4

pkgs/by-name/ti/tigerbeetle/package.nix

···

       10
       10
        
         platform =

     

       11
       11
        
           if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;

     

       12
       12
        
         hash = builtins.getAttr platform {

     

       13
       13
       -
           "universal-macos" = "sha256-muEoLk6pL0hobpdzalXs/SjlB+eRJgbt7rPHbgs0IZo=";

     

       14
       14
       -
           "x86_64-linux" = "sha256-TP7pqXZceqboMuQGkO2/yyPH4K2YWEpNIzREKQDY2is=";

     

       15
       15
       -
           "aarch64-linux" = "sha256-GGbCJVqBud+Fh1aasEEupmRF3B/sYntBkC8B5mGxnWI=";

     

       13
       13
       +
           "universal-macos" = "sha256-8RyNDE8br4fPjCE38MVci7eatiEHIMUtVGa0pCTKj1k=";

     

       14
       14
       +
           "x86_64-linux" = "sha256-18dj7GNXYhsjECIp4oqGbBSLWZhQjPORm3ohNL/jXmg=";

     

       15
       15
       +
           "aarch64-linux" = "sha256-u4JIJtEu7+YtfIpTxqmSb2xTBA57YtNtQCCNkkoEURg=";

     

       16
       16
        
         };

     

       17
       17
        
       in

     

       18
       18
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       19
       19
        
         pname = "tigerbeetle";

     

       20
       20
       -
         version = "0.16.45";

     

       20
       20
       +
         version = "0.16.47";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchzip {

     

       23
       23
        
           url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

+3 -3

pkgs/by-name/ze/zed-editor/package.nix

···

       99
       99
        
       in

     

       100
       100
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       101
       101
        
         pname = "zed-editor";

     

       102
       102
       -
         version = "0.192.7";

     

       102
       102
       +
         version = "0.192.8";

     

       103
       103
        
       

     

       104
       104
        
         outputs =

     

       105
       105
        
           [ "out" ]

     
···

       111
       111
        
           owner = "zed-industries";

     

       112
       112
        
           repo = "zed";

     

       113
       113
        
           tag = "v${finalAttrs.version}";

     

       114
       114
       -
           hash = "sha256-OjqJAb7IlFpSd7+i5QAkpsBDAbM6tZ8x/Y1HWiyDkPI=";

     

       114
       114
       +
           hash = "sha256-SvfxveVgi2GvnG4d3YUFSn0LY92YrNmwXAicQP5mivk=";

     

       115
       115
        
         };

     

       116
       116
        
       

     

       117
       117
        
         patches = [

     
···

       138
       138
        
           '';

     

       139
       139
        
       

     

       140
       140
        
         useFetchCargoVendor = true;

     

       141
       141
       -
         cargoHash = "sha256-qi3V6qGbb6kKecSTCbDMqfUKdgIliBJG1RaI5v+W9yY=";

     

       141
       141
       +
         cargoHash = "sha256-H7IgJJsdL7UsAWavdzrMQAc8SZqErJSINaLkzh+0Qic=";

     

       142
       142
        
       

     

       143
       143
        
         nativeBuildInputs =

     

       144
       144
        
           [

+23 -4

pkgs/development/coq-modules/parseque/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         mkCoqDerivation,

     

       4
       4
       +
         rocqPackages,

     

       4
       5
        
         which,

     

       5
       6
        
         coq,

     

       6
       7
        
         version ? null,

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       with lib;

     

       10
       10
       -
       mkCoqDerivation {

     

       11
       11
       +
       (mkCoqDerivation {

     

       11
       12
        
         pname = "parseque";

     

       12
       13
        
         repo = "parseque";

     

       13
       14
        
         owner = "rocq-community";

     
···

       19
       20
        
             [ coq.coq-version ]

     

       20
       21
        
             [

     

       21
       22
        
               {

     

       22
       22
       -
                 cases = [ (range "8.16" "8.20") ];

     

       23
       23
       +
                 cases = [ (range "8.16" "9.0") ];

     

       23
       24
        
                 out = "0.2.2";

     

       24
       25
        
               }

     

       25
       26
        
             ]

     
···

       30
       31
        
         releaseRev = v: "v${v}";

     

       31
       32
        
       

     

       32
       33
        
         meta = {

     

       33
       33
       -
           description = "Total parser combinators in Rocq";

     

       34
       34
       +
           description = "Total parser combinators in Coq/Rocq";

     

       34
       35
        
           maintainers = with maintainers; [ womeier ];

     

       35
       36
        
           license = licenses.mit;

     

       36
       37
        
         };

     

       37
       37
       -
       }

     

       38
       38
       +
       }).overrideAttrs

     

       39
       39
       +
         (

     

       40
       40
       +
           o:

     

       41
       41
       +
           # this is just a wrapper for rocPackages.parseque for Rocq >= 9.0

     

       42
       42
       +
           lib.optionalAttrs

     

       43
       43
       +
             (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version))

     

       44
       44
       +
             {

     

       45
       45
       +
               configurePhase = ''

     

       46
       46
       +
                 echo no configuration

     

       47
       47
       +
               '';

     

       48
       48
       +
               buildPhase = ''

     

       49
       49
       +
                 echo building nothing

     

       50
       50
       +
               '';

     

       51
       51
       +
               installPhase = ''

     

       52
       52
       +
                 echo installing nothing

     

       53
       53
       +
               '';

     

       54
       54
       +
               propagatedBuildInputs = [ rocqPackages.parseque ];

     

       55
       55
       +
             }

     

       56
       56
       +
         )

+15

pkgs/development/haskell-modules/configuration-common.nix

···

       1315
       1315
        
         VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator;

     

       1316
       1316
        
         vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils;

     

       1317
       1317
        
       

     

       1318
       1318
       +
         # Support for vulkan-headers 1.4.313.0

     

       1319
       1319
       +
         # https://github.com/YoshikuniJujo/gpu-vulkan-middle/issues/10

     

       1320
       1320
       +
         gpu-vulkan-middle = overrideCabal (drv: {

     

       1321
       1321
       +
           version =

     

       1322
       1322
       +
             let

     

       1323
       1323
       +
               fixed = "0.1.0.76";

     

       1324
       1324
       +
             in

     

       1325
       1325
       +
             lib.warnIf (lib.versionAtLeast drv.version fixed)

     

       1326
       1326
       +
               "haskellPackages.gpu-vulkan-middle: default version ${drv.version} >= ${fixed}, consider dropping override"

     

       1327
       1327
       +
               fixed;

     

       1328
       1328
       +
           sha256 = "sha256-VQAVo/84qPBFkQSmY3pT4WXOK9zrFMpK7WN9/UdED6E=";

     

       1329
       1329
       +
           revision = null;

     

       1330
       1330
       +
           editedCabalFile = null;

     

       1331
       1331
       +
         }) super.gpu-vulkan-middle;

     

       1332
       1332
       +
       

     

       1318
       1333
        
         # Generate cli completions for dhall.

     

       1319
       1334
        
         dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall;

     

       1320
       1335
        
         # 2025-01-27: allow aeson >= 2.2, 9.8 versions of text and bytestring

+4

pkgs/development/libraries/qt-6/modules/qtbase/default.nix

···

       269
       269
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       270
       270
        
             "-DQT_FEATURE_rpath=OFF"

     

       271
       271
        
             "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"

     

       272
       272
       +
             # This is only used for the min version check, which we disabled above.

     

       273
       273
       +
             # When this variable is not set, cmake tries to execute xcodebuild

     

       274
       274
       +
             # to query the version.

     

       275
       275
       +
             "-DQT_INTERNAL_XCODE_VERSION=0.1"

     

       272
       276
        
           ]

     

       273
       277
        
           ++ lib.optionals isCrossBuild [

     

       274
       278
        
             "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"

+7 -1

pkgs/development/libraries/qt-6/qtModule.nix

···

       42
       42
        
             # don't leak OS version into the final output

     

       43
       43
        
             # https://bugreports.qt.io/browse/QTBUG-136060

     

       44
       44
        
             [ "-DCMAKE_SYSTEM_VERSION=" ]

     

       45
       45
       -
             ++ lib.optional stdenv.hostPlatform.isDarwin "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"

     

       45
       45
       +
             ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       46
       46
       +
               "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"

     

       47
       47
       +
               # This is only used for the min version check, which we disabled above.

     

       48
       48
       +
               # When this variable is not set, cmake tries to execute xcodebuild

     

       49
       49
       +
               # to query the version.

     

       50
       50
       +
               "-DQT_INTERNAL_XCODE_VERSION=0.1"

     

       51
       51
       +
             ]

     

       46
       52
        
             ++ args.cmakeFlags or [ ];

     

       47
       53
        
       

     

       48
       54
        
           moveToDev = false;

+59

pkgs/development/python-modules/control/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         buildPythonPackage,

     

       5
       5
       +
         numpy,

     

       6
       6
       +
         scipy,

     

       7
       7
       +
         matplotlib,

     

       8
       8
       +
         setuptools,

     

       9
       9
       +
         setuptools-scm,

     

       10
       10
       +
         cvxopt,

     

       11
       11
       +
         pytest-timeout,

     

       12
       12
       +
         pytestCheckHook,

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       buildPythonPackage rec {

     

       16
       16
       +
         pname = "control";

     

       17
       17
       +
         version = "0.10.1";

     

       18
       18
       +
         pyproject = true;

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "python-control";

     

       22
       22
       +
           repo = "python-control";

     

       23
       23
       +
           tag = version;

     

       24
       24
       +
           hash = "sha256-wLDYPuLnsZ2+cXf7j3BxUbn4IjHPt09LE9cjQGXWrO0=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         build-system = [

     

       28
       28
       +
           setuptools

     

       29
       29
       +
           setuptools-scm

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         dependencies = [

     

       33
       33
       +
           numpy

     

       34
       34
       +
           scipy

     

       35
       35
       +
           matplotlib

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         optional-dependencies = {

     

       39
       39
       +
           # slycot is not in nixpkgs

     

       40
       40
       +
           # slycot = [ slycot ];

     

       41
       41
       +
           cvxopt = [ cvxopt ];

     

       42
       42
       +
         };

     

       43
       43
       +
       

     

       44
       44
       +
         pythonImportsCheck = [ "control" ];

     

       45
       45
       +
       

     

       46
       46
       +
         nativeCheckInputs = [

     

       47
       47
       +
           cvxopt

     

       48
       48
       +
           pytest-timeout

     

       49
       49
       +
           pytestCheckHook

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         meta = {

     

       53
       53
       +
           changelog = "https://github.com/python-control/python-control/releases/tag/${src.tag}";

     

       54
       54
       +
           description = "Python Control Systems Library";

     

       55
       55
       +
           homepage = "https://github.com/python-control/python-control";

     

       56
       56
       +
           license = lib.licenses.bsd3;

     

       57
       57
       +
           maintainers = with lib.maintainers; [ Peter3579 ];

     

       58
       58
       +
         };

     

       59
       59
       +
       }

+2 -2

pkgs/development/python-modules/craft-parts/default.nix

···

       30
       30
        
       

     

       31
       31
        
       buildPythonPackage rec {

     

       32
       32
        
         pname = "craft-parts";

     

       33
       33
       -
         version = "2.12.0";

     

       33
       33
       +
         version = "2.14.0";

     

       34
       34
        
       

     

       35
       35
        
         pyproject = true;

     

       36
       36
        
       

     
···

       38
       38
        
           owner = "canonical";

     

       39
       39
        
           repo = "craft-parts";

     

       40
       40
        
           tag = version;

     

       41
       41
       -
           hash = "sha256-mm5s7lHbU9SJsS9wTkXkJpmVsGG0qVXIeaQ+TiGz/7o=";

     

       41
       41
       +
           hash = "sha256-NJTueawkjoYPVnDSODgU/JlTG5yLow+4wiHQzNWHNbA=";

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         patches = [ ./bash-path.patch ];

+40

pkgs/development/rocq-modules/parseque/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         mkRocqDerivation,

     

       4
       4
       +
         which,

     

       5
       5
       +
         stdlib,

     

       6
       6
       +
         rocq-core,

     

       7
       7
       +
         version ? null,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       with lib;

     

       11
       11
       +
       mkRocqDerivation {

     

       12
       12
       +
         pname = "parseque";

     

       13
       13
       +
         repo = "parseque";

     

       14
       14
       +
         owner = "rocq-community";

     

       15
       15
       +
       

     

       16
       16
       +
         inherit version;

     

       17
       17
       +
         defaultVersion =

     

       18
       18
       +
           with versions;

     

       19
       19
       +
           switch

     

       20
       20
       +
             [ rocq-core.rocq-version ]

     

       21
       21
       +
             [

     

       22
       22
       +
               {

     

       23
       23
       +
                 cases = [ (range "9.0" "9.0") ];

     

       24
       24
       +
                 out = "0.3.0";

     

       25
       25
       +
               }

     

       26
       26
       +
             ]

     

       27
       27
       +
             null;

     

       28
       28
       +
       

     

       29
       29
       +
         release."0.3.0".sha256 = "sha256-W2eenv5Q421eVn2ubbninFmmdT875f3w/Zs7yGHUKP4=";

     

       30
       30
       +
       

     

       31
       31
       +
         propagatedBuildInputs = [ stdlib ];

     

       32
       32
       +
       

     

       33
       33
       +
         releaseRev = v: "v${v}";

     

       34
       34
       +
       

     

       35
       35
       +
         meta = {

     

       36
       36
       +
           description = "Total parser combinators in Rocq";

     

       37
       37
       +
           maintainers = with maintainers; [ womeier ];

     

       38
       38
       +
           license = licenses.mit;

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+2 -2

pkgs/games/path-of-building/default.nix

···

       17
       17
        
       let

     

       18
       18
        
         data = stdenv.mkDerivation (finalAttrs: {

     

       19
       19
        
           pname = "path-of-building-data";

     

       20
       20
       -
           version = "2.55.1";

     

       20
       20
       +
           version = "2.55.2";

     

       21
       21
        
       

     

       22
       22
        
           src = fetchFromGitHub {

     

       23
       23
        
             owner = "PathOfBuildingCommunity";

     

       24
       24
        
             repo = "PathOfBuilding";

     

       25
       25
        
             rev = "v${finalAttrs.version}";

     

       26
       26
       -
             hash = "sha256-O3XD52UdkjxtWdsXs6QbXzfik3ZT9TEc2PPZCIGJdCQ=";

     

       26
       26
       +
             hash = "sha256-i+9WeASdOj9QSB0HjDMP7qM7wQh3tyHuh74QlVWhi1c=";

     

       27
       27
        
           };

     

       28
       28
        
       

     

       29
       29
        
           nativeBuildInputs = [ unzip ];

-10

pkgs/servers/nextcloud/packages/30.json

···

       219
       219
        
             "agpl"

     

       220
       220
        
           ]

     

       221
       221
        
         },

     

       222
       222
       -
         "memories": {

     

       223
       223
       -
           "hash": "sha256-BfxJDCGsiRJrZWkNJSQF3rSFm/G3zzQn7C6DCETSzw4=",

     

       224
       224
       -
           "url": "https://github.com/pulsejet/memories/releases/download/v7.5.2/memories.tar.gz",

     

       225
       225
       -
           "version": "7.5.2",

     

       226
       226
       -
           "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.",

     

       227
       227
       -
           "homepage": "https://memories.gallery",

     

       228
       228
       -
           "licenses": [

     

       229
       229
       -
             "agpl"

     

       230
       230
       -
           ]

     

       231
       231
       -
         },

     

       232
       222
        
         "music": {

     

       233
       223
        
           "hash": "sha256-h83Xc292/NQPWOTRIbUSgqHUH/Sp4fYJ8GAHSiJWHP0=",

     

       234
       224
        
           "url": "https://github.com/owncloud/music/releases/download/v2.1.4/music_2.1.4_for_nextcloud.tar.gz",

-10

pkgs/servers/nextcloud/packages/31.json

···

       219
       219
        
             "agpl"

     

       220
       220
        
           ]

     

       221
       221
        
         },

     

       222
       222
       -
         "memories": {

     

       223
       223
       -
           "hash": "sha256-BfxJDCGsiRJrZWkNJSQF3rSFm/G3zzQn7C6DCETSzw4=",

     

       224
       224
       -
           "url": "https://github.com/pulsejet/memories/releases/download/v7.5.2/memories.tar.gz",

     

       225
       225
       -
           "version": "7.5.2",

     

       226
       226
       -
           "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.",

     

       227
       227
       -
           "homepage": "https://memories.gallery",

     

       228
       228
       -
           "licenses": [

     

       229
       229
       -
             "agpl"

     

       230
       230
       -
           ]

     

       231
       231
       -
         },

     

       232
       222
        
         "music": {

     

       233
       223
        
           "hash": "sha256-h83Xc292/NQPWOTRIbUSgqHUH/Sp4fYJ8GAHSiJWHP0=",

     

       234
       224
        
           "url": "https://github.com/owncloud/music/releases/download/v2.1.4/music_2.1.4_for_nextcloud.tar.gz",

+32

pkgs/servers/nextcloud/packages/apps/memories-paths.diff

···

       1
       1
       +
       diff --git a/lib/Settings/SystemConfig.php b/lib/Settings/SystemConfig.php

     

       2
       2
       +
       index 7814f071..bb1309fa 100644

     

       3
       3
       +
       --- a/lib/Settings/SystemConfig.php

     

       4
       4
       +
       +++ b/lib/Settings/SystemConfig.php

     

       5
       5
       +
       @@ -124,6 +125,14 @@ class SystemConfig

     

       6
       6
       +
             */

     

       7
       7
       +
            public static function get(string $key, mixed $default = null): mixed

     

       8
       8
       +
            {

     

       9
       9
       +
       +        switch ($key) {

     

       10
       10
       +
       +          case "memories.exiftool": return "@exiftool@";

     

       11
       11
       +
       +          case "memories.exiftool_no_local": return false;

     

       12
       12
       +
       +          case "memories.vod.ffmpeg": return "@ffmpeg@";

     

       13
       13
       +
       +          case "memories.vod.ffprobe": return "@ffprobe@";

     

       14
       14
       +
       +          case "memories.vod.path": return "@go-vod@";

     

       15
       15
       +
       +        }

     

       16
       16
       +
       +

     

       17
       17
       +
                if (!\array_key_exists($key, self::DEFAULTS)) {

     

       18
       18
       +
                    throw new \InvalidArgumentException("Invalid system config key: {$key}");

     

       19
       19
       +
                }

     

       20
       20
       +
       @@ -154,6 +161,12 @@ public static function get(string $key, mixed $default = null): mixed

     

       21
       21
       +
             */

     

       22
       22
       +
            public static function set(string $key, mixed $value): void

     

       23
       23
       +
            {

     

       24
       24
       +
       +        // Ignore those paths and always use the nix paths.

     

       25
       25
       +
       +        // We cannot return a proper error message except a 500 here without changing the code to much.

     

       26
       26
       +
       +        if (in_array($key, array("memories.exiftool", "memories.exiftool_no_local", "memories.vod.ffmpeg", "memories.vod.ffprobe", "memories.vod.path"))) {

     

       27
       27
       +
       +            throw new \InvalidArgumentException("Cannot set nix-managed key: {$key}");

     

       28
       28
       +
       +        }

     

       29
       29
       +
       +

     

       30
       30
       +
                // Check if the key is valid

     

       31
       31
       +
                if (!\array_key_exists($key, self::DEFAULTS)) {

     

       32
       32
       +
                    throw new \InvalidArgumentException("Invalid system config key: {$key}");

+91

pkgs/servers/nextcloud/packages/apps/memories.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         buildGoModule,

     

       4
       4
       +
         exiftool,

     

       5
       5
       +
         fetchurl,

     

       6
       6
       +
         ffmpeg-headless,

     

       7
       7
       +
         fetchFromGitHub,

     

       8
       8
       +
         lib,

     

       9
       9
       +
         replaceVars,

     

       10
       10
       +
       

     

       11
       11
       +
         ncVersion,

     

       12
       12
       +
       }:

     

       13
       13
       +
       let

     

       14
       14
       +
         latestVersionForNc = {

     

       15
       15
       +
           "31" = latestVersionForNc."30";

     

       16
       16
       +
           "30" = {

     

       17
       17
       +
             version = "7.5.2";

     

       18
       18
       +
             appHash = "sha256-BfxJDCGsiRJrZWkNJSQF3rSFm/G3zzQn7C6DCETSzw4=";

     

       19
       19
       +
             srcHash = "sha256-imBO/64NW5MiozpufbMRcTI9WCaN8grnHlVo+fsUNlU=";

     

       20
       20
       +
           };

     

       21
       21
       +
         };

     

       22
       22
       +
         currentVersionInfo =

     

       23
       23
       +
           latestVersionForNc.${ncVersion}

     

       24
       24
       +
             or (throw "memories currently does not support nextcloud version ${ncVersion}");

     

       25
       25
       +
       

     

       26
       26
       +
         commonMeta = with lib; {

     

       27
       27
       +
           homepage = "https://apps.nextcloud.com/apps/memories";

     

       28
       28
       +
           changelog = "https://github.com/pulsejet/memories/blob/v${currentVersionInfo.version}/CHANGELOG.md";

     

       29
       29
       +
           license = licenses.agpl3Only;

     

       30
       30
       +
           maintainers = with maintainers; [ SuperSandro2000 ];

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         go-vod = buildGoModule rec {

     

       34
       34
       +
           pname = "go-vod";

     

       35
       35
       +
           inherit (currentVersionInfo) version;

     

       36
       36
       +
       

     

       37
       37
       +
           src = fetchFromGitHub {

     

       38
       38
       +
             owner = "pulsejet";

     

       39
       39
       +
             repo = "memories";

     

       40
       40
       +
             tag = "v${version}";

     

       41
       41
       +
             hash = currentVersionInfo.srcHash;

     

       42
       42
       +
           };

     

       43
       43
       +
       

     

       44
       44
       +
           sourceRoot = "${src.name}/go-vod";

     

       45
       45
       +
       

     

       46
       46
       +
           vendorHash = null;

     

       47
       47
       +
       

     

       48
       48
       +
           meta = commonMeta // {

     

       49
       49
       +
             description = "Extremely minimal on-demand video transcoding server in go";

     

       50
       50
       +
             mainProgram = "go-vod";

     

       51
       51
       +
           };

     

       52
       52
       +
         };

     

       53
       53
       +
       in

     

       54
       54
       +
       stdenv.mkDerivation rec {

     

       55
       55
       +
         pname = "nextcloud-app-memories";

     

       56
       56
       +
         inherit (currentVersionInfo) version;

     

       57
       57
       +
       

     

       58
       58
       +
         src = fetchurl {

     

       59
       59
       +
           url = "https://github.com/pulsejet/memories/releases/download/v${version}/memories.tar.gz";

     

       60
       60
       +
           hash = currentVersionInfo.appHash;

     

       61
       61
       +
         };

     

       62
       62
       +
       

     

       63
       63
       +
         patches = [

     

       64
       64
       +
           (replaceVars ./memories-paths.diff {

     

       65
       65
       +
             exiftool = lib.getExe exiftool;

     

       66
       66
       +
             ffmpeg = lib.getExe ffmpeg-headless;

     

       67
       67
       +
             ffprobe = lib.getExe' ffmpeg-headless "ffprobe";

     

       68
       68
       +
             go-vod = lib.getExe go-vod;

     

       69
       69
       +
           })

     

       70
       70
       +
         ];

     

       71
       71
       +
       

     

       72
       72
       +
         postPatch = ''

     

       73
       73
       +
           rm appinfo/signature.json

     

       74
       74
       +
           rm -rf bin-ext/

     

       75
       75
       +
       

     

       76
       76
       +
           substituteInPlace lib/Service/BinExt.php \

     

       77
       77
       +
             --replace-fail "EXIFTOOL_VER = '12.70'" "EXIFTOOL_VER = '${exiftool.version}'"

     

       78
       78
       +
         '';

     

       79
       79
       +
       

     

       80
       80
       +
         installPhase = ''

     

       81
       81
       +
           mkdir -p $out

     

       82
       82
       +
           cp -r ./* $out/

     

       83
       83
       +
         '';

     

       84
       84
       +
       

     

       85
       85
       +
         meta = commonMeta // {

     

       86
       86
       +
           description = "Fast, modern and advanced photo management suite";

     

       87
       87
       +
           longDescription = ''

     

       88
       88
       +
             All settings related to required packages and installed programs are hardcoded in program code and cannot be changed.

     

       89
       89
       +
           '';

     

       90
       90
       +
         };

     

       91
       91
       +
       }

+5 -10

pkgs/servers/nextcloud/packages/apps/recognize.nix

···

       38
       38
        
         srcs =

     

       39
       39
        
           [

     

       40
       40
        
             (fetchurl {

     

       41
       41
       -
               inherit version;

     

       42
       41
        
               url = "https://github.com/nextcloud/recognize/releases/download/v${version}/recognize-${version}.tar.gz";

     

       43
       42
        
               hash = currentVersionInfo.appHash;

     

       44
       43
        
             })

     

       45
       44
        
       

     

       46
       45
        
             (fetchurl {

     

       47
       47
       -
               inherit version;

     

       48
       46
        
               url = "https://github.com/nextcloud/recognize/archive/refs/tags/v${version}.tar.gz";

     

       49
       47
        
               hash = currentVersionInfo.modelHash;

     

       50
       48
        
             })

     

       51
       49
        
           ]

     

       52
       50
        
           ++ lib.optionals useLibTensorflow [

     

       53
       53
       -
             (fetchurl rec {

     

       51
       51
       +
             (fetchurl {

     

       54
       52
        
               # For version see LIBTENSORFLOW_VERSION in https://github.com/tensorflow/tfjs/blob/master/tfjs-node/scripts/deps-constants.js

     

       55
       55
       -
               version = "2.9.1";

     

       56
       56
       -
               url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-${version}.tar.gz";

     

       53
       53
       +
               url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.9.1.tar.gz";

     

       57
       54
        
               hash = "sha256-f1ENJUbj214QsdEZRjaJAD1YeEKJKtPJW8pRz4KCAXM=";

     

       58
       55
        
             })

     

       59
       56
        
           ];

     
···

       61
       58
        
         unpackPhase =

     

       62
       59
        
           ''

     

       63
       60
        
             # Merge the app and the models from github

     

       64
       64
       -
             tar -xzpf "${builtins.elemAt srcs 0}" recognize;

     

       61
       61
       +
             tar -xzpf "${builtins.elemAt srcs 0}" recognize

     

       65
       62
        
             tar -xzpf "${builtins.elemAt srcs 1}" -C recognize --strip-components=1 recognize-${version}/models

     

       66
       63
        
           ''

     

       67
       64
        
           + lib.optionalString useLibTensorflow ''

     
···

       80
       77
        
             --replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${lib.getExe nodejs}'" \

     

       81
       78
        
             --replace-quiet "\$this->config->getAppValueString('node_binary')" "'${lib.getExe nodejs}'"

     

       82
       79
        
           test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -eq 0

     

       83
       83
       -
       

     

       84
       84
       -
       

     

       85
       80
        
       

     

       86
       81
        
           # Skip trying to install it... (less warnings in the log)

     

       87
       82
        
           sed  -i '/public function run/areturn ; //skip' recognize/lib/Migration/InstallDeps.php

     
···

       110
       105
        
           node src/test_libtensorflow.js

     

       111
       106
        
           cd ..

     

       112
       107
        
         '';

     

       108
       108
       +
       

     

       113
       109
        
         installPhase = ''

     

       114
       110
        
           approot="$(dirname $(dirname $(find -path '*/appinfo/info.xml' | head -n 1)))"

     

       115
       115
       -
           if [ -d "$approot" ];

     

       116
       116
       -
           then

     

       111
       111
       +
           if [ -d "$approot" ]; then

     

       117
       112
        
             mv "$approot/" $out

     

       118
       113
        
             chmod -R a-w $out

     

       119
       114
        
           fi

-1

pkgs/servers/nextcloud/packages/nextcloud-apps.json

···

       23
       23
        
       , "integration_paperless": "agpl3Plus"

     

       24
       24
        
       , "mail": "agpl3Plus"

     

       25
       25
        
       , "maps": "agpl3Plus"

     

       26
       26
       -
       , "memories": "agpl3Plus"

     

       27
       26
        
       , "music": "agpl3Plus"

     

       28
       27
        
       , "news": "agpl3Plus"

     

       29
       28
        
       , "nextpod": "agpl3Only"

+3 -2

pkgs/servers/nextcloud/packages/thirdparty.nix

···

       5
       5
        
       

     

       6
       6
        
         apps = apps.extend (

     

       7
       7
        
           self: super: {

     

       8
       8
       +
             hmr_enabler = callPackage ./apps/hmr_enabler.nix { };

     

       9
       9
       +
       

     

       10
       10
       +
             memories = callPackage ./apps/memories.nix { inherit ncVersion; };

     

       8
       11
        
       

     

       9
       9
       -
             hmr_enabler = callPackage ./apps/hmr_enabler.nix { };

     

       10
       12
        
             recognize = callPackage ./apps/recognize.nix { inherit ncVersion; };

     

       11
       11
       -
       

     

       12
       13
        
           }

     

       13
       14
        
         );

     

       14
       15
        
       }

+2

pkgs/top-level/python-packages.nix

···

       2897
       2897
        
       

     

       2898
       2898
        
         controku = callPackage ../development/python-modules/controku { };

     

       2899
       2899
        
       

     

       2900
       2900
       +
         control = callPackage ../development/python-modules/control { };

     

       2901
       2901
       +
       

     

       2900
       2902
        
         convertdate = callPackage ../development/python-modules/convertdate { };

     

       2901
       2903
        
       

     

       2902
       2904
        
         convertertools = callPackage ../development/python-modules/convertertools { };

+1

pkgs/top-level/rocq-packages.nix

···

       38
       38
        
       

     

       39
       39
        
             bignums = callPackage ../development/rocq-modules/bignums { };

     

       40
       40
        
             hierarchy-builder = callPackage ../development/rocq-modules/hierarchy-builder { };

     

       41
       41
       +
             parseque = callPackage ../development/rocq-modules/parseque { };

     

       41
       42
        
             rocq-elpi = callPackage ../development/rocq-modules/rocq-elpi { };

     

       42
       43
        
             stdlib = callPackage ../development/rocq-modules/stdlib { };

     

       43
       44