diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/ocaml-modules/dune-glob | |
parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/dune-glob')
-rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix index c7c6f9be4ee0..04b5e7623793 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-private-libs }: buildDunePackage rec { pname = "dune-glob"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; propagatedBuildInputs = [ dune-private-libs ]; meta = with lib; { - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; description = "Glob string matching language supported by dune"; maintainers = [ maintainers.marsam ]; license = licenses.mit; |