sfml: 2.5.1 -> 3.0.0 (#387764)

pkgs/by-name/an/antsimulator/package.nix

@@ -3,45 +3,49 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  sfml,
+  sfml_2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "antsimulator";
   version = "3.1";
 
   src = fetchFromGitHub {
     owner = "johnBuffer";
     repo = "AntSimulator";
-    rev = "v${version}";
-    sha256 = "sha256-1KWoGbdjF8VI4th/ZjAzASgsLEuS3xiwObulzxQAppA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1KWoGbdjF8VI4th/ZjAzASgsLEuS3xiwObulzxQAppA=";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ sfml ];
+  buildInputs = [ sfml_2 ];
 
   postPatch = ''
     substituteInPlace src/main.cpp \
-      --replace "res/" "$out/opt/antsimulator/"
+      --replace-fail "res/" "$out/opt/antsimulator/"
 
     substituteInPlace include/simulation/config.hpp \
-      --replace "res/" "$out/opt/antsimulator/"
+      --replace-fail "res/" "$out/opt/antsimulator/"
 
     substituteInPlace include/render/colony_renderer.hpp \
-      --replace "res/" "$out/opt/antsimulator/"
+      --replace-fail "res/" "$out/opt/antsimulator/"
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm644 -t $out/opt/antsimulator res/*
     install -Dm755 ./AntSimulator $out/bin/antsimulator
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/johnBuffer/AntSimulator";
     description = "Simple Ants simulator";
     mainProgram = "antsimulator";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})

pkgs/by-name/at/attract-mode/package.nix

@@ -9,7 +9,7 @@
   libarchive,
   libjpeg,
   libGLU,
-  sfml,
+  sfml_2,
   zlib,
   openal,
   fontconfig,
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
       libarchive
       libjpeg
       libGLU
-      sfml
+      sfml_2
       zlib
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

pkgs/by-name/cs/csfml/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  sfml,
+  sfml_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ sfml ];
+  buildInputs = [ sfml_2 ];
   cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_MODULE_PATH" "${sfml}/share/SFML/cmake/Modules/")
+    (lib.cmakeFeature "CMAKE_MODULE_PATH" "${sfml_2}/share/SFML/cmake/Modules/")
   ];
 
   meta = {

pkgs/by-name/cu/cutecapture/package.nix

@@ -4,7 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   libusb1,
-  sfml,
+  sfml_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Gotos";
     repo = "cutecapture";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-V8BlZykh9zOTcEypu96Ft9/6CtjsybtD8lBsg9sF5sQ=";
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libusb1
-    sfml
+    sfml_2
   ];
 
   postPatch = ''
@@ -40,11 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm444 -t $out/share/icons/hicolor/128x128/apps Cute{3,}DSCapture.png
   '';
 
-  meta = with lib; {
+  meta = {
     description = "(3)DS capture software for Linux and Mac";
     homepage = "https://github.com/Gotos/CuteCapture";
-    license = licenses.asl20;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ raphaelr ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ raphaelr ];
   };
 })

pkgs/by-name/do/dolphin-emu/package.nix

@@ -180,6 +180,10 @@ stdenv.mkDerivation (finalAttrs: {
     branch = "master";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
+    badPlatforms = [
+      # error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
+      lib.systems.inspect.patterns.isDarwin
+    ];
     maintainers = with lib.maintainers; [ pbsds ];
   };
 })

pkgs/by-name/ex/extremetuxracer/package.nix

@@ -9,7 +9,7 @@
   tcl,
   libglut,
   freetype,
-  sfml,
+  sfml_2,
   libXi,
   libXmu,
   libXext,
@@ -22,13 +22,13 @@
   intltool,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "0.8.4";
   pname = "extremetuxracer";
 
   src = fetchurl {
-    url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
-    sha256 = "sha256-+jKFzAx1Wlr/Up8/LOo1FkgRFMa0uOHsB2n+7/BHc+U=";
+    url = "mirror://sourceforge/extremetuxracer/etr-${finalAttrs.version}.tar.xz";
+    hash = "sha256-+jKFzAx1Wlr/Up8/LOo1FkgRFMa0uOHsB2n+7/BHc+U=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     tcl
     libglut
     freetype
-    sfml
+    sfml_2
     libXi
     libXmu
     libXext
@@ -71,4 +71,4 @@ stdenv.mkDerivation rec {
     mainProgram = "etr";
     platforms = with lib.platforms; linux;
   };
-}
+})

pkgs/by-name/li/liblapin/package.nix

@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  sfml,
+  sfml_2,
   libffcall,
   libusb-compat-0_1,
   libudev-zero,
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   '';
 
   buildInputs = [
-    sfml
+    sfml_2
     libffcall
     libusb-compat-0_1
     libudev-zero

pkgs/by-name/ma/marble-marcher-ce/package.nix

@@ -13,7 +13,7 @@
   eigen,
   glew,
   glm,
-  sfml,
+  sfml_2,
 
   makeDesktopItem,
 }:
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     eigen
     glew
     glm
-    sfml
+    sfml_2
   ];
 
   installFlags = [ "DESTDIR=$(out)" ];

pkgs/by-name/ma/mars/package.nix

@@ -6,7 +6,7 @@
   fribidi,
   libGL,
   libGLU,
-  sfml,
+  sfml_2,
   taglib,
 }:
 stdenv.mkDerivation {
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     fribidi
     libGL
     libGLU
-    sfml
+    sfml_2
     taglib
   ];
 

pkgs/by-name/op/opendungeons/package.nix

@@ -13,7 +13,7 @@
   boost183,
   ois,
   openal,
-  sfml,
+  sfml_2,
 
   # passthru
   unstableGitUpdater,
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     ogre'
     ois
     openal
-    sfml
+    sfml_2
   ];
 
   cmakeFlags = [

pkgs/by-name/qs/qstopmotion/package.nix

@@ -1,69 +1,73 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchurl,
-  qtbase,
-  qtmultimedia,
-  qtquickcontrols,
-  qtimageformats,
-  qtxmlpatterns,
-  ffmpeg,
-  guvcview,
+
+  # nativeBuildInputs
   cmake,
-  ninja,
-  libxml2,
-  gettext,
-  pkg-config,
-  libgphoto2,
-  gphoto2,
-  v4l-utils,
-  libv4l,
-  pcre,
-  qwt,
   extra-cmake-modules,
+  gettext,
+  gphoto2,
+  libgphoto2,
+  libsForQt5,
+  libv4l,
+  libxml2,
+  ninja,
+  pkg-config,
+
+  # buildInputs
+  guvcview,
+  pcre,
+  v4l-utils,
+
+  ffmpeg,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qstopmotion";
   version = "2.5.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/Version_${
-      builtins.replaceStrings [ "." ] [ "_" ] version
-    }/${pname}-${version}-Source.tar.gz";
-    sha256 = "sha256-jyBUyadkSuQKXOrr5XZ1jy6of1Qw8S2HPxuOrPc7RnE=";
+    url = "mirror://sourceforge/project/qstopmotion/Version_${
+      lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
+    }/qstopmotion-${finalAttrs.version}-Source.tar.gz";
+    hash = "sha256-jyBUyadkSuQKXOrr5XZ1jy6of1Qw8S2HPxuOrPc7RnE=";
   };
 
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtquickcontrols
-    qtimageformats
-    qtxmlpatterns
-    v4l-utils
-    libv4l
-    pcre
-    guvcview
-    qwt
-  ];
-
   nativeBuildInputs = [
-    pkg-config
     cmake
     extra-cmake-modules
-    ninja
     gettext
-    libgphoto2
     gphoto2
-    libxml2
+    libgphoto2
+    libsForQt5.wrapQtAppsHook
     libv4l
+    libxml2
+    ninja
+    pkg-config
   ];
 
-  patchPhase = ''
+  buildInputs = [
+    (guvcview.override {
+      useQt = true;
+      useGtk = false;
+    })
+    libsForQt5.qtbase
+    libsForQt5.qtimageformats
+    libsForQt5.qtmultimedia
+    libsForQt5.qtquickcontrols
+    libsForQt5.qtxmlpatterns
+    libsForQt5.qwt
+    libv4l
+    pcre
+    v4l-utils
+  ];
+
+  postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \
-                "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia"
+      --replace-fail \
+        "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \
+        "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia"
     grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g'
   '';
 
@@ -74,7 +78,7 @@ mkDerivation rec {
     (lib.makeBinPath [ ffmpeg ])
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.qstopmotion.org";
     description = "Create stopmotion animation with a (web)camera";
     longDescription = ''
@@ -83,11 +87,9 @@ mkDerivation rec {
       imported from a camera or from the harddrive and export the
       animation to different video formats such as mpeg or avi.
     '';
-
     license = lib.licenses.gpl2Plus;
-    maintainers = [ maintainers.leenaars ];
-    broken = stdenv.hostPlatform.isAarch64;
+    maintainers = [ lib.maintainers.leenaars ];
     platforms = lib.platforms.gnu ++ lib.platforms.linux;
     mainProgram = "qstopmotion";
   };
-}
+})

pkgs/by-name/sf/sfml/package.nix

@@ -14,21 +14,23 @@
   libvorbis,
   openal,
   udev,
+  libXi,
   libX11,
   libXcursor,
   libXrandr,
   libXrender,
   xcbutilimage,
 }:
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "sfml";
-  version = "2.6.2";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "SFML";
     repo = "SFML";
     tag = finalAttrs.version;
-    hash = "sha256-m8FVXM56qjuRKRmkcEcRI8v6IpaJxskoUQ+sNsR1EhM=";
+    hash = "sha256-e6x/L2D3eT6F/DBLQDZ+j0XD5NL9RalWZA8kcm9lZ3g=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional stdenv.hostPlatform.isLinux udev
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       libX11
+      libXi
       libXcursor
       libXrandr
       libXrender
@@ -67,11 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
       It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
     '';
     license = lib.licenses.zlib;
-    maintainers = [ lib.maintainers.astsmtl ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
     platforms = lib.platforms.unix;
-    badPlatforms = [
-      # error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
-      lib.systems.inspect.patterns.isDarwin
-    ];
   };
 })

pkgs/by-name/sf/sfml_2/package.nix

@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
+  cmake,
+
+  # buildInputs
+  flac,
+  freetype,
+  glew,
+  libjpeg,
+  libvorbis,
+  openal,
+  udev,
+  libX11,
+  libXcursor,
+  libXrandr,
+  libXrender,
+  xcbutilimage,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sfml";
+  version = "2.6.2";
+
+  src = fetchFromGitHub {
+    owner = "SFML";
+    repo = "SFML";
+    tag = finalAttrs.version;
+    hash = "sha256-m8FVXM56qjuRKRmkcEcRI8v6IpaJxskoUQ+sNsR1EhM=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs =
+    [
+      flac
+      freetype
+      glew
+      libjpeg
+      libvorbis
+      openal
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux udev
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      libX11
+      libXcursor
+      libXrandr
+      libXrender
+      xcbutilimage
+    ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "SFML_INSTALL_PKGCONFIG_FILES" true)
+    (lib.cmakeFeature "SFML_MISC_INSTALL_PREFIX" "share/SFML")
+    (lib.cmakeBool "SFML_BUILD_FRAMEWORKS" false)
+    (lib.cmakeBool "SFML_USE_SYSTEM_DEPS" true)
+  ];
+
+  meta = {
+    description = "Simple and fast multimedia library";
+    homepage = "https://www.sfml-dev.org/";
+    changelog = "https://github.com/SFML/SFML/blob/${finalAttrs.version}/changelog.md";
+    longDescription = ''
+      SFML is a simple, fast, cross-platform and object-oriented multimedia API.
+      It provides access to windowing, graphics, audio and network.
+      It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
+    '';
+    license = lib.licenses.zlib;
+    maintainers = [ lib.maintainers.astsmtl ];
+    platforms = lib.platforms.unix;
+    badPlatforms = [
+      # error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
+      lib.systems.inspect.patterns.isDarwin
+    ];
+  };
+})

pkgs/by-name/si/simplenes/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  sfml,
+  sfml_2,
 }:
 
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ sfml ];
+  buildInputs = [ sfml_2 ];
 
   installPhase = ''
     runHook preInstall

pkgs/by-name/vb/vbam/package.nix

@@ -13,21 +13,21 @@
   openal,
   pkg-config,
   SDL2,
-  sfml,
+  sfml_2,
   zip,
   zlib,
   wrapGAppsHook3,
   gsettings-desktop-schemas,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "visualboyadvance-m";
   version = "2.1.11";
   src = fetchFromGitHub {
     owner = "visualboyadvance-m";
     repo = "visualboyadvance-m";
-    rev = "v${version}";
-    sha256 = "sha256-OtJ632H449kPRY1i4Ydlcc1tgG00Mv622KrCyJ80OF4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OtJ632H449kPRY1i4Ydlcc1tgG00Mv622KrCyJ80OF4=";
   };
 
   nativeBuildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     libGL
     openal
     SDL2
-    sfml
+    sfml_2
     zip
     zlib
     wxGTK32
@@ -53,16 +53,16 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DENABLE_FFMPEG='true'"
-    "-DENABLE_LINK='true'"
-    "-DSYSCONFDIR=etc"
-    "-DENABLE_SDL='true'"
+    (lib.cmakeBool "ENABLE_FFMPEG" true)
+    (lib.cmakeBool "ENABLE_LINK" true)
+    (lib.cmakeFeature "SYSCONFDIR" "etc")
+    (lib.cmakeBool "ENABLE_SDL" true)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Merge of the original Visual Boy Advance forks";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [
       lassulus
       netali
     ];
@@ -70,4 +70,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     mainProgram = "visualboyadvance-m";
   };
-}
+})

pkgs/development/python-modules/nocturne/default.nix

@@ -8,7 +8,7 @@
   gtest,
   setuptools,
   cmake,
-  sfml,
+  sfml_2,
   hydra-core,
   pyvirtualdisplay,
 }:
@@ -45,7 +45,7 @@ buildPythonPackage {
   nativeBuildInputs = [ cmake ];
   dontUseCmakeConfigure = true;
 
-  buildInputs = [ sfml ];
+  buildInputs = [ sfml_2 ];
 
   # hydra-core and pyvirtualdisplay are not declared as dependences but they are requirements
   dependencies = [

pkgs/os-specific/linux/guvcview/default.nix

@@ -14,7 +14,7 @@
   alsa-lib,
   gsl,
   libpng,
-  sfml,
+  sfml_2,
   pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
   libpulseaudio ? null,
   useQt ? false,
@@ -28,12 +28,12 @@
 
 assert pulseaudioSupport -> libpulseaudio != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "2.1.0";
   pname = "guvcview";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${finalAttrs.version}.tar.bz2";
     hash = "sha256-PZPkyfq40aepveGm278E1s+dNHwTS1EotFhqHZC2PPs=";
   };
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       udev
       gsl
       libpng
-      sfml
+      sfml_2
     ]
     ++ lib.optionals (pulseaudioSupport) [ libpulseaudio ]
     ++ lib.optionals (useGtk) [ gtk3 ]
@@ -70,12 +70,12 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (useGtk) [ "--enable-gtk3" ]
     ++ lib.optionals (useQt) [ "--enable-qt5" ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple interface for devices supported by the linux UVC driver";
     mainProgram = "guvcview";
     homepage = "https://guvcview.sourceforge.net";
-    maintainers = [ maintainers.coconnor ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    maintainers = [ lib.maintainers.coconnor ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -14688,13 +14688,6 @@ with pkgs;
 
   qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
 
-  qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion {
-    guvcview = guvcview.override {
-      useQt = true;
-      useGtk = false;
-    };
-  };
-
   qsudo = libsForQt5.callPackage ../applications/misc/qsudo { };
 
   qsynth = libsForQt5.callPackage ../applications/audio/qsynth { };