diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-05 01:27:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 01:27:19 +0200 |
| commit | 231e60ee5c1b1f1fcbec7f867e3f57731ccc661e (patch) | |
| tree | e583ba3d18c4432eef5ea1ea3ae53bb59cb66d6c /pkgs | |
| parent | e50bf86997a645edb0610ca4267442dcdea8a071 (diff) | |
| parent | 01d9c8d1bce703e7246f7defd13e52bc6f9422a3 (diff) | |
| download | nixpkgs-231e60ee5c1b1f1fcbec7f867e3f57731ccc661e.tar nixpkgs-231e60ee5c1b1f1fcbec7f867e3f57731ccc661e.tar.gz nixpkgs-231e60ee5c1b1f1fcbec7f867e3f57731ccc661e.tar.bz2 nixpkgs-231e60ee5c1b1f1fcbec7f867e3f57731ccc661e.tar.lz nixpkgs-231e60ee5c1b1f1fcbec7f867e3f57731ccc661e.tar.xz nixpkgs-231e60ee5c1b1f1fcbec7f867e3f57731ccc661e.tar.zst nixpkgs-231e60ee5c1b1f1fcbec7f867e3f57731ccc661e.zip | |
Merge pull request #265526 from Artturin/deparg
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-6/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 6629f618a2e..4a211e5cb91 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -178,12 +178,12 @@ let # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 baseScope = lib.makeScope newScope addPackages; - bootstrapScope = baseScope.overrideScope'(final: prev: { + bootstrapScope = baseScope.overrideScope(final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; qtdeclarative = null; }); - finalScope = baseScope.overrideScope'(final: prev: { + finalScope = baseScope.overrideScope(final: prev: { qttranslations = bootstrapScope.qttranslations; }); in finalScope diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 95c2ea7b418..ff9aa962be7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -832,7 +832,7 @@ let }; ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; - })).overrideScope' liftJaneStreet; + })).overrideScope liftJaneStreet; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { 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 # dependencies. Remove this once ligo and stanc can be compiled against # 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. # Below are aliases for porting them to the latest versions of the OCaml 4 series. |