commit 5374345f821041149ae72cecf38f42ac7ce2d51f · pyrox.dev/nixpkgs

+1 -4

nixos/modules/hardware/all-firmware.nix

···

       48
       48
        
               alsa-firmware

     

       49
       49
        
               sof-firmware

     

       50
       50
        
               libreelec-dvb-firmware

     

       51
       51
       -
             ] ++ optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware

     

       52
       52
       -
               ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [

     

       53
       53
       -
               rtl8723bs-firmware

     

       54
       54
       -
             ];

     

       51
       51
       +
             ] ++ optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware;

     

       55
       52
        
           })

     

       56
       53
        
           (mkIf cfg.enableAllFirmware {

     

       57
       54
        
             assertions = [{

+1 -1

nixos/modules/system/boot/luksroot.nix

···

       513
       513
        
         postLVM = filterAttrs (n: v: !v.preLVM) luks.devices;

     

       514
       514
        
       

     

       515
       515
        
       

     

       516
       516
       -
         stage1Crypttab = pkgs.writeText "initrd-crypttab" (lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: let

     

       516
       516
       +
         stage1Crypttab = pkgs.writeText "initrd-crypttab" (lib.concatLines (lib.mapAttrsToList (n: v: let

     

       517
       517
        
           opts = v.crypttabExtraOpts

     

       518
       518
        
             ++ optional v.allowDiscards "discard"

     

       519
       519
        
             ++ optionals v.bypassWorkqueues [ "no-read-workqueue" "no-write-workqueue" ]

+3 -7

pkgs/applications/misc/gcfflasher/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "gcfflasher";

     

       11
       11
       -
         version = "4.0.3-beta";

     

       11
       11
       +
         version = "4.3.0-beta";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "dresden-elektronik";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           rev = "refs/tags/v${version}";

     

       17
       17
       -
           hash = "sha256-m+iDBfsHo+PLYd3K8JaKwhIXcnj+Q8w7gIgmHp+0plk=";

     

       17
       17
       +
           hash = "sha256-H1CZ7rAM1QpdmSnUpvg6ytln/0MQKju/C4aIk3xl0PA=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

     
···

       22
       22
        
           cmake

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       -
         postPatch = ''

     

       26
       26
       -
           substituteInPlace CMakeLists.txt \

     

       27
       27
       -
             --replace 'main_windows.c' 'main_posix.c'

     

       28
       28
       -
           '';

     

       29
       29
       -
       

     

       30
       25
        
         buildInputs = lib.optionals stdenv.isLinux [

     

       31
       26
        
           libgpiod

     

       32
       27
        
         ];

     
···

       42
       37
        
           license = licenses.bsd3;

     

       43
       38
        
           homepage = "https://github.com/dresden-elektronik/gcfflasher";

     

       44
       39
        
           maintainers = with maintainers; [ fleaz ];

     

       40
       40
       +
           platforms = platforms.all;

     

       45
       41
        
         };

     

       46
       42
        
       }

+20 -4

pkgs/applications/misc/ns-usbloader/default.nix

···

       4
       4
        
       , copyDesktopItems

     

       5
       5
        
       , makeDesktopItem

     

       6
       6
        
       , makeWrapper

     

       7
       7
       +
       , wrapGAppsHook

     

       8
       8
       +
       , gvfs

     

       7
       9
        
       , maven

     

       8
       10
        
       , jre

     

       9
       11
        
       }:

     
···

       40
       42
        
         nativeBuildInputs = [

     

       41
       43
        
           copyDesktopItems

     

       42
       44
        
           makeWrapper

     

       45
       45
       +
           wrapGAppsHook

     

       46
       46
       +
           gvfs

     

       43
       47
        
         ];

     

       44
       48
        
       

     

       49
       49
       +
         # Don't wrap binaries twice.

     

       50
       50
       +
         dontWrapGApps = true;

     

       51
       51
       +
       

     

       52
       52
       +
         ### Issues:

     

       53
       53
       +
         # * Set us to only use software rendering with `-Dprism.order=sw`, had a hard time

     

       54
       54
       +
         #   getting `prism_es2` happy with NixOS's GL/GLES.

     

       55
       55
       +
         # * Currently, there's also a lot of `Failed to build parent project for org.openjfx:javafx-*`

     

       56
       56
       +
         #   at build, but jar runs fine when using `jreWithJavaFX`.

     

       57
       57
       +
       

     

       45
       58
        
         installPhase = ''

     

       46
       59
        
           runHook preInstall

     

       47
       60
        
       

     

       48
       61
        
           mkdir -p $out/share/java

     

       49
       62
        
           install -Dm644 target/ns-usbloader-${version}.jar $out/share/java/ns-usbloader.jar

     

       50
       50
       -
       

     

       51
       51
       -
           mkdir -p $out/bin

     

       52
       52
       -
           makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \

     

       53
       53
       -
             --append-flags "-jar $out/share/java/ns-usbloader.jar"

     

       54
       63
        
       

     

       55
       64
        
           mkdir -p $out/lib/udev/rules.d

     

       56
       65
        
           install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules

     
···

       62
       71
        
           install -Dm644 target/classes/res/app_icon128x128.png $out/share/icons/hicolor/128x128/apps/ns-usbloader.png

     

       63
       72
        
       

     

       64
       73
        
           runHook postInstall

     

       74
       74
       +
         '';

     

       75
       75
       +
       

     

       76
       76
       +
         preFixup = ''

     

       77
       77
       +
           mkdir -p $out/bin

     

       78
       78
       +
           makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \

     

       79
       79
       +
             --append-flags "-Dprism.order=sw -jar $out/share/java/ns-usbloader.jar" \

     

       80
       80
       +
             "''${gappsWrapperArgs[@]}"

     

       65
       81
        
         '';

     

       66
       82
        
       

     

       67
       83
        
         desktopItems = [

+54

pkgs/by-name/kt/ktls-utils/package.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , autoreconfHook

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , gnutls

     

       7
       7
       +
       , keyutils

     

       8
       8
       +
       , glib

     

       9
       9
       +
       , libnl

     

       10
       10
       +
       , systemd

     

       11
       11
       +
       , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       stdenv.mkDerivation rec {

     

       15
       15
       +
         pname = "ktls-utils";

     

       16
       16
       +
         version = "0.10";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "oracle";

     

       20
       20
       +
           repo = "ktls-utils";

     

       21
       21
       +
           rev = "ktls-utils-${version}";

     

       22
       22
       +
           hash = "sha256-1HceFajSSq1D3IMeGQF+i/iW1lL2opLLWFfsRHW9atg=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [

     

       26
       26
       +
           autoreconfHook

     

       27
       27
       +
           pkg-config

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [

     

       31
       31
       +
           gnutls

     

       32
       32
       +
           keyutils

     

       33
       33
       +
           glib

     

       34
       34
       +
           libnl

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         outputs = [ "out" "man" ];

     

       38
       38
       +
       

     

       39
       39
       +
         configureFlags = lib.optional withSystemd [ "--with-systemd" ];

     

       40
       40
       +
       

     

       41
       41
       +
         makeFlags = lib.optional withSystemd [ "unitdir=$(out)/lib/systemd/system" ];

     

       42
       42
       +
       

     

       43
       43
       +
         doCheck = true;

     

       44
       44
       +
       

     

       45
       45
       +
         meta = with lib; {

     

       46
       46
       +
           description = "TLS handshake utilities for in-kernel TLS consumers";

     

       47
       47
       +
           homepage = "https://github.com/oracle/ktls-utils";

     

       48
       48
       +
           changelog = "https://github.com/oracle/ktls-utils/blob/${src.rev}/NEWS";

     

       49
       49
       +
           license = licenses.gpl2Only;

     

       50
       50
       +
           maintainers = with maintainers; [ ];

     

       51
       51
       +
           mainProgram = "ktls-utils";

     

       52
       52
       +
           platforms = platforms.linux;

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+38

pkgs/by-name/pr/prr/package.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , stdenv

     

       5
       5
       +
       , openssl

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , darwin

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       rustPlatform.buildRustPackage rec {

     

       11
       11
       +
         pname = "prr";

     

       12
       12
       +
         version = "0.11.0";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "danobi";

     

       16
       16
       +
           repo = pname;

     

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

     

       18
       18
       +
           hash = "sha256-mPFnMoYlOU0oJcasrCEHO+Ze1YuwJ0ap7+p2Fs75pcY=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         cargoHash = "sha256-HDNJ17SB9XdqDAAmEBJz/P52/QJcuV6sVsgxBVWKIRg=";

     

       22
       22
       +
       

     

       23
       23
       +
         buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [

     

       24
       24
       +
           darwin.apple_sdk.frameworks.Security

     

       25
       25
       +
           darwin.apple_sdk.frameworks.SystemConfiguration

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [ pkg-config ];

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with lib; {

     

       31
       31
       +
           description = "A tool that brings mailing list style code reviews to Github PRs";

     

       32
       32
       +
           homepage = "https://github.com/danobi/prr";

     

       33
       33
       +
           license = licenses.gpl2Only;

     

       34
       34
       +
           mainProgram = "prr";

     

       35
       35
       +
           maintainers = with maintainers; [ evalexpr ];

     

       36
       36
       +
         };

     

       37
       37
       +
       }

     

       38
       38
       +

+30

pkgs/by-name/sy/syn2mas/package.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildNpmPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildNpmPackage rec {

     

       7
       7
       +
         pname = "syn2mas";

     

       8
       8
       +
         version = "0.7.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "matrix-org";

     

       12
       12
       +
           repo = "matrix-authentication-service";

     

       13
       13
       +
           rev = "v${version}";

     

       14
       14
       +
           hash = "sha256-foipChunzRKIbeO+O+XYx0luzaA0G9LKrH59luQl9R0=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         sourceRoot = "source/tools/syn2mas";

     

       18
       18
       +
       

     

       19
       19
       +
         npmDepsHash = "sha256-CdEjfT4rXINv0Fzy56T//XftuAzrn03lQd76/PC2QR8=";

     

       20
       20
       +
       

     

       21
       21
       +
         dontBuild = true;

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       24
       24
       +
           description = "Tool to help with the migration of a Matrix Synapse installation to the Matrix Authentication Service";

     

       25
       25
       +
           homepage = "https://github.com/matrix-org/matrix-authentication-service/tree/main/tools/syn2mas";

     

       26
       26
       +
           license = licenses.asl20;

     

       27
       27
       +
           maintainers = with maintainers; [ teutat3s ];

     

       28
       28
       +
           mainProgram = "syn2mas";

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+6 -1

pkgs/by-name/za/zapzap/package.nix

···

       48
       48
        
       

     

       49
       49
        
         postInstall = ''

     

       50
       50
        
           install -Dm555 share/applications/com.rtosta.zapzap.desktop -t $out/share/applications/

     

       51
       51
       -
           install -Dm555 share/icons/com.rtosta.zapzap.svg -t $out/share/icons/hicolor/scalable/

     

       51
       51
       +
           install -Dm555 share/icons/com.rtosta.zapzap.svg -t $out/share/icons/hicolor/scalable/apps/

     

       52
       52
       +
         '';

     

       53
       53
       +
       

     

       54
       54
       +
         dontWrapQtApps = true;

     

       55
       55
       +
         preFixup = ''

     

       56
       56
       +
           makeWrapperArgs+=("''${qtWrapperArgs[@]}")

     

       52
       57
        
         '';

     

       53
       58
        
       

     

       54
       59
        
         # has no tests

pkgs/desktops/lomiri/default.nix

···

       25
       25
        
           lomiri-action-api = callPackage ./qml/lomiri-action-api { };

     

       26
       26
        
           lomiri-notifications = callPackage ./qml/lomiri-notifications { };

     

       27
       27
        
           lomiri-settings-components = callPackage ./qml/lomiri-settings-components { };

     

       28
       28
       +
           lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };

     

       28
       29
        
           lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };

     

       29
       30
        
       

     

       30
       31
        
           #### Services

     

       31
       32
        
           biometryd = callPackage ./services/biometryd { };

     

       32
       33
        
           hfd-service = callPackage ./services/hfd-service { };

     

       33
       34
        
           lomiri-app-launch = callPackage ./development/lomiri-app-launch { };

     

       35
       35
       +
           lomiri-download-manager = callPackage ./services/lomiri-download-manager { };

     

       34
       36
        
           mediascanner2 = callPackage ./services/mediascanner2 { };

     

       35
       37
        
         };

     

       36
       38
        
       in

+125

pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , gitUpdater

     

       6
       6
       +
       , cmake

     

       7
       7
       +
       , cmake-extras

     

       8
       8
       +
       , cups

     

       9
       9
       +
       , exiv2

     

       10
       10
       +
       , lomiri-ui-toolkit

     

       11
       11
       +
       , pam

     

       12
       12
       +
       , pkg-config

     

       13
       13
       +
       , qtbase

     

       14
       14
       +
       , qtdeclarative

     

       15
       15
       +
       , xvfb-run

     

       16
       16
       +
       }:

     

       17
       17
       +
       

     

       18
       18
       +
       stdenv.mkDerivation (finalAttrs: {

     

       19
       19
       +
         pname = "lomiri-ui-extras";

     

       20
       20
       +
         version = "0.6.2";

     

       21
       21
       +
       

     

       22
       22
       +
         src = fetchFromGitLab {

     

       23
       23
       +
           owner = "ubports";

     

       24
       24
       +
           repo = "development/core/lomiri-ui-extras";

     

       25
       25
       +
           rev = finalAttrs.version;

     

       26
       26
       +
           hash = "sha256-RZTGTe18ebqKz8kWOpRgFJO2sR97sVbdPQMW/XLHs68=";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         patches = [

     

       30
       30
       +
           # Fix compatibility with Exiv2 0.28.0

     

       31
       31
       +
           # Remove when version > 0.6.2

     

       32
       32
       +
           (fetchpatch {

     

       33
       33
       +
             name = "0001-lomiri-ui-extras-Fix-for-exiv2-0.28.0.patch";

     

       34
       34
       +
             url = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/commit/f337ceefa7c4f8f39dc7c75d51df8b86f148891a.patch";

     

       35
       35
       +
             hash = "sha256-dm50un46eTeBZsyHJF1npGBqOAF1BopJZ1Uln1PqSOE=";

     

       36
       36
       +
           })

     

       37
       37
       +
       

     

       38
       38
       +
           # Remove deprecated qt5_use_modules usage

     

       39
       39
       +
           # Remove when version > 0.6.2

     

       40
       40
       +
           (fetchpatch {

     

       41
       41
       +
             name = "0002-lomiri-ui-extras-Stop-using-qt5_use_modules.patch";

     

       42
       42
       +
             url = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/commit/df506e7ebe7107dd0465d7d65727753f07abd122.patch";

     

       43
       43
       +
             hash = "sha256-VmOhJaUgjp9BHoYAO780uxI5tE7F0Gtp9gRNe0QCrhs=";

     

       44
       44
       +
           })

     

       45
       45
       +
       

     

       46
       46
       +
           # Find qmltestrunner via PATH instead of hardcoded path

     

       47
       47
       +
           # https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/merge_requests/84

     

       48
       48
       +
           (fetchpatch {

     

       49
       49
       +
             name = "0003-lomiri-ui-extras-Dont-insist-on-finding-qmltestrunner-only-at-hardcoded-guess.patch";

     

       50
       50
       +
             url = "https://gitlab.com/OPNA2608/lomiri-ui-extras/-/commit/b0c4901818761b516a45b7f0524ac713ddf33cfe.patch";

     

       51
       51
       +
             hash = "sha256-oFeaGiYEDr9XHRlCpXX+0ALlVdfb0FmGBFF1RzIXSBE=";

     

       52
       52
       +
           })

     

       53
       53
       +
         ];

     

       54
       54
       +
       

     

       55
       55
       +
         postPatch = ''

     

       56
       56
       +
           substituteInPlace modules/Lomiri/Components/Extras{,/{plugin,PamAuthentication}}/CMakeLists.txt \

     

       57
       57
       +
             --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"

     

       58
       58
       +
       

     

       59
       59
       +
           # tst_busy_indicator runs into a codepath in lomiri-ui-toolkit that expects a working GL context

     

       60
       60
       +
           sed -i tests/qml/CMakeLists.txt \

     

       61
       61
       +
             -e '/declare_qml_test("tst_busy_indicator"/d'

     

       62
       62
       +
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         strictDeps = true;

     

       65
       65
       +
       

     

       66
       66
       +
         nativeBuildInputs = [

     

       67
       67
       +
           cmake

     

       68
       68
       +
           pkg-config

     

       69
       69
       +
         ];

     

       70
       70
       +
       

     

       71
       71
       +
         buildInputs = [

     

       72
       72
       +
           cmake-extras

     

       73
       73
       +
           cups

     

       74
       74
       +
           exiv2

     

       75
       75
       +
           pam

     

       76
       76
       +
           qtbase

     

       77
       77
       +
           qtdeclarative

     

       78
       78
       +
         ];

     

       79
       79
       +
       

     

       80
       80
       +
         nativeCheckInputs = [

     

       81
       81
       +
           qtdeclarative # qmltestrunner

     

       82
       82
       +
           xvfb-run

     

       83
       83
       +
         ];

     

       84
       84
       +
       

     

       85
       85
       +
         checkInputs = [

     

       86
       86
       +
           lomiri-ui-toolkit

     

       87
       87
       +
         ];

     

       88
       88
       +
       

     

       89
       89
       +
         dontWrapQtApps = true;

     

       90
       90
       +
       

     

       91
       91
       +
         cmakeFlags = [

     

       92
       92
       +
           "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}"

     

       93
       93
       +
         ];

     

       94
       94
       +
       

     

       95
       95
       +
         # tst_PhotoEditorPhoto and tst_PhotoEditorPhotoImageProvider randomly fail, haven't had time to debug

     

       96
       96
       +
         doCheck = false;

     

       97
       97
       +
       

     

       98
       98
       +
         # Parallelism breaks xvfb-run-launched script for QML tests

     

       99
       99
       +
         enableParallelChecking = false;

     

       100
       100
       +
       

     

       101
       101
       +
         preCheck = let

     

       102
       102
       +
           listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix;

     

       103
       103
       +
         in ''

     

       104
       104
       +
           export QT_PLUGIN_PATH=${listToQtVar qtbase.qtPluginPrefix [ qtbase ]}

     

       105
       105
       +
           export QML2_IMPORT_PATH=${listToQtVar qtbase.qtQmlPrefix ([ qtdeclarative lomiri-ui-toolkit ] ++ lomiri-ui-toolkit.propagatedBuildInputs)}

     

       106
       106
       +
           export XDG_RUNTIME_DIR=$PWD

     

       107
       107
       +
         '';

     

       108
       108
       +
       

     

       109
       109
       +
         passthru = {

     

       110
       110
       +
           updateScript = gitUpdater { };

     

       111
       111
       +
         };

     

       112
       112
       +
       

     

       113
       113
       +
         meta = with lib; {

     

       114
       114
       +
           description = "Lomiri UI Extra Components";

     

       115
       115
       +
           longDescription = ''

     

       116
       116
       +
             A collection of UI components that for various reasons can't be included in

     

       117
       117
       +
             the main Lomiri UI toolkit - mostly because of the level of quality, lack of

     

       118
       118
       +
             documentation and/or lack of automated tests.

     

       119
       119
       +
           '';

     

       120
       120
       +
           homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-extras";

     

       121
       121
       +
           license = licenses.gpl3Only;

     

       122
       122
       +
           maintainers = teams.lomiri.members;

     

       123
       123
       +
           platforms = platforms.linux;

     

       124
       124
       +
         };

     

       125
       125
       +
       })

+159

pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , gitUpdater

     

       6
       6
       +
       , testers

     

       7
       7
       +
       , boost

     

       8
       8
       +
       , cmake

     

       9
       9
       +
       , cmake-extras

     

       10
       10
       +
       , dbus

     

       11
       11
       +
       , dbus-test-runner

     

       12
       12
       +
       , withDocumentation ? true

     

       13
       13
       +
       , doxygen

     

       14
       14
       +
       , glog

     

       15
       15
       +
       , graphviz

     

       16
       16
       +
       , gtest

     

       17
       17
       +
       , lomiri-api

     

       18
       18
       +
       , pkg-config

     

       19
       19
       +
       , python3

     

       20
       20
       +
       , qtbase

     

       21
       21
       +
       , qtdeclarative

     

       22
       22
       +
       , wrapQtAppsHook

     

       23
       23
       +
       , xvfb-run

     

       24
       24
       +
       }:

     

       25
       25
       +
       

     

       26
       26
       +
       stdenv.mkDerivation (finalAttrs: {

     

       27
       27
       +
         pname = "lomiri-download-manager";

     

       28
       28
       +
         version = "0.1.2";

     

       29
       29
       +
       

     

       30
       30
       +
         src = fetchFromGitLab {

     

       31
       31
       +
           owner = "ubports";

     

       32
       32
       +
           repo = "development/core/lomiri-download-manager";

     

       33
       33
       +
           rev = finalAttrs.version;

     

       34
       34
       +
           hash = "sha256-a9C+hactBMHMr31E+ImKDPgpzxajy1klkjDcSEkPHqI=";

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       37
       37
       +
         outputs = [

     

       38
       38
       +
           "out"

     

       39
       39
       +
           "dev"

     

       40
       40
       +
         ] ++ lib.optionals withDocumentation [

     

       41
       41
       +
           "doc"

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         patches = [

     

       45
       45
       +
           # Remove when version > 0.1.2

     

       46
       46
       +
           (fetchpatch {

     

       47
       47
       +
             name = "0001-lomiri-download-manager-Make-documentation-build-optional.patch";

     

       48
       48
       +
             url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/32d7369714c01bd425af9c6de5bdc04399a12e0a.patch";

     

       49
       49
       +
             hash = "sha256-UztcBAAFXDX2j0X5D3kMp9q0vFm3/PblUAKPJ5nZyiY=";

     

       50
       50
       +
           })

     

       51
       51
       +
       

     

       52
       52
       +
           # Remove when version > 0.1.2

     

       53
       53
       +
           (fetchpatch {

     

       54
       54
       +
             name = "0002-lomiri-download-manager-Upgrade-C++-standard-to-C++17.patch";

     

       55
       55
       +
             url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/a6bc7ae80f2ff4c4743978c6c694149707d9d2e2.patch";

     

       56
       56
       +
             hash = "sha256-iA1sZhHI8Osgo1ofL5RTqgVzUG32zx0dU/28qcEqmQc=";

     

       57
       57
       +
           })

     

       58
       58
       +
       

     

       59
       59
       +
           # Remove when version > 0.1.2

     

       60
       60
       +
           (fetchpatch {

     

       61
       61
       +
             name = "0003-lomiri-download-manager-Bump-version-make-Werror-and-tests-optional.patch";

     

       62
       62
       +
             url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/73ec04c429e5285f05dd72d5bb9720ba6ff31be2.patch";

     

       63
       63
       +
             hash = "sha256-0BrJSKCvUhITwfln05OrHgHEpldbgBoh4rivAvw+qrc=";

     

       64
       64
       +
           })

     

       65
       65
       +
       

     

       66
       66
       +
           # Remove when version > 0.1.2

     

       67
       67
       +
           (fetchpatch {

     

       68
       68
       +
             name = "0004-lomiri-download-manager-Use-GNUInstallDirs-variables-for-more-install-destinations.patch";

     

       69
       69
       +
             url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/5d40daf053de62150aa5ee618285e415d7d3f1c8.patch";

     

       70
       70
       +
             hash = "sha256-r5fpiJkZkDsYX9fcX5JuPsE/qli9z5/DatmGJ9/QauU=";

     

       71
       71
       +
           })

     

       72
       72
       +
         ];

     

       73
       73
       +
       

     

       74
       74
       +
         postPatch = ''

     

       75
       75
       +
           # fetchpatch strips renames

     

       76
       76
       +
           # Remove when version > 0.1.2

     

       77
       77
       +
           for service in src/{uploads,downloads}/daemon/{lomiri-*-manager,lomiri-*-manager-systemd,com.lomiri.*}.service; do

     

       78
       78
       +
             mv "$service" "$service".in

     

       79
       79
       +
           done

     

       80
       80
       +
       

     

       81
       81
       +
           # pkg_get_variable doesn't let us substitute prefix pkg-config variable from systemd

     

       82
       82
       +
           substituteInPlace CMakeLists.txt \

     

       83
       83
       +
             --replace 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR "${placeholder "out"}/lib/systemd/user")' \

     

       84
       84
       +
             --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"

     

       85
       85
       +
         '';

     

       86
       86
       +
       

     

       87
       87
       +
         strictDeps = true;

     

       88
       88
       +
       

     

       89
       89
       +
         nativeBuildInputs = [

     

       90
       90
       +
           cmake

     

       91
       91
       +
           pkg-config

     

       92
       92
       +
           wrapQtAppsHook

     

       93
       93
       +
         ] ++ lib.optionals withDocumentation [

     

       94
       94
       +
           doxygen

     

       95
       95
       +
           graphviz

     

       96
       96
       +
         ];

     

       97
       97
       +
       

     

       98
       98
       +
         buildInputs = [

     

       99
       99
       +
           boost

     

       100
       100
       +
           cmake-extras

     

       101
       101
       +
           glog

     

       102
       102
       +
           lomiri-api

     

       103
       103
       +
           qtbase

     

       104
       104
       +
           qtdeclarative

     

       105
       105
       +
         ];

     

       106
       106
       +
       

     

       107
       107
       +
         nativeCheckInputs = [

     

       108
       108
       +
           dbus

     

       109
       109
       +
           dbus-test-runner

     

       110
       110
       +
           python3

     

       111
       111
       +
           xvfb-run

     

       112
       112
       +
         ];

     

       113
       113
       +
       

     

       114
       114
       +
         checkInputs = [

     

       115
       115
       +
           gtest

     

       116
       116
       +
         ];

     

       117
       117
       +
       

     

       118
       118
       +
         cmakeFlags = [

     

       119
       119
       +
           "-DENABLE_DOC=${lib.boolToString withDocumentation}"

     

       120
       120
       +
           # Deprecation warnings on Qt 5.15

     

       121
       121
       +
           # https://gitlab.com/ubports/development/core/lomiri-download-manager/-/issues/1

     

       122
       122
       +
           "-DENABLE_WERROR=OFF"

     

       123
       123
       +
         ];

     

       124
       124
       +
       

     

       125
       125
       +
         makeTargets = [

     

       126
       126
       +
           "all"

     

       127
       127
       +
         ] ++ lib.optionals withDocumentation [

     

       128
       128
       +
           "doc"

     

       129
       129
       +
         ];

     

       130
       130
       +
       

     

       131
       131
       +
         doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

     

       132
       132
       +
       

     

       133
       133
       +
         # xvfb tests are flaky on xvfb shutdown when parallelised

     

       134
       134
       +
         enableParallelChecking = false;

     

       135
       135
       +
       

     

       136
       136
       +
         preCheck = ''

     

       137
       137
       +
           export HOME=$TMPDIR # temp files in home

     

       138
       138
       +
           export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} # xcb platform & sqlite driver

     

       139
       139
       +
         '';

     

       140
       140
       +
       

     

       141
       141
       +
         passthru = {

     

       142
       142
       +
           tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       143
       143
       +
           updateScript = gitUpdater { };

     

       144
       144
       +
         };

     

       145
       145
       +
       

     

       146
       146
       +
         meta = with lib; {

     

       147
       147
       +
           description = "Performs uploads and downloads from a centralized location";

     

       148
       148
       +
           homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager";

     

       149
       149
       +
           license = licenses.lgpl3Only;

     

       150
       150
       +
           maintainers = teams.lomiri.members;

     

       151
       151
       +
           platforms = platforms.linux;

     

       152
       152
       +
           pkgConfigModules = [

     

       153
       153
       +
             "ldm-common"

     

       154
       154
       +
             "lomiri-download-manager-client"

     

       155
       155
       +
             "lomiri-download-manager-common"

     

       156
       156
       +
             "lomiri-upload-manager-common"

     

       157
       157
       +
           ];

     

       158
       158
       +
         };

     

       159
       159
       +
       })

+3 -3

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "aiovodafone";

     

       13
       13
       -
         version = "0.4.3";

     

       14
       14
       -
         format = "pyproject";

     

       13
       13
       +
         version = "0.5.1";

     

       14
       14
       +
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.10";

     

       17
       17
        
       

     
···

       19
       19
        
           owner = "chemelli74";

     

       20
       20
        
           repo = "aiovodafone";

     

       21
       21
        
           rev = "refs/tags/v${version}";

     

       22
       22
       -
           hash = "sha256-nYMruxEqLvkcspz0damh9tBYYROz5gleLiyhjco+rsQ=";

     

       22
       22
       +
           hash = "sha256-4Pcdf5yAzjXbmWehon9DdZfaIdEjPLcdzf/EjYKEamk=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         postPatch = ''

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "botorch";

     

       18
       18
       -
         version = "0.9.4";

     

       18
       18
       +
         version = "0.9.5";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "pytorch";

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           rev = "refs/tags/v${version}";

     

       25
       25
       -
           hash = "sha256-MSbGjv+5/znoUeveePuTrTOMTQMQvsc064G7WoHfBMI=";

     

       25
       25
       +
           hash = "sha256-M/VOt0p7io0K+VHrAmBJQ71VigH0Ll1D5it6+/o/3jg=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+15 -6

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

···

       13
       13
        
       }:

     

       14
       14
        
       let

     

       15
       15
        
         pname = "polars";

     

       16
       16
       -
         version = "0.19.12";

     

       16
       16
       +
         version = "0.20.0";

     

       17
       17
        
         rootSource = fetchFromGitHub {

     

       18
       18
        
           owner = "pola-rs";

     

       19
       19
        
           repo = "polars";

     
···

       28
       28
        
       in

     

       29
       29
        
       buildPythonPackage {

     

       30
       30
        
         inherit pname version;

     

       31
       31
       -
         format = "pyproject";

     

       32
       32
       -
         disabled = pythonOlder "3.6";

     

       31
       31
       +
         pyproject = true;

     

       32
       32
       +
       

     

       33
       33
       +
         disabled = pythonOlder "3.8";

     

       34
       34
       +
       

     

       33
       35
        
         src = rootSource;

     

       34
       36
        
       

     

       35
       37
        
         # Cargo.lock file is sometimes behind actual release which throws an error,

     
···

       46
       48
        
             "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk=";

     

       47
       49
        
           };

     

       48
       50
        
         };

     

       51
       51
       +
       

     

       49
       52
        
         cargoRoot = "py-polars";

     

       50
       53
        
       

     

       51
       54
        
         # Revisit this whenever package or Rust is upgraded

     

       52
       55
        
         RUSTC_BOOTSTRAP = 1;

     

       53
       56
        
       

     

       54
       54
       -
         propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ];

     

       57
       57
       +
         propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [

     

       58
       58
       +
           typing-extensions

     

       59
       59
       +
         ];

     

       55
       60
        
       

     

       56
       61
        
         dontUseCmakeConfigure = true;

     

       57
       62
        
       

     
···

       71
       76
        
           darwin.apple_sdk.frameworks.Security

     

       72
       77
        
         ];

     

       73
       78
        
       

     

       74
       74
       -
         pythonImportsCheck = [ "polars" ];

     

       75
       79
        
         # nativeCheckInputs = [

     

       76
       80
        
         #   pytestCheckHook

     

       77
       81
        
         #   fixtures

     
···

       82
       86
        
         #   pydot

     

       83
       87
        
         # ];

     

       84
       88
        
       

     

       89
       89
       +
         pythonImportsCheck = [

     

       90
       90
       +
           "polars"

     

       91
       91
       +
         ];

     

       92
       92
       +
       

     

       85
       93
        
         meta = with lib; {

     

       86
       86
       -
           description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js ";

     

       94
       94
       +
           description = "Fast multi-threaded DataFrame library";

     

       87
       95
        
           homepage = "https://github.com/pola-rs/polars";

     

       96
       96
       +
           changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}";

     

       88
       97
        
           license = licenses.asl20;

     

       89
       98
        
           maintainers = with maintainers; [ happysalada ];

     

       90
       99
        
         };

+2 -2

pkgs/development/tools/language-servers/metals/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "metals";

     

       5
       5
       -
         version = "1.1.0";

     

       5
       5
       +
         version = "1.2.0";

     

       6
       6
        
       

     

       7
       7
        
         deps = stdenv.mkDerivation {

     

       8
       8
        
           name = "${pname}-deps-${version}";

     
···

       16
       16
        
           '';

     

       17
       17
        
           outputHashMode = "recursive";

     

       18
       18
        
           outputHashAlgo = "sha256";

     

       19
       19
       -
           outputHash = "sha256-9zigJM0xEJSYgohbjc9ZLBKbPa/WGVSv3KVFE3QUzWE=";

     

       19
       19
       +
           outputHash = "sha256-nikQ/GFRWmYYzboc9TWIi9gd5kwgCxOLhvIEQWusFik=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ makeWrapper setJavaClassPath ];

+2 -2

pkgs/servers/matrix-synapse/matrix-hookshot/package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "matrix-hookshot",

     

       3
       3
       -
         "version": "4.5.1",

     

       3
       3
       +
         "version": "4.7.0",

     

       4
       4
        
         "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",

     

       5
       5
        
         "main": "lib/app.js",

     

       6
       6
        
         "repository": "https://github.com/matrix-org/matrix-hookshot",

     
···

       48
       48
        
           "@octokit/webhooks": "^9.1.2",

     

       49
       49
        
           "@sentry/node": "^7.52.1",

     

       50
       50
        
           "ajv": "^8.11.0",

     

       51
       51
       -
           "axios": "^0.24.0",

     

       51
       51
       +
           "axios": "^1.6.2",

     

       52
       52
        
           "cors": "^2.8.5",

     

       53
       53
        
           "express": "^4.17.3",

     

       54
       54
        
           "figma-js": "^1.14.0",

+4 -4

pkgs/servers/matrix-synapse/matrix-hookshot/pin.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "4.5.1",

     

       3
       3
       -
         "srcHash": "sha256-uqLpwgVEfwcMTeGMDn3lDUD91GHPNyWHmCSPxuV/VC0=",

     

       4
       4
       -
         "yarnHash": "08dw9vbhlmqwj2nah6fv1b2sf15ibl5kg38ghkxkbccs4j7adans",

     

       5
       5
       -
         "cargoHash": "sha256-bIpsQni3kaoYCGLz01YdauYM8ybpx+BvVTiB6N72rIA="

     

       2
       2
       +
         "version": "4.7.0",

     

       3
       3
       +
         "srcHash": "sha256-27PBuLyk/1ER26pus5tbe9CxeYEZgZrYBYy5l3B/19c=",

     

       4
       4
       +
         "yarnHash": "05mh3q5zw1aiznvbkhp7spb1bgcv32ncdb4zpyvhhv74pyhjnsn2",

     

       5
       5
       +
         "cargoHash": "sha256-cAjsNVQfXfZbM1/MoiEh/Qp0uW/iXsxBVx7cRZY3tN0="

     

       6
       6
        
       }

+14 -5

pkgs/tools/security/step-ca/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildGoModule rec {

     

       14
       14
        
         pname = "step-ca";

     

       15
       15
       -
         version = "0.25.0";

     

       15
       15
       +
         version = "0.25.2";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "smallstep";

     

       19
       19
        
           repo = "certificates";

     

       20
       20
        
           rev = "refs/tags/v${version}";

     

       21
       21
       -
           hash = "sha256-CO9Qjx4D6qNGjOdva88KRCJOQq85r5U5nwmXC1G94dY=";

     

       21
       21
       +
           hash = "sha256-cP3QypBNWGbr7R7lJLfaoBh6C37ubGuaxnxWlZ1Z000=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         vendorHash = "sha256-Weq8sS+8gsfdoVSBDm8E2DCrngfNsolqQR2/yd9etPo=";

     

       24
       24
       +
         vendorHash = "sha256-AXMMpzXEhdKSGeVg/KK2NEgalxIXP6DUTcoxOQVqow4=";

     

       25
       25
        
       

     

       26
       26
       -
         ldflags = [ "-buildid=" ];

     

       26
       26
       +
         ldflags = [

     

       27
       27
       +
           "-buildid="

     

       28
       28
       +
         ];

     

       27
       29
        
       

     

       28
       28
       -
         nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];

     

       30
       30
       +
         nativeBuildInputs = lib.optionals hsmSupport [

     

       31
       31
       +
           pkg-config

     

       32
       32
       +
         ];

     

       29
       33
        
       

     

       30
       34
        
         buildInputs =

     

       31
       35
        
           lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ]

     
···

       43
       47
        
           install -Dm444 -t $out/lib/systemd/system systemd/step-ca.service

     

       44
       48
        
         '';

     

       45
       49
        
       

     

       50
       50
       +
         preCheck = ''

     

       51
       51
       +
           export HOME=$(mktemp -d)

     

       52
       52
       +
         '';

     

       53
       53
       +
       

     

       46
       54
        
         # Tests start http servers which need to bind to local addresses:

     

       47
       55
        
         # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted

     

       48
       56
        
         __darwinAllowLocalNetworking = true;

     

       57
       57
       +
       

     

       49
       58
        
         # Tests need to run in a reproducible order, otherwise they run unreliably on

     

       50
       59
        
         # (at least) x86_64-linux.

     

       51
       60
        
         checkFlags = [ "-p 1" ];