commit f2a142727cc0fbc92a9b420567418df9dd36e568 · pyrox.dev/nixpkgs

+1 -1

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

···

       88
       88
        
               ];

     

       89
       89
        
       

     

       90
       90
        
               buildInputs = [

     

       91
       91
       -
                 pkgs.gnatcoll-xref

     

       91
       91
       +
                 pkgs.gnatPackages.gnatcoll-xref

     

       92
       92
        
               ];

     

       93
       93
        
       

     

       94
       94
        
               buildPhase = ''

+1 -1

pkgs/build-support/cc-wrapper/default.nix

···

       377
       377
        
       

     

       378
       378
        
             # this symlink points to the unwrapped gnat's output "out". It is used by

     

       379
       379
        
             # our custom gprconfig compiler description to find GNAT's ada runtime. See

     

       380
       380
       -
             # ../../development/tools/build-managers/gprbuild/{boot.nix, nixpkgs-gnat.xml}

     

       380
       380
       +
             # ../../development/ada-modules/gprbuild/{boot.nix, nixpkgs-gnat.xml}

     

       381
       381
        
             ln -sf ${cc} $out/nix-support/gprconfig-gnat-unwrapped

     

       382
       382
        
           ''

     

       383
       383

pkgs/development/libraries/ada/gnatcoll/bindings.nix pkgs/development/ada-modules/gnatcoll/bindings.nix

pkgs/development/libraries/ada/gnatcoll/core.nix pkgs/development/ada-modules/gnatcoll/core.nix

pkgs/development/libraries/ada/gnatcoll/db.nix pkgs/development/ada-modules/gnatcoll/db.nix

pkgs/development/libraries/ada/gnatprove/default.nix pkgs/development/ada-modules/gnatprove/default.nix

pkgs/development/libraries/ada/xmlada/default.nix pkgs/development/ada-modules/xmlada/default.nix

pkgs/development/tools/build-managers/gprbuild/boot.nix pkgs/development/ada-modules/gprbuild/boot.nix

pkgs/development/tools/build-managers/gprbuild/default.nix pkgs/development/ada-modules/gprbuild/default.nix

pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh

pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh pkgs/development/ada-modules/gprbuild/gpr-project-path-hook.sh

pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch pkgs/development/ada-modules/gprbuild/gprbuild-relocatable-build.patch

pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml

+45

pkgs/top-level/ada-packages.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , pkgs

     

       3
       3
       +
       , makeScopeWithSplicing'

     

       4
       4
       +
       , generateSplicesForMkScope

     

       5
       5
       +
       , gnat

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         gnat_version = lib.versions.major gnat.version;

     

       9
       9
       +
       in

     

       10
       10
       +
       makeScopeWithSplicing' {

     

       11
       11
       +
         otherSplices = generateSplicesForMkScope ("gnat" + gnat_version + "Packages");

     

       12
       12
       +
         f = (self: {

     

       13
       13
       +
           inherit gnat;

     

       14
       14
       +
       

     

       15
       15
       +
           gprbuild-boot = self.callPackage ../development/ada-modules/gprbuild/boot.nix { };

     

       16
       16
       +
           gprbuild      = self.callPackage ../development/ada-modules/gprbuild { };

     

       17
       17
       +
       

     

       18
       18
       +
           xmlada = self.callPackage ../development/ada-modules/xmlada { };

     

       19
       19
       +
       

     

       20
       20
       +
           gnatprove = self.callPackage ../development/ada-modules/gnatprove {

     

       21
       21
       +
             ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_14;

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           gnatcoll-core     = self.callPackage ../development/ada-modules/gnatcoll/core.nix { };

     

       25
       25
       +
       

     

       26
       26
       +
           # gnatcoll-bindings repository

     

       27
       27
       +
           gnatcoll-gmp      = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "gmp"; };

     

       28
       28
       +
           gnatcoll-iconv    = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "iconv"; };

     

       29
       29
       +
           gnatcoll-lzma     = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "lzma"; };

     

       30
       30
       +
           gnatcoll-omp      = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "omp"; };

     

       31
       31
       +
           gnatcoll-python3  = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "python3"; python3 = pkgs.python39; };

     

       32
       32
       +
           gnatcoll-readline = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "readline"; };

     

       33
       33
       +
           gnatcoll-syslog   = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "syslog"; };

     

       34
       34
       +
           gnatcoll-zlib     = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "zlib"; };

     

       35
       35
       +
       

     

       36
       36
       +
           # gnatcoll-db repository

     

       37
       37
       +
           gnatcoll-postgres = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "postgres"; };

     

       38
       38
       +
           gnatcoll-sql      = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "sql"; };

     

       39
       39
       +
           gnatcoll-sqlite   = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "sqlite"; };

     

       40
       40
       +
           gnatcoll-xref     = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "xref"; };

     

       41
       41
       +
           gnatcoll-db2ada   = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "gnatcoll_db2ada"; };

     

       42
       42
       +
           gnatinspect       = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "gnatinspect"; };

     

       43
       43
       +
         });

     

       44
       44
       +
       }

     

       45
       45
       +

+17 -1

pkgs/top-level/aliases.nix

···

       349
       349
        
         gnatboot11 = gnat-bootstrap11;

     

       350
       350
        
         gnatboot12 = gnat-bootstrap12;

     

       351
       351
        
         gnatboot = gnat-bootstrap;

     

       352
       352
       +
         gnatcoll-core     = gnatPackages.gnatcoll-core; # Added 2024-02-25

     

       353
       353
       +
         gnatcoll-gmp      = gnatPackages.gnatcoll-gmp; # Added 2024-02-25

     

       354
       354
       +
         gnatcoll-iconv    = gnatPackages.gnatcoll-iconv; # Added 2024-02-25

     

       355
       355
       +
         gnatcoll-lzma     = gnatPackages.gnatcoll-lzma; # Added 2024-02-25

     

       356
       356
       +
         gnatcoll-omp      = gnatPackages.gnatcoll-omp; # Added 2024-02-25

     

       357
       357
       +
         gnatcoll-python3  = gnatPackages.gnatcoll-python3; # Added 2024-02-25

     

       358
       358
       +
         gnatcoll-readline = gnatPackages.gnatcoll-readline; # Added 2024-02-25

     

       359
       359
       +
         gnatcoll-syslog   = gnatPackages.gnatcoll-syslog; # Added 2024-02-25

     

       360
       360
       +
         gnatcoll-zlib     = gnatPackages.gnatcoll-zlib; # Added 2024-02-25

     

       361
       361
       +
         gnatcoll-postgres = gnatPackages.gnatcoll-postgres; # Added 2024-02-25

     

       362
       362
       +
         gnatcoll-sql      = gnatPackages.gnatcoll-sql; # Added 2024-02-25

     

       363
       363
       +
         gnatcoll-sqlite   = gnatPackages.gnatcoll-sqlite; # Added 2024-02-25

     

       364
       364
       +
         gnatcoll-xref     = gnatPackages.gnatcoll-xref; # Added 2024-02-25

     

       365
       365
       +
         gnatcoll-db2ada   = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25

     

       366
       366
       +
         gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25

     

       352
       367
        
         gnome-firmware-updater = gnome-firmware; # added 2022-04-14

     

       353
       368
        
         gnome-passwordsafe = gnome-secrets; # added 2022-01-30

     

       354
       369
        
         gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10

     
···

       393
       408
        
         gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26

     

       394
       409
        
         govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26

     

       395
       410
        
         gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10

     

       396
       396
       -
       

     

       411
       411
       +
         gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25;

     

       397
       412
        
         graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26

     

       398
       413
        
         graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26

     

       399
       414
        
         graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26

     
···

       1174
       1189
        
         xdg_utils = xdg-utils; # Added 2021-02-01

     

       1175
       1190
        
         xineLib = xine-lib; # Added 2021-04-27

     

       1176
       1191
        
         xineUI = xine-ui; # Added 2021-04-27

     

       1192
       1192
       +
         xmlada = gnatPackages.xmlada; # Added 2024-02-25

     

       1177
       1193
        
         xonsh-unwrapped = throw "'xonsh-unwrapped' was incorporated into xonsh code; call xonsh directly instead."; # Added 2024-01-20

     

       1178
       1194
        
         xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25

     

       1179
       1195
        
         xulrunner = firefox-unwrapped; # Added 2023-11-03

+4 -38

pkgs/top-level/all-packages.nix

···

       16075
       16075
        
           bintools = bintoolsDualAs;

     

       16076
       16076
        
         });

     

       16077
       16077
        
       

     

       16078
       16078
       -
         gnatprove = callPackage ../development/libraries/ada/gnatprove {

     

       16079
       16079
       -
           ocamlPackages = ocaml-ng.ocamlPackages_4_14;

     

       16080
       16080
       -
         };

     

       16078
       16078
       +
         gnatPackages   = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat; });

     

       16079
       16079
       +
         inherit (gnatPackages)

     

       16080
       16080
       +
           gprbuild

     

       16081
       16081
       +
           gnatprove;

     

       16081
       16082
        
       

     

       16082
       16083
        
         gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { };

     

       16083
       16084
        
       

     
···

       19117
       19118
        
       

     

       19118
       19119
        
         global = callPackage ../development/tools/misc/global { };

     

       19119
       19120
        
       

     

       19120
       19120
       -
         gnatcoll-db2ada = callPackage ../development/libraries/ada/gnatcoll/db.nix {

     

       19121
       19121
       -
           component = "gnatcoll_db2ada";

     

       19122
       19122
       -
         };

     

       19123
       19123
       -
       

     

       19124
       19124
       -
         gnatinspect = callPackage ../development/libraries/ada/gnatcoll/db.nix {

     

       19125
       19125
       -
           component = "gnatinspect";

     

       19126
       19126
       -
         };

     

       19127
       19127
       -
       

     

       19128
       19121
        
         gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils { };

     

       19129
       19122
        
       

     

       19130
       19123
        
         gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing { };

     
···

       19168
       19161
        
         gotify-server = callPackage ../servers/gotify { };

     

       19169
       19162
        
       

     

       19170
       19163
        
         gotty = callPackage ../servers/gotty { };

     

       19171
       19171
       -
       

     

       19172
       19172
       -
         gprbuild-boot = callPackage ../development/tools/build-managers/gprbuild/boot.nix { };

     

       19173
       19173
       -
       

     

       19174
       19174
       -
         gprbuild = callPackage ../development/tools/build-managers/gprbuild { };

     

       19175
       19164
        
       

     

       19176
       19165
        
         gputils = callPackage ../development/embedded/gputils { };

     

       19177
       19166
        
       

     
···

       21578
       21567
        
       

     

       21579
       21568
        
         gl3w = callPackage ../development/libraries/gl3w { };

     

       21580
       21569
        
       

     

       21581
       21581
       -
         gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { };

     

       21582
       21582
       -
       

     

       21583
       21583
       -
         # gnatcoll-bindings repository

     

       21584
       21584
       -
         gnatcoll-gmp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "gmp"; };

     

       21585
       21585
       -
         gnatcoll-iconv = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "iconv"; };

     

       21586
       21586
       -
         gnatcoll-lzma = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "lzma"; };

     

       21587
       21587
       -
         gnatcoll-omp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "omp"; };

     

       21588
       21588
       -
         gnatcoll-python3 = callPackage ../development/libraries/ada/gnatcoll/bindings.nix {

     

       21589
       21589
       -
           component = "python3";

     

       21590
       21590
       -
           python3 = python39;

     

       21591
       21591
       -
         };

     

       21592
       21592
       -
         gnatcoll-readline = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "readline"; };

     

       21593
       21593
       -
         gnatcoll-syslog = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "syslog"; };

     

       21594
       21594
       -
         gnatcoll-zlib = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "zlib"; };

     

       21595
       21595
       -
       

     

       21596
       21596
       -
         # gnatcoll-db repository

     

       21597
       21597
       -
         gnatcoll-postgres = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "postgres"; };

     

       21598
       21598
       -
         gnatcoll-sql = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sql"; };

     

       21599
       21599
       -
         gnatcoll-sqlite = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sqlite"; };

     

       21600
       21600
       -
         gnatcoll-xref = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "xref"; };

     

       21601
       21601
       -
       

     

       21602
       21570
        
         gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { });

     

       21603
       21571
        
         gns3-gui = gns3Packages.guiStable;

     

       21604
       21572
        
         gns3-server = gns3Packages.serverStable;

     
···

       25493
       25461
        
         xgeometry-select = callPackage ../tools/X11/xgeometry-select { };

     

       25494
       25462
        
       

     

       25495
       25463
        
         xmake-core-sv = callPackage ../development/libraries/xmake-core-sv { };

     

       25496
       25496
       -
       

     

       25497
       25497
       -
         xmlada = callPackage ../development/libraries/ada/xmlada { };

     

       25498
       25464
        
       

     

       25499
       25465
        
         xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };

     

       25500
       25466