commit 9f2767ce37a2a9a8e424280306922fb97fb1cc11 · pyrox.dev/nixpkgs

+12

lib/licenses.nix

···

       215
       215
        
           url = "https://opensource.org/licenses/CAL-1.0";

     

       216
       216
        
         };

     

       217
       217
        
       

     

       218
       218
       +
         caldera = {

     

       219
       219
       +
           spdxId = "Caldera";

     

       220
       220
       +
           fullName = "Caldera License";

     

       221
       221
       +
           url = "http://www.lemis.com/grog/UNIX/ancient-source-all.pdf";

     

       222
       222
       +
         };

     

       223
       223
       +
       

     

       218
       224
        
         capec = {

     

       219
       225
        
           fullName = "Common Attack Pattern Enumeration and Classification";

     

       220
       226
        
           url = "https://capec.mitre.org/about/termsofuse.html";

     
···

       554
       560
        
         imlib2 = {

     

       555
       561
        
           spdxId = "Imlib2";

     

       556
       562
        
           fullName = "Imlib2 License";

     

       563
       563
       +
         };

     

       564
       564
       +
       

     

       565
       565
       +
         info-zip = {

     

       566
       566
       +
           spdxId = "Info-ZIP";

     

       567
       567
       +
           fullName = "Info-ZIP License";

     

       568
       568
       +
           url = "http://www.info-zip.org/pub/infozip/license.html";

     

       557
       569
        
         };

     

       558
       570
        
       

     

       559
       571
        
         inria-compcert = {

maintainers/maintainer-list.nix

···

       4946
       4946
        
           githubId = 1847524;

     

       4947
       4947
        
           name = "Evan Stoll";

     

       4948
       4948
        
         };

     

       4949
       4949
       +
         evanrichter = {

     

       4950
       4950
       +
           email = "evanjrichter@gmail.com";

     

       4951
       4951
       +
           github = "evanrichter";

     

       4952
       4952
       +
           githubId = 330292;

     

       4953
       4953
       +
           name = "Evan Richter";

     

       4954
       4954
       +
         };

     

       4949
       4955
        
         evax = {

     

       4950
       4956
        
           email = "nixos@evax.fr";

     

       4951
       4957
        
           github = "evax";

+55 -3

nixos/modules/virtualisation/qemu-vm.nix

···

       263
       263
        
               if cfg.useEFIBoot then "efi_bootloading_with_default_fs"

     

       264
       264
        
               else "legacy_bootloading_with_default_fs"

     

       265
       265
        
             else

     

       266
       266
       -
               "direct_boot_with_default_fs"

     

       266
       266
       +
               if cfg.directBoot.enable then "direct_boot_with_default_fs"

     

       267
       267
       +
               else "custom"

     

       267
       268
        
           else

     

       268
       269
        
             "custom";

     

       269
       270
        
         suggestedRootDevice = {

     
···

       769
       770
        
               '';

     

       770
       771
        
             };

     

       771
       772
        
       

     

       773
       773
       +
           virtualisation.directBoot = {

     

       774
       774
       +
             enable =

     

       775
       775
       +
               mkOption {

     

       776
       776
       +
                 type = types.bool;

     

       777
       777
       +
                 default = !cfg.useBootLoader;

     

       778
       778
       +
                 defaultText = "!cfg.useBootLoader";

     

       779
       779
       +
                 description =

     

       780
       780
       +
                   lib.mdDoc ''

     

       781
       781
       +
                     If enabled, the virtual machine will boot directly into the kernel instead of through a bootloader. Other relevant parameters such as the initrd are also passed to QEMU.

     

       782
       782
       +
       

     

       783
       783
       +
                     If you want to test netboot, consider disabling this option.

     

       784
       784
       +
       

     

       785
       785
       +
                     This will not boot / reboot correctly into a system that has switched to a different configuration on disk.

     

       786
       786
       +
       

     

       787
       787
       +
                     This is enabled by default if you don't enable bootloaders, but you can still enable a bootloader if you need.

     

       788
       788
       +
                     Read more about this feature: <https://qemu-project.gitlab.io/qemu/system/linuxboot.html>.

     

       789
       789
       +
                   '';

     

       790
       790
       +
               };

     

       791
       791
       +
             initrd =

     

       792
       792
       +
               mkOption {

     

       793
       793
       +
                 type = types.str;

     

       794
       794
       +
                 default = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";

     

       795
       795
       +
                 defaultText = "\${config.system.build.initialRamdisk}/\${config.system.boot.loader.initrdFile}";

     

       796
       796
       +
                 description =

     

       797
       797
       +
                   lib.mdDoc ''

     

       798
       798
       +
                     In direct boot situations, you may want to influence the initrd to load

     

       799
       799
       +
                     to use your own customized payload.

     

       800
       800
       +
       

     

       801
       801
       +
                     This is useful if you want to test the netboot image without

     

       802
       802
       +
                     testing the firmware or the loading part.

     

       803
       803
       +
                   '';

     

       804
       804
       +
               };

     

       805
       805
       +
           };

     

       806
       806
       +
       

     

       772
       807
        
           virtualisation.useBootLoader =

     

       773
       808
        
             mkOption {

     

       774
       809
        
               type = types.bool;

     
···

       895
       930
        
                     virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max.

     

       896
       931
        
                   '';

     

       897
       932
        
                 }

     

       933
       933
       +
                 { assertion = cfg.directBoot.initrd != options.virtualisation.directBoot.initrd.default -> cfg.directBoot.enable;

     

       934
       934
       +
                   message =

     

       935
       935
       +
                     ''

     

       936
       936
       +
                       You changed the default of `virtualisation.directBoot.initrd` but you are not

     

       937
       937
       +
                       using QEMU direct boot. This initrd will not be used in your current

     

       938
       938
       +
                       boot configuration.

     

       939
       939
       +
       

     

       940
       940
       +
                       Either do not mutate `virtualisation.directBoot.initrd` or enable direct boot.

     

       941
       941
       +
       

     

       942
       942
       +
                       If you have a more advanced usecase, please open an issue or a pull request.

     

       943
       943
       +
                     '';

     

       944
       944
       +
                 }

     

       898
       945
        
               ];

     

       899
       946
        
       

     

       900
       947
        
           warnings =

     
···

       915
       962
        
                 Otherwise, we recommend

     

       916
       963
        
       

     

       917
       964
        
                   ${opt.writableStore} = false;

     

       965
       965
       +
                   ''

     

       966
       966
       +
             ++ optional (cfg.directBoot.enable && cfg.useBootLoader)

     

       967
       967
       +
               ''

     

       968
       968
       +
                 You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering

     

       969
       969
       +
                 `useBootLoader` useless. You might want to disable one of those options.

     

       918
       970
        
               '';

     

       919
       971
        
       

     

       920
       972
        
           # In UEFI boot, we use a EFI-only partition table layout, thus GRUB will fail when trying to install

     
···

       1036
       1088
        
               alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9));

     

       1037
       1089
        
               # Replace all non-alphanumeric characters with underscores

     

       1038
       1090
        
               sanitizeShellIdent = s: concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s);

     

       1039
       1039
       -
             in mkIf (!cfg.useBootLoader) [

     

       1091
       1091
       +
             in mkIf cfg.directBoot.enable [

     

       1040
       1092
        
               "-kernel \${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}"

     

       1041
       1041
       -
               "-initrd ${config.system.build.toplevel}/initrd"

     

       1093
       1093
       +
               "-initrd ${cfg.directBoot.initrd}"

     

       1042
       1094
        
               ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''

     

       1043
       1095
        
             ])

     

       1044
       1096
        
             (mkIf cfg.useEFIBoot [

+5 -16

nixos/tests/nixos-rebuild-specialisations.nix

···

       14
       14
        
               connect-timeout = 1;

     

       15
       15
        
             };

     

       16
       16
        
       

     

       17
       17
       -
             system.extraDependencies = with pkgs; [

     

       18
       18
       -
               curl

     

       19
       19
       -
               desktop-file-utils

     

       20
       20
       -
               docbook5

     

       21
       21
       -
               docbook_xsl_ns

     

       22
       22
       -
               grub2

     

       23
       23
       -
               kmod.dev

     

       24
       24
       -
               libarchive

     

       25
       25
       -
               libarchive.dev

     

       26
       26
       -
               libxml2.bin

     

       27
       27
       -
               libxslt.bin

     

       28
       28
       -
               python3Minimal

     

       29
       29
       -
               shared-mime-info

     

       30
       30
       -
               stdenv

     

       31
       31
       -
               sudo

     

       32
       32
       -
               xorg.lndir

     

       17
       17
       +
             system.includeBuildDependencies = true;

     

       18
       18
       +
       

     

       19
       19
       +
             system.extraDependencies = [

     

       20
       20
       +
               # Not part of the initial build apparently?

     

       21
       21
       +
               pkgs.grub2

     

       33
       22
        
             ];

     

       34
       23
        
       

     

       35
       24
        
             virtualisation = {

+10 -4

nixos/tests/systemd-boot.nix

···

       207
       207
        
           nodes = {

     

       208
       208
        
             inherit common;

     

       209
       209
        
       

     

       210
       210
       -
             machine = { pkgs, ... }: {

     

       210
       210
       +
             machine = { pkgs, nodes, ... }: {

     

       211
       211
        
               imports = [ common ];

     

       212
       212
        
               boot.loader.systemd-boot.extraFiles = {

     

       213
       213
        
                 "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi;

     

       214
       214
        
               };

     

       215
       215
       +
       

     

       216
       216
       +
               # These are configs for different nodes, but we'll use them here in `machine`

     

       217
       217
       +
               system.extraDependencies = [

     

       218
       218
       +
                 nodes.common.system.build.toplevel

     

       219
       219
       +
                 nodes.with_netbootxyz.system.build.toplevel

     

       220
       220
       +
               ];

     

       215
       221
        
             };

     

       216
       222
        
       

     

       217
       223
        
             with_netbootxyz = { pkgs, ... }: {

     
···

       221
       227
        
           };

     

       222
       228
        
       

     

       223
       229
        
           testScript = { nodes, ... }: let

     

       224
       224
       -
             originalSystem = nodes.machine.config.system.build.toplevel;

     

       225
       225
       -
             baseSystem = nodes.common.config.system.build.toplevel;

     

       226
       226
       -
             finalSystem = nodes.with_netbootxyz.config.system.build.toplevel;

     

       230
       230
       +
             originalSystem = nodes.machine.system.build.toplevel;

     

       231
       231
       +
             baseSystem = nodes.common.system.build.toplevel;

     

       232
       232
       +
             finalSystem = nodes.with_netbootxyz.system.build.toplevel;

     

       227
       233
        
           in ''

     

       228
       234
        
             machine.succeed("test -e /boot/efi/fruits/tomato.efi")

     

       229
       235
        
             machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi")

+2 -2

pkgs/applications/audio/mympd/default.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "mympd";

     

       19
       19
       -
         version = "10.3.2";

     

       19
       19
       +
         version = "10.3.3";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "jcorporation";

     

       23
       23
        
           repo = "myMPD";

     

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

     

       25
       25
       -
           sha256 = "sha256-VnV0jZp2ymsZkVIDBYXHhJTR10CZ74wutue1GTGQtxI=";

     

       25
       25
       +
           sha256 = "sha256-LqIaRFAXB3XMidC1Dypax/ucayot/IJPAvPwzHQeH9k=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/audio/open-stage-control/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildNpmPackage rec {

     

       4
       4
        
         pname = "open-stage-control";

     

       5
       5
       -
         version = "1.25.0";

     

       5
       5
       +
         version = "1.25.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "jean-emmanuel";

     

       9
       9
        
           repo = "open-stage-control";

     

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

     

       11
       11
       -
           hash = "sha256-HbJFxgY/xba6X73TK40xXyLZiIxv1Ku/sVAekjApYFg=";

     

       11
       11
       +
           hash = "sha256-mbd+fknSzokFt5dPlZrZIpDox/NzMbvyFp2fNPelv3c=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # Remove some Electron stuff from package.json

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

···

       13
       13
        
       

     

       14
       14
        
         agda2-mode = callPackage ./manual-packages/agda2-mode { };

     

       15
       15
        
       

     

       16
       16
       +
         beancount = callPackage ./manual-packages/beancount { };

     

       17
       17
       +
       

     

       16
       18
        
         cask = callPackage ./manual-packages/cask { };

     

       17
       19
        
       

     

       18
       20
        
         control-lock = callPackage ./manual-packages/control-lock { };

+35

pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , melpaBuild

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , emacs

     

       5
       5
       +
       , writeText

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         rev = "519bfd868f206ed2fc538a57cdb631c4fec3c93e";

     

       10
       10
       +
       in

     

       11
       11
       +
       melpaBuild {

     

       12
       12
       +
         pname = "beancount";

     

       13
       13
       +
         version = "20230205.436";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "beancount";

     

       17
       17
       +
           repo = "beancount-mode";

     

       18
       18
       +
           inherit rev;

     

       19
       19
       +
           hash = "sha256-nTEXJdPEPZpNm06uYvRxLuiOHmsiIgMLerd//dA0+KQ=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         commit = rev;

     

       23
       23
       +
       

     

       24
       24
       +
         recipe = writeText "recipe" ''

     

       25
       25
       +
           (beancount :repo "beancount/beancount-mode" :fetcher github)

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         meta = {

     

       29
       29
       +
           homepage = "https://github.com/beancount/beancount-mode";

     

       30
       30
       +
           description = "Emacs major-mode to work with Beancount ledger files";

     

       31
       31
       +
           maintainers = with lib.maintainers; [ polarmutex ];

     

       32
       32
       +
           license = lib.licenses.gpl3Only;

     

       33
       33
       +
           inherit (emacs.meta) platforms;

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+1 -1

pkgs/applications/networking/remote/rustdesk/default.nix

···

       61
       61
        
           ./cargo.patch

     

       62
       62
        
         ];

     

       63
       63
        
       

     

       64
       64
       -
         # Manually simulate a vcpkg installation so that it can link the libaries

     

       64
       64
       +
         # Manually simulate a vcpkg installation so that it can link the libraries

     

       65
       65
        
         # properly.

     

       66
       66
        
         postUnpack =

     

       67
       67
        
           let

+3 -3

pkgs/applications/networking/rymdport/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildGoModule rec {

     

       13
       13
        
         pname = "rymdport";

     

       14
       14
       -
         version = "3.3.6";

     

       14
       14
       +
         version = "3.4.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "Jacalz";

     

       18
       18
        
           repo = "rymdport";

     

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

     

       20
       20
       -
           hash = "sha256-IBGvlDgpONa04u3DBJ3k8VZbtNs/W5DUHzREFpjIqrs=";

     

       20
       20
       +
           hash = "sha256-nqB4KZdYSTiyIaslFN6ncwJnD8+7ZgHj/SXAa5YAt9k=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         vendorHash = "sha256-Q3bUH1EhY63QF646FYwiVXusWPTqI5Am2AVJq+qyNVo=";

     

       23
       23
       +
         vendorHash = "sha256-03qdjeU6u0mBcdWlMhs9ORaeBkPNMO4Auqy/rOFIaVM=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

     

       26
       26
        
           pkg-config

+2 -2

pkgs/applications/version-management/diff-so-fancy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "diff-so-fancy";

     

       5
       5
       -
         version = "1.4.3";

     

       5
       5
       +
         version = "1.4.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "so-fancy";

     

       9
       9
        
           repo = "diff-so-fancy";

     

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

     

       11
       11
       -
           sha256 = "sha256-/xdBvq2u1s5/yzjwr3MLxpaD1CNktcPijXJTKW3Bc4c=";

     

       11
       11
       +
           sha256 = "sha256-yF+LI1lsE1qwOc3u7mtc+uu0N/8m4bZD5qP+xFraaTI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [

+1 -1

pkgs/applications/window-managers/afterstep/default.nix

···

       60
       60
        
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)"

     

       61
       61
        
         '';

     

       62
       62
        
       

     

       63
       63
       -
         # Parallel build fails due to missing dependencies between private libaries:

     

       63
       63
       +
         # Parallel build fails due to missing dependencies between private libraries:

     

       64
       64
        
         #   ld: cannot find ../libAfterConf/libAfterConf.a: No such file or directory

     

       65
       65
        
         # Let's disable parallel builds until it's fixed upstream:

     

       66
       66
        
         #   https://github.com/afterstep/afterstep/issues/8

+2 -2

pkgs/applications/window-managers/katriawm/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
       11
        
         pname = "katriawm";

     

       12
       12
       -
         version = "22.12";

     

       12
       12
       +
         version = "23.04";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchzip {

     

       15
       15
        
           name = finalAttrs.pname + "-" + finalAttrs.version;

     

       16
       16
        
           url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz";

     

       17
       17
       -
           hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc=";

     

       17
       17
       +
           hash = "sha256-Wi9Fv/Ms6t7tr8nxznXrn/6V04lnO1HMz4XFbuCr9+Y=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

+2 -2

pkgs/build-support/rust/build-rust-crate/default.nix

···

       125
       125
        
             #   hello = attrs: { buildInputs = [ openssl ]; };

     

       126
       126
        
             # }

     

       127
       127
        
           , crateOverrides

     

       128
       128
       -
             # Rust library dependencies, i.e. other libaries that were built

     

       128
       128
       +
             # Rust library dependencies, i.e. other libraries that were built

     

       129
       129
        
             # with buildRustCrate.

     

       130
       130
        
           , dependencies

     

       131
       131
       -
             # Rust build dependencies, i.e. other libaries that were built

     

       131
       131
       +
             # Rust build dependencies, i.e. other libraries that were built

     

       132
       132
        
             # with buildRustCrate and are used by a build script.

     

       133
       133
        
           , buildDependencies

     

       134
       134
        
             # Specify the "extern" name of a library if it differs from the library target.

+1 -1

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

···

       69
       69
        
       # This fix would not be necessary if ANY of the above were false:

     

       70
       70
        
       #  - If Nix used native headers for each different MacOS version, aligned_alloc

     

       71
       71
        
       #    would be in the headers on Catalina.

     

       72
       72
       -
       #  - If Nix used the same libary binaries for each MacOS version, aligned_alloc

     

       72
       72
       +
       #  - If Nix used the same library binaries for each MacOS version, aligned_alloc

     

       73
       73
        
       #    would not be in the library binaries.

     

       74
       74
        
       #  - If Catalina did not include aligned_alloc, this wouldn't be a problem.

     

       75
       75
        
       #  - If the configure scripts looked for header presence as well as

+2 -2

pkgs/development/compilers/kotlin/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "kotlin";

     

       5
       5
       -
         version = "1.8.21";

     

       5
       5
       +
         version = "1.8.22";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";

     

       9
       9
       -
           sha256 = "1mwggqll6117sw5ldkl1kmlp6mh9z36jhb6r0hnljryhk9bcahvf";

     

       9
       9
       +
           sha256 = "19psrm905r7fli27cn5hykvjhizshpg2xzp1kbkv3pwybki0zxci";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ jre ] ;

+4 -4

pkgs/development/compilers/kotlin/native.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "kotlin-native";

     

       10
       10
       -
         version = "1.8.21";

     

       10
       10
       +
         version = "1.8.22";

     

       11
       11
        
       

     

       12
       12
        
         src = let

     

       13
       13
        
           getArch = {

     
···

       20
       20
        
             "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";

     

       21
       21
        
       

     

       22
       22
        
           getHash = arch: {

     

       23
       23
       -
             "macos-aarch64" = "06sjlwsk1854c6qpxbfqccvcyk4i8dv13jbc7s7lamgd45wrb5qa";

     

       24
       24
       -
             "macos-x86_64" = "1mkzcwya5mjn0hjxmx8givmx9y1v4hy0cqayya20rvk10jngsfz7";

     

       25
       25
       -
             "linux-x86_64" = "1kv81ilp2dzhxx0kbqkl0i43b44vr5dvni607k78vn6n3mj59j0g";

     

       23
       23
       +
             "macos-aarch64" = "05z4jdq52lxhbs0sgv43zbfx8dkl16k04ky578b3raqf4brmm019";

     

       24
       24
       +
             "macos-x86_64" = "03f2nxp8xajpap8fw0fccacs45fp5lcjgy01ygr8yjwsaq96nvhd";

     

       25
       25
       +
             "linux-x86_64" = "12z5jxkdnraivc0in4m9qagca06jiasfnjalk9fpsd0b07y43yx1";

     

       26
       26
        
           }.${arch};

     

       27
       27
        
         in

     

       28
       28
        
           fetchurl {

+1 -1

pkgs/development/libraries/libixp/default.nix

···

       25
       25
        
       

     

       26
       26
        
         meta = {

     

       27
       27
        
           homepage = "https://github.com/0intro/libixp";

     

       28
       28
       -
           description = "Portable, simple C-language 9P client and server libary";

     

       28
       28
       +
           description = "Portable, simple C-language 9P client and server library";

     

       29
       29
        
           maintainers = with lib.maintainers; [ kovirobi ];

     

       30
       30
        
           license = lib.licenses.mit;

     

       31
       31
        
           platforms = with lib.platforms; unix;

pkgs/development/libraries/liblinphone/default.nix

···

       40
       40
        
         cmakeFlags = [

     

       41
       41
        
           "-DENABLE_STATIC=NO" # Do not build static libraries

     

       42
       42
        
           "-DENABLE_UNIT_TESTS=NO" # Do not build test executables

     

       43
       43
       +
           "-DENABLE_STRICT=NO" # Do not build with -Werror

     

       43
       44
        
         ];

     

       44
       45
        
       

     

       45
       46
        
         buildInputs = [

+2 -2

pkgs/development/libraries/mpich/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation  rec {

     

       13
       13
        
         pname = "mpich";

     

       14
       14
       -
         version = "4.1.1";

     

       14
       14
       +
         version = "4.1.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";

     

       18
       18
       -
           sha256 = "sha256-7jBHGzXvh/TIj4caXirTgRzZxN8y/U8ThEMHL/QoTKI=";

     

       18
       18
       +
           sha256 = "sha256-NJLpitq2K1l+8NKS+yRZthI7yABwqKoKML5pYgdaEvA=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         configureFlags = [

+2 -2

pkgs/development/libraries/xeus/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "xeus";

     

       13
       13
       -
         version = "3.0.5";

     

       13
       13
       +
         version = "3.1.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "jupyter-xeus";

     

       17
       17
        
           repo = pname;

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "sha256-LeU4PJ1UKfGqkRKq0/Mn9gjwNmXCy0/2SbjWJrjlOyU=";

     

       19
       19
       +
           sha256 = "sha256-jZZe8SegQuFLoH2Qp+etoKELGEWdlYQPXj14DNIMJ/0=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "hdf5plugin";

     

       9
       9
       -
         version = "4.1.1";

     

       9
       9
       +
         version = "4.1.2";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "silx-kit";

     

       14
       14
        
           repo = "hdf5plugin";

     

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

     

       16
       16
       -
           hash = "sha256-w3jgIKfJPlu8F2rJXATmbHKyabp3PQLVmCYj3RsYL3c=";

     

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

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

+3 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "jsbeautifier";

     

       12
       12
       -
         version = "1.14.7";

     

       12
       12
       +
         version = "1.14.8";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-d5kyVNsf9vhOtuHXXjtrcsui7yCBOlhbLYHo5ePHE8Y=";

     

       19
       19
       +
           hash = "sha256-1MTiY6Qt1hlK+52+VHEL48VgRJLL7D6JyS3ZhRP5i58=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

     
···

       39
       39
        
         meta = with lib; {

     

       40
       40
        
           description = "JavaScript unobfuscator and beautifier";

     

       41
       41
        
           homepage = "http://jsbeautifier.org";

     

       42
       42
       +
           changelog = "https://github.com/beautify-web/js-beautify/blob/v${version}/CHANGELOG.md";

     

       42
       43
        
           license = licenses.mit;

     

       43
       44
        
           maintainers = with maintainers; [ apeyroux ];

     

       44
       45
        
         };

+2 -2

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

···

       76
       76
        
       

     

       77
       77
        
       buildPythonPackage rec {

     

       78
       78
        
         pname = "langchain";

     

       79
       79
       -
         version = "0.0.193";

     

       79
       79
       +
         version = "0.0.195";

     

       80
       80
        
         format = "pyproject";

     

       81
       81
        
       

     

       82
       82
        
         disabled = pythonOlder "3.8";

     
···

       85
       85
        
           owner = "hwchase17";

     

       86
       86
        
           repo = "langchain";

     

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

     

       88
       88
       -
           hash = "sha256-Qg6kFFPOk+XpLzEl3YSI9I4fPq9KB4UtQf9Khgut7FE=";

     

       88
       88
       +
           hash = "sha256-PUBFAAqCAshUkASsGnFNQ5+Xh6416ISkMqJ0bYcx7WI=";

     

       89
       89
        
         };

     

       90
       90
        
       

     

       91
       91
        
         postPatch = ''

+3 -2

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

···

       9
       9
        
       

     

       10
       10
        
        buildPythonPackage rec {

     

       11
       11
        
         pname = "nunavut";

     

       12
       12
       -
         version = "2.0.9";

     

       12
       12
       +
         version = "2.1.0";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-SRiM4Vuk2nhETnBclYTeKFsT+5HgAxQe4z27h+lW7HI=";

     

       19
       19
       +
           hash = "sha256-L4FbPhhhmgjkL1c3qnSJDK+4NBO2DUqeW6WGt9MBTbg=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

     
···

       50
       50
        
             authors to generate code, schemas, metadata, documentation, etc.

     

       51
       51
        
           '';

     

       52
       52
        
           homepage = "https://nunavut.readthedocs.io/";

     

       53
       53
       +
           changelog = "https://github.com/OpenCyphal/nunavut/releases/tag/${version}";

     

       53
       54
        
           maintainers = with maintainers; [ wucke13 ];

     

       54
       55
        
           license = with licenses; [ bsd3 mit ];

     

       55
       56
        
         };

+1 -1

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

···

       40
       40
        
         ];

     

       41
       41
        
       

     

       42
       42
        
         meta = with lib; {

     

       43
       43
       -
           description = "A collection of utilities and processors for the Python Imaging Libary";

     

       43
       43
       +
           description = "A collection of utilities and processors for the Python Imaging Library";

     

       44
       44
        
           homepage = "https://github.com/matthewwithanm/pilkit/";

     

       45
       45
        
           license = licenses.bsd0;

     

       46
       46
        
           maintainers = with maintainers; [ domenkozar ];

-43

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

···

       1
       1
       -
       { stdenv, autoPatchelfHook, fetchurl, lib }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "ccloud-cli";

     

       5
       5
       -
         version = "1.39.0";

     

       6
       6
       -
       

     

       7
       7
       -
         # To get the latest version:

     

       8
       8
       -
         # curl -L https://cnfl.io/ccloud-cli | sh -s -- -l | grep -v latest | sort -V | tail -n1

     

       9
       9
       -
         src = fetchurl (if stdenv.hostPlatform.isDarwin then {

     

       10
       10
       -
             url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_darwin_amd64.tar.gz";

     

       11
       11
       -
             sha256 = "0jqpmnx3izl4gv02zpx03z6ayi3cb5if4rnyl1374yaclx44k1gd";

     

       12
       12
       -
           } else {

     

       13
       13
       -
             url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_linux_amd64.tar.gz";

     

       14
       14
       -
             sha256 = "0936hipcl37w4mzzsnjlz4q1z4j9094i4irigzqwg14gdbs7p11s";

     

       15
       15
       -
           });

     

       16
       16
       -
       

     

       17
       17
       -
         nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

     

       18
       18
       -
       

     

       19
       19
       -
         dontStrip = stdenv.isDarwin;

     

       20
       20
       -
       

     

       21
       21
       -
         installPhase = ''

     

       22
       22
       -
           mkdir -p $out/{bin,share/doc/ccloud-cli}

     

       23
       23
       -
           cp ccloud $out/bin/

     

       24
       24
       -
           cp LICENSE $out/share/doc/ccloud-cli/

     

       25
       25
       -
           cp -r legal $out/share/doc/ccloud-cli/

     

       26
       26
       -
         '';

     

       27
       27
       -
       

     

       28
       28
       -
         meta = with lib; {

     

       29
       29
       -
           description = "Confluent Cloud CLI";

     

       30
       30
       -
           homepage = "https://docs.confluent.io/current/cloud/cli/index.html";

     

       31
       31
       -
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       32
       32
       -
           license = licenses.unfree;

     

       33
       33
       -
           maintainers = with maintainers; [ kalbasit ];

     

       34
       34
       -
       

     

       35
       35
       -
           # TODO: There's support for i686 systems but I do not have any such system

     

       36
       36
       -
           # to build it locally on, it's also unfree so I cannot rely on ofborg to

     

       37
       37
       -
           # build it. Get the list of supported system by looking at the list of

     

       38
       38
       -
           # files in the S3 bucket:

     

       39
       39
       -
           #

     

       40
       40
       -
           #   https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/1.25.0/&delimiter=/%27

     

       41
       41
       -
           platforms = [ "x86_64-linux" "x86_64-darwin" ];

     

       42
       42
       -
         };

     

       43
       43
       -
       }

+5 -5

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

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "confluent-cli";

     

       5
       5
       -
         version = "2.4.0";

     

       5
       5
       +
         version = "3.17.0";

     

       6
       6
        
       

     

       7
       7
        
         # To get the latest version:

     

       8
       8
        
         # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1

     

       9
       9
        
         src = fetchurl (if stdenv.hostPlatform.isDarwin then {

     

       10
       10
       -
             url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_darwin_amd64.tar.gz";

     

       11
       11
       -
             sha256 = "1xkf7p9cn37k8j57cgbzxhqgnmchf86jyiza91bf6ddvm6jsm2gd";

     

       10
       10
       +
             url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_amd64.tar.gz";

     

       11
       11
       +
             sha256 = "03104736f65591a5be9536424460d9b8c8fc8ac8b5eb646e832371397aaf7cef";

     

       12
       12
        
           } else {

     

       13
       13
       -
             url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_linux_amd64.tar.gz";

     

       14
       14
       -
             sha256 = "1wvy7x56cc7imycf0d83mxcqzdvv56cc0zbp913xgghjn9dl2z7a";

     

       13
       13
       +
             url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_amd64.tar.gz";

     

       14
       14
       +
             sha256 = "3243beca4fefd49cf067f9a4df4f5072a8ac5dac91638e9f10ef0b0544d30445";

     

       15
       15
        
           });

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

+2 -2

pkgs/development/tools/mani/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mani";

     

       5
       5
       -
         version = "0.24.0";

     

       5
       5
       +
         version = "0.25.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "alajmo";

     

       9
       9
        
           repo = "mani";

     

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

     

       11
       11
       -
           sha256 = "sha256-ROFqeRa43qDjO+xwC68gJJqLeLSRiX+L/gf2o8kURaI=";

     

       11
       11
       +
           sha256 = "sha256-TqxoU2g4ZegJGHrnNO+ivPu209NDFcLnxpHGj8pOA4E=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-mFan09oJ+BPVJHAxoROj282WJ+4e7TD0ZqeQH1kDabQ=";

+2 -2

pkgs/development/tools/micronaut/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "micronaut";

     

       5
       5
       -
         version = "3.9.2";

     

       5
       5
       +
         version = "3.9.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";

     

       9
       9
       -
           sha256 = "sha256-LhNpkCOWgFmzGml4weIpUCHPREcDXlstSzyMZz0tBo8=";

     

       9
       9
       +
           sha256 = "sha256-ImpgmMlEZSBXCqbd8g269uE6uBicLzjQjRvcAXn9QYI=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper installShellFiles ];

+2 -2

pkgs/development/tools/misc/opengrok/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "opengrok";

     

       5
       5
       -
         version = "1.12.9";

     

       5
       5
       +
         version = "1.12.11";

     

       6
       6
        
       

     

       7
       7
        
         # binary distribution

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";

     

       10
       10
       -
           hash = "sha256-8VyCMFFL85qqnkO66qobB0OzF8DWfpjkc8Jxbp8FtH0=";

     

       10
       10
       +
           hash = "sha256-cJfBv1I8zw9Qtn9APb7+JbSahrzYYI8dkFM8fMnDVl0=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/development/tools/open-policy-agent/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildGoModule rec {

     

       13
       13
        
         pname = "open-policy-agent";

     

       14
       14
       -
         version = "0.53.0";

     

       14
       14
       +
         version = "0.53.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "open-policy-agent";

     

       18
       18
        
           repo = "opa";

     

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

     

       20
       20
       -
           hash = "sha256-HfQkd0Vl48zGMTXHJoTfVLV/OHHC+T6gcA6pcewhFJU=";

     

       20
       20
       +
           hash = "sha256-FKBrvg9uZ93dOM+LLWA1Ae7uBMiux5l355n5r8UjBbg=";

     

       21
       21
        
         };

     

       22
       22
        
         vendorHash = null;

     

       23
       23

+1 -1

pkgs/development/tools/rust/bindgen/default.nix

···

       10
       10
        
             meta = rust-bindgen-unwrapped.meta // {

     

       11
       11
        
               longDescription = rust-bindgen-unwrapped.meta.longDescription + ''

     

       12
       12
        
                 This version of bindgen is wrapped with the required compiler flags

     

       13
       13
       -
                 required to find the c and c++ standard libary, as well as the libraries

     

       13
       13
       +
                 required to find the c and c++ standard library, as well as the libraries

     

       14
       14
        
                 specified in the buildInputs of your derivation.

     

       15
       15
        
               '';

     

       16
       16
        
             };

+1 -1

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

···

       41
       41
        
         '';

     

       42
       42
        
       

     

       43
       43
        
         meta = with lib; {

     

       44
       44
       -
           description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries";

     

       44
       44
       +
           description = "A cargo subcommand to build and install C-ABI compatible dynamic and static libraries";

     

       45
       45
        
           longDescription = ''

     

       46
       46
        
             Cargo C-ABI helpers. A cargo applet that produces and installs a correct

     

       47
       47
        
             pkg-config file, a static library and a dynamic library, and a C header

+25

pkgs/os-specific/linux/cannelloni/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, cmake, lksctp-tools, sctpSupport ? true }:

     

       2
       2
       +
       stdenv.mkDerivation (finalAttrs: {

     

       3
       3
       +
         pname = "cannelloni";

     

       4
       4
       +
         version = "1.1.0";

     

       5
       5
       +
         src = fetchFromGitHub {

     

       6
       6
       +
           owner = "mguentner";

     

       7
       7
       +
           repo = "cannelloni";

     

       8
       8
       +
           rev = "v${finalAttrs.version}";

     

       9
       9
       +
           hash = "sha256-pAXHo9NCXMFKYcIJogytBiPkQE0nK6chU5TKiDNCKA8=";

     

       10
       10
       +
         };

     

       11
       11
       +
         buildInputs = [ cmake ] ++ lib.optionals sctpSupport [ lksctp-tools ];

     

       12
       12
       +
       

     

       13
       13
       +
         cmakeFlags = [

     

       14
       14
       +
           "-DCMAKE_BUILD_TYPE=Release"

     

       15
       15
       +
           "-DSCTP_SUPPORT=${lib.boolToString sctpSupport}"

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           description = "A SocketCAN over Ethernet tunnel";

     

       20
       20
       +
           homepage = "https://github.com/mguentner/cannelloni";

     

       21
       21
       +
           platforms = platforms.linux;

     

       22
       22
       +
           license = licenses.gpl2Only;

     

       23
       23
       +
           maintainers = [ maintainers.samw ];

     

       24
       24
       +
         };

     

       25
       25
       +
       })

+2 -2

pkgs/os-specific/linux/linuxptp/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "linuxptp";

     

       6
       6
       -
         version = "3.1.1";

     

       6
       6
       +
         version = "4.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz";

     

       10
       10
       -
           sha256 = "1nf0w4xyzg884v8blb81zkk6q8p6zbiq9lx61jdqwbbzkdgqbmll";

     

       10
       10
       +
           hash = "sha256-0n1e8pa7PSheIuafda4CO0tCovRlUTDW05DYr8vD2TM=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         postPatch = ''

pkgs/os-specific/linux/minimal-bootstrap/default.nix

···

       51
       51
        
             tinycc = tinycc-mes;

     

       52
       52
        
           };

     

       53
       53
        
       

     

       54
       54
       +
           heirloom = callPackage ./heirloom {

     

       55
       55
       +
             bash = bash_2_05;

     

       56
       56
       +
             tinycc = tinycc-mes;

     

       57
       57
       +
           };

     

       58
       58
       +
       

     

       59
       59
       +
           heirloom-devtools = callPackage ./heirloom-devtools { tinycc = tinycc-mes; };

     

       60
       60
       +
       

     

       54
       61
        
           ln-boot = callPackage ./ln-boot { };

     

       55
       62
        
       

     

       56
       63
        
           mes = lib.recurseIntoAttrs (callPackage ./mes { });

     
···

       73
       80
        
             echo ${gnused.tests.get-version}

     

       74
       81
        
             echo ${gnutar.tests.get-version}

     

       75
       82
        
             echo ${gzip.tests.get-version}

     

       83
       83
       +
             echo ${heirloom.tests.get-version}

     

       76
       84
        
             echo ${mes.compiler.tests.get-version}

     

       77
       85
        
             echo ${tinycc-mes.compiler.tests.chain}

     

       78
       86
        
             mkdir ''${out}

+97

pkgs/os-specific/linux/minimal-bootstrap/heirloom-devtools/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchurl

     

       3
       3
       +
       , kaem

     

       4
       4
       +
       , tinycc

     

       5
       5
       +
       , gnumake

     

       6
       6
       +
       , gnupatch

     

       7
       7
       +
       , coreutils

     

       8
       8
       +
       }:

     

       9
       9
       +
       let

     

       10
       10
       +
         pname = "heirloom-devtools";

     

       11
       11
       +
         version = "070527";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchurl {

     

       14
       14
       +
           url = "mirror://sourceforge/heirloom/heirloom-devtools/heirloom-devtools-${version}.tar.bz2";

     

       15
       15
       +
           sha256 = "9f233d8b78e4351fe9dd2d50d83958a0e5af36f54e9818521458a08e058691ba";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         # Thanks to the live-bootstrap project!

     

       19
       19
       +
         # See https://github.com/fosslinux/live-bootstrap/blob/d918b984ad6fe4fc7680f3be060fd82f8c9fddd9/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem

     

       20
       20
       +
         liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/d918b984ad6fe4fc7680f3be060fd82f8c9fddd9/sysa/heirloom-devtools-070527";

     

       21
       21
       +
       

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           # Remove all kinds of wchar support. Mes Libc does not support wchar in any form

     

       24
       24
       +
           (fetchurl {

     

       25
       25
       +
             url = "${liveBootstrap}/patches/yacc_remove_wchar.patch";

     

       26
       26
       +
             sha256 = "0wgiz02bb7xzjy2gnbjp8y31qy6rc4b29v01zi32zh9lw54j68hc";

     

       27
       27
       +
           })

     

       28
       28
       +
           # Similarly to yacc, remove wchar. See yacc patch for further information

     

       29
       29
       +
           (fetchurl {

     

       30
       30
       +
             url = "${liveBootstrap}/patches/lex_remove_wchar.patch";

     

       31
       31
       +
             sha256 = "168dfngi51ljjqgd55wbvmffaq61gk48gak50ymnl1br92qkp4zh";

     

       32
       32
       +
           })

     

       33
       33
       +
         ];

     

       34
       34
       +
       in

     

       35
       35
       +
       kaem.runCommand "${pname}-${version}" {

     

       36
       36
       +
         inherit pname version;

     

       37
       37
       +
       

     

       38
       38
       +
         nativeBuildInputs = [

     

       39
       39
       +
           tinycc.compiler

     

       40
       40
       +
           gnumake

     

       41
       41
       +
           gnupatch

     

       42
       42
       +
           coreutils

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         meta = with lib; {

     

       46
       46
       +
           description = "Portable yacc and lex derived from OpenSolaris";

     

       47
       47
       +
           homepage = "https://heirloom.sourceforge.net/devtools.html";

     

       48
       48
       +
           license = with licenses; [ cddl bsdOriginalUC caldera ];

     

       49
       49
       +
           maintainers = teams.minimal-bootstrap.members;

     

       50
       50
       +
           platforms = platforms.unix;

     

       51
       51
       +
         };

     

       52
       52
       +
       } ''

     

       53
       53
       +
         # Unpack

     

       54
       54
       +
         unbz2 --file ${src} --output heirloom-devtools.tar

     

       55
       55
       +
         untar --file heirloom-devtools.tar

     

       56
       56
       +
         rm heirloom-devtools.tar

     

       57
       57
       +
         build=''${NIX_BUILD_TOP}/heirloom-devtools-${version}

     

       58
       58
       +
         cd ''${build}

     

       59
       59
       +
       

     

       60
       60
       +
         # Patch

     

       61
       61
       +
         ${lib.concatLines (map (f: "patch -Np0 -i ${f}") patches)}

     

       62
       62
       +
       

     

       63
       63
       +
         # Build yacc

     

       64
       64
       +
         cd yacc

     

       65
       65
       +
         make -f Makefile.mk \

     

       66
       66
       +
           CC="tcc -B ${tinycc.libs}/lib" \

     

       67
       67
       +
           AR="tcc -ar" \

     

       68
       68
       +
           CFLAGS="-DMAXPATHLEN=4096 -DEILSEQ=84 -DMB_LEN_MAX=100" \

     

       69
       69
       +
           LDFLAGS="-lgetopt" \

     

       70
       70
       +
           RANLIB=true \

     

       71
       71
       +
           LIBDIR=''${out}/lib

     

       72
       72
       +
       

     

       73
       73
       +
         # Install yacc

     

       74
       74
       +
         install -D yacc ''${out}/bin/yacc

     

       75
       75
       +
         install -Dm 444 liby.a ''${out}/lib/liby.a

     

       76
       76
       +
         install -Dm 444 yaccpar ''${out}/lib/yaccpar

     

       77
       77
       +
       

     

       78
       78
       +
         # Make yacc available to lex

     

       79
       79
       +
         PATH="''${out}/bin:''${PATH}"

     

       80
       80
       +
       

     

       81
       81
       +
         # Build lex

     

       82
       82
       +
         cd ../lex

     

       83
       83
       +
         make -f Makefile.mk \

     

       84
       84
       +
           CC="tcc -B ${tinycc.libs}/lib" \

     

       85
       85
       +
           AR="tcc -ar" \

     

       86
       86
       +
           CFLAGS="-DEILSEQ=84 -DMB_LEN_MAX=100" \

     

       87
       87
       +
           LDFLAGS="-lgetopt" \

     

       88
       88
       +
           RANLIB=true \

     

       89
       89
       +
           LIBDIR=''${out}/lib

     

       90
       90
       +
       

     

       91
       91
       +
         # Install lex

     

       92
       92
       +
         install -D lex ''${out}/bin/lex

     

       93
       93
       +
         install -Dm 444 ncform ''${out}/lib/lex/ncform

     

       94
       94
       +
         install -Dm 444 nceucform ''${out}/lib/lex/nceucform

     

       95
       95
       +
         install -Dm 444 nrform ''${out}/lib/lex/nrform

     

       96
       96
       +
         install -Dm 444 libl.a ''${out}/lib/libl.a

     

       97
       97
       +
       ''

+84

pkgs/os-specific/linux/minimal-bootstrap/heirloom/cp-no-socket.patch

···

       1
       1
       +
       --- cp/cp.c

     

       2
       2
       +
       +++ cp/cp.c

     

       3
       3
       +
       @@ -42,8 +42,6 @@ static const char sccsid[] USED = "@(#)cp.sl	1.84 (gritter) 3/4/06";

     

       4
       4
       +
        

     

       5
       5
       +
        #include	<sys/types.h>

     

       6
       6
       +
        #include	<sys/stat.h>

     

       7
       7
       +
       -#include	<sys/socket.h>

     

       8
       8
       +
       -#include	<sys/un.h>

     

       9
       9
       +
        #include	<sys/time.h>

     

       10
       10
       +
        #include	<sys/resource.h>

     

       11
       11
       +
        #include	<fcntl.h>

     

       12
       12
       +
       @@ -427,6 +425,7 @@ fdcopy(const char *src, const struct stat *ssp, const int sfd,

     

       13
       13
       +
        #endif

     

       14
       14
       +
        

     

       15
       15
       +
        #ifdef	__linux__

     

       16
       16
       +
       +#ifdef	O_DIRECT

     

       17
       17
       +
        	if (!bflag && !Dflag && ssp->st_size > 0) {

     

       18
       18
       +
        		long long	sent;

     

       19
       19
       +
        

     

       20
       20
       +
       @@ -436,6 +435,7 @@ fdcopy(const char *src, const struct stat *ssp, const int sfd,

     

       21
       21
       +
        		if (sent < 0)

     

       22
       22
       +
        			goto err;

     

       23
       23
       +
        	}

     

       24
       24
       +
       +#endif

     

       25
       25
       +
        #endif	/* __linux__ */

     

       26
       26
       +
        	if (pagesize == 0)

     

       27
       27
       +
        		if ((pagesize = 4096) < 0)

     

       28
       28
       +
       @@ -702,37 +702,6 @@ symlinkcopy(const char *src, const struct stat *ssp,

     

       29
       29
       +
        	}

     

       30
       30
       +
        }

     

       31
       31
       +
        

     

       32
       32
       +
       -static void

     

       33
       33
       +
       -socketcopy(const char *src, const struct stat *ssp,

     

       34
       34
       +
       -		const char *tgt, const struct stat *dsp)

     

       35
       35
       +
       -{

     

       36
       36
       +
       -	int	fd, addrsz;

     

       37
       37
       +
       -	struct sockaddr_un	addr;

     

       38
       38
       +
       -	size_t	len;

     

       39
       39
       +
       -

     

       40
       40
       +
       -	if (do_unlink(tgt, dsp) != OKAY)

     

       41
       41
       +
       -		return;

     

       42
       42
       +
       -	len = strlen(tgt);

     

       43
       43
       +
       -	memset(&addr, 0, sizeof addr);

     

       44
       44
       +
       -	addr.sun_family = AF_UNIX;

     

       45
       45
       +
       -	addrsz = sizeof addr - sizeof addr.sun_path + len;

     

       46
       46
       +
       -	if ((len >= sizeof addr.sun_path ? errno = ENAMETOOLONG, fd = -1, 1 :

     

       47
       47
       +
       -			(strncpy(addr.sun_path,tgt,sizeof addr.sun_path), 0)) ||

     

       48
       48
       +
       -			(fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0 ||

     

       49
       49
       +
       -			bind(fd, (struct sockaddr *)&addr, addrsz) < 0) {

     

       50
       50
       +
       -		fprintf(stderr, "%s: cannot create socket %s\n%s: %s\n",

     

       51
       51
       +
       -				progname, tgt,

     

       52
       52
       +
       -				progname, strerror(errno));

     

       53
       53
       +
       -		if (fd >= 0)

     

       54
       54
       +
       -			close(fd);

     

       55
       55
       +
       -		errcnt |= 01;

     

       56
       56
       +
       -		return;

     

       57
       57
       +
       -	}

     

       58
       58
       +
       -	close(fd);

     

       59
       59
       +
       -	if (pflag)

     

       60
       60
       +
       -		permissions(tgt, ssp);

     

       61
       61
       +
       -}

     

       62
       62
       +
       -

     

       63
       63
       +
        static void

     

       64
       64
       +
        specialcopy(const char *src, const struct stat *ssp,

     

       65
       65
       +
        		const char *tgt, const struct stat *dsp)

     

       66
       66
       +
       @@ -748,9 +717,6 @@ specialcopy(const char *src, const struct stat *ssp,

     

       67
       67
       +
        	case S_IFLNK:

     

       68
       68
       +
        		symlinkcopy(src, ssp, tgt, dsp);

     

       69
       69
       +
        		break;

     

       70
       70
       +
       -	case S_IFSOCK:

     

       71
       71
       +
       -		socketcopy(src, ssp, tgt, dsp);

     

       72
       72
       +
       -		break;

     

       73
       73
       +
        	case S_IFDOOR:

     

       74
       74
       +
        		ignoring("door", src);

     

       75
       75
       +
        		break;

     

       76
       76
       +
       @@ -1043,7 +1009,7 @@ ln(const char *src, const char *tgt, struct stat *dsp, int level,

     

       77
       77
       +
        		errcnt |= 01;

     

       78
       78
       +
        		return;

     

       79
       79
       +
        	}

     

       80
       80
       +
       -#if (defined (SUS) || defined (S42)) && (defined (__linux__) || defined (__sun))

     

       81
       81
       +
       +#if (defined (SUS) || defined (S42)) && (defined (__linux__) || defined (__sun)) && !defined (__TINYC__)

     

       82
       82
       +
        	if (sflag == 0) {

     

       83
       83
       +
        		char	*rpbuf = alloca(PATH_MAX+1);

     

       84
       84
       +
        		if (realpath(src, rpbuf) == NULL) {

+130

pkgs/os-specific/linux/minimal-bootstrap/heirloom/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchurl

     

       3
       3
       +
       , bash

     

       4
       4
       +
       , tinycc

     

       5
       5
       +
       , gnumake

     

       6
       6
       +
       , gnupatch

     

       7
       7
       +
       , heirloom-devtools

     

       8
       8
       +
       , heirloom

     

       9
       9
       +
       }:

     

       10
       10
       +
       let

     

       11
       11
       +
         pname = "heirloom";

     

       12
       12
       +
         version = "070715";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchurl {

     

       15
       15
       +
           url = "mirror://sourceforge/heirloom/heirloom/${version}/heirloom-${version}.tar.bz2";

     

       16
       16
       +
           sha256 = "sha256-6zP3C8wBmx0OCkHx11UtRcV6FicuThxIY07D5ESWow8=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           # we pre-generate nawk's proctab.c as meslibc is not capable of running maketab

     

       21
       21
       +
           # during build time (insufficient sscanf support)

     

       22
       22
       +
           ./proctab.patch

     

       23
       23
       +
       

     

       24
       24
       +
           # disable utilities that don't build successfully

     

       25
       25
       +
           ./disable-programs.patch

     

       26
       26
       +
       

     

       27
       27
       +
           # "tcc -ar" doesn't support creating empty archives

     

       28
       28
       +
           ./tcc-empty-ar.patch

     

       29
       29
       +
           # meslibc doesn't have seperate libm

     

       30
       30
       +
           ./dont-link-lm.patch

     

       31
       31
       +
           # meslibc's vprintf doesn't support %ll

     

       32
       32
       +
           ./vprintf.patch

     

       33
       33
       +
           # meslibc doesn't support sysconf()

     

       34
       34
       +
           ./sysconf.patch

     

       35
       35
       +
           # meslibc doesn't support locale

     

       36
       36
       +
           ./strcoll.patch

     

       37
       37
       +
           # meslibc doesn't support termios.h

     

       38
       38
       +
           ./termios.patch

     

       39
       39
       +
           # meslibc doesn't support utime.h

     

       40
       40
       +
           ./utime.patch

     

       41
       41
       +
           # meslibc doesn't support langinfo.h

     

       42
       42
       +
           ./langinfo.patch

     

       43
       43
       +
           # support building with meslibc

     

       44
       44
       +
           ./meslibc-support.patch

     

       45
       45
       +
           # remove socket functionality as unsupported by meslibc

     

       46
       46
       +
           ./cp-no-socket.patch

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         makeFlags = [

     

       50
       50
       +
           # mk.config build options

     

       51
       51
       +
           "CC='tcc -B ${tinycc.libs}/lib -include ${./stubs.h} -include ${./musl.h}'"

     

       52
       52
       +
           "AR='tcc -ar'"

     

       53
       53
       +
           "RANLIB=true"

     

       54
       54
       +
           "STRIP=true"

     

       55
       55
       +
           "SHELL=${bash}/bin/sh"

     

       56
       56
       +
           "POSIX_SHELL=${bash}/bin/sh"

     

       57
       57
       +
           "DEFBIN=/bin"

     

       58
       58
       +
           "SV3BIN=/5bin"

     

       59
       59
       +
           "S42BIN=/5bin/s42"

     

       60
       60
       +
           "SUSBIN=/bin"

     

       61
       61
       +
           "SU3BIN=/5bin/posix2001"

     

       62
       62
       +
           "UCBBIN=/ucb"

     

       63
       63
       +
           "CCSBIN=/ccs/bin"

     

       64
       64
       +
           "DEFLIB=/lib"

     

       65
       65
       +
           "DEFSBIN=/bin"

     

       66
       66
       +
           "MANDIR=/share/man"

     

       67
       67
       +
           "LCURS=" # disable ncurses

     

       68
       68
       +
           "USE_ZLIB=0" # disable zlib

     

       69
       69
       +
           "IWCHAR='-I../libwchar'"

     

       70
       70
       +
           "LWCHAR='-L../libwchar -lwchar'"

     

       71
       71
       +
         ];

     

       72
       72
       +
       in

     

       73
       73
       +
       bash.runCommand "${pname}-${version}" {

     

       74
       74
       +
         inherit pname version;

     

       75
       75
       +
       

     

       76
       76
       +
         nativeBuildInputs = [

     

       77
       77
       +
           tinycc.compiler

     

       78
       78
       +
           gnumake

     

       79
       79
       +
           gnupatch

     

       80
       80
       +
           heirloom-devtools

     

       81
       81
       +
         ];

     

       82
       82
       +
       

     

       83
       83
       +
         passthru.sed =

     

       84
       84
       +
           bash.runCommand "${pname}-sed-${version}" {} ''

     

       85
       85
       +
             install -D ${heirloom}/bin/sed $out/bin/sed

     

       86
       86
       +
           '';

     

       87
       87
       +
       

     

       88
       88
       +
         passthru.tests.get-version = result:

     

       89
       89
       +
           bash.runCommand "${pname}-get-version-${version}" {} ''

     

       90
       90
       +
             ${result}/bin/banner Hello Heirloom

     

       91
       91
       +
             mkdir $out

     

       92
       92
       +
           '';

     

       93
       93
       +
       

     

       94
       94
       +
         meta = with lib; {

     

       95
       95
       +
           description = "The Heirloom Toolchest is a collection of standard Unix utilities";

     

       96
       96
       +
           homepage = "https://heirloom.sourceforge.net/tools.html";

     

       97
       97
       +
           license = with licenses; [

     

       98
       98
       +
             # All licenses according to LICENSE/

     

       99
       99
       +
             zlib

     

       100
       100
       +
             caldera

     

       101
       101
       +
             bsdOriginalUC

     

       102
       102
       +
             cddl

     

       103
       103
       +
             bsd3

     

       104
       104
       +
             gpl2Plus

     

       105
       105
       +
             lgpl21Plus

     

       106
       106
       +
             lpl-102

     

       107
       107
       +
             info-zip

     

       108
       108
       +
           ];

     

       109
       109
       +
           maintainers = teams.minimal-bootstrap.members;

     

       110
       110
       +
           platforms = platforms.unix;

     

       111
       111
       +
         };

     

       112
       112
       +
       } ''

     

       113
       113
       +
         # Unpack

     

       114
       114
       +
         unbz2 --file ${src} --output heirloom.tar

     

       115
       115
       +
         untar --file heirloom.tar

     

       116
       116
       +
         rm heirloom.tar

     

       117
       117
       +
         cd heirloom-${version}

     

       118
       118
       +
       

     

       119
       119
       +
         # Patch

     

       120
       120
       +
         ${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches}

     

       121
       121
       +
         cp ${./proctab.c} nawk/proctab.c

     

       122
       122
       +
       

     

       123
       123
       +
         # Build

     

       124
       124
       +
         # These tools are required during later build steps

     

       125
       125
       +
         export PATH="$PATH:$PWD/ed:$PWD/nawk:$PWD/sed"

     

       126
       126
       +
         make ${lib.concatStringsSep " " makeFlags}

     

       127
       127
       +
       

     

       128
       128
       +
         # Install

     

       129
       129
       +
         make install ROOT=$out ${lib.concatStringsSep " " makeFlags}

     

       130
       130
       +
       ''

+43

pkgs/os-specific/linux/minimal-bootstrap/heirloom/disable-programs.patch

···

       1
       1
       +
       --- makefile

     

       2
       2
       +
       +++ makefile

     

       3
       3
       +
       @@ -1,21 +1,24 @@

     

       4
       4
       +
       -SHELL = /bin/sh

     

       5
       5
       +
       +SHELL = sh

     

       6
       6
       +
        

     

       7
       7
       +
       -SUBDIRS = build libwchar libcommon libuxre _install \

     

       8
       8
       +
       -	banner basename bc bdiff bfs \

     

       9
       9
       +
       -	cal calendar cat chmod chown \

     

       10
       10
       +
       -	cksum cmp col comm copy cp cpio csplit cut \

     

       11
       11
       +
       -	date dc dd deroff diff diff3 dircmp dirname df du \

     

       12
       12
       +
       +SUBDIRS = libwchar libcommon libuxre _install \

     

       13
       13
       +
       +	banner basename bdiff bfs \

     

       14
       14
       +
       +	cat chmod chown \

     

       15
       15
       +
       +	cksum cmp col comm copy cp csplit cut \

     

       16
       16
       +
       +	dc dirname \

     

       17
       17
       +
        	echo ed env expand expr \

     

       18
       18
       +
       -	factor file find fmt fmtmsg fold \

     

       19
       19
       +
       -	getconf getopt grep groups hd head hostname id join \

     

       20
       20
       +
       -	kill line listusers ln logins logname ls \

     

       21
       21
       +
       -	mail man mesg mkdir mkfifo mknod more mvdir \

     

       22
       22
       +
       -	nawk news nice nl nohup oawk od \

     

       23
       23
       +
       -	paste pathchk pg pgrep pr printenv printf priocntl ps psrinfo pwd \

     

       24
       24
       +
       -	random renice rm rmdir \

     

       25
       25
       +
       -	sdiff sed setpgrp shl sleep sort spell split stty su sum sync \

     

       26
       26
       +
       -	tabs tail tapecntl tar tcopy tee test time touch tr true tsort tty \

     

       27
       27
       +
       -	ul uname uniq units users wc what who whoami whodo xargs yes

     

       28
       28
       +
       +	file fmt fold \

     

       29
       29
       +
       +	getopt grep hd head join \

     

       30
       30
       +
       +	kill line ln logname ls \

     

       31
       31
       +
       +	mesg mkdir mknod \

     

       32
       32
       +
       +	nl nohup od \

     

       33
       33
       +
       +	paste pathchk pgrep pr printenv printf pwd \

     

       34
       34
       +
       +	random rm rmdir \

     

       35
       35
       +
       +	sed sleep sort split sum \

     

       36
       36
       +
       +	tee test touch tr true tsort tty \

     

       37
       37
       +
       +	uniq units wc what whoami xargs yes

     

       38
       38
       +
       +

     

       39
       39
       +
       +# These depend on some coreutils that we need to build first

     

       40
       40
       +
       +SUBDIRS += bc nawk build

     

       41
       41
       +
        

     

       42
       42
       +
        dummy: makefiles all

     

       43
       43
       +

+44

pkgs/os-specific/linux/minimal-bootstrap/heirloom/dont-link-lm.patch

···

       1
       1
       +
       --- csplit/Makefile.mk

     

       2
       2
       +
       +++ csplit/Makefile.mk

     

       3
       3
       +
       @@ -1,19 +1,19 @@

     

       4
       4
       +
        all: csplit csplit_sus csplit_su3

     

       5
       5
       +
        

     

       6
       6
       +
        csplit: csplit.o

     

       7
       7
       +
       -	$(LD) $(LDFLAGS) csplit.o $(LCOMMON) $(LWCHAR) $(LIBS) -lm -o csplit

     

       8
       8
       +
       +	$(LD) $(LDFLAGS) csplit.o $(LCOMMON) $(LWCHAR) $(LIBS) -o csplit

     

       9
       9
       +
        

     

       10
       10
       +
        csplit.o: csplit.c

     

       11
       11
       +
        	$(CC) $(CFLAGS) $(CPPFLAGS) $(XO6FL) $(LARGEF) $(IWCHAR) $(ICOMMON) -c csplit.c

     

       12
       12
       +
        

     

       13
       13
       +
        csplit_sus: csplit_sus.o

     

       14
       14
       +
       -	$(LD) $(LDFLAGS) csplit_sus.o $(LUXRE) $(LCOMMON) $(LWCHAR) $(LIBS) -lm -o csplit_sus

     

       15
       15
       +
       +	$(LD) $(LDFLAGS) csplit_sus.o $(LUXRE) $(LCOMMON) $(LWCHAR) $(LIBS) -o csplit_sus

     

       16
       16
       +
        

     

       17
       17
       +
        csplit_sus.o: csplit.c

     

       18
       18
       +
        	$(CC) $(CFLAGS) $(CPPFLAGS) $(XO6FL) $(LARGEF) $(IUXRE) $(IWCHAR) $(ICOMMON) -DSUS -c csplit.c -o csplit_sus.o

     

       19
       19
       +
        

     

       20
       20
       +
        csplit_su3: csplit_su3.o

     

       21
       21
       +
       -	$(LD) $(LDFLAGS) csplit_su3.o $(LUXRE) $(LCOMMON) $(LWCHAR) $(LIBS) -lm -o csplit_su3

     

       22
       22
       +
       +	$(LD) $(LDFLAGS) csplit_su3.o $(LUXRE) $(LCOMMON) $(LWCHAR) $(LIBS) -o csplit_su3

     

       23
       23
       +
        

     

       24
       24
       +
        csplit_su3.o: csplit.c

     

       25
       25
       +
        	$(CC) $(CFLAGS) $(CPPFLAGS) $(XO6FL) $(LARGEF) $(IUXRE) $(IWCHAR) $(ICOMMON) -DSU3 -c csplit.c -o csplit_su3.o

     

       26
       26
       +
       --- nawk/Makefile.mk

     

       27
       27
       +
       +++ nawk/Makefile.mk

     

       28
       28
       +
       @@ -3,13 +3,13 @@ all: awk awk_sus awk_su3

     

       29
       29
       +
        OBJ = awk.lx.o b.o lib.o main.o parse.o proctab.o run.o tran.o

     

       30
       30
       +
        

     

       31
       31
       +
        awk: awk.g.o $(OBJ) version.o

     

       32
       32
       +
       -	$(LD) $(LDFLAGS) awk.g.o $(OBJ) version.o $(LUXRE) -lm $(LCOMMON) $(LWCHAR) $(LIBS) -o awk

     

       33
       33
       +
       +	$(LD) $(LDFLAGS) awk.g.o $(OBJ) version.o $(LUXRE) $(LCOMMON) $(LWCHAR) $(LIBS) -o awk

     

       34
       34
       +
        

     

       35
       35
       +
        awk_sus: awk.g.o $(OBJ) version_sus.o

     

       36
       36
       +
       -	$(LD) $(LDFLAGS) awk.g.o $(OBJ) version_sus.o $(LUXRE) -lm $(LCOMMON) $(LWCHAR) $(LIBS) -o awk_sus

     

       37
       37
       +
       +	$(LD) $(LDFLAGS) awk.g.o $(OBJ) version_sus.o $(LUXRE) $(LCOMMON) $(LWCHAR) $(LIBS) -o awk_sus

     

       38
       38
       +
        

     

       39
       39
       +
        awk_su3: awk.g.2001.o $(OBJ) version_su3.o

     

       40
       40
       +
       -	$(LD) $(LDFLAGS) awk.g.2001.o $(OBJ) version_su3.o $(LUXRE) -lm $(LCOMMON) $(LWCHAR) $(LIBS) -o awk_su3

     

       41
       41
       +
       +	$(LD) $(LDFLAGS) awk.g.2001.o $(OBJ) version_su3.o $(LUXRE) $(LCOMMON) $(LWCHAR) $(LIBS) -o awk_su3

     

       42
       42
       +
        

     

       43
       43
       +
        awk.g.c: awk.g.y

     

       44
       44
       +
        	$(YACC) -d awk.g.y

+99

pkgs/os-specific/linux/minimal-bootstrap/heirloom/langinfo.patch

···

       1
       1
       +
       --- nawk/main.c

     

       2
       2
       +
       +++ nawk/main.c

     

       3
       3
       +
       @@ -35,7 +35,6 @@

     

       4
       4
       +
        #include <errno.h>

     

       5
       5
       +
        #include <string.h>

     

       6
       6
       +
        #include <locale.h>

     

       7
       7
       +
       -#include <langinfo.h>

     

       8
       8
       +
        #include <libgen.h>

     

       9
       9
       +
        

     

       10
       10
       +
        #define	CMDCLASS	""/*"UX:"*/	/* Command classification */

     

       11
       11
       +
       --- sort/sort.c

     

       12
       12
       +
       +++ sort/sort.c

     

       13
       13
       +
       @@ -63,7 +63,6 @@ static const char sccsid[] USED = "@(#)sort.sl	1.37 (gritter) 5/29/05";

     

       14
       14
       +
        #include <locale.h>

     

       15
       15
       +
        #include <wchar.h>

     

       16
       16
       +
        #include <wctype.h>

     

       17
       17
       +
       -#include <langinfo.h>

     

       18
       18
       +
        #include <inttypes.h>

     

       19
       19
       +
        #include <errno.h>

     

       20
       20
       +
        

     

       21
       21
       +
       @@ -287,18 +286,6 @@ main(int argc, char **argv)

     

       22
       22
       +
        	else

     

       23
       23
       +
        		chkblank();

     

       24
       24
       +
        	compare = cmpf = ccoll ? mb_cur_max > 1 ? cmpm : cmpa : cmpl;

     

       25
       25
       +
       -	setlocale(LC_NUMERIC, "");

     

       26
       26
       +
       -	arg = nl_langinfo(RADIXCHAR);

     

       27
       27
       +
       -	if (mb_cur_max > 1)

     

       28
       28
       +
       -		next(radixchar, arg, i);

     

       29
       29
       +
       -	else

     

       30
       30
       +
       -		radixchar = *arg & 0377;

     

       31
       31
       +
       -	arg = nl_langinfo(THOUSEP);

     

       32
       32
       +
       -	if (mb_cur_max > 1)

     

       33
       33
       +
       -		next(thousep, arg, i);

     

       34
       34
       +
       -	else

     

       35
       35
       +
       -		thousep = *arg & 0377;

     

       36
       36
       +
       -	setlocale(LC_TIME, "");

     

       37
       37
       +
        	fields = smalloc(NF * sizeof *fields);

     

       38
       38
       +
        	copyproto();

     

       39
       39
       +
        	eargv = argv;

     

       40
       40
       +
       @@ -1088,8 +1075,7 @@ cmp(const char *i, const char *j)

     

       41
       41
       +
        		} else {

     

       42
       42
       +
        			sa = elicpy(collba, pa, la, '\n', ignore, code);

     

       43
       43
       +
        			sb = elicpy(collbb, pb, lb, '\n', ignore, code);

     

       44
       44
       +
       -			n = fp->Mflg ? monthcmp(collba, collbb) :

     

       45
       45
       +
       -				strcoll(collba, collbb);

     

       46
       46
       +
       +			n = strcmp(collba, collbb);

     

       47
       47
       +
        			if (n)

     

       48
       48
       +
        				return n > 0 ? -fp->rflg : fp->rflg;

     

       49
       49
       +
        			pa = &pa[sa];

     

       50
       50
       +
       @@ -1570,49 +1556,6 @@ upcdup(const char *s)

     

       51
       51
       +
        	return r;

     

       52
       52
       +
        }

     

       53
       53
       +
        

     

       54
       54
       +
       -static const char	*months[12];

     

       55
       55
       +
       -

     

       56
       56
       +
       -#define	COPY_ABMON(m)	months[m-1] = upcdup(nl_langinfo(ABMON_##m))

     

       57
       57
       +
       -

     

       58
       58
       +
       -static void

     

       59
       59
       +
       -fillmonths(void)

     

       60
       60
       +
       -{

     

       61
       61
       +
       -	COPY_ABMON(1);

     

       62
       62
       +
       -	COPY_ABMON(2);

     

       63
       63
       +
       -	COPY_ABMON(3);

     

       64
       64
       +
       -	COPY_ABMON(4);

     

       65
       65
       +
       -	COPY_ABMON(5);

     

       66
       66
       +
       -	COPY_ABMON(6);

     

       67
       67
       +
       -	COPY_ABMON(7);

     

       68
       68
       +
       -	COPY_ABMON(8);

     

       69
       69
       +
       -	COPY_ABMON(9);

     

       70
       70
       +
       -	COPY_ABMON(10);

     

       71
       71
       +
       -	COPY_ABMON(11);

     

       72
       72
       +
       -	COPY_ABMON(12);

     

       73
       73
       +
       -}

     

       74
       74
       +
       -

     

       75
       75
       +
       -static int

     

       76
       76
       +
       -monthcoll(const char *s)

     

       77
       77
       +
       -{

     

       78
       78
       +
       -	int	i;

     

       79
       79
       +
       -	char	u[MB_LEN_MAX*3+1];

     

       80
       80
       +
       -

     

       81
       81
       +
       -	cpcu3(u, s);

     

       82
       82
       +
       -	for (i = 0; i < 12; i++)

     

       83
       83
       +
       -		if (strcmp(u, months[i]) == 0)

     

       84
       84
       +
       -			return i;

     

       85
       85
       +
       -	return 0;

     

       86
       86
       +
       -}

     

       87
       87
       +
       -

     

       88
       88
       +
       -

     

       89
       89
       +
       -static int

     

       90
       90
       +
       -monthcmp(const char *pa, const char *pb)

     

       91
       91
       +
       -{

     

       92
       92
       +
       -	if (months[0] == NULL)

     

       93
       93
       +
       -		fillmonths();

     

       94
       94
       +
       -	return monthcoll(pa) - monthcoll(pb);

     

       95
       95
       +
       -}

     

       96
       96
       +
       -

     

       97
       97
       +
        /*

     

       98
       98
       +
         * isblank() consumes half of execution time (in skip()) with

     

       99
       99
       +
         * glibc 2.3.1. Check if it contains only space and tab, and

+322

pkgs/os-specific/linux/minimal-bootstrap/heirloom/meslibc-support.patch

···

       1
       1
       +
       --- _install/install_ucb.c

     

       2
       2
       +
       +++ _install/install_ucb.c

     

       3
       3
       +
       @@ -267,7 +267,7 @@ cp(const char *src, const char *tgt, struct stat *dsp)

     

       4
       4
       +
        	if (check(src, tgt, dsp, &sst) != OKAY)

     

       5
       5
       +
        		return;

     

       6
       6
       +
        	unlink(tgt);

     

       7
       7
       +
       -	if ((dfd = creat(tgt, 0700)) < 0 || fchmod(dfd, 0700) < 0 ||

     

       8
       8
       +
       +	if ((dfd = creat(tgt, 0700)) < 0 || chmod(tgt, 0700) < 0 ||

     

       9
       9
       +
        			fstat(dfd, &nst) < 0) {

     

       10
       10
       +
        		fprintf(stderr, "%s: %s: %s\n", progname, src,

     

       11
       11
       +
        				strerror(errno));

     

       12
       12
       +
       --- libcommon/Makefile.mk

     

       13
       13
       +
       +++ libcommon/Makefile.mk

     

       14
       14
       +
       @@ -15,7 +15,7 @@ CHECK: CHECK.c

     

       15
       15
       +
        headers: CHECK

     

       16
       16
       +
        	one() { \

     

       17
       17
       +
        		rm -f "$$1.h"; \

     

       18
       18
       +
       -		if grep "$$1_h[	 ]*=[ 	]*[^0][	 ]*;" CHECK >/dev/null; \

     

       19
       19
       +
       +		if true; \

     

       20
       20
       +
        		then \

     

       21
       21
       +
        			ln -s "_$$1.h" "$$1.h"; \

     

       22
       22
       +
        		fi; \

     

       23
       23
       +
       --- libcommon/atoll.h

     

       24
       24
       +
       +++ libcommon/atoll.h

     

       25
       25
       +
       @@ -1,8 +1,10 @@

     

       26
       26
       +
        /*	Sccsid @(#)atoll.h	1.4 (gritter) 7/18/04	*/

     

       27
       27
       +
        

     

       28
       28
       +
        #if defined (__hpux) || defined (_AIX) || \

     

       29
       29
       +
       -	defined (__FreeBSD__) && (__FreeBSD__) < 5

     

       30
       30
       +
       +	(defined (__FreeBSD__) && (__FreeBSD__) < 5) || defined (__TINYC__)

     

       31
       31
       +
       +#ifndef __TINYC__

     

       32
       32
       +
        extern long long strtoll(const char *nptr, char **endptr, int base);

     

       33
       33
       +
        extern unsigned long long strtoull(const char *nptr, char **endptr, int base);

     

       34
       34
       +
       +#endif

     

       35
       35
       +
        extern long long atoll(const char *nptr);

     

       36
       36
       +
        #endif	/* __hpux || _AIX || __FreeBSD__ < 5 */

     

       37
       37
       +
       --- libcommon/blank.h

     

       38
       38
       +
       +++ libcommon/blank.h

     

       39
       39
       +
       @@ -5,7 +5,7 @@

     

       40
       40
       +
         */

     

       41
       41
       +
        /*	Sccsid @(#)blank.h	1.3 (gritter) 5/1/04	*/

     

       42
       42
       +
        

     

       43
       43
       +
       -#ifndef	__dietlibc__

     

       44
       44
       +
       +#if !defined(__dietlibc__) && !defined(__TINYC__)

     

       45
       45
       +
        #ifndef	LIBCOMMON_BLANK_H

     

       46
       46
       +
        #define	LIBCOMMON_BLANK_H	1

     

       47
       47
       +
        

     

       48
       48
       +
       --- libcommon/getdir.c

     

       49
       49
       +
       +++ libcommon/getdir.c

     

       50
       50
       +
       @@ -52,7 +52,7 @@ extern int	getdents(int, struct dirent *, size_t);

     

       51
       51
       +
        #undef	d_ino

     

       52
       52
       +
        #endif	/* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__

     

       53
       53
       +
        	 || __APPLE__ */

     

       54
       54
       +
       -#elif defined	(__dietlibc__)

     

       55
       55
       +
       +#elif defined	(__dietlibc__) || defined(__TINYC__)

     

       56
       56
       +
        #include	<dirent.h>

     

       57
       57
       +
        #include	<unistd.h>

     

       58
       58
       +
        #else		/* !__GLIBC__, !__dietlibc__ */

     

       59
       59
       +
       --- libcommon/memalign.c

     

       60
       60
       +
       +++ libcommon/memalign.c

     

       61
       61
       +
       @@ -23,7 +23,7 @@

     

       62
       62
       +
        

     

       63
       63
       +
        #if defined (__FreeBSD__) || defined (__dietlibc__) || defined (_AIX) || \

     

       64
       64
       +
        	defined (__NetBSD__) || defined (__OpenBSD__) || \

     

       65
       65
       +
       -	defined (__DragonFly__) || defined (__APPLE__)

     

       66
       66
       +
       +	defined (__DragonFly__) || defined (__APPLE__) || defined(__TINYC__)

     

       67
       67
       +
        /*

     

       68
       68
       +
         * FreeBSD malloc(3) promises to page-align the return of malloc() calls

     

       69
       69
       +
         * if size is at least a page. This serves for a poor man's memalign() 

     

       70
       70
       +
       --- libcommon/memalign.h

     

       71
       71
       +
       +++ libcommon/memalign.h

     

       72
       72
       +
       @@ -26,7 +26,7 @@

     

       73
       73
       +
        

     

       74
       74
       +
        #if defined (__FreeBSD__) || defined (__dietlibc__) || defined (_AIX) || \

     

       75
       75
       +
        	defined (__NetBSD__) || defined (__OpenBSD__) || \

     

       76
       76
       +
       -	defined (__DragonFly__) || defined (__APPLE__)

     

       77
       77
       +
       +	defined (__DragonFly__) || defined (__APPLE__) || defined(__TINYC__)

     

       78
       78
       +
        #include	<stdlib.h>

     

       79
       79
       +
        

     

       80
       80
       +
        extern void	*memalign(size_t, size_t);

     

       81
       81
       +
       --- libcommon/pathconf.c

     

       82
       82
       +
       +++ libcommon/pathconf.c

     

       83
       83
       +
       @@ -21,7 +21,7 @@

     

       84
       84
       +
         */

     

       85
       85
       +
        /*	Sccsid @(#)pathconf.c	1.2 (gritter) 5/1/04	*/

     

       86
       86
       +
        

     

       87
       87
       +
       -#ifdef	__dietlibc__

     

       88
       88
       +
       +#if defined(__dietlibc__) || defined(__TINYC__)

     

       89
       89
       +
        #include <unistd.h>

     

       90
       90
       +
        #include "pathconf.h"

     

       91
       91
       +
        

     

       92
       92
       +
       --- libcommon/pathconf.h

     

       93
       93
       +
       +++ libcommon/pathconf.h

     

       94
       94
       +
       @@ -21,7 +21,7 @@

     

       95
       95
       +
         */

     

       96
       96
       +
        /*	Sccsid @(#)pathconf.h	1.2 (gritter) 5/1/04	*/

     

       97
       97
       +
        

     

       98
       98
       +
       -#ifdef	__dietlibc__

     

       99
       99
       +
       +#if defined(__dietlibc__) || defined(__TINYC__)

     

       100
       100
       +
        #include <unistd.h>

     

       101
       101
       +
        

     

       102
       102
       +
        extern long	fpathconf(int, int);

     

       103
       103
       +
       --- libcommon/regexp.h

     

       104
       104
       +
       +++ libcommon/regexp.h

     

       105
       105
       +
       @@ -47,7 +47,7 @@

     

       106
       106
       +
        static const char regexp_h_sccsid[] REGEXP_H_USED =

     

       107
       107
       +
        	"@(#)regexp.sl	1.56 (gritter) 5/29/05";

     

       108
       108
       +
        

     

       109
       109
       +
       -#if !defined (REGEXP_H_USED_FROM_VI) && !defined (__dietlibc__)

     

       110
       110
       +
       +#if !defined (REGEXP_H_USED_FROM_VI) && !defined (__dietlibc__) && !defined (__TINYC__)

     

       111
       111
       +
        #define	REGEXP_H_WCHARS

     

       112
       112
       +
        #endif

     

       113
       113
       +
        

     

       114
       114
       +
       --- libcommon/sfile.c

     

       115
       115
       +
       +++ libcommon/sfile.c

     

       116
       116
       +
       @@ -21,7 +21,7 @@

     

       117
       117
       +
         */

     

       118
       118
       +
        /*	Sccsid @(#)sfile.c	1.9 (gritter) 6/7/04	*/

     

       119
       119
       +
        

     

       120
       120
       +
       -#ifdef	__linux__

     

       121
       121
       +
       +#if defined(__linux__) && !defined(__TINYC__)

     

       122
       122
       +
        #undef	_FILE_OFFSET_BITS

     

       123
       123
       +
        

     

       124
       124
       +
        #include	<sys/types.h>

     

       125
       125
       +
       --- libcommon/sighold.c

     

       126
       126
       +
       +++ libcommon/sighold.c

     

       127
       127
       +
       @@ -22,7 +22,7 @@

     

       128
       128
       +
        /*	Sccsid @(#)sighold.c	1.7 (gritter) 1/22/06	*/

     

       129
       129
       +
        

     

       130
       130
       +
        #if defined (__FreeBSD__) || defined (__dietlibc__) || defined (__NetBSD__) || \

     

       131
       131
       +
       -	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)

     

       132
       132
       +
       +	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) || defined (__TINYC__)

     

       133
       133
       +
        #include <signal.h>

     

       134
       134
       +
        #include "sigset.h"

     

       135
       135
       +
        

     

       136
       136
       +
       --- libcommon/sigignore.c

     

       137
       137
       +
       +++ libcommon/sigignore.c

     

       138
       138
       +
       @@ -22,7 +22,7 @@

     

       139
       139
       +
        /*	Sccsid @(#)sigignore.c	1.6 (gritter) 1/22/06	*/

     

       140
       140
       +
        

     

       141
       141
       +
        #if defined (__FreeBSD__) || defined (__dietlibc__) || defined (__NetBSD__) || \

     

       142
       142
       +
       -	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)

     

       143
       143
       +
       +	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) || defined (__TINYC__)

     

       144
       144
       +
        #include <signal.h>

     

       145
       145
       +
        #include "sigset.h"

     

       146
       146
       +
        

     

       147
       147
       +
       --- libcommon/sigpause.c

     

       148
       148
       +
       +++ libcommon/sigpause.c

     

       149
       149
       +
       @@ -22,7 +22,7 @@

     

       150
       150
       +
        /*	Sccsid @(#)sigpause.c	1.6 (gritter) 1/22/06	*/

     

       151
       151
       +
        

     

       152
       152
       +
        #if defined (__FreeBSD__) || defined (__dietlibc__) || defined (__NetBSD__) || \

     

       153
       153
       +
       -	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)

     

       154
       154
       +
       +	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) || defined (__TINYC__)

     

       155
       155
       +
        #include <signal.h>

     

       156
       156
       +
        #include "sigset.h"

     

       157
       157
       +
        

     

       158
       158
       +
       --- libcommon/sigrelse.c

     

       159
       159
       +
       +++ libcommon/sigrelse.c

     

       160
       160
       +
       @@ -22,7 +22,7 @@

     

       161
       161
       +
        /*	Sccsid @(#)sigrelse.c	1.8 (gritter) 1/22/06	*/

     

       162
       162
       +
        

     

       163
       163
       +
        #if defined (__FreeBSD__) || defined (__dietlibc__) || defined (__NetBSD__) || \

     

       164
       164
       +
       -	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)

     

       165
       165
       +
       +	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) || defined (__TINYC__)

     

       166
       166
       +
        #include <signal.h>

     

       167
       167
       +
        #include "sigset.h"

     

       168
       168
       +
        

     

       169
       169
       +
       --- libcommon/sigset.c

     

       170
       170
       +
       +++ libcommon/sigset.c

     

       171
       171
       +
       @@ -22,7 +22,7 @@

     

       172
       172
       +
        /*	Sccsid @(#)sigset.c	1.7 (gritter) 1/22/06	*/

     

       173
       173
       +
        

     

       174
       174
       +
        #if defined (__FreeBSD__) || defined (__dietlibc__) || defined (__NetBSD__) || \

     

       175
       175
       +
       -	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)

     

       176
       176
       +
       +	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) || defined (__TINYC__)

     

       177
       177
       +
        #include <signal.h>

     

       178
       178
       +
        #include "sigset.h"

     

       179
       179
       +
        

     

       180
       180
       +
       @@ -46,10 +46,7 @@ void (*sigset(int sig, void (*func)(int)))(int)

     

       181
       181
       +
        	if (sigaction(sig, func==SIG_HOLD?(struct sigaction *)0:&nact, &oact)

     

       182
       182
       +
        			== -1)

     

       183
       183
       +
        		return SIG_ERR;

     

       184
       184
       +
       -	if (sigismember(&oset, sig))

     

       185
       185
       +
       -		return SIG_HOLD;

     

       186
       186
       +
       -	else

     

       187
       187
       +
       -		return (oact.sa_handler);

     

       188
       188
       +
       +	return (oact.sa_handler);

     

       189
       189
       +
        }

     

       190
       190
       +
        #endif	/* __FreeBSD__ || __dietlibc__ || __NetBSD__ || __OpenBSD__ ||

     

       191
       191
       +
        	__DragonFly__ || __APPLE__ */

     

       192
       192
       +
       --- libcommon/sigset.h

     

       193
       193
       +
       +++ libcommon/sigset.h

     

       194
       194
       +
       @@ -22,7 +22,7 @@

     

       195
       195
       +
        /*	Sccsid @(#)sigset.h	1.9 (gritter) 1/22/06	*/

     

       196
       196
       +
        

     

       197
       197
       +
        #if defined (__FreeBSD__) || defined (__dietlibc__) || defined (__NetBSD__) || \

     

       198
       198
       +
       -	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)

     

       199
       199
       +
       +	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) || defined (__TINYC__)

     

       200
       200
       +
        

     

       201
       201
       +
        #ifndef	SIG_HOLD

     

       202
       202
       +
        #define	SIG_HOLD	((void (*)(int))2)

     

       203
       203
       +
       --- libcommon/strtol.c

     

       204
       204
       +
       +++ libcommon/strtol.c

     

       205
       205
       +
       @@ -1,7 +1,7 @@

     

       206
       206
       +
        /*	Sccsid @(#)strtol.c	1.6 (gritter) 7/18/04	*/

     

       207
       207
       +
        

     

       208
       208
       +
        #if defined (__hpux) || defined (_AIX) || \

     

       209
       209
       +
       -	defined (__FreeBSD__) && (__FreeBSD__) < 5

     

       210
       210
       +
       +	(defined (__FreeBSD__) && (__FreeBSD__) < 5) || defined (__TINYC__)

     

       211
       211
       +
        

     

       212
       212
       +
        #include	<stdlib.h>

     

       213
       213
       +
        #include	<ctype.h>

     

       214
       214
       +
       @@ -97,6 +97,7 @@ out:	if (pp <= bptr) {

     

       215
       215
       +
        	return v * sign;

     

       216
       216
       +
        }

     

       217
       217
       +
        

     

       218
       218
       +
       +#ifndef __TINYC__

     

       219
       219
       +
        long long

     

       220
       220
       +
        strtoll(const char *nptr, char **endptr, int base)

     

       221
       221
       +
        {

     

       222
       222
       +
       @@ -108,6 +109,7 @@ strtoull(const char *nptr, char **endptr, int base)

     

       223
       223
       +
        {

     

       224
       224
       +
        	return (unsigned long long)internal(nptr, endptr, base, 3);

     

       225
       225
       +
        }

     

       226
       226
       +
       +#endif

     

       227
       227
       +
        

     

       228
       228
       +
        long long

     

       229
       229
       +
        atoll(const char *nptr)

     

       230
       230
       +
       --- nawk/awk.h

     

       231
       231
       +
       +++ nawk/awk.h

     

       232
       232
       +
       @@ -156,7 +156,6 @@ extern Cell	*rlengthloc;	/* RLENGTH */

     

       233
       233
       +
        #endif

     

       234
       234
       +
        

     

       235
       235
       +
        #ifndef	IN_MAKETAB

     

       236
       236
       +
       -#include <wchar.h>

     

       237
       237
       +
        

     

       238
       238
       +
        /*

     

       239
       239
       +
         * Get next character from string s and store it in wc; n is set to

     

       240
       240
       +
       --- nawk/awk.lx.l

     

       241
       241
       +
       +++ nawk/awk.lx.l

     

       242
       242
       +
       @@ -71,7 +71,6 @@

     

       243
       243
       +
        

     

       244
       244
       +
        #include	"awk.h"

     

       245
       245
       +
        #include	"y.tab.h"

     

       246
       246
       +
       -#include	<pfmt.h>

     

       247
       247
       +
        #include	<unistd.h>

     

       248
       248
       +
        

     

       249
       249
       +
        static void	awk_unputstr(const char *s);

     

       250
       250
       +
       --- nawk/run.c

     

       251
       251
       +
       +++ nawk/run.c

     

       252
       252
       +
       @@ -1467,14 +1467,6 @@ Cell *bltin(Node **a, int n)

     

       253
       253
       +
        	case FRAND:

     

       254
       254
       +
        		u = (Awkfloat) (rand() % 32767) / 32767.0;

     

       255
       255
       +
        		break;

     

       256
       256
       +
       -	case FSRAND:

     

       257
       257
       +
       -		u = saved_srand; /* return previous seed */

     

       258
       258
       +
       -		if (x->tval & REC)	/* no argument provided */

     

       259
       259
       +
       -			saved_srand = time(NULL);

     

       260
       260
       +
       -		else

     

       261
       261
       +
       -			saved_srand = getfval(x);

     

       262
       262
       +
       -		srand((int) saved_srand);

     

       263
       263
       +
       -		break;

     

       264
       264
       +
        	case FTOUPPER:

     

       265
       265
       +
        	case FTOLOWER:

     

       266
       266
       +
        		p = getsval(x);

     

       267
       267
       +
       --- pgrep/pgrep.c

     

       268
       268
       +
       +++ pgrep/pgrep.c

     

       269
       269
       +
       @@ -214,7 +214,7 @@ chdir_to_proc(void)

     

       270
       270
       +
        		fprintf(stderr, "%s: cannot open %s\n", progname, PROCDIR);

     

       271
       271
       +
        		exit(3);

     

       272
       272
       +
        	}

     

       273
       273
       +
       -	if (fchdir(fd) < 0) {

     

       274
       274
       +
       +	if (chdir(PROCDIR) < 0) {

     

       275
       275
       +
        		fprintf(stderr, "%s: cannot chdir to %s\n", progname, PROCDIR);

     

       276
       276
       +
        		exit(3);

     

       277
       277
       +
        	}

     

       278
       278
       +
       --- rm/rm.c

     

       279
       279
       +
       +++ rm/rm.c

     

       280
       280
       +
       @@ -242,7 +242,7 @@ rm(size_t pend, const char *base, const int olddir, int ssub, int level)

     

       281
       281
       +
        				}

     

       282
       282
       +
        				return;

     

       283
       283
       +
        			}

     

       284
       284
       +
       -			if (fchdir(df) < 0) {

     

       285
       285
       +
       +			if (chdir(base) < 0) {

     

       286
       286
       +
        				if (rmfile(base, &st) < 0) {

     

       287
       287
       +
        					fprintf(stderr,

     

       288
       288
       +
        						"%s: cannot chdir to %s\n",

     

       289
       289
       +
       @@ -270,7 +270,7 @@ rm(size_t pend, const char *base, const int olddir, int ssub, int level)

     

       290
       290
       +
        					progname, path);

     

       291
       291
       +
        				errcnt |= 4;

     

       292
       292
       +
        			}

     

       293
       293
       +
       -			if (olddir >= 0 && fchdir(olddir) < 0) {

     

       294
       294
       +
       +			if (olddir >= 0) {

     

       295
       295
       +
        				fprintf(stderr, "%s: cannot change backwards\n",

     

       296
       296
       +
        						progname);

     

       297
       297
       +
        				exit(1);

     

       298
       298
       +
       @@ -316,24 +316,6 @@ subproc(size_t pend, const char *base, int level)

     

       299
       299
       +
        		int status;

     

       300
       300
       +
        

     

       301
       301
       +
        		while (waitpid(pid, &status, 0) != pid);

     

       302
       302
       +
       -		if (status && WIFSIGNALED(status)) {

     

       303
       303
       +
       -			/*

     

       304
       304
       +
       -			 * If the signal was sent due to a tty keypress,

     

       305
       305
       +
       -			 * we should be terminated automatically and

     

       306
       306
       +
       -			 * never reach this point. Otherwise, we terminate

     

       307
       307
       +
       -			 * with the same signal, but make sure that we do

     

       308
       308
       +
       -			 * not overwrite a possibly generated core file.

     

       309
       309
       +
       -			 * This results in nearly the usual behavior except

     

       310
       310
       +
       -			 * that the shell never prints a 'core dumped'

     

       311
       311
       +
       -			 * message.

     

       312
       312
       +
       -			 */

     

       313
       313
       +
       -			struct rlimit	rl;

     

       314
       314
       +
       -

     

       315
       315
       +
       -			rl.rlim_cur = rl.rlim_max = 0;

     

       316
       316
       +
       -			setrlimit(RLIMIT_CORE, &rl);

     

       317
       317
       +
       -			raise(WTERMSIG(status));

     

       318
       318
       +
       -			pause();

     

       319
       319
       +
       -		}

     

       320
       320
       +
        		return status ? WEXITSTATUS(status) : 0;

     

       321
       321
       +
        	}

     

       322
       322
       +
        	case -1:

+53

pkgs/os-specific/linux/minimal-bootstrap/heirloom/musl.h

···

       1
       1
       +
       /*

     

       2
       2
       +
         Copyright © 2005-2019 Rich Felker, et al.

     

       3
       3
       +
       

     

       4
       4
       +
         Permission is hereby granted, free of charge, to any person obtaining

     

       5
       5
       +
         a copy of this software and associated documentation files (the

     

       6
       6
       +
         "Software"), to deal in the Software without restriction, including

     

       7
       7
       +
         without limitation the rights to use, copy, modify, merge, publish,

     

       8
       8
       +
         distribute, sublicense, and/or sell copies of the Software, and to

     

       9
       9
       +
         permit persons to whom the Software is furnished to do so, subject to

     

       10
       10
       +
         the following conditions:

     

       11
       11
       +
       

     

       12
       12
       +
         The above copyright notice and this permission notice shall be

     

       13
       13
       +
         included in all copies or substantial portions of the Software.

     

       14
       14
       +
       

     

       15
       15
       +
         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

     

       16
       16
       +
         EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

     

       17
       17
       +
         MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

     

       18
       18
       +
         IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

     

       19
       19
       +
         CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

     

       20
       20
       +
         TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

     

       21
       21
       +
         SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

     

       22
       22
       +
       */

     

       23
       23
       +
       

     

       24
       24
       +
       // Additional utilities from musl 1.1.24

     

       25
       25
       +
       

     

       26
       26
       +
       // include/stdlib.h

     

       27
       27
       +
       #define WEXITSTATUS(s) (((s) & 0xff00) >> 8)

     

       28
       28
       +
       #define WTERMSIG(s) ((s) & 0x7f)

     

       29
       29
       +
       #define WIFEXITED(s) (!WTERMSIG(s))

     

       30
       30
       +
       #define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu)

     

       31
       31
       +
       

     

       32
       32
       +
       // include/sys/sysmacros.h

     

       33
       33
       +
       #define major(x) \

     

       34
       34
       +
       	((unsigned)( (((x)>>31>>1) & 0xfffff000) | (((x)>>8) & 0x00000fff) ))

     

       35
       35
       +
       #define minor(x) \

     

       36
       36
       +
       	((unsigned)( (((x)>>12) & 0xffffff00) | ((x) & 0x000000ff) ))

     

       37
       37
       +
       #define makedev(x,y) ( \

     

       38
       38
       +
               (((x)&0xfffff000ULL) << 32) | \

     

       39
       39
       +
       	(((x)&0x00000fffULL) << 8) | \

     

       40
       40
       +
               (((y)&0xffffff00ULL) << 12) | \

     

       41
       41
       +
       	(((y)&0x000000ffULL)) )

     

       42
       42
       +
       

     

       43
       43
       +
       // src/misc/basename.c

     

       44
       44
       +
       #include <string.h>

     

       45
       45
       +
       char *basename(char *s)

     

       46
       46
       +
       {

     

       47
       47
       +
       	size_t i;

     

       48
       48
       +
       	if (!s || !*s) return ".";

     

       49
       49
       +
       	i = strlen(s)-1;

     

       50
       50
       +
       	for (; i&&s[i]=='/'; i--) s[i] = 0;

     

       51
       51
       +
       	for (; i&&s[i-1]!='/'; i--);

     

       52
       52
       +
       	return s+i;

     

       53
       53
       +
       }

+205

pkgs/os-specific/linux/minimal-bootstrap/heirloom/proctab.c

···

       1
       1
       +
       #include <stdio.h>

     

       2
       2
       +
       #include "awk.h"

     

       3
       3
       +
       #include "y.tab.h"

     

       4
       4
       +
       

     

       5
       5
       +
       static unsigned char *printname[92] = {

     

       6
       6
       +
       	(unsigned char *) "FIRSTTOKEN",	/* 258 */

     

       7
       7
       +
       	(unsigned char *) "PROGRAM",	/* 259 */

     

       8
       8
       +
       	(unsigned char *) "PASTAT",	/* 260 */

     

       9
       9
       +
       	(unsigned char *) "PASTAT2",	/* 261 */

     

       10
       10
       +
       	(unsigned char *) "XBEGIN",	/* 262 */

     

       11
       11
       +
       	(unsigned char *) "XEND",	/* 263 */

     

       12
       12
       +
       	(unsigned char *) "NL",	/* 264 */

     

       13
       13
       +
       	(unsigned char *) "ARRAY",	/* 265 */

     

       14
       14
       +
       	(unsigned char *) "MATCH",	/* 266 */

     

       15
       15
       +
       	(unsigned char *) "NOTMATCH",	/* 267 */

     

       16
       16
       +
       	(unsigned char *) "MATCHOP",	/* 268 */

     

       17
       17
       +
       	(unsigned char *) "FINAL",	/* 269 */

     

       18
       18
       +
       	(unsigned char *) "DOT",	/* 270 */

     

       19
       19
       +
       	(unsigned char *) "ALL",	/* 271 */

     

       20
       20
       +
       	(unsigned char *) "CCL",	/* 272 */

     

       21
       21
       +
       	(unsigned char *) "NCCL",	/* 273 */

     

       22
       22
       +
       	(unsigned char *) "CHAR",	/* 274 */

     

       23
       23
       +
       	(unsigned char *) "MCHAR",	/* 275 */

     

       24
       24
       +
       	(unsigned char *) "OR",	/* 276 */

     

       25
       25
       +
       	(unsigned char *) "STAR",	/* 277 */

     

       26
       26
       +
       	(unsigned char *) "QUEST",	/* 278 */

     

       27
       27
       +
       	(unsigned char *) "PLUS",	/* 279 */

     

       28
       28
       +
       	(unsigned char *) "AND",	/* 280 */

     

       29
       29
       +
       	(unsigned char *) "BOR",	/* 281 */

     

       30
       30
       +
       	(unsigned char *) "APPEND",	/* 282 */

     

       31
       31
       +
       	(unsigned char *) "EQ",	/* 283 */

     

       32
       32
       +
       	(unsigned char *) "GE",	/* 284 */

     

       33
       33
       +
       	(unsigned char *) "GT",	/* 285 */

     

       34
       34
       +
       	(unsigned char *) "LE",	/* 286 */

     

       35
       35
       +
       	(unsigned char *) "LT",	/* 287 */

     

       36
       36
       +
       	(unsigned char *) "NE",	/* 288 */

     

       37
       37
       +
       	(unsigned char *) "IN",	/* 289 */

     

       38
       38
       +
       	(unsigned char *) "ARG",	/* 290 */

     

       39
       39
       +
       	(unsigned char *) "BLTIN",	/* 291 */

     

       40
       40
       +
       	(unsigned char *) "BREAK",	/* 292 */

     

       41
       41
       +
       	(unsigned char *) "CONTINUE",	/* 293 */

     

       42
       42
       +
       	(unsigned char *) "DELETE",	/* 294 */

     

       43
       43
       +
       	(unsigned char *) "DO",	/* 295 */

     

       44
       44
       +
       	(unsigned char *) "EXIT",	/* 296 */

     

       45
       45
       +
       	(unsigned char *) "FOR",	/* 297 */

     

       46
       46
       +
       	(unsigned char *) "FUNC",	/* 298 */

     

       47
       47
       +
       	(unsigned char *) "SUB",	/* 299 */

     

       48
       48
       +
       	(unsigned char *) "GSUB",	/* 300 */

     

       49
       49
       +
       	(unsigned char *) "IF",	/* 301 */

     

       50
       50
       +
       	(unsigned char *) "INDEX",	/* 302 */

     

       51
       51
       +
       	(unsigned char *) "LSUBSTR",	/* 303 */

     

       52
       52
       +
       	(unsigned char *) "MATCHFCN",	/* 304 */

     

       53
       53
       +
       	(unsigned char *) "NEXT",	/* 305 */

     

       54
       54
       +
       	(unsigned char *) "ADD",	/* 306 */

     

       55
       55
       +
       	(unsigned char *) "MINUS",	/* 307 */

     

       56
       56
       +
       	(unsigned char *) "MULT",	/* 308 */

     

       57
       57
       +
       	(unsigned char *) "DIVIDE",	/* 309 */

     

       58
       58
       +
       	(unsigned char *) "MOD",	/* 310 */

     

       59
       59
       +
       	(unsigned char *) "ASSIGN",	/* 311 */

     

       60
       60
       +
       	(unsigned char *) "ASGNOP",	/* 312 */

     

       61
       61
       +
       	(unsigned char *) "ADDEQ",	/* 313 */

     

       62
       62
       +
       	(unsigned char *) "SUBEQ",	/* 314 */

     

       63
       63
       +
       	(unsigned char *) "MULTEQ",	/* 315 */

     

       64
       64
       +
       	(unsigned char *) "DIVEQ",	/* 316 */

     

       65
       65
       +
       	(unsigned char *) "MODEQ",	/* 317 */

     

       66
       66
       +
       	(unsigned char *) "POWEQ",	/* 318 */

     

       67
       67
       +
       	(unsigned char *) "PRINT",	/* 319 */

     

       68
       68
       +
       	(unsigned char *) "PRINTF",	/* 320 */

     

       69
       69
       +
       	(unsigned char *) "SPRINTF",	/* 321 */

     

       70
       70
       +
       	(unsigned char *) "ELSE",	/* 322 */

     

       71
       71
       +
       	(unsigned char *) "INTEST",	/* 323 */

     

       72
       72
       +
       	(unsigned char *) "CONDEXPR",	/* 324 */

     

       73
       73
       +
       	(unsigned char *) "POSTINCR",	/* 325 */

     

       74
       74
       +
       	(unsigned char *) "PREINCR",	/* 326 */

     

       75
       75
       +
       	(unsigned char *) "POSTDECR",	/* 327 */

     

       76
       76
       +
       	(unsigned char *) "PREDECR",	/* 328 */

     

       77
       77
       +
       	(unsigned char *) "VAR",	/* 329 */

     

       78
       78
       +
       	(unsigned char *) "IVAR",	/* 330 */

     

       79
       79
       +
       	(unsigned char *) "VARNF",	/* 331 */

     

       80
       80
       +
       	(unsigned char *) "CALL",	/* 332 */

     

       81
       81
       +
       	(unsigned char *) "NUMBER",	/* 333 */

     

       82
       82
       +
       	(unsigned char *) "STRING",	/* 334 */

     

       83
       83
       +
       	(unsigned char *) "FIELD",	/* 335 */

     

       84
       84
       +
       	(unsigned char *) "REGEXPR",	/* 336 */

     

       85
       85
       +
       	(unsigned char *) "GETLINE",	/* 337 */

     

       86
       86
       +
       	(unsigned char *) "RETURN",	/* 338 */

     

       87
       87
       +
       	(unsigned char *) "SPLIT",	/* 339 */

     

       88
       88
       +
       	(unsigned char *) "SUBSTR",	/* 340 */

     

       89
       89
       +
       	(unsigned char *) "WHILE",	/* 341 */

     

       90
       90
       +
       	(unsigned char *) "CAT",	/* 342 */

     

       91
       91
       +
       	(unsigned char *) "NOT",	/* 343 */

     

       92
       92
       +
       	(unsigned char *) "UMINUS",	/* 344 */

     

       93
       93
       +
       	(unsigned char *) "POWER",	/* 345 */

     

       94
       94
       +
       	(unsigned char *) "DECR",	/* 346 */

     

       95
       95
       +
       	(unsigned char *) "INCR",	/* 347 */

     

       96
       96
       +
       	(unsigned char *) "INDIRECT",	/* 348 */

     

       97
       97
       +
       	(unsigned char *) "LASTTOKEN",	/* 349 */

     

       98
       98
       +
       };

     

       99
       99
       +
       

     

       100
       100
       +
       

     

       101
       101
       +
       Cell *(*proctab[92])(Node **, int) = {

     

       102
       102
       +
       	nullproc,	/* FIRSTTOKEN */

     

       103
       103
       +
       	program,	/* PROGRAM */

     

       104
       104
       +
       	pastat,	/* PASTAT */

     

       105
       105
       +
       	dopa2,	/* PASTAT2 */

     

       106
       106
       +
       	nullproc,	/* XBEGIN */

     

       107
       107
       +
       	nullproc,	/* XEND */

     

       108
       108
       +
       	nullproc,	/* NL */

     

       109
       109
       +
       	array,	/* ARRAY */

     

       110
       110
       +
       	matchop,	/* MATCH */

     

       111
       111
       +
       	matchop,	/* NOTMATCH */

     

       112
       112
       +
       	nullproc,	/* MATCHOP */

     

       113
       113
       +
       	nullproc,	/* FINAL */

     

       114
       114
       +
       	nullproc,	/* DOT */

     

       115
       115
       +
       	nullproc,	/* ALL */

     

       116
       116
       +
       	nullproc,	/* CCL */

     

       117
       117
       +
       	nullproc,	/* NCCL */

     

       118
       118
       +
       	nullproc,	/* CHAR */

     

       119
       119
       +
       	nullproc,	/* MCHAR */

     

       120
       120
       +
       	nullproc,	/* OR */

     

       121
       121
       +
       	nullproc,	/* STAR */

     

       122
       122
       +
       	nullproc,	/* QUEST */

     

       123
       123
       +
       	nullproc,	/* PLUS */

     

       124
       124
       +
       	boolop,	/* AND */

     

       125
       125
       +
       	boolop,	/* BOR */

     

       126
       126
       +
       	nullproc,	/* APPEND */

     

       127
       127
       +
       	relop,	/* EQ */

     

       128
       128
       +
       	relop,	/* GE */

     

       129
       129
       +
       	relop,	/* GT */

     

       130
       130
       +
       	relop,	/* LE */

     

       131
       131
       +
       	relop,	/* LT */

     

       132
       132
       +
       	relop,	/* NE */

     

       133
       133
       +
       	instat,	/* IN */

     

       134
       134
       +
       	arg,	/* ARG */

     

       135
       135
       +
       	bltin,	/* BLTIN */

     

       136
       136
       +
       	jump,	/* BREAK */

     

       137
       137
       +
       	jump,	/* CONTINUE */

     

       138
       138
       +
       	delete,	/* DELETE */

     

       139
       139
       +
       	dostat,	/* DO */

     

       140
       140
       +
       	jump,	/* EXIT */

     

       141
       141
       +
       	forstat,	/* FOR */

     

       142
       142
       +
       	nullproc,	/* FUNC */

     

       143
       143
       +
       	sub,	/* SUB */

     

       144
       144
       +
       	gsub,	/* GSUB */

     

       145
       145
       +
       	ifstat,	/* IF */

     

       146
       146
       +
       	sindex,	/* INDEX */

     

       147
       147
       +
       	nullproc,	/* LSUBSTR */

     

       148
       148
       +
       	matchop,	/* MATCHFCN */

     

       149
       149
       +
       	jump,	/* NEXT */

     

       150
       150
       +
       	arith,	/* ADD */

     

       151
       151
       +
       	arith,	/* MINUS */

     

       152
       152
       +
       	arith,	/* MULT */

     

       153
       153
       +
       	arith,	/* DIVIDE */

     

       154
       154
       +
       	arith,	/* MOD */

     

       155
       155
       +
       	assign,	/* ASSIGN */

     

       156
       156
       +
       	nullproc,	/* ASGNOP */

     

       157
       157
       +
       	assign,	/* ADDEQ */

     

       158
       158
       +
       	assign,	/* SUBEQ */

     

       159
       159
       +
       	assign,	/* MULTEQ */

     

       160
       160
       +
       	assign,	/* DIVEQ */

     

       161
       161
       +
       	assign,	/* MODEQ */

     

       162
       162
       +
       	assign,	/* POWEQ */

     

       163
       163
       +
       	print,	/* PRINT */

     

       164
       164
       +
       	aprintf,	/* PRINTF */

     

       165
       165
       +
       	awsprintf,	/* SPRINTF */

     

       166
       166
       +
       	nullproc,	/* ELSE */

     

       167
       167
       +
       	intest,	/* INTEST */

     

       168
       168
       +
       	condexpr,	/* CONDEXPR */

     

       169
       169
       +
       	incrdecr,	/* POSTINCR */

     

       170
       170
       +
       	incrdecr,	/* PREINCR */

     

       171
       171
       +
       	incrdecr,	/* POSTDECR */

     

       172
       172
       +
       	incrdecr,	/* PREDECR */

     

       173
       173
       +
       	nullproc,	/* VAR */

     

       174
       174
       +
       	nullproc,	/* IVAR */

     

       175
       175
       +
       	getnf,	/* VARNF */

     

       176
       176
       +
       	call,	/* CALL */

     

       177
       177
       +
       	nullproc,	/* NUMBER */

     

       178
       178
       +
       	nullproc,	/* STRING */

     

       179
       179
       +
       	nullproc,	/* FIELD */

     

       180
       180
       +
       	nullproc,	/* REGEXPR */

     

       181
       181
       +
       	getline,	/* GETLINE */

     

       182
       182
       +
       	jump,	/* RETURN */

     

       183
       183
       +
       	split,	/* SPLIT */

     

       184
       184
       +
       	substr,	/* SUBSTR */

     

       185
       185
       +
       	whilestat,	/* WHILE */

     

       186
       186
       +
       	cat,	/* CAT */

     

       187
       187
       +
       	boolop,	/* NOT */

     

       188
       188
       +
       	arith,	/* UMINUS */

     

       189
       189
       +
       	arith,	/* POWER */

     

       190
       190
       +
       	nullproc,	/* DECR */

     

       191
       191
       +
       	nullproc,	/* INCR */

     

       192
       192
       +
       	indirect,	/* INDIRECT */

     

       193
       193
       +
       	nullproc,	/* LASTTOKEN */

     

       194
       194
       +
       };

     

       195
       195
       +
       

     

       196
       196
       +
       unsigned char *tokname(int n)

     

       197
       197
       +
       {

     

       198
       198
       +
       	static unsigned char buf[100];

     

       199
       199
       +
       

     

       200
       200
       +
       	if (n < FIRSTTOKEN || n > LASTTOKEN) {

     

       201
       201
       +
       		snprintf((char *)buf, sizeof buf, "token %d", n);

     

       202
       202
       +
       		return buf;

     

       203
       203
       +
       	}

     

       204
       204
       +
       	return printname[n-257];

     

       205
       205
       +
       }

+11

pkgs/os-specific/linux/minimal-bootstrap/heirloom/proctab.patch

···

       1
       1
       +
       --- nawk/Makefile.mk

     

       2
       2
       +
       +++ nawk/Makefile.mk

     

       3
       3
       +
       @@ -28,8 +28,6 @@ maketab: maketab.o

     

       4
       4
       +
        	$(HOSTCC) maketab.o -o maketab

     

       5
       5
       +
        	./maketab > proctab.c

     

       6
       6
       +
        

     

       7
       7
       +
       -proctab.c: maketab

     

       8
       8
       +
       -

     

       9
       9
       +
        awk.g.o: awk.g.c

     

       10
       10
       +
        	$(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IWCHAR) $(ICOMMON) $(IUXRE) -c awk.g.c

     

       11
       11
       +

+73

pkgs/os-specific/linux/minimal-bootstrap/heirloom/strcoll.patch

···

       1
       1
       +
       --- comm/comm.c

     

       2
       2
       +
       +++ comm/comm.c

     

       3
       3
       +
       @@ -242,7 +242,7 @@ compare(const char *a, const char *b)

     

       4
       4
       +
        			return(2);

     

       5
       5
       +
        		}

     

       6
       6
       +
        	} else {

     

       7
       7
       +
       -		n = strcoll(a, b);

     

       8
       8
       +
       +		n = strcmp(a, b);

     

       9
       9
       +
        		return n ? n > 0 ? 2 : 1 : 0;

     

       10
       10
       +
        	}

     

       11
       11
       +
        }

     

       12
       12
       +
       --- expr/expr.y

     

       13
       13
       +
       +++ expr/expr.y

     

       14
       14
       +
       @@ -234,7 +234,7 @@ _rel(int op, register char *r1, register char *r2)

     

       15
       15
       +
        	if (numeric(r1) && numeric(r2))

     

       16
       16
       +
        		i = atoll(r1) - atoll(r2);

     

       17
       17
       +
        	else

     

       18
       18
       +
       -		i = strcoll(r1, r2);

     

       19
       19
       +
       +		i = strcmp(r1, r2);

     

       20
       20
       +
        	switch(op) {

     

       21
       21
       +
        	case EQ: i = i==0; break;

     

       22
       22
       +
        	case GT: i = i>0; break;

     

       23
       23
       +
       --- join/join.c

     

       24
       24
       +
       +++ join/join.c

     

       25
       25
       +
       @@ -65,7 +65,7 @@ enum {

     

       26
       26
       +
        	JF = -1

     

       27
       27
       +
        };

     

       28
       28
       +
        #define	ppi(f, j)	((j) >= 0 && (j) < ppisize[f] ? ppibuf[f][j] : null)

     

       29
       29
       +
       -#define comp() strcoll(ppi(F1, j1),ppi(F2, j2))

     

       30
       30
       +
       +#define comp() strcmp(ppi(F1, j1),ppi(F2, j2))

     

       31
       31
       +
        

     

       32
       32
       +
        #define	next(wc, s, n)	(*(s) & 0200 ? ((n) = mbtowi(&(wc), (s), mb_cur_max), \

     

       33
       33
       +
        		(n) = ((n) > 0 ? (n) : (n) < 0 ? (wc=WEOF, 1) : 1)) : \

     

       34
       34
       +
       --- ls/ls.c

     

       35
       35
       +
       +++ ls/ls.c

     

       36
       36
       +
       @@ -575,13 +575,13 @@ _mergesort(struct file **al)

     

       37
       37
       +
        static int

     

       38
       38
       +
        namecmp(struct file *f1, struct file *f2)

     

       39
       39
       +
        {

     

       40
       40
       +
       -	return strcoll(f1->name, f2->name);

     

       41
       41
       +
       +	return strcmp(f1->name, f2->name);

     

       42
       42
       +
        }

     

       43
       43
       +
        

     

       44
       44
       +
        static int

     

       45
       45
       +
        extcmp(struct file *f1, struct file *f2)

     

       46
       46
       +
        {

     

       47
       47
       +
       -	return strcoll(extension(f1->name), extension(f2->name));

     

       48
       48
       +
       +	return strcmp(extension(f1->name), extension(f2->name));

     

       49
       49
       +
        }

     

       50
       50
       +
        

     

       51
       51
       +
        static int

     

       52
       52
       +
       --- nawk/run.c

     

       53
       53
       +
       +++ nawk/run.c

     

       54
       54
       +
       @@ -608,7 +608,7 @@ Cell *relop(Node **a, int n)

     

       55
       55
       +
        		j = x->fval - y->fval;

     

       56
       56
       +
        		i = j<0? -1: (j>0? 1: 0);

     

       57
       57
       +
        	} else {

     

       58
       58
       +
       -		i = strcoll((char*)getsval(x), (char*)getsval(y));

     

       59
       59
       +
       +		i = strcmp((char*)getsval(x), (char*)getsval(y));

     

       60
       60
       +
        	}

     

       61
       61
       +
        	tempfree(x, "");

     

       62
       62
       +
        	tempfree(y, "");

     

       63
       63
       +
       --- sort/sort.c

     

       64
       64
       +
       +++ sort/sort.c

     

       65
       65
       +
       @@ -1148,7 +1148,7 @@ cmpl(const char *pa, const char *pb)

     

       66
       66
       +
        

     

       67
       67
       +
        	ecpy(collba, pa, '\n');

     

       68
       68
       +
        	ecpy(collbb, pb, '\n');

     

       69
       69
       +
       -	n = strcoll(collba, collbb);

     

       70
       70
       +
       +	n = strcmp(collba, collbb);

     

       71
       71
       +
        	return n ? n > 0 ? -fields[0].rflg : fields[0].rflg : 0;

     

       72
       72
       +
        }

     

       73
       73
       +

+64

pkgs/os-specific/linux/minimal-bootstrap/heirloom/stubs.h

···

       1
       1
       +
       #include <getopt.h>

     

       2
       2
       +
       extern int optopt;

     

       3
       3
       +
       

     

       4
       4
       +
       int ftruncate(int fd, int offset) {

     

       5
       5
       +
         return -1;

     

       6
       6
       +
       }

     

       7
       7
       +
       

     

       8
       8
       +
       int getsid (int pid) {

     

       9
       9
       +
         return -1;

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       static int isblank(int c)

     

       13
       13
       +
       {

     

       14
       14
       +
       	return c == ' ' || c == '\t';

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       #define lchown chown

     

       18
       18
       +
       

     

       19
       19
       +
       // meslibc implements lstat but is missing declaration

     

       20
       20
       +
       #include <sys/stat.h>

     

       21
       21
       +
       int lstat (char const *file_name, struct stat *statbuf);

     

       22
       22
       +
       

     

       23
       23
       +
       #include <fcntl.h>

     

       24
       24
       +
       int mkstemp(char *t)

     

       25
       25
       +
       {

     

       26
       26
       +
         mktemp(t);

     

       27
       27
       +
         int fd = open(t, O_CREAT|O_RDWR|O_TRUNC, 0600);

     

       28
       28
       +
         return fd;

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       int putenv(char *string)

     

       32
       32
       +
       {

     

       33
       33
       +
         return 0;

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       char* realpath (char* path, char* resolved) {

     

       37
       37
       +
         return NULL;

     

       38
       38
       +
       }

     

       39
       39
       +
       

     

       40
       40
       +
       #define strncasecmp(a,b,n) strncmp(strupr(a),strupr(b),n)

     

       41
       41
       +
       

     

       42
       42
       +
       

     

       43
       43
       +
       #define nlink_t unsigned long

     

       44
       44
       +
       

     

       45
       45
       +
       #include <limits.h>

     

       46
       46
       +
       #define USHRT_MAX UINT16_MAX

     

       47
       47
       +
       #define SSIZE_MAX LONG_MAX

     

       48
       48
       +
       #define MB_LEN_MAX 1 

     

       49
       49
       +
       

     

       50
       50
       +
       #define EPERM 1

     

       51
       51
       +
       #define ESRCH 3

     

       52
       52
       +
       #define EDOM 33

     

       53
       53
       +
       #define S_IFSOCK 0140000

     

       54
       54
       +
       #define S_ISVTX 01000

     

       55
       55
       +
       #define S_IREAD S_IRUSR

     

       56
       56
       +
       #define S_IWRITE S_IWUSR

     

       57
       57
       +
       #define S_IEXEC S_IXUSR

     

       58
       58
       +
       

     

       59
       59
       +
       #define _PC_PATH_MAX PATH_MAX

     

       60
       60
       +
       #define _PC_VDISABLE 8

     

       61
       61
       +
       #define _POSIX_PATH_MAX PATH_MAX

     

       62
       62
       +
       #define LINE_MAX 4096

     

       63
       63
       +
       

     

       64
       64
       +
       #define LC_TIME 0

+77

pkgs/os-specific/linux/minimal-bootstrap/heirloom/sysconf.patch

···

       1
       1
       +
       --- cmp/cmp.c

     

       2
       2
       +
       +++ cmp/cmp.c

     

       3
       3
       +
       @@ -264,7 +264,7 @@ openfile(const char *fn)

     

       4
       4
       +
        	struct file	*f;

     

       5
       5
       +
        

     

       6
       6
       +
        	if (pagesize == 0)

     

       7
       7
       +
       -		if ((pagesize = sysconf(_SC_PAGESIZE)) < 0)

     

       8
       8
       +
       +		if ((pagesize = 4096) < 0)

     

       9
       9
       +
        			pagesize = 4096;

     

       10
       10
       +
        	if ((f = memalign(pagesize, sizeof *f)) == NULL) {

     

       11
       11
       +
        		write(2, "no memory\n", 10);

     

       12
       12
       +
       --- copy/copy.c

     

       13
       13
       +
       +++ copy/copy.c

     

       14
       14
       +
       @@ -362,7 +362,7 @@ fdcopy(const char *src, const struct stat *sp, int sfd,

     

       15
       15
       +
        			goto err;

     

       16
       16
       +
        	}

     

       17
       17
       +
        #endif	/* __linux__ */

     

       18
       18
       +
       -	if (pagesize == 0 && (pagesize = sysconf(_SC_PAGESIZE)) <= 0)

     

       19
       19
       +
       +	if (pagesize == 0 && (pagesize = 4096) <= 0)

     

       20
       20
       +
        		pagesize = 4096;

     

       21
       21
       +
        	if ((blksize = sp->st_blksize) <= 0)

     

       22
       22
       +
        		blksize = 512;

     

       23
       23
       +
       --- cp/cp.c

     

       24
       24
       +
       +++ cp/cp.c

     

       25
       25
       +
       @@ -438,7 +438,7 @@ fdcopy(const char *src, const struct stat *ssp, const int sfd,

     

       26
       26
       +
        	}

     

       27
       27
       +
        #endif	/* __linux__ */

     

       28
       28
       +
        	if (pagesize == 0)

     

       29
       29
       +
       -		if ((pagesize = sysconf(_SC_PAGESIZE)) < 0)

     

       30
       30
       +
       +		if ((pagesize = 4096) < 0)

     

       31
       31
       +
        			pagesize = 4096;

     

       32
       32
       +
        	if (bflag)

     

       33
       33
       +
        		blksize = bflag;

     

       34
       34
       +
       --- libcommon/ib_alloc.c

     

       35
       35
       +
       +++ libcommon/ib_alloc.c

     

       36
       36
       +
       @@ -41,7 +41,7 @@ ib_alloc(int fd, unsigned blksize)

     

       37
       37
       +
        	struct stat	st;

     

       38
       38
       +
        

     

       39
       39
       +
        	if (pagesize == 0)

     

       40
       40
       +
       -		if ((pagesize = sysconf(_SC_PAGESIZE)) < 0)

     

       41
       41
       +
       +		if ((pagesize = 4096) < 0)

     

       42
       42
       +
        			pagesize = 4096;

     

       43
       43
       +
        	if (blksize == 0) {

     

       44
       44
       +
        		if (fstat(fd, &st) < 0)

     

       45
       45
       +
       --- libcommon/memalign.c

     

       46
       46
       +
       +++ libcommon/memalign.c

     

       47
       47
       +
       @@ -40,7 +40,7 @@ memalign(size_t alignment, size_t size)

     

       48
       48
       +
        	static long	pagesize;

     

       49
       49
       +
        

     

       50
       50
       +
        	if (pagesize == 0)

     

       51
       51
       +
       -		pagesize = sysconf(_SC_PAGESIZE);

     

       52
       52
       +
       +		pagesize = 4096;

     

       53
       53
       +
        	if (alignment != pagesize)

     

       54
       54
       +
        		return NULL;

     

       55
       55
       +
        	if (size < pagesize)

     

       56
       56
       +
       --- libcommon/oblok.c

     

       57
       57
       +
       +++ libcommon/oblok.c

     

       58
       58
       +
       @@ -100,7 +100,7 @@ ob_alloc(int fd, enum ob_mode bf)

     

       59
       59
       +
        	struct oblok	*op;

     

       60
       60
       +
        

     

       61
       61
       +
        	if (pagesize == 0)

     

       62
       62
       +
       -		if ((pagesize = sysconf(_SC_PAGESIZE)) < 0)

     

       63
       63
       +
       +		if ((pagesize = 4096) < 0)

     

       64
       64
       +
        			pagesize = 4096;

     

       65
       65
       +
        	if ((op = memalign(pagesize, sizeof *op)) == NULL)

     

       66
       66
       +
        		return NULL;

     

       67
       67
       +
       --- xargs/xargs.c

     

       68
       68
       +
       +++ xargs/xargs.c

     

       69
       69
       +
       @@ -404,7 +404,7 @@ static void

     

       70
       70
       +
        endcmd(void)

     

       71
       71
       +
        {

     

       72
       72
       +
        	a_agg = a_cnt;

     

       73
       73
       +
       -	a_maxsize = sysconf(_SC_ARG_MAX) - envsz() - 2048 - a_asz;

     

       74
       74
       +
       +	a_maxsize = 65536 - envsz() - 2048 - a_asz;

     

       75
       75
       +
        	if (nflag || sflag) {

     

       76
       76
       +
        		long	newsize = sflag ? atol(sflag) :

     

       77
       77
       +
        #ifdef	WEIRD_LIMITS

+11

pkgs/os-specific/linux/minimal-bootstrap/heirloom/tcc-empty-ar.patch

···

       1
       1
       +
       --- libwchar/Makefile.mk

     

       2
       2
       +
       +++ libwchar/Makefile.mk

     

       3
       3
       +
       @@ -10,7 +10,7 @@ fake:

     

       4
       4
       +
        	if test "x$(LWCHAR)" = x; \

     

       5
       5
       +
        	then \

     

       6
       6
       +
        		touch $(OBJ); \

     

       7
       7
       +
       -		ar r libwchar.a $(OBJ); \

     

       8
       8
       +
       +		touch libwchar.a $(OBJ); \

     

       9
       9
       +
        	fi

     

       10
       10
       +
        

     

       11
       11
       +
        install:

+141

pkgs/os-specific/linux/minimal-bootstrap/heirloom/termios.patch

···

       1
       1
       +
       --- ed/ed.c

     

       2
       2
       +
       +++ ed/ed.c

     

       3
       3
       +
       @@ -68,7 +68,6 @@ static const char sccsid[] USED = "@(#)ed.sl	1.99 (gritter) 7/27/06";

     

       4
       4
       +
        #include <stdlib.h>

     

       5
       5
       +
        #include <signal.h>

     

       6
       6
       +
        #include "sigset.h"

     

       7
       7
       +
       -#include <termios.h>

     

       8
       8
       +
        #include <setjmp.h>

     

       9
       9
       +
        #include <libgen.h>

     

       10
       10
       +
        #include <inttypes.h>

     

       11
       11
       +
       @@ -77,7 +76,6 @@ static const char sccsid[] USED = "@(#)ed.sl	1.99 (gritter) 7/27/06";

     

       12
       12
       +
        #include <ctype.h>

     

       13
       13
       +
        #include <wctype.h>

     

       14
       14
       +
        #include <limits.h>

     

       15
       15
       +
       -#include <termios.h>

     

       16
       16
       +
        static int	FNSIZE;

     

       17
       17
       +
        static int	LBSIZE;

     

       18
       18
       +
        static int	RHSIZE;

     

       19
       19
       +
       @@ -2273,22 +2271,10 @@ sclose(int fd)

     

       20
       20
       +
        static void

     

       21
       21
       +
        fspec(const char *lp)

     

       22
       22
       +
        {

     

       23
       23
       +
       -	struct termios	ts;

     

       24
       24
       +
        	const char	*cp;

     

       25
       25
       +
        

     

       26
       26
       +
        	freetabs();

     

       27
       27
       +
        	maxlength = 0;

     

       28
       28
       +
       -	if (tcgetattr(1, &ts) < 0

     

       29
       29
       +
       -#ifdef	TAB3

     

       30
       30
       +
       -			|| (ts.c_oflag&TAB3) == 0

     

       31
       31
       +
       -#endif

     

       32
       32
       +
       -			)

     

       33
       33
       +
       -		return;

     

       34
       34
       +
       -	while (lp[0]) {

     

       35
       35
       +
       -		if (lp[0] == '<' && lp[1] == ':')

     

       36
       36
       +
       -			break;

     

       37
       37
       +
       -		lp++;

     

       38
       38
       +
       -	}

     

       39
       39
       +
        	if (lp[0]) {

     

       40
       40
       +
        		lp += 2;

     

       41
       41
       +
        		while ((cp = ftok(&lp)) != NULL) {

     

       42
       42
       +
       --- ls/ls.c

     

       43
       43
       +
       +++ ls/ls.c

     

       44
       44
       +
       @@ -102,7 +102,6 @@ static char ifmt_c[] = "-pc-d-b--nl-SD--";

     

       45
       45
       +
        #include <grp.h>

     

       46
       46
       +
        #include <errno.h>

     

       47
       47
       +
        #include <fcntl.h>

     

       48
       48
       +
       -#include <termios.h>

     

       49
       49
       +
        #include <locale.h>

     

       50
       50
       +
        #include <limits.h>

     

       51
       51
       +
        #include <ctype.h>

     

       52
       52
       +
       @@ -110,14 +109,6 @@ static char ifmt_c[] = "-pc-d-b--nl-SD--";

     

       53
       53
       +
        #include <wchar.h>

     

       54
       54
       +
        #include <wctype.h>

     

       55
       55
       +
        #include "config.h"

     

       56
       56
       +
       -#ifndef	USE_TERMCAP

     

       57
       57
       +
       -#ifndef	sun

     

       58
       58
       +
       -#include <curses.h>

     

       59
       59
       +
       -#include <term.h>

     

       60
       60
       +
       -#endif

     

       61
       61
       +
       -#else	/* USE_TERMCAP */

     

       62
       62
       +
       -#include <termcap.h>

     

       63
       63
       +
       -#endif	/* USE_TERMCAP */

     

       64
       64
       +
        

     

       65
       65
       +
        #ifdef	_AIX

     

       66
       66
       +
        #include <sys/sysmacros.h>

     

       67
       67
       +
       @@ -989,13 +980,6 @@ printname(const char *name, struct file *f, int doit)

     

       68
       68
       +
        			bold++;

     

       69
       69
       +
        		}

     

       70
       70
       +
        		if (color) {

     

       71
       71
       +
       -#ifndef	USE_TERMCAP

     

       72
       72
       +
       -			if (bold)

     

       73
       73
       +
       -				vidattr(A_BOLD);

     

       74
       74
       +
       -#else	/* USE_TERMCAP */

     

       75
       75
       +
       -			if (Bold)

     

       76
       76
       +
       -				tputs(Bold, 1, putchar);

     

       77
       77
       +
       -#endif	/* USE_TERMCAP */

     

       78
       78
       +
        			printf(color);

     

       79
       79
       +
        		}

     

       80
       80
       +
        	}

     

       81
       81
       +
       @@ -1056,13 +1040,6 @@ printname(const char *name, struct file *f, int doit)

     

       82
       82
       +
        		}

     

       83
       83
       +
        	}

     

       84
       84
       +
        	if (doit && color) {

     

       85
       85
       +
       -#if !defined (USE_TERMCAP)

     

       86
       86
       +
       -		if (bold)

     

       87
       87
       +
       -			vidattr(A_NORMAL);

     

       88
       88
       +
       -#else	/* USE_TERMCAP */

     

       89
       89
       +
       -		if (Normal)

     

       90
       90
       +
       -			tputs(Normal, 1, putchar);

     

       91
       91
       +
       -#endif	/* USE_TERMCAP */

     

       92
       92
       +
        		printf(fc_get(FC_NORMAL));

     

       93
       93
       +
        	}

     

       94
       94
       +
        	if (f)

     

       95
       95
       +
       @@ -1598,16 +1575,12 @@ main(int argc, char **argv)

     

       96
       96
       +
        {

     

       97
       97
       +
        	struct file *flist = nil, **aflist = &flist;

     

       98
       98
       +
        	enum depth depth;

     

       99
       99
       +
       -	struct winsize ws;

     

       100
       100
       +
        	int i;

     

       101
       101
       +
        	char *cp;

     

       102
       102
       +
        

     

       103
       103
       +
        #ifdef	__GLIBC__

     

       104
       104
       +
        	putenv("POSIXLY_CORRECT=1");

     

       105
       105
       +
        #endif

     

       106
       106
       +
       -	setlocale(LC_COLLATE, "");

     

       107
       107
       +
       -	setlocale(LC_CTYPE, "");

     

       108
       108
       +
       -	setlocale(LC_TIME, "");

     

       109
       109
       +
        #ifndef	UCB

     

       110
       110
       +
        	if (getenv("SYSV3") != NULL)

     

       111
       111
       +
        		sysv3 = 1;

     

       112
       112
       +
       @@ -1624,16 +1597,6 @@ main(int argc, char **argv)

     

       113
       113
       +
        	}

     

       114
       114
       +
        	if (istty || isatty(1)) {

     

       115
       115
       +
        		istty = 1;

     

       116
       116
       +
       -#if !defined (USE_TERMCAP)

     

       117
       117
       +
       -		setupterm(NULL, 1, &tinfostat);

     

       118
       118
       +
       -#else	/* USE_TERMCAP */

     

       119
       119
       +
       -		{

     

       120
       120
       +
       -			char	buf[2048];

     

       121
       121
       +
       -			if ((cp = getenv("TERM")) != NULL)

     

       122
       122
       +
       -				if (tgetent(buf, cp) > 0)

     

       123
       123
       +
       -					tinfostat = 1;

     

       124
       124
       +
       -		}

     

       125
       125
       +
       -#endif	/* USE_TERMCAP */

     

       126
       126
       +
        		field |= FL_STATUS;

     

       127
       127
       +
        	}

     

       128
       128
       +
        	while ((i = getopt(argc, argv, personalities[personality].per_opt))

     

       129
       129
       +
       @@ -1753,12 +1716,6 @@ main(int argc, char **argv)

     

       130
       130
       +
        	if ((cp = getenv("COLUMNS")) != NULL) {

     

       131
       131
       +
        		ncols = atoi(cp);

     

       132
       132
       +
        	} else if ((present('C') || present('x') || present('m')) && istty) {

     

       133
       133
       +
       -		if (ioctl(1, TIOCGWINSZ, &ws) == 0 && ws.ws_col > 0)

     

       134
       134
       +
       -			ncols = ws.ws_col - 1;

     

       135
       135
       +
       -#if !defined (USE_TERMCAP)

     

       136
       136
       +
       -		else if (tinfostat == 1 && columns > 0)

     

       137
       137
       +
       -			ncols = columns;

     

       138
       138
       +
       -#endif	/* !USE_TERMCAP */

     

       139
       139
       +
        	}

     

       140
       140
       +
        	depth = SURFACE;

     

       141
       141
       +
        	if (optind == argc) {

+90

pkgs/os-specific/linux/minimal-bootstrap/heirloom/utime.patch

···

       1
       1
       +
       --- copy/copy.c

     

       2
       2
       +
       +++ copy/copy.c

     

       3
       3
       +
       @@ -46,7 +46,6 @@ static const char sccsid[] USED = "@(#)copy.sl	1.15 (gritter) 5/29/05";

     

       4
       4
       +
        #include <libgen.h>

     

       5
       5
       +
        #include <limits.h>

     

       6
       6
       +
        #include <dirent.h>

     

       7
       7
       +
       -#include <utime.h>

     

       8
       8
       +
        #include <stdarg.h>

     

       9
       9
       +
        #include "sfile.h"

     

       10
       10
       +
        #include "memalign.h"

     

       11
       11
       +
       @@ -441,12 +440,6 @@ attribs(const char *dst, const struct stat *sp)

     

       12
       12
       +
        	if (oflag && ((sp->st_mode&S_IFMT) == S_IFLNK ?

     

       13
       13
       +
        			lchown:chown)(dst, sp->st_uid, sp->st_gid) < 0)

     

       14
       14
       +
        		complain("Unable to chown %s", dst);

     

       15
       15
       +
       -	if (mflag && (sp->st_mode&S_IFMT) != S_IFLNK) {

     

       16
       16
       +
       -		struct utimbuf	ut;

     

       17
       17
       +
       -		ut.actime = sp->st_atime;

     

       18
       18
       +
       -		ut.modtime = sp->st_mtime;

     

       19
       19
       +
       -		utime(dst, &ut);

     

       20
       20
       +
       -	}

     

       21
       21
       +
        }

     

       22
       22
       +
        

     

       23
       23
       +
        static void

     

       24
       24
       +
       --- cp/cp.c

     

       25
       25
       +
       +++ cp/cp.c

     

       26
       26
       +
       @@ -56,7 +56,6 @@ static const char sccsid[] USED = "@(#)cp.sl	1.84 (gritter) 3/4/06";

     

       27
       27
       +
        #include	<libgen.h>

     

       28
       28
       +
        #include	<limits.h>

     

       29
       29
       +
        #include	<dirent.h>

     

       30
       30
       +
       -#include	<utime.h>

     

       31
       31
       +
        #include	"sfile.h"

     

       32
       32
       +
        #include	"memalign.h"

     

       33
       33
       +
        #include	"alloca.h"

     

       34
       34
       +
       @@ -354,18 +353,6 @@ permissions(const char *path, const struct stat *ssp)

     

       35
       35
       +
        

     

       36
       36
       +
        	mode = ssp->st_mode & 07777;

     

       37
       37
       +
        	if (pflag) {

     

       38
       38
       +
       -		struct utimbuf ut;

     

       39
       39
       +
       -		ut.actime = ssp->st_atime;

     

       40
       40
       +
       -		ut.modtime = ssp->st_mtime;

     

       41
       41
       +
       -		if (utime(path, &ut) < 0) {

     

       42
       42
       +
       -#if defined (SUS) || defined (S42)

     

       43
       43
       +
       -			fprintf(stderr, "%s: cannot set times for %s\n%s: %s\n",

     

       44
       44
       +
       -					progname, path,

     

       45
       45
       +
       -					progname, strerror(errno));

     

       46
       46
       +
       -#endif /* SUS || S42 */

     

       47
       47
       +
       -			if (pers != PERS_MV)

     

       48
       48
       +
       -				errcnt |= 010;

     

       49
       49
       +
       -		}

     

       50
       50
       +
        		if (myuid == 0) {

     

       51
       51
       +
        			if (chown(path, ssp->st_uid, ssp->st_gid) < 0) {

     

       52
       52
       +
        #if defined (SUS) || defined (S42)

     

       53
       53
       +
       --- touch/touch.c

     

       54
       54
       +
       +++ touch/touch.c

     

       55
       55
       +
       @@ -47,7 +47,6 @@ static const char sccsid[] USED = "@(#)touch.sl	1.21 (gritter) 5/29/05";

     

       56
       56
       +
        #include	<stdlib.h>

     

       57
       57
       +
        #include	<errno.h>

     

       58
       58
       +
        #include	<libgen.h>

     

       59
       59
       +
       -#include	<utime.h>

     

       60
       60
       +
        #include	<ctype.h>

     

       61
       61
       +
        #include	<time.h>

     

       62
       62
       +
        

     

       63
       63
       +
       @@ -80,7 +79,6 @@ static void

     

       64
       64
       +
        touch(const char *fn)

     

       65
       65
       +
        {

     

       66
       66
       +
        	struct stat st;

     

       67
       67
       +
       -	struct utimbuf ut;

     

       68
       68
       +
        

     

       69
       69
       +
        	if (stat(fn, &st) < 0) {

     

       70
       70
       +
        		if (errno == ENOENT) {

     

       71
       71
       +
       @@ -113,19 +111,6 @@ touch(const char *fn)

     

       72
       72
       +
        			return;

     

       73
       73
       +
        		}

     

       74
       74
       +
        	}

     

       75
       75
       +
       -	if (aflag)

     

       76
       76
       +
       -		ut.actime = nacc;

     

       77
       77
       +
       -	else

     

       78
       78
       +
       -		ut.actime = st.st_atime;

     

       79
       79
       +
       -	if (mflag)

     

       80
       80
       +
       -		ut.modtime = nmod;

     

       81
       81
       +
       -	else

     

       82
       82
       +
       -		ut.modtime = st.st_mtime;

     

       83
       83
       +
       -	if (utime(fn, nulltime ? NULL : &ut) < 0) {

     

       84
       84
       +
       -		fprintf(stderr, "%s: cannot change times on %s\n",

     

       85
       85
       +
       -				progname, fn);

     

       86
       86
       +
       -		errcnt++;

     

       87
       87
       +
       -	}

     

       88
       88
       +
        }

     

       89
       89
       +
        

     

       90
       90
       +
        static void

+128

pkgs/os-specific/linux/minimal-bootstrap/heirloom/vprintf.patch

···

       1
       1
       +
       --- cksum/cksum.c

     

       2
       2
       +
       +++ cksum/cksum.c

     

       3
       3
       +
       @@ -147,7 +147,7 @@ cksum(const char *name)

     

       4
       4
       +
        		s = (s << 8) ^ crctab[(s >> 24) ^ c];

     

       5
       5
       +
        	}

     

       6
       6
       +
        	s = ~s;

     

       7
       7
       +
       -	printf("%u %llu", (unsigned)s, nbytes);

     

       8
       8
       +
       +	printf("%u %lu", (unsigned)s, nbytes);

     

       9
       9
       +
        	if(name)

     

       10
       10
       +
        		printf(" %s", name);

     

       11
       11
       +
        	printf("\n");

     

       12
       12
       +
       --- cmp/cmp.c

     

       13
       13
       +
       +++ cmp/cmp.c

     

       14
       14
       +
       @@ -246,8 +246,8 @@ different:

     

       15
       15
       +
        				errcnt = 1;

     

       16
       16
       +
        			} else {

     

       17
       17
       +
        				if (sflag == 0)

     

       18
       18
       +
       -					printf("%s %s differ: char %lld,"

     

       19
       19
       +
       -							" line %lld\n",

     

       20
       20
       +
       +					printf("%s %s differ: char %ld,"

     

       21
       21
       +
       +							" line %ld\n",

     

       22
       22
       +
        						f1->f_nam, f2->f_nam,

     

       23
       23
       +
        						(long long)offset(f1),

     

       24
       24
       +
        						line);

     

       25
       25
       +
       --- csplit/csplit.c

     

       26
       26
       +
       +++ csplit/csplit.c

     

       27
       27
       +
       @@ -284,7 +284,7 @@ csplit(const char *fn)

     

       28
       28
       +
        				op = nextfile();

     

       29
       29
       +
        			if (op) {

     

       30
       30
       +
        				if (!sflag)

     

       31
       31
       +
       -					printf("%lld\n", bytes);

     

       32
       32
       +
       +					printf("%ld\n", bytes);

     

       33
       33
       +
        				bytes = 0;

     

       34
       34
       +
        				fclose(op);

     

       35
       35
       +
        			}

     

       36
       36
       +
       --- expr/expr.y

     

       37
       37
       +
       +++ expr/expr.y

     

       38
       38
       +
       @@ -140,7 +140,7 @@ expression:	expr NOARG {

     

       39
       39
       +
        			if (sus && numeric($1)) {

     

       40
       40
       +
        				int64_t	n;

     

       41
       41
       +
        				n = atoll($1);

     

       42
       42
       +
       -				printf("%lld\n", n);

     

       43
       43
       +
       +				printf("%ld\n", n);

     

       44
       44
       +
        				exit(n == 0);

     

       45
       45
       +
        			} else

     

       46
       46
       +
        				puts($1);

     

       47
       47
       +
       @@ -447,10 +447,10 @@ numpr(int64_t val)

     

       48
       48
       +
        	int	ret;

     

       49
       49
       +
        

     

       50
       50
       +
        	rv = smalloc(NUMSZ);

     

       51
       51
       +
       -	ret = snprintf(rv, NUMSZ, "%lld", (long long)val);

     

       52
       52
       +
       +	ret = snprintf(rv, NUMSZ, "%ld", (long long)val);

     

       53
       53
       +
        	if (ret < 0 || ret >= NUMSZ) {

     

       54
       54
       +
        		rv = srealloc(rv, ret + 1);

     

       55
       55
       +
       -		ret = snprintf(rv, ret, "%lld", (long long)val);

     

       56
       56
       +
       +		ret = snprintf(rv, ret, "%ld", (long long)val);

     

       57
       57
       +
        		if (ret < 0)

     

       58
       58
       +
        			yyerror("illegal number");

     

       59
       59
       +
        	}

     

       60
       60
       +
       --- grep/Makefile.mk

     

       61
       61
       +
       +++ grep/Makefile.mk

     

       62
       62
       +
       @@ -92,7 +92,7 @@ config.h:

     

       63
       63
       +
        	-echo 'long long foo;' >___build$$$$.c ; \

     

       64
       64
       +
        	$(CC) $(CFLAGS2) $(CPPFLAGS) $(IWCHAR) $(ICOMMON) $(IUXRE) $(LARGEF) -c ___build$$$$.c >/dev/null 2>&1 ; \

     

       65
       65
       +
        	if test $$? = 0 && test -f ___build$$$$.o ; \

     

       66
       66
       +
       -	then	echo '#define	LONGLONG' >>config.h ; \

     

       67
       67
       +
       +	then	echo '' >>config.h ; \

     

       68
       68
       +
        	fi ; \

     

       69
       69
       +
        	rm -f ___build$$$$.o ___build$$$$.c

     

       70
       70
       +
        

     

       71
       71
       +
       --- ls/Makefile.mk

     

       72
       72
       +
       +++ ls/Makefile.mk

     

       73
       73
       +
       @@ -76,7 +76,7 @@ config.h:

     

       74
       74
       +
        	-echo 'long long foo;' >___build$$$$.c ; \

     

       75
       75
       +
        	$(CC) $(CFLAGS) $(CPPFLAGS) $(LARGEF) $(IWCHAR) -c ___build$$$$.c >/dev/null 2>&1 ; \

     

       76
       76
       +
        	if test $$? = 0 && test -f ___build$$$$.o ; \

     

       77
       77
       +
       -	then	echo '#define	LONGLONG' >>config.h ; \

     

       78
       78
       +
       +	then	echo '' >>config.h ; \

     

       79
       79
       +
        	fi ; \

     

       80
       80
       +
        	rm -f ___build$$$$.o ___build$$$$.c

     

       81
       81
       +
        	-echo '#include <sys/types.h>' >___build$$$$.c ; \

     

       82
       82
       +
       --- pr/pr.c

     

       83
       83
       +
       +++ pr/pr.c

     

       84
       84
       +
       @@ -548,7 +548,7 @@ print(const char *fp, const char **argp)

     

       85
       85
       +
        			putcs("  ");

     

       86
       86
       +
        			putcs(header);

     

       87
       87
       +
        			snprintf(linebuf, sizeof linebuf,

     

       88
       88
       +
       -					" Page %lld\n\n\n", page);

     

       89
       89
       +
       +					" Page %ld\n\n\n", page);

     

       90
       90
       +
        			putcs(linebuf);

     

       91
       91
       +
        		}

     

       92
       92
       +
        		c = putpage();

     

       93
       93
       +
       --- sed/sed1.c

     

       94
       94
       +
       +++ sed/sed1.c

     

       95
       95
       +
       @@ -489,7 +489,7 @@ command(struct reptr *ipc)

     

       96
       96
       +
        			break;

     

       97
       97
       +
        

     

       98
       98
       +
        		case EQCOM:

     

       99
       99
       +
       -			fprintf(stdout, "%lld\n", lnum);

     

       100
       100
       +
       +			fprintf(stdout, "%ld\n", lnum);

     

       101
       101
       +
        			break;

     

       102
       102
       +
        

     

       103
       103
       +
        		case GCOM:

     

       104
       104
       +
       --- sum/sum.c

     

       105
       105
       +
       +++ sum/sum.c

     

       106
       106
       +
       @@ -116,7 +116,7 @@ sum(const char *name)

     

       107
       107
       +
        	else {

     

       108
       108
       +
        		s = (s & 0xFFFF) + (s >> 16);

     

       109
       109
       +
        		s = (s & 0xFFFF) + (s >> 16);

     

       110
       110
       +
       -		printf("%u %llu", (unsigned)s,

     

       111
       111
       +
       +		printf("%u %lu", (unsigned)s,

     

       112
       112
       +
        				(unsigned long long)(nbytes+UNIT-1)/UNIT);

     

       113
       113
       +
        	}

     

       114
       114
       +
        	if(name)

     

       115
       115
       +
       --- wc/wc.c

     

       116
       116
       +
       +++ wc/wc.c

     

       117
       117
       +
       @@ -89,9 +89,9 @@ report(unsigned long long count)

     

       118
       118
       +
        #if defined (S42)

     

       119
       119
       +
        	if (putspace++)

     

       120
       120
       +
        		printf(" ");

     

       121
       121
       +
       -	printf("%llu", count);

     

       122
       122
       +
       +	printf("%lu", count);

     

       123
       123
       +
        #else	/* !S42 */

     

       124
       124
       +
       -	printf("%7llu ", count);

     

       125
       125
       +
       +	printf("%7lu ", count);

     

       126
       126
       +
        #endif	/* !S42 */

     

       127
       127
       +
        }

     

       128
       128
       +

+2 -2

pkgs/servers/sql/pgpool/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "pgpool-II";

     

       13
       13
       -
         version = "4.4.2";

     

       13
       13
       +
         version = "4.4.3";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz";

     

       17
       17
        
           name = "pgpool-II-${version}.tar.gz";

     

       18
       18
       -
           sha256 = "sha256-Pmx4jnDwZyx7OMiKbKdvMfN4axJWiZgMwGOrdSylgjQ=";

     

       18
       18
       +
           sha256 = "sha256-RnRaqY9FTgl87LTaz1NvicN+0+xB8y8KhGk0Ip0OtzM=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [

+3 -3

pkgs/tools/admin/eksctl/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "eksctl";

     

       5
       5
       -
         version = "0.143.0";

     

       5
       5
       +
         version = "0.144.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "weaveworks";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           hash = "sha256-FVZQooV1sygxubPZ/9CvWIEcDhDGIbreDPUBrtyIy60=";

     

       11
       11
       +
           hash = "sha256-ZbapTT9tZFz+TGefElU3oHhLc6mWqxd4L9HxcryFuHw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-WJ7pTooO4/o0IR4Rio+EoN7oxmobG7GqT7aEUqusKI0=";

     

       14
       14
       +
         vendorHash = "sha256-4ORKH9jnrow3gbV6zyiWb93yJzJVfIe/O+wST5+DmFQ=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+1 -1

pkgs/tools/graphics/leela/default.nix

···

       17
       17
        
         installFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ];

     

       18
       18
        
       

     

       19
       19
        
         meta = {

     

       20
       20
       -
           description = "CLI frontend to the poppler-glib libary of PDF tools";

     

       20
       20
       +
           description = "CLI frontend to the poppler-glib library of PDF tools";

     

       21
       21
        
           homepage = "https://github.com/TrilbyWhite/Leela";

     

       22
       22
        
           license = lib.licenses.gpl3;

     

       23
       23
        
           maintainers = [ lib.maintainers.puffnfresh ];

+43

pkgs/tools/graphics/maskromtool/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , qtbase

     

       6
       6
       +
       , qt6

     

       7
       7
       +
       , wrapQtAppsHook

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "maskromtool";

     

       12
       12
       +
         version = "2023-05-30";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "travisgoodspeed";

     

       16
       16
       +
           repo = "maskromtool";

     

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

     

       18
       18
       +
           hash = "sha256-HiP9igrq9rmW7MxdTdOsJ86j/Ccxb2lFTaIJfyUW7Bo=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           qtbase

     

       23
       23
       +
           qt6.qtcharts

     

       24
       24
       +
           qt6.qttools

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           cmake

     

       29
       29
       +
           wrapQtAppsHook

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         meta = {

     

       33
       33
       +
           description = "A CAD tool for extracting bits from Mask ROM photographs";

     

       34
       34
       +
           homepage = "https://github.com/travisgoodspeed/maskromtool";

     

       35
       35
       +
           license = [

     

       36
       36
       +
             lib.licenses.beerware

     

       37
       37
       +
             lib.licenses.gpl1Plus

     

       38
       38
       +
           ];

     

       39
       39
       +
           maintainers = [

     

       40
       40
       +
             lib.maintainers.evanrichter

     

       41
       41
       +
           ];

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+2 -2

pkgs/tools/misc/dupd/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "dupd";

     

       9
       9
       -
         version = "1.7.2";

     

       9
       9
       +
         version = "1.7.3";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "jvirkki";

     

       13
       13
        
           repo  = "dupd";

     

       14
       14
        
           rev   = version;

     

       15
       15
       -
           sha256 = "sha256-Jl95Ke1AntYeTKARQTXm5qMhwISEw4Pvnr6I2WEFlP4=";

     

       15
       15
       +
           sha256 = "sha256-ZiQroJ5fjBCIjU+M8KRA0N3Mrg9h0NVtfYUIS4cYyhw=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         postPatch = ''

+3 -3

pkgs/tools/misc/fclones/default.nix

···

       7
       7
        
       

     

       8
       8
        
       rustPlatform.buildRustPackage rec {

     

       9
       9
        
         pname = "fclones";

     

       10
       10
       -
         version = "0.31.0";

     

       10
       10
       +
         version = "0.31.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "pkolaczk";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           hash = "sha256-VJU6qfcsV1VO/b8LQmIARGhkB8LrGcGsnfu1rUbK3rA=";

     

       16
       16
       +
           hash = "sha256-7XixwONEgALMEQlF+SAzx8SO79GrNE8YBX2bDcslVdE=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cargoHash = "sha256-KkJyB6Bdy+gjLHFgLML0rX8OF3/2yXO6XAwUOyvbQIE=";

     

       19
       19
       +
         cargoHash = "sha256-hsidW0T8a6Bj8g+ybm3XX0Ddha+z4/DzHBSQD1jRa3A=";

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = lib.optionals stdenv.isDarwin [

     

       22
       22
        
           darwin.apple_sdk_11_0.frameworks.AppKit

+1 -1

pkgs/tools/misc/usbimager/default.nix

···

       20
       20
        
         buildInputs = lib.optionals withUdisks [ udisks glib ]

     

       21
       21
        
           ++ lib.optional (!withLibui) libX11

     

       22
       22
        
           ++ lib.optional withLibui gtk3;

     

       23
       23
       -
           # libui is bundled with the source of usbimager as a compiled static libary

     

       23
       23
       +
           # libui is bundled with the source of usbimager as a compiled static library

     

       24
       24
        
       

     

       25
       25
        
         postPatch = ''

     

       26
       26
        
           sed -i \

+3 -3

pkgs/tools/misc/uutils-coreutils/default.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "uutils-coreutils";

     

       15
       15
       -
         version = "0.0.17";

     

       15
       15
       +
         version = "0.0.19";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "uutils";

     

       19
       19
        
           repo = "coreutils";

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "sha256-r4IpmwZaRKzesvq7jAjCvfvZVmfcvwj23zMH3VnlC4I=";

     

       21
       21
       +
           sha256 = "sha256-ysMSO6VaiaL4Sh5F0VbeAQYOo78lhVQjewZ5lwaCLRM=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       25
       25
        
           inherit src;

     

       26
       26
        
           name = "${pname}-${version}";

     

       27
       27
       -
           hash = "sha256-ZbGLBjjAsdEhWK3/RS+yRI70xqV+5fzg76Y2Lip1m9A=";

     

       27
       27
       +
           hash = "sha256-cBocRWIpG2BQZDPJq4cNNYrFg/MBR3o58fXGHanTn30=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ];

+3 -3

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

···

       4
       4
        
       

     

       5
       5
        
       rustPlatform.buildRustPackage rec {

     

       6
       6
        
         pname = "nix-index";

     

       7
       7
       -
         version = "0.1.5";

     

       7
       7
       +
         version = "0.1.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "bennofs";

     

       11
       11
        
           repo = "nix-index";

     

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

     

       13
       13
       -
           sha256 = "sha256-/btQP7I4zpIA0MWEQJVYnR1XhyudPnYD5Qx4vrW+Uq8=";

     

       13
       13
       +
           sha256 = "sha256-mdK63qRVvISRbRwfMel4SYucmBxR6RLbM4IFz3K3Pks=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         cargoSha256 = "sha256-CzLBOLtzIYqdWjTDKHVnc1YXXyj1HqvXzoFYHS0qxog=";

     

       16
       16
       +
         cargoHash = "sha256-uIGxCaFj4x1Ck/D2xxOlosJaGSVbOKxbXAEAkkBxyaQ=";

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkg-config ];

     

       19
       19
        
         buildInputs = [ openssl curl sqlite ]

+2 -2

pkgs/tools/security/exploitdb/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "exploitdb";

     

       9
       9
       -
         version = "2023-06-08";

     

       9
       9
       +
         version = "2023-06-10";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitLab {

     

       12
       12
        
           owner = "exploit-database";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           hash = "sha256-zvbWYPpexd4V8kVKH2g+SE481zD9MaZa7ISIZK4weug=";

     

       15
       15
       +
           hash = "sha256-DSn7ngNeW0PWQYnh5d1LQ0RO3PoQcplSGUytWX5QTww=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

+3 -3

pkgs/tools/security/vault/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "vault";

     

       9
       9
       -
         version = "1.13.2";

     

       9
       9
       +
         version = "1.13.3";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "hashicorp";

     

       13
       13
        
           repo = "vault";

     

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

     

       15
       15
       -
           sha256 = "sha256-U4V2+O8//6mkuznSHkPWeeJNK6NtUTEhFk7zz3FEe58=";

     

       15
       15
       +
           sha256 = "sha256-/AqUsjZArL4KjAzSkb1sM/xhKCIlg+2uvkV0TVwI1Q4=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-eyXmmhMAbLJiLwQQAR4+baU53n2WY5laUKEGoPjpBg4=";

     

       18
       18
       +
         vendorHash = "sha256-Wt5VahshNI/etzQQdcKgD/TBuD4NMi5eVPMHiJYfScY=";

     

       19
       19
        
       

     

       20
       20
        
         subPackages = [ "." ];

     

       21
       21

+3 -3

pkgs/tools/typesetting/tectonic/default.nix

···

       14
       14
        
       

     

       15
       15
        
       rustPlatform.buildRustPackage rec {

     

       16
       16
        
         pname = "tectonic";

     

       17
       17
       -
         version = "0.12.0";

     

       17
       17
       +
         version = "0.13.1";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "tectonic-typesetting";

     

       21
       21
        
           repo = "tectonic";

     

       22
       22
        
           rev = "tectonic@${version}";

     

       23
       23
        
           fetchSubmodules = true;

     

       24
       24
       -
           sha256 = "sha256-m2wBZNaepad4eaT/1DTjzAYrDX2wH/7wMfdzPWHQOLI=";

     

       24
       24
       +
           sha256 = "sha256-m1KmyVB4/Flr/xZGY7ixRZhEGNcIPWnwzUsf3VLqzZc=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         cargoSha256 = "sha256-pMqwWWmPxJZbJavxSVfjjRd7u9fI2AUZRjHF5SxxqoU=";

     

       27
       27
       +
         cargoHash = "sha256-Q1b7/XJ5Aq2hV2uv12B64WI+JOw6M8J3KITXs5cUo6U=";

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ pkg-config makeBinaryWrapper ];

     

       30
       30

+32

pkgs/tools/virtualization/multipass/cmake_no_fetch.patch

···

       1
       1
       +
       diff --git a/3rd-party/CMakeLists.txt b/3rd-party/CMakeLists.txt

     

       2
       2
       +
       index 188ebfc6..4a34a922 100644

     

       3
       3
       +
       --- a/3rd-party/CMakeLists.txt

     

       4
       4
       +
       +++ b/3rd-party/CMakeLists.txt

     

       5
       5
       +
       @@ -2,12 +2,8 @@ include(FetchContent)

     

       6
       6
       +
        set(FETCHCONTENT_QUIET FALSE)

     

       7
       7
       +
        

     

       8
       8
       +
        FetchContent_Declare(gRPC

     

       9
       9
       +
       -  GIT_REPOSITORY https://github.com/CanonicalLtd/grpc.git

     

       10
       10
       +
       -  GIT_TAG ba8e7f72

     

       11
       11
       +
       -  GIT_SHALLOW TRUE

     

       12
       12
       +
       -  GIT_SUBMODULES "third_party/abseil-cpp third_party/cares/cares third_party/protobuf third_party/re2 third_party/zlib"

     

       13
       13
       +
       -  GIT_SUBMODULES_RECURSE false

     

       14
       14
       +
       -  GIT_PROGRESS TRUE

     

       15
       15
       +
       +  DOWNLOAD_COMMAND true

     

       16
       16
       +
       +  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/grpc

     

       17
       17
       +
        )

     

       18
       18
       +
        set(gRPC_SSL_PROVIDER "package" CACHE STRING "Provider of ssl library")

     

       19
       19
       +
        

     

       20
       20
       +
       diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt

     

       21
       21
       +
       index 52bd407f..a1100112 100644

     

       22
       22
       +
       --- a/tests/CMakeLists.txt

     

       23
       23
       +
       +++ b/tests/CMakeLists.txt

     

       24
       24
       +
       @@ -28,7 +28,7 @@ FetchContent_Declare(googletest

     

       25
       25
       +
        )

     

       26
       26
       +
        set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

     

       27
       27
       +
        set(INSTALL_GTEST OFF CACHE BOOL "")

     

       28
       28
       +
       -FetchContent_MakeAvailable(googletest)

     

       29
       29
       +
       +# FetchContent_MakeAvailable(googletest)

     

       30
       30
       +
        

     

       31
       31
       +
        add_executable(multipass_tests

     

       32
       32
       +
          blueprint_test_lambdas.cpp

+26 -18

pkgs/tools/virtualization/multipass/default.nix

···

       25
       25
        
       

     

       26
       26
        
       let

     

       27
       27
        
         pname = "multipass";

     

       28
       28
       -
         version = "1.11.1";

     

       28
       28
       +
         version = "1.12.0";

     

       29
       29
       +
       

     

       30
       30
       +
         # This is done here because a CMakeLists.txt from one of it's submodules tries

     

       31
       31
       +
         # to modify a file, so we grab the source for the submodule here, copy it into

     

       32
       32
       +
         # the source of the Multipass project which allows the modification to happen.

     

       33
       33
       +
         grpc_src = fetchFromGitHub {

     

       34
       34
       +
           owner = "CanonicalLtd";

     

       35
       35
       +
           repo = "grpc";

     

       36
       36
       +
           rev = "ba8e7f72a57b9e0b25783a4d3cea58c79379f194";

     

       37
       37
       +
           hash = "sha256-DS1UNLCUdbipn5w4p2aVa8LgHHhdJiAfzfEdIXNO69o=";

     

       38
       38
       +
           fetchSubmodules = true;

     

       39
       39
       +
         };

     

       29
       40
        
       in

     

       30
       30
       -
       stdenv.mkDerivation {

     

       41
       41
       +
       stdenv.mkDerivation

     

       42
       42
       +
       {

     

       31
       43
        
         inherit pname version;

     

       32
       44
        
       

     

       33
       45
        
         src = fetchFromGitHub {

     

       34
       46
        
           owner = "canonical";

     

       35
       47
        
           repo = "multipass";

     

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

     

       37
       37
       -
           sha256 = "sha256-AIZs+NRAn/r9EjTx9InDZzS4ycni4MZQXmC0A5rpaJk=";

     

       49
       49
       +
           sha256 = "sha256-CwyiLkpyTfn4734ESnHHWwiMdy3AP0BuQv6Uc1nTAuU=";

     

       38
       50
        
           fetchSubmodules = true;

     

       39
       51
        
         };

     

       40
       52
        
       

     

       41
       41
       -
         preConfigure = ''

     

       53
       53
       +
         patches = [

     

       54
       54
       +
           ./lxd_socket_path.patch

     

       55
       55
       +
           ./cmake_no_fetch.patch

     

       56
       56
       +
         ];

     

       57
       57
       +
       

     

       58
       58
       +
         postPatch = ''

     

       59
       59
       +
           # Make sure the version is reported correctly in the compiled binary.

     

       42
       60
        
           substituteInPlace ./CMakeLists.txt \

     

       43
       61
        
             --replace "determine_version(MULTIPASS_VERSION)" "" \

     

       44
       62
        
             --replace 'set(MULTIPASS_VERSION ''${MULTIPASS_VERSION})' 'set(MULTIPASS_VERSION "v${version}")'

     

       45
       63
        
       

     

       64
       64
       +
           # Patch the patch of the OVMF binaries to use paths from the nix store.

     

       46
       65
        
           substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \

     

       47
       66
        
             --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \

     

       48
       67
        
             --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd"

     

       49
       49
       -
         '';

     

       50
       50
       -
       

     

       51
       51
       -
         postPatch = ''

     

       52
       52
       -
           # Patch all of the places where Multipass expects the LXD socket to be provided by a snap

     

       53
       53
       -
           substituteInPlace ./src/network/network_access_manager.cpp \

     

       54
       54
       -
             --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket"

     

       55
       68
        
       

     

       56
       56
       -
           substituteInPlace ./src/platform/backends/lxd/lxd_virtual_machine.cpp \

     

       57
       57
       -
             --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket"

     

       69
       69
       +
           # Copy the grpc submodule we fetched into the source code.

     

       70
       70
       +
           cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc

     

       58
       71
        
       

     

       59
       59
       -
           substituteInPlace ./src/platform/backends/lxd/lxd_request.h \

     

       60
       60
       -
             --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket"

     

       61
       61
       -
       

     

       62
       62
       -
           substituteInPlace ./tests/CMakeLists.txt \

     

       63
       63
       -
             --replace "FetchContent_MakeAvailable(googletest)" ""

     

       64
       64
       -
       

     

       72
       72
       +
           # Configure CMake to use gtest from the nix store since we disabled fetching from the internet.

     

       65
       73
        
           cat >> tests/CMakeLists.txt <<'EOF'

     

       66
       74
        
             add_library(gtest INTERFACE)

     

       67
       75
        
             target_include_directories(gtest INTERFACE ${gtest.dev}/include)

+13

pkgs/tools/virtualization/multipass/lxd_socket_path.patch

···

       1
       1
       +
       diff --git a/src/platform/backends/lxd/lxd_request.h b/src/platform/backends/lxd/lxd_request.h

     

       2
       2
       +
       index 4b5e8840..5e673ad7 100644

     

       3
       3
       +
       --- a/src/platform/backends/lxd/lxd_request.h

     

       4
       4
       +
       +++ b/src/platform/backends/lxd/lxd_request.h

     

       5
       5
       +
       @@ -27,7 +27,7 @@

     

       6
       6
       +
        

     

       7
       7
       +
        namespace multipass

     

       8
       8
       +
        {

     

       9
       9
       +
       -const QUrl lxd_socket_url{"unix:///var/snap/lxd/common/lxd/unix.socket@1.0"};

     

       10
       10
       +
       +const QUrl lxd_socket_url{"unix:///var/lib/lxd/unix.socket@1.0"};

     

       11
       11
       +
        const QString lxd_project_name{"multipass"};

     

       12
       12
       +
        

     

       13
       13
       +
        class NetworkAccessManager;

pkgs/top-level/aliases.nix

···

       213
       213
        
         cassandra_2_1 = throw "cassandra_2_1 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29

     

       214
       214
        
         cassandra_2_2 = throw "cassandra_2_2 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29

     

       215
       215
        
         catfish = xfce.catfish; # Added 2019-12-22

     

       216
       216
       +
         ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09

     

       216
       217
        
         ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25

     

       217
       218
        
         cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12

     

       218
       219
        
         cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs"; # Added 2020-06-05

+4 -2

pkgs/top-level/all-packages.nix

···

       6241
       6241
        
       

     

       6242
       6242
        
         can-utils = callPackage ../os-specific/linux/can-utils { };

     

       6243
       6243
        
       

     

       6244
       6244
       +
         cannelloni = callPackage ../os-specific/linux/cannelloni { };

     

       6245
       6245
       +
       

     

       6244
       6246
        
         caudec = callPackage ../applications/audio/caudec { };

     

       6245
       6247
        
       

     

       6246
       6248
        
         ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { };

     
···

       9397
       9399
        
         manifest-tool = callPackage ../development/tools/manifest-tool { };

     

       9398
       9400
        
       

     

       9399
       9401
        
         mask = callPackage ../development/tools/mask { };

     

       9402
       9402
       +
       

     

       9403
       9403
       +
         maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { };

     

       9400
       9404
        
       

     

       9401
       9405
        
         mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { };

     

       9402
       9406
        
       

     
···

       18684
       18688
        
         heroku = callPackage ../development/tools/heroku { };

     

       18685
       18689
        
       

     

       18686
       18690
        
         highlight-assertions = callPackage ../development/tools/misc/highlight-assertions { };

     

       18687
       18687
       -
       

     

       18688
       18688
       -
         ccloud-cli = callPackage ../development/tools/ccloud-cli { };

     

       18689
       18691
        
       

     

       18690
       18692
        
         confluent-cli = callPackage ../development/tools/confluent-cli { };

     

       18691
       18693