Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

2 files changed, 69 insertions, 166 deletions

diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix
deleted file mode 100644
index 73f15b744bf5..000000000000
--- a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix
+++ /dev/null
@@ -1,110 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, cmake
-, pkg-config
-, boost
-, freeimage
-, freetype
-, libpng
-, ois
-, zziplib
-, freeglut
-, libGL
-, libGLU
-, libICE
-, libSM
-, libX11
-, libXaw
-, libXmu
-, libXrandr
-, libXrender
-, libXt
-, libXxf86vm
-, xorgproto
-, darwin
-, withNvidiaCg ? false
-, nvidia_cg_toolkit
-, withSamples ? false
-}:
-
-let
-  inherit (darwin.apple_sdk.frameworks) AGL Cocoa;
-in
-stdenv.mkDerivation rec {
-  pname = "ogre";
-  version = "1.10.11";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz";
-    sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";
-  };
-
-  patches = [
-    # aarch64-darwin support
-    (fetchpatch {
-      url = "https://github.com/OGRECave/ogre/commit/bd5fbe3482c56e58c6c3b3bf439b1eab8c1be258.patch";
-      includes = [ "OgreMain/include/OgrePlatform*.h" ];
-      sha256 = "sha256-ELeCklQkltz7DeDaGl78Jk1H3Wdfu8fMUiMZaJM4s/Y=";
-    })
-    (fetchpatch {
-      url = "https://github.com/OGRECave/ogre/commit/0873244cc06b613ca2afbcb5522fe9ef89f111c5.patch";
-      sha256 = "sha256-xGvlMB55B2rdthxNMIM5iFf9p/6zuE8bGL9P04qtweQ=";
-    })
-    # aarch64-linux support
-    (fetchpatch {
-      name = "fix-build-on-aarch64-linux.patch";
-      url = "https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69.patch";
-      sha256 = "sha256-22wlJPZ7lRIPAMqvpI/2YI0neQjGi1UXt8y5zNSpxCw=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    boost
-    freeimage
-    freetype
-    libpng
-    ois
-    zziplib
-  ] ++ lib.optionals stdenv.isLinux [
-    freeglut
-    libGL
-    libGLU
-    libICE
-    libSM
-    libX11
-    libXaw
-    libXmu
-    libXrandr
-    libXrender
-    libXt
-    libXxf86vm
-    xorgproto
-  ] ++ lib.optionals stdenv.isDarwin [
-    AGL
-    Cocoa
-  ] ++ lib.optionals withNvidiaCg [
-    nvidia_cg_toolkit
-  ];
-
-  cmakeFlags = [
-    "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
-    "-DOGRE_BUILD_SAMPLES=${toString withSamples}"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
-  ];
-
-  meta = {
-    description = "3D Object-Oriented Graphics Rendering Engine";
-    homepage = "https://www.ogre3d.org/";
-    maintainers = with lib.maintainers; [ raskin wegank ];
-    platforms = lib.platforms.unix;
-    license = lib.licenses.mit;
-  };
-}
diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix
index ce4951937165..6bac6c5a425b 100644
--- a/nixpkgs/pkgs/development/libraries/ogre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix
@@ -27,72 +27,85 @@
 , libXxf86vm
 , xorgproto
   # darwin
-, Cocoa
+, darwin
   # optional
 , withNvidiaCg ? false
 , nvidia_cg_toolkit
 , withSamples ? false
 }:
 
-stdenv.mkDerivation rec {
-  pname = "ogre";
-  version = "13.6.4";
+let
+  common = { version, hash }: stdenv.mkDerivation {
+    pname = "ogre";
+    inherit version;
 
-  src = fetchFromGitHub {
-    owner = "OGRECave";
-    repo = "ogre";
-    rev = "v${version}";
-    hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8=";
-  };
+    src = fetchFromGitHub {
+      owner = "OGRECave";
+      repo = "ogre";
+      rev = "v${version}";
+      inherit hash;
+    };
+
+    nativeBuildInputs = [
+      cmake
+      pkg-config
+      unzip
+    ];
 
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    unzip
-  ];
+    buildInputs = [
+      SDL2
+      boost
+      freeimage
+      freetype
+      libpng
+      ois
+      pugixml
+      zziplib
+    ] ++ lib.optionals stdenv.isLinux [
+      freeglut
+      libGL
+      libGLU
+      libICE
+      libSM
+      libX11
+      libXaw
+      libXmu
+      libXrandr
+      libXrender
+      libXt
+      libXxf86vm
+      xorgproto
+    ] ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Cocoa
+    ] ++ lib.optionals withNvidiaCg [
+      nvidia_cg_toolkit
+    ];
 
-  buildInputs = [
-    SDL2
-    boost
-    freeimage
-    freetype
-    libpng
-    ois
-    pugixml
-    zziplib
-  ] ++ lib.optionals stdenv.isLinux [
-    freeglut
-    libGL
-    libGLU
-    libICE
-    libSM
-    libX11
-    libXaw
-    libXmu
-    libXrandr
-    libXrender
-    libXt
-    libXxf86vm
-    xorgproto
-  ] ++ lib.optionals stdenv.isDarwin [
-    Cocoa
-  ] ++ lib.optionals withNvidiaCg [
-    nvidia_cg_toolkit
-  ];
+    cmakeFlags = [
+      "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
+      "-DOGRE_BUILD_DEPENDENCIES=OFF"
+      "-DOGRE_BUILD_SAMPLES=${toString withSamples}"
+    ] ++ lib.optionals stdenv.isDarwin [
+      "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
+    ];
 
-  cmakeFlags = [
-    "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
-    "-DOGRE_BUILD_DEPENDENCIES=OFF"
-    "-DOGRE_BUILD_SAMPLES=${toString withSamples}"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
-  ];
+    meta = {
+      description = "3D Object-Oriented Graphics Rendering Engine";
+      homepage = "https://www.ogre3d.org/";
+      maintainers = with lib.maintainers; [ raskin wegank ];
+      platforms = lib.platforms.unix;
+      license = lib.licenses.mit;
+    };
+  };
+in
+{
+  ogre_14 = common {
+    version = "14.0.1";
+    hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU=";
+  };
 
-  meta = {
-    description = "3D Object-Oriented Graphics Rendering Engine";
-    homepage = "https://www.ogre3d.org/";
-    maintainers = with lib.maintainers; [ raskin wegank ];
-    platforms = lib.platforms.unix;
-    license = lib.licenses.mit;
+  ogre_13 = common {
+    version = "13.6.5";
+    hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE=";
   };
 }