ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #265526 from Artturin/deparg

Browse Source
This commit is contained in:
Artturi 2023-11-05 01:27:19 +02:00 committed by GitHub
commit 231e60ee5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-6/default.nix
View File

@ -178,12 +178,12 @@ let
# simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01
baseScope = lib.makeScope newScope addPackages; baseScope = lib.makeScope newScope addPackages;
bootstrapScope = baseScope.overrideScope'(final: prev: { bootstrapScope = baseScope.overrideScope(final: prev: {
qtbase = prev.qtbase.override { qttranslations = null; }; qtbase = prev.qtbase.override { qttranslations = null; };
qtdeclarative = null; qtdeclarative = null;
}); });
finalScope = baseScope.overrideScope'(final: prev: { finalScope = baseScope.overrideScope(final: prev: {
qttranslations = bootstrapScope.qttranslations; qttranslations = bootstrapScope.qttranslations;
}); });
in finalScope in finalScope

4
pkgs/top-level/ocaml-packages.nix
View File

@ -832,7 +832,7 @@ let
}; };
ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };
})).overrideScope' liftJaneStreet; })).overrideScope liftJaneStreet;
janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
self = self.janeStreet_0_9_0; self = self.janeStreet_0_9_0;
@ -1967,7 +1967,7 @@ in let inherit (pkgs) callPackage; in rec
# *and* non-JS OCaml libraries can pull in the same version of JS transitive # *and* non-JS OCaml libraries can pull in the same version of JS transitive
# dependencies. Remove this once ligo and stanc can be compiled against # dependencies. Remove this once ligo and stanc can be compiled against
# janestreet 0.16 libraries. # janestreet 0.16 libraries.
ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope' (self: super: super // super.janeStreet_0_15); ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope (self: super: super // super.janeStreet_0_15);
# We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0.
# Below are aliases for porting them to the latest versions of the OCaml 4 series. # Below are aliases for porting them to the latest versions of the OCaml 4 series.