commit d16e82bf21f0ea027d05252c97bb84716f4c638a · pyrox.dev/nixpkgs

+6

maintainers/maintainer-list.nix

···

       7439
       7439
        
             fingerprint = "B768 6CD7 451A 650D 9C54  4204 6710 CF0C 1CBD 7762";

     

       7440
       7440
        
           }];

     

       7441
       7441
        
         };

     

       7442
       7442
       +
         jleightcap = {

     

       7443
       7443
       +
           email = "jack@leightcap.com";

     

       7444
       7444
       +
           github = "jleightcap";

     

       7445
       7445
       +
           githubId = 30168080;

     

       7446
       7446
       +
           name = "Jack Leightcap";

     

       7447
       7447
       +
         };

     

       7442
       7448
        
         jlesquembre = {

     

       7443
       7449
        
           email = "jl@lafuente.me";

     

       7444
       7450
        
           github = "jlesquembre";

+5 -50

nixos/modules/system/boot/loader/grub/grub.nix

···

       13
       13
        
           if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs;

     

       14
       14
        
       

     

       15
       15
        
         realGrub = if cfg.zfsSupport then grubPkgs.grub2.override { zfsSupport = true; }

     

       16
       16
       -
           else if cfg.trustedBoot.enable

     

       17
       17
       -
                then if cfg.trustedBoot.isHPLaptop

     

       18
       18
       -
                     then grubPkgs.trustedGrub-for-HP

     

       19
       19
       -
                     else grubPkgs.trustedGrub

     

       20
       20
       -
                else grubPkgs.grub2;

     

       16
       16
       +
           else grubPkgs.grub2;

     

       21
       17
        
       

     

       22
       18
        
         grub =

     

       23
       19
        
           # Don't include GRUB if we're only generating a GRUB menu (e.g.,

     
···

       674
       670
        
               '';

     

       675
       671
        
             };

     

       676
       672
        
       

     

       677
       677
       -
             trustedBoot = {

     

       678
       678
       -
       

     

       679
       679
       -
               enable = mkOption {

     

       680
       680
       -
                 default = false;

     

       681
       681
       -
                 type = types.bool;

     

       682
       682
       -
                 description = lib.mdDoc ''

     

       683
       683
       -
                   Enable trusted boot. GRUB will measure all critical components during

     

       684
       684
       -
                   the boot process to offer TCG (TPM) support.

     

       685
       685
       -
                 '';

     

       686
       686
       -
               };

     

       687
       687
       -
       

     

       688
       688
       -
               systemHasTPM = mkOption {

     

       689
       689
       -
                 default = "";

     

       690
       690
       -
                 example = "YES_TPM_is_activated";

     

       691
       691
       -
                 type = types.str;

     

       692
       692
       -
                 description = lib.mdDoc ''

     

       693
       693
       -
                   Assertion that the target system has an activated TPM. It is a safety

     

       694
       694
       -
                   check before allowing the activation of 'trustedBoot.enable'. TrustedBoot

     

       695
       695
       -
                   WILL FAIL TO BOOT YOUR SYSTEM if no TPM is available.

     

       696
       696
       -
                 '';

     

       697
       697
       -
               };

     

       698
       698
       -
       

     

       699
       699
       -
               isHPLaptop = mkOption {

     

       700
       700
       -
                 default = false;

     

       701
       701
       -
                 type = types.bool;

     

       702
       702
       -
                 description = lib.mdDoc ''

     

       703
       703
       -
                   Use a special version of TrustedGRUB that is needed by some HP laptops

     

       704
       704
       -
                   and works only for the HP laptops.

     

       705
       705
       -
                 '';

     

       706
       706
       -
               };

     

       707
       707
       -
       

     

       708
       708
       -
             };

     

       709
       709
       -
       

     

       710
       673
        
           };

     

       711
       674
        
       

     

       712
       675
        
         };

     
···

       783
       746
        
                 message = "You cannot have duplicated devices in mirroredBoots";

     

       784
       747
        
               }

     

       785
       748
        
               {

     

       786
       786
       -
                 assertion = !cfg.efiSupport || !cfg.trustedBoot.enable;

     

       787
       787
       -
                 message = "Trusted GRUB does not have EFI support";

     

       788
       788
       -
               }

     

       789
       789
       -
               {

     

       790
       790
       -
                 assertion = !cfg.zfsSupport || !cfg.trustedBoot.enable;

     

       791
       791
       -
                 message = "Trusted GRUB does not have ZFS support";

     

       792
       792
       -
               }

     

       793
       793
       -
               {

     

       794
       794
       -
                 assertion = !cfg.trustedBoot.enable || cfg.trustedBoot.systemHasTPM == "YES_TPM_is_activated";

     

       795
       795
       -
                 message = "Trusted GRUB can break the system! Confirm that the system has an activated TPM by setting 'systemHasTPM'.";

     

       796
       796
       -
               }

     

       797
       797
       -
               {

     

       798
       749
        
                 assertion = cfg.efiInstallAsRemovable -> cfg.efiSupport;

     

       799
       750
        
                 message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn on boot.loader.grub.efiSupport";

     

       800
       751
        
               }

     
···

       841
       792
        
             (mkRenamedOptionModule [ "boot" "grubDevice" ] [ "boot" "loader" "grub" "device" ])

     

       842
       793
        
             (mkRenamedOptionModule [ "boot" "bootMount" ] [ "boot" "loader" "grub" "bootDevice" ])

     

       843
       794
        
             (mkRenamedOptionModule [ "boot" "grubSplashImage" ] [ "boot" "loader" "grub" "splashImage" ])

     

       795
       795
       +
             (mkRemovedOptionModule [ "boot" "loader" "grub" "trustedBoot" ] ''

     

       796
       796
       +
               Support for Trusted GRUB has been removed, because the project

     

       797
       797
       +
               has been retired upstream.

     

       798
       798
       +
             '')

     

       844
       799
        
             (mkRemovedOptionModule [ "boot" "loader" "grub" "extraInitrd" ] ''

     

       845
       800
        
               This option has been replaced with the bootloader agnostic

     

       846
       801
        
               boot.initrd.secrets option. To migrate to the initrd secrets system,

+2 -2

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

···

       2
       2
        
       

     

       3
       3
        
       (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {

     

       4
       4
        
         pname = "signalbackup-tools";

     

       5
       5
       -
         version = "20230508-1";

     

       5
       5
       +
         version = "20230510";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "bepaald";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           hash = "sha256-0kkbJGZEnB6bL+aNhHpSI2oHpsVmju3OEFG7mitKBsc=";

     

       11
       11
       +
           hash = "sha256-EsFF9fPpHfVmbLm2hRpcJBmwfovfK4CV3LukrG9nP3U=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         postPatch = ''

+61

pkgs/applications/office/gnote/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , desktop-file-utils

     

       5
       5
       +
       , gettext

     

       6
       6
       +
       , gspell

     

       7
       7
       +
       , gtkmm3

     

       8
       8
       +
       , itstool

     

       9
       9
       +
       , libsecret

     

       10
       10
       +
       , libuuid

     

       11
       11
       +
       , libxml2

     

       12
       12
       +
       , libxslt

     

       13
       13
       +
       , meson

     

       14
       14
       +
       , ninja

     

       15
       15
       +
       , pkg-config

     

       16
       16
       +
       , wrapGAppsHook

     

       17
       17
       +
       , gnome

     

       18
       18
       +
       }:

     

       19
       19
       +
       

     

       20
       20
       +
       stdenv.mkDerivation rec {

     

       21
       21
       +
         pname = "gnote";

     

       22
       22
       +
         version = "44.0";

     

       23
       23
       +
       

     

       24
       24
       +
         src = fetchurl {

     

       25
       25
       +
           url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       26
       26
       +
           hash = "sha256-3DvXkmj+mdTtVmeawHbMnZqq9ieWE403HPCIFffmSS0=";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         buildInputs = [

     

       30
       30
       +
           gspell

     

       31
       31
       +
           gtkmm3

     

       32
       32
       +
           libsecret

     

       33
       33
       +
           libuuid

     

       34
       34
       +
           libxml2

     

       35
       35
       +
           libxslt

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         nativeBuildInputs = [

     

       39
       39
       +
           desktop-file-utils

     

       40
       40
       +
           gettext

     

       41
       41
       +
           itstool

     

       42
       42
       +
           meson

     

       43
       43
       +
           ninja

     

       44
       44
       +
           pkg-config

     

       45
       45
       +
           wrapGAppsHook

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         passthru = {

     

       49
       49
       +
           updateScript = gnome.updateScript {

     

       50
       50
       +
             packageName = pname;

     

       51
       51
       +
           };

     

       52
       52
       +
         };

     

       53
       53
       +
       

     

       54
       54
       +
         meta = with lib; {

     

       55
       55
       +
           homepage = "https://wiki.gnome.org/Apps/Gnote";

     

       56
       56
       +
           description = "A note taking application";

     

       57
       57
       +
           maintainers = with maintainers; [ jfvillablanca ];

     

       58
       58
       +
           license = licenses.gpl3Only;

     

       59
       59
       +
           platforms = platforms.linux;

     

       60
       60
       +
         };

     

       61
       61
       +
       }

+2 -2

pkgs/development/python-modules/azure-mgmt-security/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "azure-mgmt-security";

     

       14
       14
       -
         version = "3.0.0";

     

       14
       14
       +
         version = "5.0.0";

     

       15
       15
        
         format = "setuptools";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           hash = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q=";

     

       21
       21
       +
           hash = "sha256-OLA+/oLCNEzqID/alebQC3rCJ4L6HAtYXNDqLI/z5wI=";

     

       22
       22
        
           extension = "zip";

     

       23
       23
        
         };

     

       24
       24

+2 -2

pkgs/development/python-modules/bluetooth-auto-recovery/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "bluetooth-auto-recovery";

     

       15
       15
       -
         version = "1.1.2";

     

       15
       15
       +
         version = "1.2.0";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.9";

     
···

       21
       21
        
           owner = "Bluetooth-Devices";

     

       22
       22
        
           repo = pname;

     

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

     

       24
       24
       -
           hash = "sha256-lOtdrNXY9IYMGFdqhX4rM228OAZ2bUEBZKP+gcDGfuM=";

     

       24
       24
       +
           hash = "sha256-uPa8iXG++doRMAK83NSnqiqnZSIjdL7zMTkjdRrSjtA=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+6 -3

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "eternalegypt";

     

       11
       11
       -
         version = "0.0.15";

     

       11
       11
       +
         version = "0.0.16";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.8";

     
···

       17
       17
        
           owner = "amelchio";

     

       18
       18
        
           repo = pname;

     

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

     

       20
       20
       -
           sha256 = "sha256-CKiv5gVHaEyO9P5x2FKgpSIm2pUiFptaEQVPZHALASk=";

     

       20
       20
       +
           hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

     
···

       28
       28
        
         # Project has no tests

     

       29
       29
        
         doCheck = false;

     

       30
       30
        
       

     

       31
       31
       -
         pythonImportsCheck = [ "eternalegypt" ];

     

       31
       31
       +
         pythonImportsCheck = [

     

       32
       32
       +
           "eternalegypt"

     

       33
       33
       +
         ];

     

       32
       34
        
       

     

       33
       35
        
         meta = with lib; {

     

       34
       36
        
           description = "Python API for Netgear LTE modems";

     

       35
       37
        
           homepage = "https://github.com/amelchio/eternalegypt";

     

       38
       38
       +
           changelog = "https://github.com/amelchio/eternalegypt/releases/tag/v${version}";

     

       36
       39
        
           license = with licenses; [ mit ];

     

       37
       40
        
           maintainers = with maintainers; [ fab ];

     

       38
       41
        
         };

+3 -3

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "fx2";

     

       12
       12
       -
         version = "0.9";

     

       12
       12
       +
         version = "0.11";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "whitequark";

     

       16
       16
        
           repo = "libfx2";

     

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

     

       18
       18
       -
           hash = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk=";

     

       18
       18
       +
           hash = "sha256-uJpXsUMFqJY7mjj1rtfc0XWEfNDxO1xXobgBDGFHnp4=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ sdcc ];

     
···

       23
       23
        
         propagatedBuildInputs = [ libusb1 crcmod ];

     

       24
       24
        
       

     

       25
       25
        
         preBuild = ''

     

       26
       26
       +
           make -C firmware

     

       26
       27
        
           cd software

     

       27
       27
       -
           ${python.pythonForBuild.interpreter} setup.py build_ext

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
        
         preInstall = ''

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "mkdocstrings-python";

     

       14
       14
       -
         version = "0.10.0";

     

       14
       14
       +
         version = "0.10.1";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     
···

       20
       20
        
           owner = "mkdocstrings";

     

       21
       21
        
           repo = "python";

     

       22
       22
        
           rev = version;

     

       23
       23
       -
           hash = "sha256-UJfAlSgH3xFqSOjJFon87YWd08nFgi1yYbEsCyMDVlA=";

     

       23
       23
       +
           hash = "sha256-VGPlOHQNtXrfmcne93xDIxN20KDGlTQrjeAKhX/L6K0=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "msgspec";

     

       11
       11
       -
         version = "0.14.2";

     

       11
       11
       +
         version = "0.15.0";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.8";

     
···

       17
       17
        
           owner = "jcrist";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = "refs/tags/${version}";

     

       20
       20
       -
           hash = "sha256-8EdAnHrgff+Xf7r/FuyGYZxpzEXusRTyXbNTNgPcHO0=";

     

       20
       20
       +
           hash = "sha256-pyGmzG2oy+1Ip4w+pyjASvVyZDEjDylBZfbxLPFzSoU=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         # Requires libasan to be accessible

+2 -2

pkgs/development/python-modules/onvif-zeep-async/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "onvif-zeep-async";

     

       11
       11
       -
         version = "2.1.4";

     

       11
       11
       +
         version = "3.1.3";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           hash = "sha256-F8NqdEYz38mWSfOQ9oIjQccaGkON8skqm+ItQD71CPo=";

     

       18
       18
       +
           hash = "sha256-Lq8jYLEJKluRfsuRghkp7VPIcrHn3qaJTyid9O8lriA=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "panel";

     

       19
       19
       -
         version = "0.14.3";

     

       19
       19
       +
         version = "0.14.4";

     

       20
       20
        
       

     

       21
       21
        
         format = "wheel";

     

       22
       22
        
       

     
···

       25
       25
        
         # tries to fetch even more artifacts

     

       26
       26
        
         src = fetchPypi {

     

       27
       27
        
           inherit pname version format;

     

       28
       28
       -
           hash = "sha256-XOu17oydXwfyowYUmCKF7/RC0RQ0Uf1Ixmn+VTa85Lo=";

     

       28
       28
       +
           hash = "sha256-3U/PL8cnbNPw3xEM56YZesQEDXTE79yMCSsjdxwfUU0=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+77

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , cmake

     

       4
       4
       +
       , ninja

     

       5
       5
       +
       , qt6

     

       6
       6
       +
       , python

     

       7
       7
       +
       , shiboken6

     

       8
       8
       +
       , libxcrypt

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       stdenv.mkDerivation rec {

     

       12
       12
       +
         pname = "pyside6";

     

       13
       13
       +
       

     

       14
       14
       +
         inherit (shiboken6) version src;

     

       15
       15
       +
       

     

       16
       16
       +
         sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}";

     

       17
       17
       +
       

     

       18
       18
       +
         postPatch = ''

     

       19
       19
       +
           # Don't ignore optional Qt modules

     

       20
       20
       +
           substituteInPlace cmake/PySideHelpers.cmake \

     

       21
       21
       +
             --replace \

     

       22
       22
       +
               'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \

     

       23
       23
       +
               'set (found_basepath 0)'

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           cmake

     

       28
       28
       +
           ninja

     

       29
       29
       +
           python

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         buildInputs = with qt6; [

     

       33
       33
       +
           # required

     

       34
       34
       +
           qtbase

     

       35
       35
       +
           # optional

     

       36
       36
       +
           qt3d

     

       37
       37
       +
           qtcharts

     

       38
       38
       +
           qtconnectivity

     

       39
       39
       +
           qtdatavis3d

     

       40
       40
       +
           qtdeclarative

     

       41
       41
       +
           qthttpserver

     

       42
       42
       +
           qtmultimedia

     

       43
       43
       +
           qtnetworkauth

     

       44
       44
       +
           qtquick3d

     

       45
       45
       +
           qtremoteobjects

     

       46
       46
       +
           qtscxml

     

       47
       47
       +
           qtsensors

     

       48
       48
       +
           qtspeech

     

       49
       49
       +
           qtsvg

     

       50
       50
       +
           qttools

     

       51
       51
       +
           qtwebchannel

     

       52
       52
       +
           qtwebengine

     

       53
       53
       +
           qtwebsockets

     

       54
       54
       +
         ] ++ lib.optionals (python.pythonOlder "3.9") [

     

       55
       55
       +
           # see similar issue: 202262

     

       56
       56
       +
           # libxcrypt is required for crypt.h for building older python modules

     

       57
       57
       +
           libxcrypt

     

       58
       58
       +
         ];

     

       59
       59
       +
       

     

       60
       60
       +
         propagatedBuildInputs = [

     

       61
       61
       +
           shiboken6

     

       62
       62
       +
         ];

     

       63
       63
       +
       

     

       64
       64
       +
         cmakeFlags = [

     

       65
       65
       +
           "-DBUILD_TESTS=OFF"

     

       66
       66
       +
         ];

     

       67
       67
       +
       

     

       68
       68
       +
         dontWrapQtApps = true;

     

       69
       69
       +
       

     

       70
       70
       +
         meta = with lib; {

     

       71
       71
       +
           description = "Python bindings for Qt";

     

       72
       72
       +
           license = with licenses; [ lgpl3Only gpl2Only gpl3Only ];

     

       73
       73
       +
           homepage = "https://wiki.qt.io/Qt_for_Python";

     

       74
       74
       +
           maintainers = with maintainers; [ gebner Enzime ];

     

       75
       75
       +
           broken = stdenv.isDarwin;

     

       76
       76
       +
         };

     

       77
       77
       +
       }

+2 -2

pkgs/development/python-modules/python-otbr-api/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "python-otbr-api";

     

       15
       15
       -
         version = "1.0.9";

     

       15
       15
       +
         version = "1.1.0";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.9";

     
···

       21
       21
        
           owner = "home-assistant-libs";

     

       22
       22
        
           repo = pname;

     

       23
       23
        
           rev = "refs/tags/${version}";

     

       24
       24
       -
           hash = "sha256-Rg5+EOsxRse618WvP4+9ybiu0mJpizrzCmeIbRnFgaA=";

     

       24
       24
       +
           hash = "sha256-0JPniehl4cnoTWgqmq1fMZwU8FFl2Zx4CF81az6iaxQ=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/pyvisa-py/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "pyvisa-py";

     

       15
       15
       -
         version = "0.6.3";

     

       15
       15
       +
         version = "0.7.0";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.7";

     
···

       21
       21
        
           owner = "pyvisa";

     

       22
       22
        
           repo = "pyvisa-py";

     

       23
       23
        
           rev = "refs/tags/${version}";

     

       24
       24
       -
           hash = "sha256-bRO2xO3Q9ruu5KY9SHwdhDU3DoZfW98uYiEFv5P0Fqc=";

     

       24
       24
       +
           hash = "sha256-wMDO0CUCSSCB8cXvTmIEWD8OGMZRZNhmmRx+fZnK288=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+75

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchurl

     

       3
       3
       +
       , llvmPackages

     

       4
       4
       +
       , python

     

       5
       5
       +
       , qt6

     

       6
       6
       +
       , cmake

     

       7
       7
       +
       , autoPatchelfHook

     

       8
       8
       +
       , stdenv

     

       9
       9
       +
       , libxcrypt

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       llvmPackages.stdenv.mkDerivation rec {

     

       13
       13
       +
         pname = "shiboken6";

     

       14
       14
       +
         version = "6.5.0";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchurl {

     

       17
       17
       +
           # https://download.qt.io/official_releases/QtForPython/shiboken6/

     

       18
       18
       +
           url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz";

     

       19
       19
       +
           sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}";

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           ./fix-include-qt-headers.patch

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         # Due to Shiboken.abi3.so being linked to libshiboken6.abi3.so.6.5 in the build tree,

     

       29
       29
       +
         # we need to remove the build tree reference from the RPATH and then add the correct

     

       30
       30
       +
         # directory to the RPATH. On Linux, the second part is handled by autoPatchelfHook.

     

       31
       31
       +
         # https://bugreports.qt.io/browse/PYSIDE-2233

     

       32
       32
       +
         postBuild = ''

     

       33
       33
       +
           echo "fixing RPATH of Shiboken.abi3.so"

     

       34
       34
       +
         '' + (if stdenv.isDarwin then ''

     

       35
       35
       +
           invalid_rpaths=$(otool -l Shiboken.abi3.so | awk '

     

       36
       36
       +
               /^[^ ]/ {f = 0}

     

       37
       37
       +
               $2 == "LC_RPATH" && $1 == "cmd" {f = 1}

     

       38
       38
       +
               f && gsub(/^ *path | \(offset [0-9]+\)$/, "") == 2

     

       39
       39
       +
           ' | grep --invert-match /nix/store)

     

       40
       40
       +
           install_name_tool $(echo $invalid_rpaths | sed 's/^/-delete_rpath /' | tr '\n' ' ' | sed 's/ $//') Shiboken.abi3.so

     

       41
       41
       +
           install_name_tool -add_rpath $out/lib Shiboken.abi3.so

     

       42
       42
       +
         '' else ''

     

       43
       43
       +
           patchelf Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes /nix/store

     

       44
       44
       +
         '');

     

       45
       45
       +
       

     

       46
       46
       +
         cmakeFlags = [

     

       47
       47
       +
           "-DBUILD_TESTS=OFF"

     

       48
       48
       +
         ];

     

       49
       49
       +
       

     

       50
       50
       +
         dontWrapQtApps = true;

     

       51
       51
       +
       

     

       52
       52
       +
         nativeBuildInputs = [

     

       53
       53
       +
           cmake

     

       54
       54
       +
           python

     

       55
       55
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       56
       56
       +
           autoPatchelfHook

     

       57
       57
       +
         ];

     

       58
       58
       +
       

     

       59
       59
       +
         buildInputs = [

     

       60
       60
       +
           llvmPackages.llvm

     

       61
       61
       +
           llvmPackages.libclang

     

       62
       62
       +
           qt6.qtbase

     

       63
       63
       +
         ] ++ (lib.optionals (python.pythonOlder "3.9") [

     

       64
       64
       +
           # see similar issue: 202262

     

       65
       65
       +
           # libxcrypt is required for crypt.h for building older python modules

     

       66
       66
       +
           libxcrypt

     

       67
       67
       +
         ]);

     

       68
       68
       +
       

     

       69
       69
       +
         meta = with lib; {

     

       70
       70
       +
           description = "Generator for the pyside6 Qt bindings";

     

       71
       71
       +
           license = with licenses; [ lgpl3Only gpl2Only gpl3Only ];

     

       72
       72
       +
           homepage = "https://wiki.qt.io/Qt_for_Python";

     

       73
       73
       +
           maintainers = with maintainers; [ gebner Enzime ];

     

       74
       74
       +
         };

     

       75
       75
       +
       }

+80

pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch

···

       1
       1
       +
       --- a/ApiExtractor/clangparser/compilersupport.cpp

     

       2
       2
       +
       +++ b/ApiExtractor/clangparser/compilersupport.cpp

     

       3
       3
       +
       @@ -16,6 +16,7 @@

     

       4
       4
       +
        #include <QtCore/QStandardPaths>

     

       5
       5
       +
        #include <QtCore/QStringList>

     

       6
       6
       +
        #include <QtCore/QVersionNumber>

     

       7
       7
       +
       +#include <QtCore/QRegularExpression>

     

       8
       8
       +
        

     

       9
       9
       +
        #include <clang-c/Index.h>

     

       10
       10
       +
        

     

       11
       11
       +
       @@ -341,6 +342,13 @@ QByteArrayList emulatedCompilerOptions()

     

       12
       12
       +
        {

     

       13
       13
       +
            QByteArrayList result;

     

       14
       14
       +
            HeaderPaths headerPaths;

     

       15
       15
       +
       +

     

       16
       16
       +
       +    bool isNixDebug = qgetenv("NIX_DEBUG").toInt() > 0;

     

       17
       17
       +
       +    // examples:

     

       18
       18
       +
       +    // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtsensors-6.4.2-dev/include

     

       19
       19
       +
       +    // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtbase-6.4.2-dev/include

     

       20
       20
       +
       +    QRegularExpression qtHeaderRegex(uR"(/[0-9a-z]{32}-qt[a-z0-9]+-)"_s);

     

       21
       21
       +
       +

     

       22
       22
       +
            switch (compiler()) {

     

       23
       23
       +
            case Compiler::Msvc:

     

       24
       24
       +
                result.append(QByteArrayLiteral("-fms-compatibility-version=19.26.28806"));

     

       25
       25
       +
       @@ -352,9 +360,30 @@ QByteArrayList emulatedCompilerOptions()

     

       26
       26
       +
                    appendClangBuiltinIncludes(&headerPaths);

     

       27
       27
       +
                break;

     

       28
       28
       +
            case Compiler::Clang:

     

       29
       29
       +
       -        headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s)));

     

       30
       30
       +
       +    // fix: error: cannot jump from switch statement to this case label: case Compiler::Gpp

     

       31
       31
       +
       +    // note: jump bypasses variable initialization: const HeaderPaths clangPaths =

     

       32
       32
       +
       +    {

     

       33
       33
       +
       +        //headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s)));

     

       34
       34
       +
       +        // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors.

     

       35
       35
       +
       +        // PySide requires that Qt headers are not -isystem

     

       36
       36
       +
       +        // https://bugreports.qt.io/browse/PYSIDE-787

     

       37
       37
       +
       +        const HeaderPaths clangPaths = gppInternalIncludePaths(compilerFromCMake(u"clang++"_qs));

     

       38
       38
       +
       +        for (const HeaderPath &h : clangPaths) {

     

       39
       39
       +
       +            auto match = qtHeaderRegex.match(QString::fromUtf8(h.path));

     

       40
       40
       +
       +            if (!match.hasMatch()) {

     

       41
       41
       +
       +                if (isNixDebug)

     

       42
       42
       +
       +                    qDebug() << "shiboken compilersupport.cpp: found non-qt header: " << h.path;

     

       43
       43
       +
       +                // add using -isystem

     

       44
       44
       +
       +                headerPaths.append(h);

     

       45
       45
       +
       +            } else {

     

       46
       46
       +
       +                if (isNixDebug)

     

       47
       47
       +
       +                    qDebug() << "shiboken compilersupport.cpp: found qt header: " << h.path;

     

       48
       48
       +
       +                headerPaths.append({h.path, HeaderType::Standard});

     

       49
       49
       +
       +            }

     

       50
       50
       +
       +        }

     

       51
       51
       +
                result.append(noStandardIncludeOption());

     

       52
       52
       +
                break;

     

       53
       53
       +
       +    }

     

       54
       54
       +
            case Compiler::Gpp:

     

       55
       55
       +
                if (needsClangBuiltinIncludes())

     

       56
       56
       +
                    appendClangBuiltinIncludes(&headerPaths);

     

       57
       57
       +
       @@ -363,8 +392,20 @@ QByteArrayList emulatedCompilerOptions()

     

       58
       58
       +
                // <type_traits> etc (g++ 11.3).

     

       59
       59
       +
                const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_qs));

     

       60
       60
       +
                for (const HeaderPath &h : gppPaths) {

     

       61
       61
       +
       -            if (h.path.contains("c++") || h.path.contains("sysroot"))

     

       62
       62
       +
       +            // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors.

     

       63
       63
       +
       +            // PySide requires that Qt headers are not -isystem

     

       64
       64
       +
       +            // https://bugreports.qt.io/browse/PYSIDE-787

     

       65
       65
       +
       +            auto match = qtHeaderRegex.match(QString::fromUtf8(h.path));

     

       66
       66
       +
       +            if (!match.hasMatch()) {

     

       67
       67
       +
       +                if (isNixDebug)

     

       68
       68
       +
       +                    qDebug() << "shiboken compilersupport.cpp: found non-qt header: " << h.path;

     

       69
       69
       +
       +                // add using -isystem

     

       70
       70
       +
                        headerPaths.append(h);

     

       71
       71
       +
       +            } else {

     

       72
       72
       +
       +                if (isNixDebug)

     

       73
       73
       +
       +                    qDebug() << "shiboken compilersupport.cpp: found qt header: " << h.path;

     

       74
       74
       +
       +                headerPaths.append({h.path, HeaderType::Standard});

     

       75
       75
       +
       +            }

     

       76
       76
       +
                }

     

       77
       77
       +
                break;

     

       78
       78
       +
            }

     

       79
       79
       +
       -- 

     

       80
       80
       +
       2.39.0

+5 -4

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "volvooncall";

     

       20
       20
       -
         version = "0.10.2";

     

       20
       20
       +
         version = "0.10.3";

     

       21
       21
        
         format = "setuptools";

     

       22
       22
        
       

     

       23
       23
       -
         disabled = pythonOlder "3.8";

     

       23
       23
       +
         disabled = pythonOlder "3.10";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "molobrakos";

     

       27
       27
        
           repo = "volvooncall";

     

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

     

       29
       29
       -
           hash = "sha256-/BMwDuo4xE/XOLM8qzJwt0A0h0+ihbCVCxT3BBToiVU=";

     

       29
       29
       +
           hash = "sha256-FLrsU3u/0+T09cu2zU2fLjuAy9PWAikgbaW8xBALjwU=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         patches = [

     

       33
       33
       -
           # Remove async, https://github.com/molobrakos/volvooncall/pull/92

     

       33
       33
       +
           # Remove asynctest, https://github.com/molobrakos/volvooncall/pull/92

     

       34
       34
        
           (fetchpatch {

     

       35
       35
        
             name = "remove-asnyc.patch";

     

       36
       36
        
             url = "https://github.com/molobrakos/volvooncall/commit/ef0df403250288c00ed4c600e9dfa79dcba8941e.patch";

     
···

       67
       67
        
         meta = with lib; {

     

       68
       68
        
           description = "Retrieve information from the Volvo On Call web service";

     

       69
       69
        
           homepage = "https://github.com/molobrakos/volvooncall";

     

       70
       70
       +
           changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}";

     

       70
       71
        
           license = licenses.unlicense;

     

       71
       72
        
           maintainers = with maintainers; [ dotlambda ];

     

       72
       73
        
         };

+11 -3

pkgs/development/tools/rust/cargo-dist/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , pkg-config

     

       5
       5
        
       , bzip2

     

       6
       6
       +
       , xz

     

       7
       7
       +
       , zstd

     

       6
       8
        
       , stdenv

     

       7
       9
        
       , rustup

     

       8
       10
        
       }:

     

       9
       11
        
       

     

       10
       12
        
       rustPlatform.buildRustPackage rec {

     

       11
       13
        
         pname = "cargo-dist";

     

       12
       12
       -
         version = "0.0.6";

     

       14
       14
       +
         version = "0.0.7";

     

       13
       15
        
       

     

       14
       16
        
         src = fetchFromGitHub {

     

       15
       17
        
           owner = "axodotdev";

     

       16
       18
        
           repo = "cargo-dist";

     

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

     

       18
       18
       -
           hash = "sha256-fpOBSMVBkuFJcog5g5qFO/0GI78GkkwWQC7zocrVJ2w=";

     

       20
       20
       +
           hash = "sha256-uXC+iaOcEIyGMVNtAduhT68GuE29aL/3S6uEMllAWNA=";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       21
       -
         cargoHash = "sha256-BqbF21OotztNZsol6wlTDzfz0ViybPF5KK/v+F9N5Us=";

     

       23
       23
       +
         cargoHash = "sha256-/TLi+ESOZhJ4Xg3hdUEWhM0K4asI9+L1M1+hWuDOj9Q=";

     

       22
       24
        
       

     

       23
       25
        
         nativeBuildInputs = [

     

       24
       26
        
           pkg-config

     
···

       26
       28
        
       

     

       27
       29
        
         buildInputs = [

     

       28
       30
        
           bzip2

     

       31
       31
       +
           xz

     

       32
       32
       +
           zstd

     

       29
       33
        
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         env = {

     

       36
       36
       +
           ZSTD_SYS_USE_PKG_CONFIG = true;

     

       37
       37
       +
         };

     

       30
       38
        
       

     

       31
       39
        
         nativeCheckInputs = lib.optionals stdenv.isDarwin [

     

       32
       40
        
           rustup

-119

pkgs/tools/misc/grub/trusted.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchurl

     

       4
       4
       -
       , fetchFromGitHub

     

       5
       5
       -
       , fetchpatch

     

       6
       6
       -
       , autogen

     

       7
       7
       -
       , flex

     

       8
       8
       -
       , bison

     

       9
       9
       -
       , python2

     

       10
       10
       -
       , autoconf

     

       11
       11
       -
       , automake

     

       12
       12
       -
       , gettext

     

       13
       13
       -
       , ncurses

     

       14
       14
       -
       , libusb-compat-0_1

     

       15
       15
       -
       , freetype

     

       16
       16
       -
       , qemu

     

       17
       17
       -
       , lvm2

     

       18
       18
       -
       , for_HP_laptop ? false

     

       19
       19
       -
       }:

     

       20
       20
       -
       

     

       21
       21
       -
       let

     

       22
       22
       -
         pcSystems = {

     

       23
       23
       -
           i686-linux.target = "i386";

     

       24
       24
       -
           x86_64-linux.target = "i386";

     

       25
       25
       -
         };

     

       26
       26
       -
       

     

       27
       27
       -
         inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems);

     

       28
       28
       -
       

     

       29
       29
       -
         version = if for_HP_laptop then "1.2.1" else "1.2.0";

     

       30
       30
       -
       

     

       31
       31
       -
         unifont_bdf = fetchurl {

     

       32
       32
       -
           url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";

     

       33
       33
       -
           sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";

     

       34
       34
       -
         };

     

       35
       35
       -
       

     

       36
       36
       -
         po_src = fetchurl {

     

       37
       37
       -
           name = "grub-2.02-beta2.tar.gz";

     

       38
       38
       -
           url = "https://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";

     

       39
       39
       -
           sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";

     

       40
       40
       -
       

     

       41
       41
       -
         };

     

       42
       42
       -
       

     

       43
       43
       -
       in

     

       44
       44
       -
       

     

       45
       45
       -
       stdenv.mkDerivation rec {

     

       46
       46
       -
         pname = "trustedGRUB2";

     

       47
       47
       -
         inherit version;

     

       48
       48
       -
       

     

       49
       49
       -
         src = fetchFromGitHub {

     

       50
       50
       -
           owner = "Sirrix-AG";

     

       51
       51
       -
           repo = "TrustedGRUB2";

     

       52
       52
       -
           rev = version;

     

       53
       53
       -
           sha256 =

     

       54
       54
       -
             if for_HP_laptop

     

       55
       55
       -
             then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw="

     

       56
       56
       -
             else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns=";

     

       57
       57
       -
         };

     

       58
       58
       -
       

     

       59
       59
       -
         nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];

     

       60
       60
       -
         buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]

     

       61
       61
       -
           ++ lib.optional doCheck qemu;

     

       62
       62
       -
       

     

       63
       63
       -
         hardeningDisable = [ "stackprotector" "pic" ];

     

       64
       64
       -
       

     

       65
       65
       -
         env.NIX_CFLAGS_COMPILE = "-Wno-error"; # generated code redefines yyfree

     

       66
       66
       -
       

     

       67
       67
       -
         preConfigure =

     

       68
       68
       -
           '' for i in "tests/util/"*.in

     

       69
       69
       -
              do

     

       70
       70
       -
                sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g'

     

       71
       71
       -
              done

     

       72
       72
       -
       

     

       73
       73
       -
              # Apparently, the QEMU executable is no longer called

     

       74
       74
       -
              # `qemu-system-i386', even on i386.

     

       75
       75
       -
              #

     

       76
       76
       -
              # In addition, use `-nodefaults' to avoid errors like:

     

       77
       77
       -
              #

     

       78
       78
       -
              #  chardev: opening backend "stdio" failed

     

       79
       79
       -
              #  qemu: could not open serial device 'stdio': Invalid argument

     

       80
       80
       -
              #

     

       81
       81
       -
              # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.

     

       82
       82
       -
              sed -i "tests/util/grub-shell.in" \

     

       83
       83
       -
                  -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'

     

       84
       84
       -
           '';

     

       85
       85
       -
       

     

       86
       86
       -
         prePatch =

     

       87
       87
       -
           '' tar zxf ${po_src} grub-2.02~beta2/po

     

       88
       88
       -
              rm -rf po

     

       89
       89
       -
              mv grub-2.02~beta2/po po

     

       90
       90
       -
              sh autogen.sh

     

       91
       91
       -
              gunzip < "${unifont_bdf}" > "unifont.bdf"

     

       92
       92
       -
              sed -i "configure" \

     

       93
       93
       -
                  -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"

     

       94
       94
       -
           '';

     

       95
       95
       -
       

     

       96
       96
       -
         patches = [

     

       97
       97
       -
           ./fix-bash-completion.patch

     

       98
       98
       -
           (fetchpatch {

     

       99
       99
       -
             # glibc-2.26 and above needs '<sys/sysmacros.h>'

     

       100
       100
       -
             url = "https://github.com/Rohde-Schwarz/TrustedGRUB2/commit/7a5b301e3adb8e054288518a325135a1883c1c6c.patch";

     

       101
       101
       -
             sha256 = "1jfrrmcrd9a8w7n419kszxgbpshx7888wc05smg5q4jvc1ag3xm7";

     

       102
       102
       -
           })

     

       103
       103
       -
         ];

     

       104
       104
       -
       

     

       105
       105
       -
         # save target that grub is compiled for

     

       106
       106
       -
         grubTarget = lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc";

     

       107
       107
       -
       

     

       108
       108
       -
         doCheck = false;

     

       109
       109
       -
         # On -j16 races with early header creation:

     

       110
       110
       -
         #  config.h:38:10: fatal error: ./config-util.h: No such file or directory

     

       111
       111
       -
         enableParallelBuilding = false;

     

       112
       112
       -
       

     

       113
       113
       -
         meta = with lib; {

     

       114
       114
       -
           description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)";

     

       115
       115
       -
           homepage = "https://github.com/Sirrix-AG/TrustedGRUB2";

     

       116
       116
       -
           license = licenses.gpl3Plus;

     

       117
       117
       -
           platforms = platforms.gnu ++ platforms.linux;

     

       118
       118
       -
         };

     

       119
       119
       -
       }

+2

pkgs/top-level/aliases.nix

···

       1657
       1657
        
         trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned";

     

       1658
       1658
        
         trilium = throw "trilium has been removed. Please use trilium-desktop instead"; # Added 2020-04-29

     

       1659
       1659
        
         truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22

     

       1660
       1660
       +
         trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10

     

       1661
       1661
       +
         trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10

     

       1660
       1662
        
         tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07

     

       1661
       1663
        
         turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08

     

       1662
       1664
        
         tvbrowser-bin = tvbrowser; # Added 2023-03-02

+2 -4

pkgs/top-level/all-packages.nix

···

       8170
       8170
        
       

     

       8171
       8171
        
         grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { };

     

       8172
       8172
        
       

     

       8173
       8173
       -
         trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };

     

       8174
       8174
       -
       

     

       8175
       8175
       -
         trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };

     

       8176
       8176
       -
       

     

       8177
       8173
        
         grub2 = callPackage ../tools/misc/grub/default.nix {

     

       8178
       8174
        
           # update breaks grub2

     

       8179
       8175
        
           gnulib = pkgs.gnulib.overrideAttrs (_: rec {

     
···

       20751
       20747
        
         gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { };

     

       20752
       20748
        
       

     

       20753
       20749
        
         gnome-menus = callPackage ../development/libraries/gnome-menus { };

     

       20750
       20750
       +
       

     

       20751
       20751
       +
         gnote = callPackage ../applications/office/gnote { };

     

       20754
       20752
        
       

     

       20755
       20753
        
         elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };

     

       20756
       20754

+8

pkgs/top-level/python-packages.nix

···

       9175
       9175
        
           inherit (pkgs) cmake ninja qt5;

     

       9176
       9176
        
         });

     

       9177
       9177
        
       

     

       9178
       9178
       +
         pyside6 = toPythonModule (callPackage ../development/python-modules/pyside6 {

     

       9179
       9179
       +
           inherit (pkgs) cmake ninja qt6;

     

       9180
       9180
       +
         });

     

       9181
       9181
       +
       

     

       9178
       9182
        
         pyside = callPackage ../development/python-modules/pyside {

     

       9179
       9183
        
           inherit (pkgs) mesa;

     

       9180
       9184
        
         };

     
···

       10951
       10955
        
       

     

       10952
       10956
        
         shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 {

     

       10953
       10957
        
           inherit (pkgs) cmake llvmPackages qt5;

     

       10958
       10958
       +
         });

     

       10959
       10959
       +
       

     

       10960
       10960
       +
         shiboken6 = toPythonModule (callPackage ../development/python-modules/shiboken6 {

     

       10961
       10961
       +
           inherit (pkgs) cmake llvmPackages qt6;

     

       10954
       10962
        
         });

     

       10955
       10963
        
       

     

       10956
       10964
        
         shippai = callPackage ../development/python-modules/shippai { };