commit df770ba961e1ddac2407cce53fe67454d38894e2 · pyrox.dev/nixpkgs

+1

maintainers/team-list.nix

···

       413
       413
        
       

     

       414
       414
        
         jupyter = {

     

       415
       415
        
           members = [

     

       416
       416
       +
             GaetanLepage

     

       416
       417
        
             natsukium

     

       417
       418
        
           ];

     

       418
       419
        
           scope = "Maintain Jupyter and related packages.";

+3 -3

nixos/modules/i18n/input-method/fcitx5.nix

···

       107
       107
        
               };

     

       108
       108
        
             in

     

       109
       109
        
             lib.attrsets.mergeAttrsList [

     

       110
       110
       -
               (optionalFile "config" (lib.generators.toINI { }) sts.globalOptions)

     

       111
       111
       -
               (optionalFile "profile" (lib.generators.toINI { }) sts.inputMethod)

     

       110
       110
       +
               (optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions)

     

       111
       111
       +
               (optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod)

     

       112
       112
        
               (lib.concatMapAttrs

     

       113
       113
        
                 (name: value: optionalFile

     

       114
       114
        
                   "conf/${name}.conf"

     

       115
       115
        
                   (lib.generators.toINIWithGlobalSection { })

     

       116
       116
        
                   value)

     

       117
       117
       -
                 sts.addons)

     

       117
       117
       +
                 cfg.settings.addons)

     

       118
       118
        
             ];

     

       119
       119
        
       

     

       120
       120
        
           environment.variables = {

-11

nixos/tests/fcitx5/config

···

       1
       1
       -
       [Hotkey]

     

       2
       2
       -
       EnumerateSkipFirst=False

     

       3
       3
       -
       

     

       4
       4
       -
       [Hotkey/TriggerKeys]

     

       5
       5
       -
       0=Control+space

     

       6
       6
       -
       

     

       7
       7
       -
       [Hotkey/EnumerateForwardKeys]

     

       8
       8
       -
       0=Alt+Shift_L

     

       9
       9
       -
       

     

       10
       10
       -
       [Hotkey/EnumerateBackwardKeys]

     

       11
       11
       -
       0=Alt+Shift_R

+37 -10

nixos/tests/fcitx5/default.nix

···

       36
       36
        
               pkgs.fcitx5-m17n

     

       37
       37
        
               pkgs.fcitx5-mozc

     

       38
       38
        
             ];

     

       39
       39
       +
             fcitx5.settings = {

     

       40
       40
       +
               globalOptions = {

     

       41
       41
       +
                 "Hotkey"."EnumerateSkipFirst" = "False";

     

       42
       42
       +
                 "Hotkey/TriggerKeys"."0" = "Control+space";

     

       43
       43
       +
                 "Hotkey/EnumerateForwardKeys"."0" = "Alt+Shift_L";

     

       44
       44
       +
                 "Hotkey/EnumerateBackwardKeys"."0" = "Alt+Shift_R";

     

       45
       45
       +
               };

     

       46
       46
       +
               inputMethod = {

     

       47
       47
       +
                 "GroupOrder" = {

     

       48
       48
       +
                   "0" = "NixOS_test";

     

       49
       49
       +
                 };

     

       50
       50
       +
                 "Groups/0" = {

     

       51
       51
       +
                   "Default Layout" = "us";

     

       52
       52
       +
                   "DefaultIM" = "wbx";

     

       53
       53
       +
                   "Name" = "NixOS_test";

     

       54
       54
       +
                 };

     

       55
       55
       +
                 "Groups/0/Items/0" = {

     

       56
       56
       +
                   "Name" = "keyboard-us";

     

       57
       57
       +
                 };

     

       58
       58
       +
                 "Groups/0/Items/1" = {

     

       59
       59
       +
                   "Layout" = "us";

     

       60
       60
       +
                   "Name" = "wbx";

     

       61
       61
       +
                 };

     

       62
       62
       +
                 "Groups/0/Items/2" = {

     

       63
       63
       +
                   "Layout" = "us";

     

       64
       64
       +
                   "Name" = "hangul";

     

       65
       65
       +
                 };

     

       66
       66
       +
                 "Groups/0/Items/3" = {

     

       67
       67
       +
                   "Layout" = "us";

     

       68
       68
       +
                   "Name" = "m17n_sa_harvard-kyoto";

     

       69
       69
       +
                 };

     

       70
       70
       +
                 "Groups/0/Items/4" = {

     

       71
       71
       +
                   "Layout" = "us";

     

       72
       72
       +
                   "Name" = "mozc";

     

       73
       73
       +
                 };

     

       74
       74
       +
               };

     

       75
       75
       +
             };

     

       39
       76
        
           };

     

       40
       77
        
         };

     

       41
       78
        
       

     
···

       43
       80
        
           let

     

       44
       81
        
             user = nodes.machine.users.users.alice;

     

       45
       82
        
             xauth         = "${user.home}/.Xauthority";

     

       46
       46
       -
             fcitx_confdir = "${user.home}/.config/fcitx5";

     

       47
       83
        
           in

     

       48
       84
        
             ''

     

       49
       85
        
                   start_all()

     
···

       55
       91
        
       

     

       56
       92
        
                   machine.succeed("su - ${user.name} -c 'kill $(pgrep fcitx5)'")

     

       57
       93
        
                   machine.sleep(1)

     

       58
       58
       -
       

     

       59
       59
       -
                   machine.copy_from_host(

     

       60
       60
       -
                       "${./profile}",

     

       61
       61
       -
                       "${fcitx_confdir}/profile",

     

       62
       62
       -
                   )

     

       63
       63
       -
                   machine.copy_from_host(

     

       64
       64
       -
                       "${./config}",

     

       65
       65
       -
                       "${fcitx_confdir}/config",

     

       66
       66
       -
                   )

     

       67
       94
        
       

     

       68
       95
        
                   machine.succeed("su - ${user.name} -c 'alacritty >&2 &'")

     

       69
       96
        
                   machine.succeed("su - ${user.name} -c 'fcitx5 >&2 &'")

-27

nixos/tests/fcitx5/profile

···

       1
       1
       -
       [Groups/0]

     

       2
       2
       -
       Name=NixOS_test

     

       3
       3
       -
       Default Layout=us

     

       4
       4
       -
       DefaultIM=wbx

     

       5
       5
       -
       

     

       6
       6
       -
       [Groups/0/Items/0]

     

       7
       7
       -
       Name=keyboard-us

     

       8
       8
       -
       Layout=

     

       9
       9
       -
       

     

       10
       10
       -
       [Groups/0/Items/1]

     

       11
       11
       -
       Name=wbx

     

       12
       12
       -
       Layout=us

     

       13
       13
       -
       

     

       14
       14
       -
       [Groups/0/Items/2]

     

       15
       15
       -
       Name=hangul

     

       16
       16
       -
       Layout=us

     

       17
       17
       -
       

     

       18
       18
       -
       [Groups/0/Items/3]

     

       19
       19
       -
       Name=m17n_sa_harvard-kyoto

     

       20
       20
       -
       Layout=us

     

       21
       21
       -
       

     

       22
       22
       -
       [Groups/0/Items/4]

     

       23
       23
       -
       Name=mozc

     

       24
       24
       -
       Layout=us

     

       25
       25
       -
       

     

       26
       26
       -
       [GroupOrder]

     

       27
       27
       -
       0=NixOS_test

+27 -12

pkgs/applications/misc/keepmenu/default.nix

···

       1
       1
       -
       { lib, python3Packages, fetchPypi, xvfb-run }:

     

       1
       1
       +
       { lib, python3Packages, fetchFromGitHub, xvfb-run, xdotool, dmenu }:

     

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "keepmenu";

     

       5
       5
       -
         version = "1.3.1";

     

       5
       5
       +
         version = "1.4.0";

     

       6
       6
       +
         format = "pyproject";

     

       6
       7
        
       

     

       7
       7
       -
         src = fetchPypi {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           hash = "sha256-AGuJY7IirzIjcu/nY9CzeOqU1liwcRijYLi8hGN/pRg=";

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "firecat53";

     

       10
       10
       +
           repo = "keepmenu";

     

       11
       11
       +
           rev = version;

     

       12
       12
       +
           hash = "sha256-3vFg+9Nw+NhuPJbrmBahXwa13wXlBg5IMYwJ+unn88k=";

     

       10
       13
        
         };

     

       11
       14
        
       

     

       12
       12
       -
         preConfigure = ''

     

       13
       13
       -
           export HOME=$TMPDIR

     

       14
       14
       -
           mkdir -p $HOME/.config/keepmenu

     

       15
       15
       -
           cp config.ini.example $HOME/.config/keepmenu/config.ini

     

       16
       16
       -
         '';

     

       15
       15
       +
         nativeBuildInputs = with python3Packages; [

     

       16
       16
       +
           hatchling

     

       17
       17
       +
           hatch-vcs

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       17
       21
        
       

     

       18
       22
        
         propagatedBuildInputs = with python3Packages; [

     

       19
       23
        
           pykeepass

     

       20
       24
        
           pynput

     

       21
       25
        
         ];

     

       22
       26
        
       

     

       23
       23
       -
         nativeCheckInputs = [ xvfb-run ];

     

       27
       27
       +
         nativeCheckInputs = [ xvfb-run xdotool dmenu ];

     

       28
       28
       +
       

     

       29
       29
       +
         postPatch = ''

     

       30
       30
       +
           substituteInPlace tests/keepmenu-config.ini tests/tests.py \

     

       31
       31
       +
             --replace "/usr/bin/dmenu" "dmenu"

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       24
       34
        
         checkPhase = ''

     

       25
       25
       -
           xvfb-run python setup.py test

     

       35
       35
       +
           runHook preCheck

     

       36
       36
       +
       

     

       37
       37
       +
           xvfb-run python tests/tests.py

     

       38
       38
       +
       

     

       39
       39
       +
           runHook postCheck

     

       26
       40
        
         '';

     

       27
       41
        
       

     

       28
       42
        
         pythonImportsCheck = [ "keepmenu" ];

     
···

       32
       46
        
           description = "Dmenu/Rofi frontend for Keepass databases";

     

       33
       47
        
           license = licenses.gpl3Only;

     

       34
       48
        
           maintainers = with maintainers; [ elliot ];

     

       49
       49
       +
           platforms = platforms.linux;

     

       35
       50
        
         };

     

       36
       51
        
       }

+11 -3

pkgs/applications/misc/leetcode-cli/default.nix

···

       7
       7
        
       , sqlite

     

       8
       8
        
       , stdenv

     

       9
       9
        
       , darwin

     

       10
       10
       +
       , testers

     

       11
       11
       +
       , leetcode-cli

     

       10
       12
        
       }:

     

       11
       13
        
       

     

       12
       14
        
       rustPlatform.buildRustPackage rec {

     

       13
       15
        
         pname = "leetcode-cli";

     

       14
       14
       -
         version = "0.4.1";

     

       16
       16
       +
         version = "0.4.2";

     

       15
       17
        
       

     

       16
       18
        
         src = fetchCrate {

     

       17
       19
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "sha256-8v10Oe3J0S9xp4b2UDOnv+W0UDgveK+mAyV3I/zZUGw=";

     

       20
       20
       +
           sha256 = "sha256-Yr8Jsy8863O6saaFRAxssni+PtK7XYe+Iifgxu8Rx6Q=";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       21
       -
         cargoHash = "sha256-MdHk8i/murKcWi9gydyPyq/6r1SovKP04PMJyXXrCiQ=";

     

       23
       23
       +
         cargoHash = "sha256-rab/oLr27UOlnwUUB1RXC/egLoYyzmVtzN1L+AGed8o=";

     

       22
       24
        
       

     

       23
       25
        
         nativeBuildInputs = [

     

       24
       26
        
           pkg-config

     
···

       29
       31
        
           dbus

     

       30
       32
        
           sqlite

     

       31
       33
        
         ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

     

       34
       34
       +
       

     

       35
       35
       +
         passthru.tests = testers.testVersion {

     

       36
       36
       +
           package = leetcode-cli;

     

       37
       37
       +
           command = "leetcode -V";

     

       38
       38
       +
           version = "leetcode ${version}";

     

       39
       39
       +
         };

     

       32
       40
        
       

     

       33
       41
        
         meta = with lib; {

     

       34
       42
        
           description = "May the code be with you 👻";

+5 -4

pkgs/applications/networking/instant-messengers/armcord/default.nix

···

       39
       39
        
       

     

       40
       40
        
       stdenv.mkDerivation rec {

     

       41
       41
        
         pname = "armcord";

     

       42
       42
       -
         version = "3.2.1";

     

       42
       42
       +
         version = "3.2.3";

     

       43
       43
        
       

     

       44
       44
        
         src =

     

       45
       45
        
           let

     
···

       48
       48
        
             {

     

       49
       49
        
               x86_64-linux = fetchurl {

     

       50
       50
        
                 url = "${base}/v${version}/ArmCord_${version}_amd64.deb";

     

       51
       51
       -
                 sha256 = "1cfbypn9kh566s09c1bvxswpc0r11pmsvxlh4dixd5s622ia3h7r";

     

       51
       51
       +
                 hash = "sha256-d8Xv9ecXxkUAIqCS82VKlLNne56hESYvYtSDvNvGul0=";

     

       52
       52
        
               };

     

       53
       53
        
               aarch64-linux = fetchurl {

     

       54
       54
        
                 url = "${base}/v${version}/ArmCord_${version}_arm64.deb";

     

       55
       55
       -
                 sha256 = "0mb6az0mzjz2zal7igigjcigg3phn2ijfw04igpl7q2rg6ha3z00";

     

       55
       55
       +
                 hash = "sha256-yqZ4hl+E4IEEEuKhfyDYY1Lyz5/Nekrf8uxoJr1B8w8=";

     

       56
       56
        
               };

     

       57
       57
        
             }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       58
       58
        
       

     
···

       131
       131
        
       

     

       132
       132
        
         meta = with lib; {

     

       133
       133
        
           description = "Lightweight, alternative desktop client for Discord";

     

       134
       134
       -
           homepage = "https://github.com/ArmCord/ArmCord";

     

       134
       134
       +
           homepage = "https://armcord.app";

     

       135
       135
       +
           downloadPage = "https://github.com/ArmCord/ArmCord";

     

       135
       136
        
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       136
       137
        
           license = licenses.osl3;

     

       137
       138
        
           maintainers = with maintainers; [ wrmilling ];

+2 -2

pkgs/applications/office/portfolio/default.nix

···

       27
       27
        
       in

     

       28
       28
        
       stdenv.mkDerivation rec {

     

       29
       29
        
         pname = "PortfolioPerformance";

     

       30
       30
       -
         version = "0.64.5";

     

       30
       30
       +
         version = "0.65.0";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchurl {

     

       33
       33
        
           url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";

     

       34
       34
       -
           hash = "sha256-dF8w5JyUNypLyPqFC6dWLArPjykvy9BPZnHYs6lyYQM=";

     

       34
       34
       +
           hash = "sha256-a1LL8RCxItrtsyQrJSbMEBPUwxKK6t8FXdFEhxGdvxw=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [

+2 -7

pkgs/desktops/budgie/budgie-backgrounds/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "budgie-backgrounds";

     

       12
       12
       -
         version = "1.0";

     

       12
       12
       +
         version = "2.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "BuddiesOfBudgie";

     

       16
       16
        
           repo = "budgie-backgrounds";

     

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

     

       18
       18
       -
           hash = "sha256-TdtgOYHO2QH4W2jWBuAzYQwxwAPya2lC3VrIi7kvi+M=";

     

       18
       18
       +
           hash = "sha256-L6y9YVS0NFsycS90AmUJJd9HFMJ/Ge99pI426tC05jA=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

     
···

       24
       24
        
           meson

     

       25
       25
        
           ninja

     

       26
       26
        
         ];

     

       27
       27
       -
       

     

       28
       28
       -
         preConfigure = ''

     

       29
       29
       -
           chmod +x ./scripts/optimizeImage.sh

     

       30
       30
       -
           patchShebangs ./scripts/optimizeImage.sh

     

       31
       31
       -
         '';

     

       32
       27
        
       

     

       33
       28
        
         meta = with lib; {

     

       34
       29
        
           description = "The default background set for the Budgie Desktop";

+6

pkgs/development/compilers/gcc/common/builder.nix

···

       3
       3
        
       , enableMultilib

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       +
       let

     

       7
       7
       +
         forceLibgccToBuildCrtStuff =

     

       8
       8
       +
           import ./libgcc-buildstuff.nix { inherit lib stdenv; };

     

       9
       9
       +
       in

     

       10
       10
       +
       

     

       6
       11
        
       originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {

     

       12
       12
       +
         passthru = (originalAttrs.passthru or {}) // { inherit forceLibgccToBuildCrtStuff; };

     

       7
       13
        
         preUnpack = ''

     

       8
       14
        
           oldOpts="$(shopt -po nounset)" || true

     

       9
       15
        
           set -euo pipefail

+37

pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       # Trick to build a gcc that is capable of emitting shared libraries *without* having the

     

       6
       6
       +
       # targetPlatform libc available beforehand.  Taken from:

     

       7
       7
       +
       #   https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/

     

       8
       8
       +
       #   https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff

     

       9
       9
       +
       let

     

       10
       10
       +
         # crt{i,n}.o are the first and last (respectively) object file

     

       11
       11
       +
         # linked when producing an executable.  Traditionally these

     

       12
       12
       +
         # files are delivered as part of the C library, but on GNU

     

       13
       13
       +
         # systems they are in fact built by GCC.  Since libgcc needs to

     

       14
       14
       +
         # build before glibc, we can't wait for them to be copied by

     

       15
       15
       +
         # glibc.  At this early pre-glibc stage these files sometimes

     

       16
       16
       +
         # have different names.

     

       17
       17
       +
         crtstuff-ofiles =

     

       18
       18
       +
           if stdenv.targetPlatform.isPower

     

       19
       19
       +
           then "ecrti.o ecrtn.o ncrti.o ncrtn.o"

     

       20
       20
       +
           else "crti.o crtn.o";

     

       21
       21
       +
       

     

       22
       22
       +
         # Normally, `SHLIB_LC` is set to `-lc`, which means that

     

       23
       23
       +
         # `libgcc_s.so` cannot be built until `libc.so` is available.

     

       24
       24
       +
         # The assignment below clobbers this variable, removing the

     

       25
       25
       +
         # `-lc`.

     

       26
       26
       +
         #

     

       27
       27
       +
         # On PowerPC we add `-mnewlib`, which means "libc has not been

     

       28
       28
       +
         # built yet".  This causes libgcc's Makefile to use the

     

       29
       29
       +
         # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the

     

       30
       30
       +
         # versions which have been repackaged in libc as `crt{n,i}.o`

     

       31
       31
       +
         #

     

       32
       32
       +
         SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower "-mnewlib";

     

       33
       33
       +
       

     

       34
       34
       +
       in ''

     

       35
       35
       +
           echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in

     

       36
       36
       +
           echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in

     

       37
       37
       +
         ''

+7 -7

pkgs/development/compilers/gcc/common/libgcc.nix

···

       44
       44
        
           !langJit &&

     

       45
       45
        
           !stdenv.hostPlatform.isDarwin &&

     

       46
       46
        
           enableShared

     

       47
       47
       -
           ;

     

       47
       47
       +
         ;

     

       48
       48
        
       

     

       49
       49
       -
           # For some reason libgcc_s.so has major-version "2" on m68k but

     

       50
       50
       -
           # "1" everywhere else.  Might be worth changing this to "*".

     

       51
       51
       -
           libgcc_s-version-major =

     

       52
       52
       -
             if targetPlatform.isM68k

     

       53
       53
       -
             then "2"

     

       54
       54
       -
             else "1";

     

       49
       49
       +
         # For some reason libgcc_s.so has major-version "2" on m68k but

     

       50
       50
       +
         # "1" everywhere else.  Might be worth changing this to "*".

     

       51
       51
       +
         libgcc_s-version-major =

     

       52
       52
       +
           if targetPlatform.isM68k

     

       53
       53
       +
           then "2"

     

       54
       54
       +
           else "1";

     

       55
       55
        
       

     

       56
       56
        
       in

     

       57
       57
        
       (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {

+1 -35

pkgs/development/compilers/gcc/common/pre-configure.nix

···

       112
       112
        
         export inhibit_libc=true

     

       113
       113
        
       ''

     

       114
       114
        
       

     

       115
       115
       -
       # Trick to build a gcc that is capable of emitting shared libraries *without* having the

     

       116
       116
       -
       # targetPlatform libc available beforehand.  Taken from:

     

       117
       117
       -
       #   https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/

     

       118
       118
       -
       #   https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff

     

       119
       115
        
       + lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && enableShared)

     

       120
       120
       -
         (let

     

       121
       121
       -
       

     

       122
       122
       -
           # crt{i,n}.o are the first and last (respectively) object file

     

       123
       123
       -
           # linked when producing an executable.  Traditionally these

     

       124
       124
       -
           # files are delivered as part of the C library, but on GNU

     

       125
       125
       -
           # systems they are in fact built by GCC.  Since libgcc needs to

     

       126
       126
       -
           # build before glibc, we can't wait for them to be copied by

     

       127
       127
       -
           # glibc.  At this early pre-glibc stage these files sometimes

     

       128
       128
       -
           # have different names.

     

       129
       129
       -
           crtstuff-ofiles =

     

       130
       130
       -
             if targetPlatform.isPower

     

       131
       131
       -
             then "ecrti.o ecrtn.o ncrti.o ncrtn.o"

     

       132
       132
       -
             else "crti.o crtn.o";

     

       133
       133
       -
       

     

       134
       134
       -
           # Normally, `SHLIB_LC` is set to `-lc`, which means that

     

       135
       135
       -
           # `libgcc_s.so` cannot be built until `libc.so` is available.

     

       136
       136
       -
           # The assignment below clobbers this variable, removing the

     

       137
       137
       -
           # `-lc`.

     

       138
       138
       -
           #

     

       139
       139
       -
           # On PowerPC we add `-mnewlib`, which means "libc has not been

     

       140
       140
       -
           # built yet".  This causes libgcc's Makefile to use the

     

       141
       141
       -
           # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the

     

       142
       142
       -
           # versions which have been repackaged in libc as `crt{n,i}.o`

     

       143
       143
       -
           #

     

       144
       144
       -
           SHLIB_LC = lib.optionalString targetPlatform.isPower "-mnewlib";

     

       145
       145
       -
       

     

       146
       146
       -
         in ''

     

       147
       147
       -
           echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in

     

       148
       148
       -
           echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in

     

       149
       149
       -
         '')

     

       150
       150
       -
       

     

       116
       116
       +
         (import ./libgcc-buildstuff.nix { inherit lib stdenv; })

+140

pkgs/development/libraries/gcc/libgcc/default.nix

···

       1
       1
       +
       { lib, stdenvNoLibs, buildPackages

     

       2
       2
       +
       , gcc, glibc

     

       3
       3
       +
       , libiberty

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         stdenv = stdenvNoLibs;

     

       8
       8
       +
         gccConfigureFlags = gcc.cc.configureFlags ++ [

     

       9
       9
       +
           "--disable-fixincludes"

     

       10
       10
       +
           "--disable-intl"

     

       11
       11
       +
           "--enable-threads=posix"

     

       12
       12
       +
           "--with-glibc-version=${glibc.version}"

     

       13
       13
       +
       

     

       14
       14
       +
           # these are required in order to prevent inhibit_libc=true,

     

       15
       15
       +
           # which will cripple libgcc's unwinder; see:

     

       16
       16
       +
           #  https://github.com/NixOS/nixpkgs/issues/213453#issuecomment-1616346163

     

       17
       17
       +
           "--with-headers=${lib.getDev glibc}/include"

     

       18
       18
       +
           "--with-native-system-header-dir=${lib.getDev glibc}${glibc.incdir or "/include"}"

     

       19
       19
       +
           "--with-build-sysroot=/"

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
       in stdenv.mkDerivation (finalAttrs: {

     

       23
       23
       +
         pname = "libgcc";

     

       24
       24
       +
         inherit (gcc.cc) src version;

     

       25
       25
       +
       

     

       26
       26
       +
         outputs = [ "out" "dev" ];

     

       27
       27
       +
       

     

       28
       28
       +
         strictDeps = true;

     

       29
       29
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       30
       30
       +
         nativeBuildInputs = [ libiberty ];

     

       31
       31
       +
         buildInputs = [ glibc ];

     

       32
       32
       +
       

     

       33
       33
       +
         postUnpack = ''

     

       34
       34
       +
           mkdir -p ./build

     

       35
       35
       +
           buildRoot=$(readlink -e "./build")

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       38
       38
       +
         postPatch =

     

       39
       39
       +
           gcc.cc.passthru.forceLibgccToBuildCrtStuff

     

       40
       40
       +
           + ''

     

       41
       41
       +
             sourceRoot=$(readlink -e "./libgcc")

     

       42
       42
       +
           '';

     

       43
       43
       +
       

     

       44
       44
       +
         hardeningDisable = [ "pie" ];

     

       45
       45
       +
       

     

       46
       46
       +
         preConfigure =

     

       47
       47
       +
         ''

     

       48
       48
       +
           # Drop in libiberty, as external builds are not expected

     

       49
       49
       +
           cd "$buildRoot"

     

       50
       50
       +
           (

     

       51
       51
       +
             mkdir -p build-${stdenv.buildPlatform.config}/libiberty/

     

       52
       52
       +
             cd build-${stdenv.buildPlatform.config}/libiberty/

     

       53
       53
       +
             ln -s ${buildPackages.libiberty}/lib/libiberty.a ./

     

       54
       54
       +
           )

     

       55
       55
       +
           mkdir -p "$buildRoot/gcc"

     

       56
       56
       +
           cd "$buildRoot/gcc"

     

       57
       57
       +
           (

     

       58
       58
       +
             # We "shift" the tools over to fake platforms perspective from the previous stage.

     

       59
       59
       +
             export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD

     

       60
       60
       +
             export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD

     

       61
       61
       +
             export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD

     

       62
       62
       +
             export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD

     

       63
       63
       +
             export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD

     

       64
       64
       +
       

     

       65
       65
       +
             export AS=$AS_FOR_BUILD

     

       66
       66
       +
             export CC=$CC_FOR_BUILD

     

       67
       67
       +
             export CPP=$CPP_FOR_BUILD

     

       68
       68
       +
             export CXX=$CXX_FOR_BUILD

     

       69
       69
       +
             export LD=$LD_FOR_BUILD

     

       70
       70
       +
       

     

       71
       71
       +
             export AS_FOR_TARGET=${stdenv.cc}/bin/$AS

     

       72
       72
       +
             export CC_FOR_TARGET=${stdenv.cc}/bin/$CC

     

       73
       73
       +
             export CPP_FOR_TARGET=${stdenv.cc}/bin/$CPP

     

       74
       74
       +
             export LD_FOR_TARGET=${stdenv.cc.bintools}/bin/$LD

     

       75
       75
       +
       

     

       76
       76
       +
             # We define GENERATOR_FILE so nothing bothers looking for GNU GMP.

     

       77
       77
       +
             export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1'

     

       78
       78
       +
       

     

       79
       79
       +
             "$sourceRoot/../gcc/configure" ${lib.concatStringsSep " " gccConfigureFlags}

     

       80
       80
       +
       

     

       81
       81
       +
             # We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built.

     

       82
       82
       +
             sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile

     

       83
       83
       +
       

     

       84
       84
       +
             make \

     

       85
       85
       +
               config.h \

     

       86
       86
       +
               libgcc.mvars \

     

       87
       87
       +
               tconfig.h \

     

       88
       88
       +
               tm.h \

     

       89
       89
       +
               options.h \

     

       90
       90
       +
               insn-constants.h \

     

       91
       91
       +
         '' + lib.optionalString stdenv.targetPlatform.isM68k ''

     

       92
       92
       +
               sysroot-suffix.h \

     

       93
       93
       +
         '' + lib.optionalString stdenv.targetPlatform.isArmv7 ''

     

       94
       94
       +
               arm-isa.h \

     

       95
       95
       +
               arm-cpu.h \

     

       96
       96
       +
         '' + ''

     

       97
       97
       +
               insn-modes.h

     

       98
       98
       +
           )

     

       99
       99
       +
           mkdir -p "$buildRoot/gcc/include"

     

       100
       100
       +
       

     

       101
       101
       +
           # Preparing to configure + build libgcc itself

     

       102
       102
       +
           mkdir -p "$buildRoot/gcc/${stdenv.hostPlatform.config}/libgcc"

     

       103
       103
       +
           cd "$buildRoot/gcc/${stdenv.hostPlatform.config}/libgcc"

     

       104
       104
       +
           configureScript=$sourceRoot/configure

     

       105
       105
       +
           chmod +x "$configureScript"

     

       106
       106
       +
       

     

       107
       107
       +
           export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD

     

       108
       108
       +
           export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD

     

       109
       109
       +
           export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD

     

       110
       110
       +
           export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD

     

       111
       111
       +
           export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD

     

       112
       112
       +
       

     

       113
       113
       +
           export AS=${stdenv.cc}/bin/$AS

     

       114
       114
       +
           export CC=${stdenv.cc}/bin/$CC

     

       115
       115
       +
           export CPP=${stdenv.cc}/bin/$CPP

     

       116
       116
       +
           export CXX=${stdenv.cc}/bin/$CXX

     

       117
       117
       +
           export LD=${stdenv.cc.bintools}/bin/$LD

     

       118
       118
       +
       

     

       119
       119
       +
           export AS_FOR_TARGET=${stdenv.cc}/bin/$AS_FOR_TARGET

     

       120
       120
       +
           export CC_FOR_TARGET=${stdenv.cc}/bin/$CC_FOR_TARGET

     

       121
       121
       +
           export CPP_FOR_TARGET=${stdenv.cc}/bin/$CPP_FOR_TARGET

     

       122
       122
       +
           export LD_FOR_TARGET=${stdenv.cc.bintools}/bin/$LD_FOR_TARGET

     

       123
       123
       +
         '';

     

       124
       124
       +
       

     

       125
       125
       +
         configurePlatforms = [ "build" "host" ];

     

       126
       126
       +
         configureFlags = [

     

       127
       127
       +
           "cross_compiling=true"

     

       128
       128
       +
           "--disable-gcov"

     

       129
       129
       +
           "--with-glibc-version=${glibc.version}"

     

       130
       130
       +
         ];

     

       131
       131
       +
       

     

       132
       132
       +
         makeFlags = [ "MULTIBUILDTOP:=../" ];

     

       133
       133
       +
       

     

       134
       134
       +
         postInstall = ''

     

       135
       135
       +
           moveToOutput "lib/gcc/${stdenv.hostPlatform.config}/${finalAttrs.version}/include" "$dev"

     

       136
       136
       +
           mkdir -p "$out/lib" "$dev/include"

     

       137
       137
       +
           ln -s "$out/lib/gcc/${stdenv.hostPlatform.config}/${finalAttrs.version}"/* "$out/lib"

     

       138
       138
       +
           ln -s "$dev/lib/gcc/${stdenv.hostPlatform.config}/${finalAttrs.version}/include"/* "$dev/include/"

     

       139
       139
       +
         '';

     

       140
       140
       +
       })

+6 -5

pkgs/development/libraries/glibc/default.nix

···

       4
       4
        
       , withGd ? false

     

       5
       5
        
       , withLibcrypt? false

     

       6
       6
        
       , buildPackages

     

       7
       7
       +
       , libgcc

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       let

     
···

       16
       17
        
       

     

       17
       18
        
       (callPackage ./common.nix { inherit stdenv; } {

     

       18
       19
        
         inherit withLinuxHeaders withGd profilingLibraries withLibcrypt;

     

       19
       19
       -
         pname = "glibc" + lib.optionalString withGd "-gd";

     

       20
       20
       +
         pname = "glibc" + lib.optionalString withGd "-gd" + lib.optionalString (stdenv.cc.isGNU && libgcc==null) "-nolibgcc";

     

       20
       21
        
       }).overrideAttrs(previousAttrs: {

     

       21
       22
        
       

     

       22
       23
        
           # Note:

     
···

       90
       91
        
           #

     

       91
       92
        
           makeFlags =

     

       92
       93
        
             (previousAttrs.makeFlags or [])

     

       93
       93
       -
             ++ lib.optionals (stdenv.cc.cc?libgcc) [

     

       94
       94
       -
               "user-defined-trusted-dirs=${stdenv.cc.cc.libgcc}/lib"

     

       94
       94
       +
             ++ lib.optionals (libgcc != null) [

     

       95
       95
       +
               "user-defined-trusted-dirs=${libgcc}/lib"

     

       95
       96
        
             ];

     

       96
       97
        
       

     

       97
       98
        
           postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then ''

     
···

       166
       167
        
       

     

       167
       168
        
           passthru =

     

       168
       169
        
             (previousAttrs.passthru or {})

     

       169
       169
       -
             // lib.optionalAttrs (stdenv.cc.cc?libgcc) {

     

       170
       170
       -
               inherit (stdenv.cc.cc) libgcc;

     

       170
       170
       +
             // lib.optionalAttrs (libgcc != null) {

     

       171
       171
       +
               inherit libgcc;

     

       171
       172
        
             };

     

       172
       173
        
       

     

       173
       174
        
         meta = (previousAttrs.meta or {}) // { description = "The GNU C Library"; };

+2 -2

pkgs/development/python-modules/bthome-ble/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "bthome-ble";

     

       16
       16
       -
         version = "3.0.0";

     

       16
       16
       +
         version = "3.1.0";

     

       17
       17
        
         format = "pyproject";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.9";

     
···

       22
       22
        
           owner = "Bluetooth-Devices";

     

       23
       23
        
           repo = "bthome-ble";

     

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

     

       25
       25
       -
           hash = "sha256-dLXeJojGeiwPPxXES1qzay1kC/YiI6pKyxKD2z32Av8=";

     

       25
       25
       +
           hash = "sha256-CcLb+2UOLKwfBw3E51LJUZmLqpBw85nLXl1J/oFfEVs=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+10

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

···

       23
       23
        
           sha256 = "0ymjv322mv6y424fmpd70f87152w55mbwwj6i7p3sjzf0ixmxy26";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       +
         postPatch = ''

     

       27
       27
       +
           for f in influxdb/tests/dataframe_client_test.py influxdb/tests/influxdb08/dataframe_client_test.py; do

     

       28
       28
       +
             substituteInPlace "$f" \

     

       29
       29
       +
               --replace "pandas.util.testing" "pandas.testing"

     

       30
       30
       +
           done

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       26
       33
        
         propagatedBuildInputs = [

     

       27
       34
        
           requests

     

       28
       35
        
           python-dateutil

     
···

       51
       58
        
           "test_write_points_from_dataframe_with_tags_and_nan_json"

     

       52
       59
        
           # Reponse is not empty but `s = '孝'` and the JSON decoder chokes on that

     

       53
       60
        
           "test_query_with_empty_result"

     

       61
       61
       +
           # Pandas API changes cause it to no longer infer datetimes in the expected manner

     

       62
       62
       +
           "test_multiquery_into_dataframe"

     

       63
       63
       +
           "test_multiquery_into_dataframe_dropna"

     

       54
       64
        
         ];

     

       55
       65
        
       

     

       56
       66
        
         pythonImportsCheck = [ "influxdb" ];

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "mashumaro";

     

       20
       20
       -
         version = "3.8.1";

     

       20
       20
       +
         version = "3.9";

     

       21
       21
        
         format = "pyproject";

     

       22
       22
        
         disabled = pythonOlder "3.7";

     

       23
       23
        
       

     
···

       25
       25
        
           owner = "Fatal1ty";

     

       26
       26
        
           repo = pname;

     

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

     

       28
       28
       -
           hash = "sha256-WDKohmcdVlQR/6AMSISN0y6UQx4tmOf1fANCPLRYiqI=";

     

       28
       28
       +
           hash = "sha256-oH44poFVnoM831dJuA9KcHCsuW6gh5B2EHrnKwza6A4=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/mypy-boto3-ebs/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "mypy-boto3-ebs";

     

       11
       11
       -
         version = "1.28.13";

     

       11
       11
       +
         version = "1.28.16";

     

       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-GhOEPhx4zD5jXyTMH75DOq0UL4LgOMkJn0U5nKciNMI=";

     

       18
       18
       +
           hash = "sha256-PJkVweQPGGR3NwCpg/O+Cs822XU6awMfUL6wWwT6e0w=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "pylitterbot";

     

       18
       18
       -
         version = "2023.4.3";

     

       18
       18
       +
         version = "2023.4.4";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.9";

     
···

       24
       24
        
           owner = "natekspencer";

     

       25
       25
        
           repo = pname;

     

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

     

       27
       27
       -
           hash = "sha256-pUtOLQ4ftG0tYPued12CqKGt3LKyfmLPxIYKvkYg1nI=";

     

       27
       27
       +
           hash = "sha256-Vsnxb597HOu1zHXqZjC3rsjyEQYoSNQcXiArzqOWBUQ=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "pyschlage";

     

       14
       14
       -
         version = "2023.7.0";

     

       14
       14
       +
         version = "2023.8.1";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     
···

       20
       20
        
           owner = "dknowles2";

     

       21
       21
        
           repo = "pyschlage";

     

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

     

       23
       23
       -
           hash = "sha256-PH8ClpuYwTu+34hSPPwI1KMFut6UaxWVrbf38LYb9EQ=";

     

       23
       23
       +
           hash = "sha256-PTkuVGUdqRcvgcIL7yoVWNLQcWyDpXXHLxb7CoD8J1s=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

+2 -2

pkgs/development/python-modules/reolink-aio/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "reolink-aio";

     

       13
       13
       -
         version = "0.7.6";

     

       13
       13
       +
         version = "0.7.7";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.9";

     
···

       19
       19
        
           owner = "starkillerOG";

     

       20
       20
        
           repo = "reolink_aio";

     

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

     

       22
       22
       -
           hash = "sha256-muxM9+3D8WL2muw5yxbYKmbkVc5lTcj9XQOr67hb/pU=";

     

       22
       22
       +
           hash = "sha256-RlnUROCCYBIgxwnORaG5pxo9Npq80LvVGhmj29tPXN8=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         postPatch = ''

+2 -2

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

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "twilio";

     

       21
       21
       -
         version = "8.5.0";

     

       21
       21
       +
         version = "8.6.0";

     

       22
       22
        
         format = "setuptools";

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.7";

     
···

       27
       27
        
           owner = "twilio";

     

       28
       28
        
           repo = "twilio-python";

     

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

     

       30
       30
       -
           hash = "sha256-tU4nyjo1DC7F2UvaV6Hn/Nqxbm8OR1E1qtUGMVgZ8U8=";

     

       30
       30
       +
           hash = "sha256-ATspn/cY9DJahcsesnzwDOCEKYoUbqSoeOR3+kLou0s=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/types-ujson/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-ujson";

     

       8
       8
       -
         version = "5.8.0.0";

     

       8
       8
       +
         version = "5.8.0.1";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           hash = "sha256-KFao0Ig0db7IDBrHcsAG6mkSFcxV3tIWR7XIfIYknLs=";

     

       13
       13
       +
           hash = "sha256-KxQ4gkirTNH176jEZHYREll8zVfA2EI49zYxq+DiDP0=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

+2 -2

pkgs/development/tools/analysis/checkov/default.nix

···

       22
       22
        
       

     

       23
       23
        
       buildPythonApplication rec {

     

       24
       24
        
         pname = "checkov";

     

       25
       25
       -
         version = "2.3.364";

     

       25
       25
       +
         version = "2.3.365";

     

       26
       26
        
         format = "setuptools";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "bridgecrewio";

     

       30
       30
        
           repo = pname;

     

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

     

       32
       32
       -
           hash = "sha256-pec8JLFLqhe75G2Tk/3EwGYr9Dg2xgT8MlVS471QH60=";

     

       32
       32
       +
           hash = "sha256-shJfqslstZIQ7W0GBV75M2ekxpb1/sIqbFDrL74Zpp4=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         patches = [

+6

pkgs/development/tools/build-managers/bazel/bazel_6/default.nix

···

       625
       625
        
       

     

       626
       626
        
           cd ./bazel_src

     

       627
       627
        
       

     

       628
       628
       +
           # If .bazelversion file is present in dist files and doesn't match `bazel` version

     

       629
       629
       +
           # running `bazel` command within bazel_src will fail.

     

       630
       630
       +
           # Let's remove .bazelversion within the test, if present it is meant to indicate bazel version

     

       631
       631
       +
           # to compile bazel with, not version of bazel to be built and tested.

     

       632
       632
       +
           rm -f .bazelversion

     

       633
       633
       +
       

     

       628
       634
        
           # test whether $WORKSPACE_ROOT/tools/bazel works

     

       629
       635
        
       

     

       630
       636
        
           mkdir -p tools

+10 -8

pkgs/development/tools/language-servers/typst-lsp/Cargo.lock

···

       96
       96
        
       

     

       97
       97
        
       [[package]]

     

       98
       98
        
       name = "async-trait"

     

       99
       99
       -
       version = "0.1.72"

     

       99
       99
       +
       version = "0.1.73"

     

       100
       100
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       101
       101
       -
       checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"

     

       101
       101
       +
       checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"

     

       102
       102
        
       dependencies = [

     

       103
       103
        
        "proc-macro2",

     

       104
       104
        
        "quote",

     
···

       3045
       3045
        
       

     

       3046
       3046
        
       [[package]]

     

       3047
       3047
        
       name = "tower-lsp"

     

       3048
       3048
       -
       version = "0.19.0"

     

       3048
       3048
       +
       version = "0.20.0"

     

       3049
       3049
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       3050
       3050
       -
       checksum = "9b38fb0e6ce037835174256518aace3ca621c4f96383c56bb846cfc11b341910"

     

       3050
       3050
       +
       checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508"

     

       3051
       3051
        
       dependencies = [

     

       3052
       3052
        
        "async-trait",

     

       3053
       3053
        
        "auto_impl",

     
···

       3068
       3068
        
       

     

       3069
       3069
        
       [[package]]

     

       3070
       3070
        
       name = "tower-lsp-macros"

     

       3071
       3071
       -
       version = "0.8.0"

     

       3071
       3071
       +
       version = "0.9.0"

     

       3072
       3072
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       3073
       3073
       -
       checksum = "34723c06344244474fdde365b76aebef8050bf6be61a935b91ee9ff7c4e91157"

     

       3073
       3073
       +
       checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"

     

       3074
       3074
        
       dependencies = [

     

       3075
       3075
        
        "proc-macro2",

     

       3076
       3076
        
        "quote",

     

       3077
       3077
       -
        "syn 1.0.109",

     

       3077
       3077
       +
        "syn 2.0.28",

     

       3078
       3078
        
       ]

     

       3079
       3079
        
       

     

       3080
       3080
        
       [[package]]

     
···

       3267
       3267
        
       

     

       3268
       3268
        
       [[package]]

     

       3269
       3269
        
       name = "typst-lsp"

     

       3270
       3270
       -
       version = "0.9.0"

     

       3270
       3270
       +
       version = "0.9.1"

     

       3271
       3271
        
       dependencies = [

     

       3272
       3272
        
        "anyhow",

     

       3273
       3273
        
        "async-compression",

     

       3274
       3274
       +
        "async-trait",

     

       3274
       3275
        
        "bpaf",

     

       3275
       3276
        
        "chrono",

     

       3276
       3277
        
        "comemo",

     
···

       3287
       3288
        
        "opentelemetry",

     

       3288
       3289
        
        "opentelemetry-jaeger",

     

       3289
       3290
        
        "parking_lot",

     

       3291
       3291
       +
        "percent-encoding",

     

       3290
       3292
        
        "regex",

     

       3291
       3293
        
        "reqwest",

     

       3292
       3294
        
        "same-file",

+4 -12

pkgs/development/tools/language-servers/typst-lsp/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , rustPlatform

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , pkg-config

     

       5
       5
       -
       , openssl

     

       6
       4
        
       , stdenv

     

       7
       5
        
       , darwin

     

       8
       6
        
       }:

     

       9
       7
        
       

     

       10
       8
        
       rustPlatform.buildRustPackage rec {

     

       11
       9
        
         pname = "typst-lsp";

     

       12
       12
       -
         version = "0.9.0";

     

       10
       10
       +
         version = "0.9.1";

     

       13
       11
        
       

     

       14
       12
        
         src = fetchFromGitHub {

     

       15
       13
        
           owner = "nvarner";

     

       16
       14
        
           repo = "typst-lsp";

     

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

     

       18
       18
       -
           hash = "sha256-XV/LlibO+2ORle0lVcqqHrDdH75kodk9yOU3OsHFA+A=";

     

       16
       16
       +
           hash = "sha256-vzywUbfLyogJhjybiUEGJ2XESjDWE2fMfHM0uJxZC38=";

     

       19
       17
        
         };

     

       20
       18
        
       

     

       21
       19
        
         cargoLock = {

     
···

       25
       23
        
           };

     

       26
       24
        
         };

     

       27
       25
        
       

     

       28
       28
       -
         nativeBuildInputs = [

     

       29
       29
       -
           pkg-config

     

       30
       30
       -
         ];

     

       31
       31
       -
       

     

       32
       32
       -
         buildInputs = [

     

       33
       33
       -
           openssl

     

       34
       34
       -
         ] ++ lib.optionals stdenv.isDarwin [

     

       26
       26
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       35
       27
        
           darwin.apple_sdk.frameworks.Security

     

       36
       28
        
         ];

     

       37
       29
        
       

     

       38
       30
        
         checkFlags = [

     

       39
       31
        
           # requires internet access

     

       40
       40
       -
           "--skip=workspace::package::external::repo::test::full_download"

     

       32
       32
       +
           "--skip=workspace::package::external::remote_repo::test::full_download"

     

       41
       33
        
         ];

     

       42
       34
        
       

     

       43
       35
        
         meta = with lib; {

+2 -2

pkgs/development/tools/twilio-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       4
       4
        
         pname = "twilio-cli";

     

       5
       5
       -
         version = "5.11.0";

     

       5
       5
       +
         version = "5.12.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-h8Y8AgXOfl7GWlyRYRAw+SlD3ZX9U0NMyvBQiI/vGgY=";

     

       9
       9
       +
           sha256 = "sha256-K8SMUT2f8pgxCP5JGFyo/gLm60t0OeCt/1fYAw2HQX0=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ nodejs ];

+3 -3

pkgs/development/tools/typos/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "typos";

     

       5
       5
       -
         version = "1.16.4";

     

       5
       5
       +
         version = "1.16.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "crate-ci";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-/LEE+54ppv/jkUgpuMReorQA9D4KAuPG04E8lIk7upA=";

     

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

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-hvFDmtNweTXQEgu5ng/lBVu7OPnA8hA8h6HFvGxCJIE=";

     

       14
       14
       +
         cargoHash = "sha256-oBl8FTgxTK8czIExMsAHgJyHsfEzyoDRiAhH9R5tHKw=";

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "Source code spell checker";

+1

pkgs/os-specific/linux/nvidia-x11/builder.sh

···

       64
       64
        
           for i in $lib32 $out; do

     

       65
       65
        
               rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately

     

       66
       66
        
               rm -f $i/lib/libnvidia-gtk* # built from source

     

       67
       67
       +
               rm -f $i/lib/libnvidia-wayland-client* # built from source

     

       67
       68
        
               if [ "$useGLVND" = "1" ]; then

     

       68
       69
        
                   # Pre-built libglvnd

     

       69
       70
        
                   rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*

+24 -6

pkgs/os-specific/linux/nvidia-x11/settings.nix

···

       1
       1
        
       nvidia_x11: sha256:

     

       2
       2
        
       

     

       3
       3
       -
       { stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, m4, jansson, gtk2, dbus, gtk3

     

       4
       4
       -
       , libXv, libXrandr, libXext, libXxf86vm, libvdpau

     

       5
       5
       -
       , librsvg, wrapGAppsHook

     

       6
       6
       -
       , withGtk2 ? false, withGtk3 ? true

     

       3
       3
       +
       { stdenv

     

       4
       4
       +
       , lib

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , fetchpatch

     

       7
       7
       +
       , pkg-config

     

       8
       8
       +
       , m4

     

       9
       9
       +
       , jansson

     

       10
       10
       +
       , gtk2

     

       11
       11
       +
       , dbus

     

       12
       12
       +
       , gtk3

     

       13
       13
       +
       , libXv

     

       14
       14
       +
       , libXrandr

     

       15
       15
       +
       , libXext

     

       16
       16
       +
       , libXxf86vm

     

       17
       17
       +
       , libvdpau

     

       18
       18
       +
       , librsvg

     

       19
       19
       +
       , wrapGAppsHook

     

       20
       20
       +
       , addOpenGLRunpath

     

       21
       21
       +
       , withGtk2 ? false

     

       22
       22
       +
       , withGtk3 ? true

     

       7
       23
        
       }:

     

       8
       24
        
       

     

       9
       25
        
       let

     
···

       75
       91
        
           fi

     

       76
       92
        
         '';

     

       77
       93
        
       

     

       78
       78
       -
         nativeBuildInputs = [ pkg-config m4 ];

     

       94
       94
       +
         nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ];

     

       79
       95
        
       

     

       80
       96
        
         buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]

     

       81
       81
       -
                    ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];

     

       97
       97
       +
           ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];

     

       82
       98
        
       

     

       83
       99
        
         installFlags = [ "PREFIX=$(out)" ];

     

       84
       100
        
       

     
···

       106
       122
        
         postFixup = ''

     

       107
       123
        
           patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \

     

       108
       124
        
             $out/bin/$binaryName

     

       125
       125
       +
       

     

       126
       126
       +
           addOpenGLRunpath $out/bin/$binaryName

     

       109
       127
        
         '';

     

       110
       128
        
       

     

       111
       129
        
         passthru = {

+2 -2

pkgs/servers/monitoring/prometheus/postgres-exporter.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "postgres_exporter";

     

       5
       5
       -
         version = "0.13.1";

     

       5
       5
       +
         version = "0.13.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "prometheus-community";

     

       9
       9
        
           repo = "postgres_exporter";

     

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

     

       11
       11
       -
           sha256 = "sha256-DBb15rtwrR+jixbnZEfhQUkCo+N+kPiZ60VxtNoL90c=";

     

       11
       11
       +
           sha256 = "sha256-K0B6EsRCWznYf4xS+9T4HafOSUPHCNsu2ZSIVXneGyk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-0MQS42/4iImtq3yBGVCe0BwV0HiJCo7LVEAbsKltE4g=";

+3 -1

pkgs/test/cross/default.nix

···

       115
       115
        
         in

     

       116
       116
        
           pkgs.runCommand "test-mbuffer" {} ''

     

       117
       117
        
             echo hello | ${emulator} ${mbuffer}/bin/mbuffer

     

       118
       118
       +
             touch $out

     

       118
       119
        
           '';

     

       119
       120
        
       

     

       120
       121
        
         # This is meant to be a carefully curated list of builds/packages

     
···

       127
       128
        
         # of things that often break.  So, no buckshot `mapTestOnCross`

     

       128
       129
        
         # calls here.

     

       129
       130
        
         sanity = [

     

       130
       130
       -
           #pkgs.mbuffer              # https://github.com/NixOS/nixpkgs/issues/213453

     

       131
       131
       +
           mbuffer

     

       131
       132
        
           #pkgs.pkgsCross.gnu64.bash # https://github.com/NixOS/nixpkgs/issues/243164

     

       132
       133
        
           pkgs.gcc_multi.cc

     

       133
       134
        
           pkgs.pkgsMusl.stdenv

     

       134
       135
        
           pkgs.pkgsLLVM.stdenv

     

       135
       136
        
           pkgs.pkgsStatic.bash

     

       136
       137
        
           pkgs.pkgsCross.arm-embedded.stdenv

     

       138
       138
       +
           pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv

     

       137
       139
        
           pkgs.pkgsCross.m68k.stdenv

     

       138
       140
        
           pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc

     

       139
       141
        
           pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc

+2 -2

pkgs/tools/filesystems/duperemove/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "duperemove";

     

       7
       7
       -
         version = "0.11.3";

     

       7
       7
       +
         version = "0.12";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "markfasheh";

     

       11
       11
        
           repo = "duperemove";

     

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

     

       13
       13
       -
           sha256 = "sha256-WjUM52IqMDvBzeGHo7p4JcvMO5iPWPVOr8GJ3RSsnUs=";

     

       13
       13
       +
           hash = "sha256-VPwcWAENCRnU51F78FhMPjQZaCTewQRUdeFwK1blJbs=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         postPatch = ''

+9 -6

pkgs/tools/misc/ripdrag/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchCrate, pkg-config, wrapGAppsHook4, gtk4 }:

     

       1
       1
       +
       { lib, rustPlatform, fetchFromGitHub, pkg-config, wrapGAppsHook4, gtk4 }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "ripdrag";

     

       5
       5
       -
         version = "0.4.0";

     

       5
       5
       +
         version = "0.4.1";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchCrate {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           hash = "sha256-9VGvwMovJb1IIpwf+1FxcxnPcmPl+59jfQC6365E95s=";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "nik012003";

     

       9
       9
       +
           repo = "ripdrag";

     

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

     

       11
       11
       +
           hash = "sha256-Omq5y6ECo+3thhz88IMZJGkRNlAEuMAMbljVKXzxSQc=";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       12
       -
         cargoHash = "sha256-kxT0wJodPiHXX/bsvrlPbyfUbxPBgmv68a8I5pKOwEg=";

     

       14
       14
       +
         cargoHash = "sha256-NQHFnA/9K8V8sxX9Lzoh6tuKvMmx7FMd8lTTPiQ+xnU=";

     

       13
       15
        
       

     

       14
       16
        
         nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];

     

       15
       17
        
       

     
···

       18
       20
        
         meta = with lib; {

     

       19
       21
        
           description = "An application that lets you drag and drop files from and to the terminal";

     

       20
       22
        
           homepage = "https://github.com/nik012003/ripdrag";

     

       23
       23
       +
           changelog = "https://github.com/nik012003/ripdrag/releases/tag/${src.rev}";

     

       21
       24
        
           license = licenses.gpl3Only;

     

       22
       25
        
           maintainers = with maintainers; [ figsoda ];

     

       23
       26
        
         };

+17 -4

pkgs/tools/package-management/nix-doc/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }:

     

       1
       1
       +
       { lib, stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "nix-doc";

     

       5
       5
       -
         version = "0.5.9";

     

       5
       5
       +
         version = "0.5.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

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

     

       9
       9
        
           owner = "lf-";

     

       10
       10
        
           repo = "nix-doc";

     

       11
       11
       -
           sha256 = "sha256-uilVJz1MnMF3i/ZXY0bIoSK3uAzfxWuHfhoOSmQgY/I=";

     

       11
       11
       +
           sha256 = "sha256-+T4Bz26roTFiXTM8P8FnJLSdFY2hP26X4nChWWUACN8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         doCheck = true;

     
···

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ pkg-config nix ];

     

       18
       18
        
       

     

       19
       19
       -
         cargoSha256 = "sha256-02noJcbtml4MxRCjaWtjOWLTUNOQnKy3GCsil31J6F8=";

     

       19
       19
       +
         # Packaging support for making the nix-doc plugin load cleanly as a no-op on

     

       20
       20
       +
         # the wrong Nix version (disabling bindnow permits loading libraries

     

       21
       21
       +
         # requiring unavailable symbols if they are unreached)

     

       22
       22
       +
         hardeningDisable = [ "bindnow" ];

     

       23
       23
       +
         # Due to a Rust bug, setting -Z relro-level to anything including "off" on

     

       24
       24
       +
         # macOS will cause link errors

     

       25
       25
       +
         env = lib.optionalAttrs stdenv.isLinux {

     

       26
       26
       +
           # nix-doc does not use nightly features, however, there is no other way to

     

       27
       27
       +
           # set relro-level

     

       28
       28
       +
           RUSTC_BOOTSTRAP = 1;

     

       29
       29
       +
           RUSTFLAGS = "-Z relro-level=partial";

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         cargoSha256 = "sha256-GylSWo4LIsjKnJE9H6iJHZ99UI6UPhAOnAGXk+v8bko=";

     

       20
       33
        
       

     

       21
       34
        
         meta = with lib; {

     

       22
       35
        
           description = "An interactive Nix documentation tool";

+50

pkgs/tools/text/nltk_data/default.nix

···

       1
       1
       +
       { lib, newScope, fetchFromGitHub, unzip, stdenvNoCC }:

     

       2
       2
       +
       let

     

       3
       3
       +
         base = {

     

       4
       4
       +
           version = "unstable-2023-02-02";

     

       5
       5
       +
           nativeBuildInputs = [ unzip ];

     

       6
       6
       +
           dontBuild = true;

     

       7
       7
       +
           meta = with lib; {

     

       8
       8
       +
             description = "NLTK Data";

     

       9
       9
       +
             homepage = "https://github.com/nltk/nltk_data";

     

       10
       10
       +
             license = licenses.asl20;

     

       11
       11
       +
             platforms = platforms.all;

     

       12
       12
       +
             maintainers = with maintainers; [ happysalada ];

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
         makeNltkDataPackage = {pname, location, hash}:

     

       16
       16
       +
           let

     

       17
       17
       +
             src = fetchFromGitHub {

     

       18
       18
       +
               owner = "nltk";

     

       19
       19
       +
               repo = "nltk_data";

     

       20
       20
       +
               rev = "5db857e6f7df11eabb5e5665836db9ec8df07e28";

     

       21
       21
       +
               inherit hash;

     

       22
       22
       +
               sparseCheckout = [ "${location}/${pname}.zip" ];

     

       23
       23
       +
             };

     

       24
       24
       +
           in

     

       25
       25
       +
           stdenvNoCC.mkDerivation (base // {

     

       26
       26
       +
             inherit pname src;

     

       27
       27
       +
             version = base.version;

     

       28
       28
       +
             installPhase = ''

     

       29
       29
       +
               runHook preInstall

     

       30
       30
       +
       

     

       31
       31
       +
               mkdir -p $out

     

       32
       32
       +
               unzip ${src}/${location}/${pname}.zip

     

       33
       33
       +
               cp -R ${pname}/ $out/

     

       34
       34
       +
       

     

       35
       35
       +
               runHook postInstall

     

       36
       36
       +
             '';

     

       37
       37
       +
           });

     

       38
       38
       +
       in

     

       39
       39
       +
       lib.makeScope newScope (self: {

     

       40
       40
       +
         punkt = makeNltkDataPackage ({

     

       41
       41
       +
           pname = "punkt";

     

       42
       42
       +
           location = "packages/tokenizers";

     

       43
       43
       +
           hash = "sha256-rMkgn3xzmSJNv8//kqbPF2Xq3Gf16lgA1Wx8FPYbaQo=";

     

       44
       44
       +
         });

     

       45
       45
       +
         averaged_perceptron_tagger = makeNltkDataPackage ({

     

       46
       46
       +
           pname = "averaged_perceptron_tagger";

     

       47
       47
       +
           location = "packages/taggers";

     

       48
       48
       +
           hash = "sha256-ilTs4HWPUoHxQb4kWEy3wJ6QsE/98+EQya44gtV2inw=";

     

       49
       49
       +
         });

     

       50
       50
       +
       })

-1

pkgs/top-level/aliases.nix

···

       879
       879
        
         liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22

     

       880
       880
        
         liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22

     

       881
       881
        
         liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22

     

       882
       882
       -
         libgcc = throw "libgcc was removed, use gcc.cc.libgcc if needed"; # added 2023-05-13

     

       883
       882
        
         libgksu = throw "libgksu has been removed"; # Added 2022-01-16

     

       884
       883
        
         libgme = game-music-emu; # Added 2022-07-20

     

       885
       884
        
         libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22

+9

pkgs/top-level/all-packages.nix

···

       5971
       5971
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       5972
       5972
        
         };

     

       5973
       5973
        
       

     

       5974
       5974
       +
         nltk-data = callPackage ../tools/text/nltk_data { };

     

       5975
       5975
       +
       

     

       5974
       5976
        
         nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime;

     

       5975
       5977
        
       

     

       5976
       5978
        
         nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools;

     
···

       18916
       18918
        
       

     

       18917
       18919
        
         librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { };

     

       18918
       18920
        
       

     

       18921
       18921
       +
         libgcc = stdenv.cc.cc.libgcc or null;

     

       18922
       18922
       +
       

     

       18919
       18923
        
         # This is for e.g. LLVM libraries on linux.

     

       18920
       18924
        
         gccForLibs =

     

       18921
       18925
        
           if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU

     
···

       21444
       21448
        
         # Being redundant to avoid cycles on boot. TODO: find a better way

     

       21445
       21449
        
         glibcCross = callPackage ../development/libraries/glibc {

     

       21446
       21450
        
           stdenv = gccCrossLibcStdenv; # doesn't compile without gcc

     

       21451
       21451
       +
           libgcc = callPackage ../development/libraries/gcc/libgcc {

     

       21452
       21452
       +
             gcc = gccCrossLibcStdenv.cc;

     

       21453
       21453
       +
             glibc = glibcCross.override { libgcc = null; };

     

       21454
       21454
       +
             stdenvNoLibs = gccCrossLibcStdenv;

     

       21455
       21455
       +
           };

     

       21447
       21456
        
         };

     

       21448
       21457
        
       

     

       21449
       21458
        
         muslCross = musl.override {