diff options
Diffstat (limited to 'pkgs/applications')
35 files changed, 350 insertions, 1101 deletions
diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix deleted file mode 100644 index aa182165786..00000000000 --- a/pkgs/applications/audio/hydrogen/0.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, alsa-lib -, boost -, glib -, lash -, libjack2 -, libarchive -, libsndfile -, lrdf -, qt4 -}: - -stdenv.mkDerivation rec { - version = "0.9.7"; - pname = "hydrogen"; - - src = fetchFromGitHub { - owner = "hydrogen-music"; - repo = "hydrogen"; - rev = version; - sha256 = "sha256-6ycNUcumtAEl/6XbIpW6JglGv4nNOdMrOJ1nvJg3z/c="; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ - alsa-lib - boost - glib - lash - libjack2 - libarchive - libsndfile - lrdf - qt4 - ]; - - meta = with lib; { - description = "Advanced drum machine"; - homepage = "http://www.hydrogen-music.org"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix deleted file mode 100644 index 35aea5bd086..00000000000 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, qt4, alsa-lib }: - -stdenv.mkDerivation rec { - version = "0.4.0"; - pname = "qmidiroute"; - - src = fetchurl { - url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${pname}-${version}.tar.gz"; - sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ qt4 alsa-lib ]; - - meta = with lib; { - description = "MIDI event processor and router"; - longDescription = '' - qmidiroute is a versatile MIDI event processor and router for the ALSA - sequencer. The graphical interface is based on the Qt4 toolkit. - qmidiroute permits setting up an unlimited number of MIDI maps in which - incoming events are selected, modified or even changed in type before - being directed to a dedicated ALSA output port. The maps work in - parallel, and they are organized in tabs. - ''; - - license = licenses.gpl2; - maintainers = [ maintainers.lebastr ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix deleted file mode 100644 index 081b0c92889..00000000000 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkg-config, which, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - pname = "qtscrobbler"; - version = "0.11"; - - src = fetchurl { - url = "mirror://sourceforge/qtscrob/qtscrob/${version}/qtscrob-${version}.tar.bz2"; - sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba"; - }; - - nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkg-config which ]; - buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp; - - enableParallelBuilding = true; - - postPatch = '' - cd src - sed -i -e "s,/usr/local,$out," -e "s,/usr,," common.pri - ''; - - meta = with lib; { - description = "Qt based last.fm scrobbler"; - longDescription = '' - QTScrobbler is a tool to upload information about the tracks you have played from your Digital Audio Player (DAP) to your last.fm account. - It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware. - ''; - - homepage = "https://qtscrob.sourceforge.net"; - license = licenses.gpl2; - maintainers = [ maintainers.vanzef ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix deleted file mode 100644 index 7a6399ff3c6..00000000000 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, help2man -, pkg-config -, libsndfile -, fftwFloat -, libjack2 -, libxml2 -, qt4 -, boost -, ecasound -, glibcLocales -, libGLU -, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL -}: - -stdenv.mkDerivation { - pname = "soundscape-renderer"; - version = "unstable-2016-11-03"; - - src = fetchFromGitHub { - owner = "SoundScapeRenderer"; - repo = "ssr"; - rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; - sha256 = "sha256-9s+Elaxz9kX+Nle1CqBU/9r0hdI4dhsJ6GrNqvP5HIs="; - }; - - # Without it doesn't find all of the boost libraries. - BOOST_LIB_DIR = "${boost}/lib"; - # uses the deprecated get_generic_category() in boost_system - env.NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; - - LC_ALL = "en_US.UTF-8"; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; - - # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 - # 2) Make it find ecasound headers - # 3) Fix locale for help2man - prePatch = '' - substituteInPlace configure.ac --replace 'git describe ||' 'git describe 2> /dev/null ||'; - substituteInPlace configure.ac --replace '/{usr,opt}/{,local/}' '${ecasound}/' - substituteInPlace man/Makefile.am --replace '--locale=en' '--locale=en_US.UTF-8' - ''; - - meta = { - homepage = "http://spatialaudio.net/ssr/"; - description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.fridh ]; - }; - -} diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index a9d6303e485..4cf298c1785 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump -, withGui }: +{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, hexdump }: stdenv.mkDerivation rec { - pname = "namecoin" + lib.optionalString (!withGui) "d"; + pname = "namecoind"; version = "25.0"; src = fetchFromGitHub { @@ -25,10 +24,6 @@ stdenv.mkDerivation rec { db4 miniupnpc eject - ] ++ lib.optionals withGui [ - qt4 - protobuf - qrencode ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix deleted file mode 100644 index 8c74d8c5c8f..00000000000 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, callPackage, fetchurl, - guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, - tex ? null, - aspell ? null, - netpbm ? null, - imagemagick ? null, - extraFonts ? false, - chineseFonts ? false, - japaneseFonts ? false, - koreanFonts ? false }: -let - version = "1.99.4"; - common = callPackage ./common.nix { - inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; - }; -in -stdenv.mkDerivation { - pname = "TeXmacs"; - inherit version; - - src= fetchurl { - url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "1z8sj0xd1ncbl7ipzfsib6lmc7ahgvmiw61ln5zxm2l88jf7qc1a"; - }; - - patches = [ ./darwin.patch ]; - - buildInputs = [ guile_1_8.dev qt4 freetype CoreFoundation Cocoa gettext libiconv ghostscript ]; - - GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile "; - - NIX_LDFLAGS="${zlib}/lib/libz.dylib"; - - buildPhase = '' - substituteInPlace Makefile \ - --replace 'find -d $(MACOS_PACKAGE_TEXMACS)' 'find $(MACOS_PACKAGE_TEXMACS) -depth' \ - --replace '$(MACOS_PACKAGE_SRC)/bundle-libs.sh' 'true' - make MACOS_BUNDLE - ''; - - installPhase = '' - mkdir -p $out/Applications - cp -R ../distr/TeXmacs-${version}.app $out/Applications - ''; - - inherit (common) postPatch; - - postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " + - "${ghostscript}/bin:" + - (lib.optionalString (aspell != null) "${aspell}/bin:") + - (lib.optionalString (tex != null) "${tex}/bin:") + - (lib.optionalString (netpbm != null) "${lib.getBin netpbm}/bin:") + - (lib.optionalString (imagemagick != null) "${imagemagick}/bin:"); - - enableParallelBuilding = true; - - meta = common.meta // { - platforms = lib.platforms.darwin; - }; -} diff --git a/pkgs/applications/editors/texmacs/darwin.patch b/pkgs/applications/editors/texmacs/darwin.patch deleted file mode 100644 index 2cb33fbbef3..00000000000 --- a/pkgs/applications/editors/texmacs/darwin.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/configure -+++ b/configure -@@ -7461,7 +7461,7 @@ $as_echo "final adjustments for cygwin host" >&6; } - CONFIG_QTPIPES="yes" - CONFIG_CXXFLAGS="-I${prefix}/include" - CONFIG_BSHARED="" -- CONFIG_BFLAGS="-framework Cocoa -framework IOKit" -+ CONFIG_BFLAGS="-framework Cocoa -framework IOKit -framework CoreFoundation" - CONFIG_BPATH="" - CONFIG_SO="dylib" - CONFIG_LIB_PATH="DYLD_LIBRARY_PATH" -@@ -8281,6 +8281,7 @@ _ASEOF - if $QMAKE ${additional_qmake_flags} ; then :; else - as_fn_error $? "Calling $QMAKE failed." "$LINENO" 5 - fi -+ echo "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10" >> $pro_file - # Try to compile a simple Qt app. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a simple Qt app" >&5 - $as_echo_n "checking whether we can build a simple Qt app... " >&6; } ---- a/src/Plugins/Unix/unix_sys_utils.cpp -+++ b/src/Plugins/Unix/unix_sys_utils.cpp -@@ -17,6 +17,7 @@ - #include <spawn.h> - #include <unistd.h> - #include <sys/wait.h> -+#include <pthread.h> - - // for thread safe strings - #include <string> diff --git a/pkgs/applications/emulators/resim/default.nix b/pkgs/applications/emulators/resim/default.nix deleted file mode 100644 index d69aafcec2b..00000000000 --- a/pkgs/applications/emulators/resim/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchFromGitHub, lib, stdenv, cmake, qt4 }: - -stdenv.mkDerivation { - pname = "resim"; - version = "unstable-2016-11-11"; - src = fetchFromGitHub { - owner = "itszor"; - repo = "resim"; - rev = "cdc7808ceb7ba4ac00d0d08ca646b58615059150"; - sha256 = "1743lngqxd7ai4k6cd4d1cf9h60z2pnvr2iynfs1zlpcj3w1hx0c"; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 ]; - installPhase = '' - mkdir -pv $out/{lib,bin} - cp -v libresim/libarmsim.so $out/lib/libarmsim.so - cp -v vc4emul/vc4emul $out/bin/vc4emul - ''; - - cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - meta.license = lib.licenses.mit; -} diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix deleted file mode 100644 index dda734363eb..00000000000 --- a/pkgs/applications/graphics/animbar/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, cmake, qt4, file }: - -stdenv.mkDerivation rec { - pname = "animbar"; - version = "1.2"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qt4 file ]; - - installPhase = '' - mkdir -p $out/bin $out/share/pixmaps - cp src/animbar $out/bin - cp ../icon/* $out/share/pixmaps - ''; - - meta = with lib; { - description = "Create your own animation on paper and transparancy"; - longDescription = '' - Animbar lets you easily create your own animation on paper and - transparancy. From a set of input images two output images are - computed, that are printed one on paper and one on - transparency. By moving the transparency over the paper you - create a fascinating animation effect. This kind of animation - technique is hundreds of years old and known under several - names: picket fence animation, barrier grid animation, Moiré - animation, to name a few. - ''; - homepage = "http://animbar.mnim.org"; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; - license = licenses.gpl3; - }; -} diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index 6a47760082e..efbab2e04bb 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,23 +1,34 @@ -{ lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }: +{ stdenv +, lib +, fetchgit +, dos2unix +, qtbase +, qttools +, qtx11extras +, wrapQtAppsHook +, cmake }: stdenv.mkDerivation rec { pname = "qscreenshot"; - version = "1.0"; + version = "unstable-2021-10-18"; - src = fetchurl { - url = "mirror://sourceforge/qscreenshot/qscreenshot-${version}-src.tar.gz"; - sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; + src = fetchgit { + url = "https://git.code.sf.net/p/qscreenshot/code"; + rev = "e340f06ae2f1a92a353eaa68e103d1c840adc12d"; + sha256 = "0mdiwn74vngiyazr3lq72f3jnv5zw8wyd2dw6rik6dbrvfs69jig"; }; - buildInputs = [ dos2unix which qt ] - ++ lib.optional stdenv.isDarwin Carbon; - - # Remove carriage returns that cause /bin/sh to abort - preConfigure = '' - dos2unix configure - sed -i "s|lrelease-qt4|lrelease|" src/src.pro - ''; + preConfigure = "cd qScreenshot"; + nativeBuildInputs = [ + cmake + qttools + wrapQtAppsHook + ]; + buildInputs = [ + qtbase + qtx11extras + ]; meta = with lib; { description = "Simple creation and editing of screenshots"; homepage = "https://sourceforge.net/projects/qscreenshot/"; diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix deleted file mode 100644 index 3e2037f6d45..00000000000 --- a/pkgs/applications/graphics/scantailor/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qt4, cmake, libjpeg, libtiff, boost }: - -stdenv.mkDerivation rec { - pname = "scantailor"; - version = "0.9.12.1"; - - src = fetchFromGitHub { - owner = "scantailor"; - repo = "scantailor"; - rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Jn8+X737vwaE0ZPYdQv/1SocmWFA74XL90IW8yNiafA="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 libjpeg libtiff boost ]; - - meta = { - homepage = "https://scantailor.org/"; - description = "Interactive post-processing tool for scanned pages"; - - license = lib.licenses.gpl3Plus; - - maintainers = [ lib.maintainers.viric ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index ca93cf7bf2f..7f78b60f45b 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -51,7 +51,7 @@ in buildFHSEnv { fluidsynth hidapi mesa libdrm # MAME - qt48 fontconfig SDL2_ttf + fontconfig SDL2_ttf # Mednafen freeglut mesa_glu @@ -65,9 +65,6 @@ in buildFHSEnv { # Mupen64Plus boost dash - # Osmose - qt4 - # Overwatch 2 libunwind diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix deleted file mode 100644 index 4ae3cdeebd0..00000000000 --- a/pkgs/applications/misc/navipowm/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: -stdenv.mkDerivation rec { - pname = "navipowm"; - version = "0.2.4"; - - src = fetchurl { - url = "mirror://sourceforge/navipowm/NaviPOWM-${version}.tar.gz"; - sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; - }; - - preConfigure = '' - cd Qt/KDevelop - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/navipowm-${version}/Icons - cp bin/NaviPOWM $out/bin - cp ../../common/Config/navipowm.ini $out/share/navipowm-${version} - cp ../../common/Images/* $out/share/navipowm-${version} - ''; - - buildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; - - meta = { - homepage = "https://navipowm.sourceforge.net/"; - description = "Car navigation system"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix deleted file mode 100644 index 2678f744f8e..00000000000 --- a/pkgs/applications/misc/qmetro/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, qmake4Hook, unzip, qt4 }: - -stdenv.mkDerivation rec { - pname = "qmetro"; - version = "0.7.1"; - - src = fetchurl { - url = "mirror://sourceforge/qmetro/qmetro-${version}.zip"; - sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5"; - }; - - nativeBuildInputs = [ qmake4Hook unzip ]; - - buildInputs = [ qt4 ]; - - postPatch = '' - sed -e 's#Exec=/usr/bin/qmetro#Exec=qmetro#' -i rc/qmetro.desktop - echo 'LIBS += -lz' >> qmetro.pro - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/qmetro/"; - description = "Worldwide transit maps viewer"; - license = licenses.gpl3; - - maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix deleted file mode 100644 index 556c635e60b..00000000000 --- a/pkgs/applications/misc/sqliteman/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla-qt4 }: - -stdenv.mkDerivation rec { - pname = "sqliteman"; - version = "1.2.0"; - - src = fetchFromGitHub { - repo = "sqliteman"; - owner = "pvanek"; - rev = version; - sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 qscintilla-qt4 ]; - - prePatch = '' - sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp - ''; - - preConfigure = '' - cd Sqliteman - sed -i 's,/usr/include/Qsci,${qscintilla-qt4}/include/Qsci,' cmake/modules/FindQScintilla.cmake - sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla-qt4}/libs,' cmake/modules/FindQScintilla.cmake - ''; - - meta = with lib; { - description = "A simple but powerful Sqlite3 GUI database manager"; - homepage = "http://sqliteman.yarpen.cz/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.eikek ]; - }; -} diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 872592a0436..07857fbf5e9 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, qt4, openssl, pkg-config }: +{ stdenv, fetchurl, lib, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "yate"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # TODO zaptel ? postgres ? nativeBuildInputs = [ pkg-config ]; - buildInputs = [ qt4 openssl ]; + buildInputs = [ openssl ]; # /dev/null is used when linking which is a impure path for the wrapper postPatch = diff --git a/pkgs/applications/office/scribus/1_4.nix b/pkgs/applications/office/scribus/1_4.nix deleted file mode 100644 index a6427d0f890..00000000000 --- a/pkgs/applications/office/scribus/1_4.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 -, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: - -let - icon = fetchurl { - url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg"; - sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; - }; - - pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); -in stdenv.mkDerivation rec { - pname = "scribus"; - version = "1.4.8"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = with xorg; - [ freetype lcms libtiff libxml2 libart_lgpl qt4 - pythonEnv cups fontconfig - libjpeg zlib libpng podofo hunspell cairo - boost # for internal 2geom library - libXaw libXext libX11 libXtst libXi libXinerama - libpthreadstubs libXau libXdmcp - imagemagick # To build the icon - ]; - - postPatch = '' - substituteInPlace scribus/util_ghostscript.cpp \ - --replace 'QString gsName("gs");' \ - 'QString gsName("${ghostscript}/bin/gs");' - ''; - - postInstall = '' - for i in 16 24 48 64 96 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png - done - ''; - - meta = { - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "https://www.scribus.net"; - license = lib.licenses.gpl2; - }; -} diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 7e171f7d702..55c84fd2a3d 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,5 +1,6 @@ -{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: -mkDerivation rec { +{ stdenv, lib, fetchzip, qtbase, qttools, cmake, sqlite, wrapQtAppsHook }: + +stdenv.mkDerivation rec { pname = "tagainijisho"; version = "1.2.2"; @@ -8,8 +9,8 @@ mkDerivation rec { hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qttools sqlite ]; + nativeBuildInputs = [ qttools cmake wrapQtAppsHook ]; + buildInputs = [ qtbase sqlite ]; cmakeFlags = [ "-DEMBED_SQLITE=OFF" diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix deleted file mode 100644 index 547123b6795..00000000000 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: - -stdenv.mkDerivation rec { - pname = "avogadro"; - version = "1.1.1"; - - src = fetchurl { - url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2"; - sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; - }; - - buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ]; - - nativeBuildInputs = [ cmake pkg-config doxygen ]; - - env.NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; - - patches = [ - (fetchurl { - url = "https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch"; - sha256 = "1p113v19z3zwr9gxj2k599f8p97a8rwm93pa4amqvd0snn31mw0k"; - }) - ]; - - meta = with lib; { - description = "Molecule editor and visualizer"; - maintainers = with maintainers; [ danielbarter ]; - platforms = platforms.mesaPlatforms; - }; -} diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 169130b4101..2235cf0b4a3 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -1,91 +1,98 @@ { lib -, stdenv -, python3 -, fetchPypi , fetchFromBitbucket -, fetchpatch -, substituteAll -, geos +, buildPythonApplication +, pyqt5 +, matplotlib +, numpy +, cycler +, python-dateutil +, kiwisolver +, six +, setuptools +, dill +, rtree +, pyopengl +, vispy +, ortools +, svg-path +, simplejson +, shapely +, freetype-py +, fonttools +, rasterio +, lxml +, ezdxf +, qrcode +, reportlab +, svglib +, gdal +, pyserial +, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - shapely = super.shapely.overridePythonAttrs (old: rec { - version = "1.8.4"; - - src = fetchPypi { - pname = "Shapely"; - inherit version; - hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; - }; - - # Environment variable used in shapely/_buildcfg.py - GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - - patches = [ - # Patch to search form GOES .so/.dylib files in a Nix-aware way - (substituteAll { - src = ./shapely-library-paths.patch; - libgeos_c = GEOS_LIBRARY_PATH; - libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'setuptools<64' 'setuptools' - ''; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "flatcam"; - version = "8.5"; + version = "unstable-2022-02-02"; src = fetchFromBitbucket { owner = "jpcgt"; repo = pname; - rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging. - sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; + rev = "ebf5cb9e3094362c4b0774a54cf119559c02211d"; # beta branch as of 2022-02-02 + hash = "sha256-QKkBPEM+HVYmSZ83b4JRmOmCMp7C3EUqbJKPqUXMiKE="; }; - propagatedBuildInputs = with python.pkgs; [ + format = "other"; + + dontBuild = true; + + propagatedBuildInputs = [ + pyqt5 matplotlib numpy - packaging - pyqt4 - rtree - scipy - setuptools - shapely - simplejson + cycler + python-dateutil + kiwisolver six + setuptools + dill + rtree + pyopengl + vispy + ortools svg-path + simplejson + shapely + freetype-py + fonttools + rasterio + lxml + ezdxf + qrcode + reportlab + svglib + gdal + pyserial ]; - packaging_fix_pull_request_patch = fetchpatch { - name = "packaging_fix_pull_request.patch"; - url = "https://bitbucket.org/trepetti/flatcam/commits/5591ed889d1f48a5190fe237b562cb932cb5876c/raw"; - sha256 = "19rhjdrf1n1q29cgpcry6pl2kl90zq0d613hhkwdir9bhq5bkknp"; - }; + preInstall = '' + patchShebangs . - patches = [ - packaging_fix_pull_request_patch - ./release.patch - ]; + sed -i "s|/usr/local/bin|$out/bin|" Makefile - postPatch = '' - substituteInPlace setup.py --replace "'shapely>=1.3'" "'shapely>=1.3'," + mkdir -p $out/share/{flatcam,applications} + mkdir -p $out/bin ''; - # Only non-GUI tests can be run deterministically in the Nix build environment. - checkPhase = '' - python -m unittest tests.test_excellon - python -m unittest tests.test_gerber_buffer - python -m unittest tests.test_paint - python -m unittest tests.test_pathconnect + installFlags = [ + "USER_ID=0" + "LOCAL_PATH=/build/source/." + "INSTALL_PATH=${placeholder "out"}/share/flatcam" + "APPS_PATH=${placeholder "out"}/share/applications" + ]; + + postInstall = '' + sed -i "s|python3|${python3.withPackages (_: propagatedBuildInputs)}/bin/python3|" $out/bin/flatcam-beta + mv $out/bin/flatcam{-beta,} ''; meta = with lib; { diff --git a/pkgs/applications/science/electronics/flatcam/release.patch b/pkgs/applications/science/electronics/flatcam/release.patch deleted file mode 100644 index 945228e35ba..00000000000 --- a/pkgs/applications/science/electronics/flatcam/release.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/FlatCAMVersion.py b/FlatCAMVersion.py -index ba9e04a5..2c64d5a6 100644 ---- a/FlatCAMVersion.py -+++ b/FlatCAMVersion.py -@@ -16,7 +16,7 @@ version = { - "number": 8.5, - "date": (2016, 7, 1), # Year, Month, Day - "name": None, -- "release": False, -+ "release": True, - } - - diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix deleted file mode 100644 index e22138997be..00000000000 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: - -stdenv.mkDerivation rec { - pname = "qfsm"; - version = "0.54.0"; - - src = fetchurl { - url = "mirror://sourceforge/qfsm/qfsm-${version}-Source.tar.bz2"; - sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qt4 graphviz ]; - - patches = [ - ./drop-hardcoded-prefix.patch - ./gcc6-fixes.patch - ]; - - hardeningDisable = [ "format" ]; - - meta = { - description = "Graphical editor for finite state machines"; - homepage = "https://qfsm.sourceforge.net/"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch b/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch deleted file mode 100644 index 965d67ac552..00000000000 --- a/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ubrw qfsm-0.53.0-Source-orig/CMakeLists.txt qfsm-0.53.0-Source-new/CMakeLists.txt ---- qfsm-0.53.0-Source-orig/CMakeLists.txt 2012-11-11 20:13:01.935856229 +0100 -+++ qfsm-0.53.0-Source-new/CMakeLists.txt 2012-11-11 20:13:24.962930007 +0100 -@@ -406,10 +406,6 @@ - - - IF(UNIX AND NOT WIN32) -- SET(CMAKE_INSTALL_PREFIX "/usr") --ENDIF(UNIX AND NOT WIN32) -- --IF(UNIX AND NOT WIN32) - ADD_DEFINITIONS(-DQFSM_LANGUAGE_DIR="${CMAKE_INSTALL_PREFIX}/share/qfsm/") - ADD_DEFINITIONS(-DQFSM_HELP_DIR="${CMAKE_INSTALL_PREFIX}/share/doc/qfsm/") - ELSE(UNIX AND NOT WIN32) -@@ -472,5 +468,3 @@ - ) - - ENDIF(UNIX AND NOT WIN32) -- -- diff --git a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch b/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch deleted file mode 100644 index 5cedc647639..00000000000 --- a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- qfsm-0.54.0-Source-orig/src/FileIO.cpp 2015-01-02 19:01:46.000000000 +0100 -+++ qfsm-0.54.0-Source/src/FileIO.cpp 2017-09-11 19:53:30.579488402 +0200 -@@ -1617,7 +1617,7 @@ - QString ext; - - if (!imp) -- return FALSE; -+ return NULL; - - Project* p=NULL; - importdlg->setAcceptMode(QFileDialog::AcceptOpen); -@@ -1641,7 +1641,7 @@ - ifstream fin(act_importfile); - - if (!fin) -- return FALSE; -+ return NULL; - - emit setWaitCursor(); - diff --git a/pkgs/applications/science/electronics/qucs/cmakelists.patch b/pkgs/applications/science/electronics/qucs/cmakelists.patch deleted file mode 100644 index 27066f09c84..00000000000 --- a/pkgs/applications/science/electronics/qucs/cmakelists.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git i/qucs-core/CMakeLists.txt w/qucs-core/CMakeLists.txt -index 2dbbd41..d174b50 100644 ---- i/qucs-core/CMakeLists.txt -+++ w/qucs-core/CMakeLists.txt -@@ -158,26 +158,9 @@ ENDIF() - - # - # Need Bison --# --# This is a HACK to get arround a PATH issue with Qt Creator on OSX. --# It seams impossible to pass a custom PATH to Qt Creator on OSX, ie, cannot prepend `/usr/local/bin/` for intance. --# The FIND_PACKAGE fails. For now we provide a fallback with a custom FIND_PROGRAM. The variable BISON_DIR is also available. --IF(WIN32) -- FIND_PACKAGE(BISON 2.4 REQUIRED) -- IF(BISON_FOUND) -- #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) -- ENDIF() --ELSE() # Linux, OSX -- # use -DBISON_DIR=/path/ to provide the path to bison -- FIND_PROGRAM( BISON_EXECUTABLE bison -- PATHS /usr/local/bin/ /opt/local/bin/ /usr/bin ${BISON_DIR} -- DOC "bison path" -- NO_DEFAULT_PATH ) -- IF(BISON_EXECUTABLE ) -- MESSAGE(STATUS "Found bison: " ${BISON_EXECUTABLE}) -- ELSE() -- MESSAGE(FATAL_ERROR "Unable to find bison. Try to provide -DBISON_DIR=[path]") -- ENDIF() -+FIND_PACKAGE(BISON 2.4 REQUIRED) -+IF(BISON_FOUND) -+ #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) - ENDIF() - - # diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix deleted file mode 100644 index eeb10b3a5a1..00000000000 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{lib, stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }: - -stdenv.mkDerivation rec { - version = "0.0.19"; - pname = "qucs"; - - src = fetchFromGitHub { - owner = "Qucs"; - repo = "qucs"; - rev = "qucs-${version}"; - sha256 = "106h3kjyg7c0hkmzkin7h8fcl32n60835121b2qqih8ixi6r5id6"; - }; - - QTDIR=qt4; - - patches = [ - ./cmakelists.patch - ]; - - nativeBuildInputs = [ cmake flex bison ]; - buildInputs = [ qt4 libX11 gperf adms ]; - - meta = { - description = "Integrated circuit simulator"; - homepage = "https://qucs.sourceforge.net"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index 3b88ff3403e..d8c762de60c 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -10,19 +10,19 @@ , gtest , uhdm , antlr4 -, flatbuffers , capnproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.57"; + version = "1.73"; src = fetchFromGitHub { owner = "chipsalliance"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Gty0OSNG5Nonyw7v2KiKP51LhiugMY7uqI6aJ6as0SQ="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-z47Eqs3fP53pbEb3s66CqMiO4UpEwox+fKakxtRBakQ="; + fetchSubmodules = false; # we use all dependencies from nix }; nativeBuildInputs = [ @@ -40,14 +40,13 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid gperftools - flatbuffers uhdm capnproto antlr4.runtime.cpp ]; cmakeFlags = [ - "-DSURELOG_USE_HOST_FLATBUFFERS=On" + "-DSURELOG_USE_HOST_CAPNP=On" "-DSURELOG_USE_HOST_UHDM=On" "-DSURELOG_USE_HOST_GTEST=On" "-DSURELOG_USE_HOST_ANTLR=On" @@ -66,7 +65,8 @@ stdenv.mkDerivation rec { description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler"; homepage = "https://github.com/chipsalliance/Surelog"; license = lib.licenses.asl20; + mainProgram = "surelog"; maintainers = with lib.maintainers; [ matthuszagh ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 2a667a8ac9d..c1acd79dcab 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -7,15 +7,16 @@ , gtest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; - version = "1.57"; + version = "1.73"; src = fetchFromGitHub { owner = "chipsalliance"; - repo = pname; - rev = "v${version}"; - hash = "sha256-z3vURlKXCW5W2naVwJjBXcn94u80JsBxlUOIy9ylsJw="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-VmRn51UrJTGEG4n2fi5kRv8khXakfGbqMtYPejsZCBI="; + fetchSubmodules = false; # we use all dependencies from nix }; nativeBuildInputs = [ @@ -43,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ matthuszagh ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix deleted file mode 100644 index b08acc77c64..00000000000 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }: - -with lib; -stdenv.mkDerivation { - pname = "aliza"; - version = "1.98.57"; - src = fetchurl { - # See https://www.aliza-dicom-viewer.com/download - urls = [ - "https://drive.google.com/uc?export=download&id=1-AXa3tjy_onecW2k7ftjAQl0KGTb0B1Y" - "https://web.archive.org/web/20210327224315/https://doc-0s-0s-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/1lgjid9ti29rdf5ebmd7o58iqhs3gfpo/1616884950000/16072287944266838401/*/1-AXa3tjy_onecW2k7ftjAQl0KGTb0B1Y?e=download" - ]; - sha256 = "01qk2gadmc24pmfdnmpiz7vgfiqkvhznyq9rsr153frscg76gc9b"; - name = "aliza.rpm"; - }; - - nativeBuildInputs = [ makeWrapper rpmextract ]; - - unpackCmd = "rpmextract $curSrc"; - - postPatch = '' - sed -i 's/^Exec.*$/Exec=aliza %F/' share/applications/aliza.desktop - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r bin share $out - - runHook postInstall - ''; - - postInstall = let - libs = lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ]; - in '' - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/aliza - - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/aliza-vtkvol - - wrapProgram $out/bin/aliza \ - --prefix LD_LIBRARY_PATH : ${libs} - - wrapProgram $out/bin/aliza-vtkvol \ - --prefix LD_LIBRARY_PATH : ${libs} - ''; - - meta = { - description = "Medical imaging software with 2D, 3D and 4D capabilities"; - homepage = "https://www.aliza-dicom-viewer.com"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ mounium ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 1f8a2d3b8d5..6dc630181be 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -2,7 +2,6 @@ , lib , callPackage , fetchurl -, fetchpatch , makeWrapper , cmake , coreutils @@ -14,6 +13,7 @@ , gnugrep , gnused , gsl +, gtest , lapack , libX11 , libXpm @@ -23,7 +23,7 @@ , libGL , libxcrypt , libxml2 -, llvm_9 +, llvm_13 , lsof , lz4 , xz @@ -55,23 +55,9 @@ , noSplash ? false }: -let - - _llvm_9 = llvm_9.overrideAttrs (prev: { - patches = (prev.patches or [ ]) ++ [ - (fetchpatch { - url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff"; - stripLen = 3; - hash = "sha256-LH2RipJICEDWOr7JzX5s0QiUhEwXNMFEJihYKy9qWpo="; - }) - ]; - }); - -in - stdenv.mkDerivation rec { pname = "root"; - version = "6.26.10"; + version = "6.28.06"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -79,7 +65,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-jla+w5cQQBeqVPnrVU3noaE0R0/gs7sPQ6cPxPq9Yl8="; + hash = "sha256-rztnO5rKOTpcmuG/huqyZyqvGEG2WMXG56MKuTxYZTM="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -97,10 +83,11 @@ stdenv.mkDerivation rec { lapack libxcrypt libxml2 - _llvm_9 + llvm_13 lz4 xz gsl + gtest openblas openssl xxHash @@ -122,27 +109,16 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - ] ++ lib.optionals (python.pkgs.pythonAtLeast "3.11") [ - # Fix build against Python 3.11 - (fetchpatch { - url = "https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc.patch"; - hash = "sha256-4qur2e3SxMIPgOg4IjlvuULR2BObuP7xdvs+LmNT2/s="; - }) ]; - # Fix build against vanilla LLVM 9 - postPatch = '' - sed \ - -e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/i#define private protected' \ - -e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/a#undef private' \ - -i interpreter/cling/lib/Interpreter/IncrementalJIT.h - ''; - preConfigure = '' rm -rf builtins/* substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' + substituteInPlace interpreter/llvm/src/tools/clang/tools/driver/CMakeLists.txt \ + --replace 'add_clang_symlink(''${link} clang)' "" + # Don't require textutil on macOS : > cmake/modules/RootCPack.cmake @@ -167,6 +143,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" + "-Dbuiltin_freetype=OFF" + "-Dbuiltin_gtest=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=OFF" "-Dalien=OFF" @@ -240,23 +218,20 @@ stdenv.mkDerivation rec { # but it also need to support Bash-less POSIX shell like dash, # as they are mentioned in `thisroot.sh`. - # `thisroot.sh` would include commands `lsof` and `procps` since ROOT 6.28. - # See https://github.com/root-project/root/pull/10332 - patchRcPathPosix "$out/bin/thisroot.sh" "${lib.makeBinPath [ coreutils # dirname tail gnugrep # grep gnused # sed - lsof # lsof # for ROOT (>=6.28) + lsof # lsof man # manpath - procps # ps # for ROOT (>=6.28) + procps # ps which # which ]}" patchRcPathCsh "$out/bin/thisroot.csh" "${lib.makeBinPath [ coreutils gnugrep gnused - lsof # lsof # for ROOT (>=6.28) + lsof # lsof man which ]}" diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 7d284d5eebb..c748b6d1bd3 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,33 +1,19 @@ -{ fetchsvn, lib, stdenv, cmake, qt4, libGLU, libGL }: +{ stdenv, fetchFromGitLab, lib, cmake, qtbase, qttools, qtcharts, libGLU, libGL, glm, glew, wrapQtAppsHook }: -# ViTE 1.1 has several bugs, so use the SVN version. -let - rev = "1543"; - externals = fetchsvn { - url = "svn://scm.gforge.inria.fr/svn/vite/externals"; - sha256 = "1a422n3dp72v4visq5b1i21cf8sj12903sgg5v2hah3sgk02dnyz"; - inherit rev; - }; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "vite"; - version = "1.2pre${rev}"; - - src = fetchsvn { - url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; - sha256 = "02479dv96h29d0w0svp42mjjrxhmv8lkkqp30w7mlx5gr2g0v7lf"; - inherit rev; + version = "unstable-2022-05-17"; + + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "solverstack"; + repo = pname; + rev = "6d497cc519fac623e595bd174e392939c4de845c"; + hash = "sha256-Yf2jYALZplIXzVtd/sg6gzEYrZ+oU0zLG1ETd/hiTi0="; }; - preConfigure = '' - rm -rv externals - ln -sv "${externals}" externals - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 libGLU libGL ]; - - NIX_LDFLAGS = "-lGLU"; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + buildInputs = [ qtbase qtcharts libGLU libGL glm glew ]; meta = { description = "Visual Trace Explorer (ViTE), a tool to visualize execution traces"; diff --git a/pkgs/applications/system/asusctl/Cargo.lock b/pkgs/applications/system/asusctl/Cargo.lock index 6377a21c708..573daf88941 100644 --- a/pkgs/applications/system/asusctl/Cargo.lock +++ b/pkgs/applications/system/asusctl/Cargo.lock @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -115,18 +115,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "android-activity" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bc1575e653f158cbdc6ebcd917b9564e66321c5325c232c3591269c257be69" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ "android-properties", "bitflags 1.3.2", @@ -163,9 +163,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arboard" @@ -199,7 +199,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "asusd", "cargo-husky", @@ -218,7 +218,7 @@ dependencies = [ [[package]] name = "asusd" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "async-trait", "cargo-husky", @@ -242,7 +242,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "config-traits", @@ -323,15 +323,15 @@ dependencies = [ "polling", "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -374,7 +374,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -385,13 +385,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -426,9 +426,9 @@ checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atomic_refcell" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" +checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" [[package]] name = "atspi" @@ -471,9 +471,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -486,9 +486,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bindgen" @@ -518,9 +518,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] [[package]] name = "block" @@ -594,7 +597,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -656,11 +659,12 @@ checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -680,9 +684,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -767,7 +771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -781,7 +785,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "log", @@ -870,6 +874,12 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1079,7 +1089,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1119,9 +1129,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1190,9 +1200,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", @@ -1286,7 +1296,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1420,9 +1430,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" @@ -1544,9 +1554,9 @@ dependencies = [ [[package]] name = "glutin" -version = "0.30.9" +version = "0.30.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b0385782048be65f0a9dd046c469d6a758a53fe1aa63a8111dea394d2ffa2f" +checksum = "8fc93b03242719b8ad39fb26ed2b01737144ce7bd4bfc7adadcef806596760fe" dependencies = [ "bitflags 1.3.2", "cfg_aliases", @@ -1579,9 +1589,9 @@ dependencies = [ [[package]] name = "glutin_egl_sys" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3bcbddc51573b977fc6dca5d93867e4f29682cdbaf5d13e48f4fa4346d4d87" +checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5" dependencies = [ "gl_generator", "windows-sys 0.45.0", @@ -1776,9 +1786,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff335215fb898bf09c45833b657233d8c0b699a616d7dd64d0513080da270ab6" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" dependencies = [ "bitflags 1.3.2", "futures-core", @@ -1826,7 +1836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.4", + "rustix 0.38.9", "windows-sys 0.48.0", ] @@ -1983,9 +1993,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1999,15 +2009,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "logind-zbus" -version = "3.1.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b36b364be05220b24411a1c1a1ee4df0ba77b09c9880e70e5f4c16ebdec157" +checksum = "c07a2542f6e91ea92780158654852190edb2ba0b232d9d00d649d0c691cb7eb3" dependencies = [ "serde", "zbus", @@ -2015,9 +2025,9 @@ dependencies = [ [[package]] name = "mac-notification-sys" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc434554ad0e640d772f7f262aa28e61d485212533d3673abe5f3d1729bd42a" +checksum = "9402858e87f85f88bf518bd2e68450640df1c99b1ddb3ea28c4d5d823bb54cdd" dependencies = [ "cc", "dirs-next", @@ -2274,7 +2284,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -2340,9 +2350,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2355,9 +2365,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "orbclient" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" dependencies = [ "redox_syscall 0.3.5", ] @@ -2433,7 +2443,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2456,9 +2466,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2480,9 +2490,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2577,9 +2587,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2651,9 +2661,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -2663,9 +2673,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -2680,7 +2690,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rog-control-center" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "asusd", "cargo-husky", @@ -2713,7 +2723,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "gif", @@ -2730,7 +2740,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "log", @@ -2744,7 +2754,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "rog_anime", @@ -2756,7 +2766,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "concat-idents", @@ -2769,26 +2779,26 @@ dependencies = [ "serde_derive", "sysfs-class", "typeshare", - "udev 0.7.0", + "udev", "zbus", ] [[package]] name = "rog_profiles" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "log", "serde", "serde_derive", "typeshare", - "udev 0.7.0", + "udev", "zbus", ] [[package]] name = "rog_simulators" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "glam", "log", @@ -2799,20 +2809,21 @@ dependencies = [ [[package]] name = "ron" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 1.3.2", + "bitflags 2.4.0", "serde", + "serde_derive", ] [[package]] name = "rusb" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a8c36914f9b1a3be712c1dfa48c9b397131f9a75707e570a391735f785c5d1" +checksum = "45fff149b6033f25e825cbb7b2c625a11ee8e6dac09264d49beb125e39aa97bf" dependencies = [ "libc", "libusb1-sys", @@ -2855,14 +2866,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -2937,29 +2948,29 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.174" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.174" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -2968,13 +2979,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3024,15 +3035,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3109,6 +3120,16 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3128,8 +3149,8 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "supergfxctl" -version = "5.1.1" -source = "git+https://gitlab.com/asus-linux/supergfxctl.git#fcba63b1a29284fc76da65e60751a33b81380259" +version = "5.1.2" +source = "git+https://gitlab.com/asus-linux/supergfxctl.git#c2a1bb3461c7abbcdabecdc463d668555120f953" dependencies = [ "log", "logind-zbus", @@ -3137,7 +3158,7 @@ dependencies = [ "serde_derive", "serde_json", "tokio", - "udev 0.6.3", + "udev", "zbus", ] @@ -3154,9 +3175,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -3187,9 +3208,9 @@ dependencies = [ [[package]] name = "systemd-zbus" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abba675e441b13248eaf74f1acfacf64adc7b5c030f2f3ff66cc7e02b9a0c417" +checksum = "ffbb1b6ea6d96b14a7e94532711efc4106337fe8b1d6bdf8ba5318012a9fa7e3" dependencies = [ "serde", "zbus", @@ -3197,9 +3218,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri-winrt-notification" @@ -3213,14 +3234,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.4", + "rustix 0.38.9", "windows-sys 0.48.0", ] @@ -3235,30 +3256,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "time" -version = "0.3.23" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ + "deranged", "serde", "time-core", ] @@ -3320,17 +3342,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -3343,7 +3364,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3386,7 +3407,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.5.0", + "winnow", ] [[package]] @@ -3409,7 +3430,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3457,17 +3478,6 @@ dependencies = [ [[package]] name = "udev" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c960764f7e816eed851a96c364745d37f9fe71a2e7dba79fbd40104530b5dd0" -dependencies = [ - "libc", - "libudev-sys", - "pkg-config", -] - -[[package]] -name = "udev" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" @@ -3758,9 +3768,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ "core-foundation", "home", @@ -3849,7 +3859,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -3889,7 +3899,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -3909,17 +3919,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -3930,9 +3940,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -3948,9 +3958,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -3966,9 +3976,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -3984,9 +3994,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -4002,9 +4012,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -4014,9 +4024,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -4032,9 +4042,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winit" @@ -4073,18 +4083,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -4149,9 +4150,9 @@ checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "zbus" -version = "3.13.1" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" dependencies = [ "async-broadcast", "async-executor", @@ -4162,6 +4163,7 @@ dependencies = [ "async-recursion", "async-task", "async-trait", + "blocking", "byteorder", "derivative", "enumflags2", @@ -4189,16 +4191,15 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.13.1" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "regex", "syn 1.0.109", - "winnow 0.4.1", "zvariant_utils", ] diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix index 95b0f847fea..8b5eb17cbca 100644 --- a/pkgs/applications/system/asusctl/default.nix +++ b/pkgs/applications/system/asusctl/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-SZijR9PotN0O72laj+FBSCVMXLXadmLRhCSD4XqobD0="; + hash = "sha256-T/KAhKoxZRdbJspL+Fkos6YqVhiUxCtxbCSm+8CX1to="; }; cargoHash = ""; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI="; "notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs="; - "supergfxctl-5.1.1" = "sha256-H00QHNILEjOtavXdj4Jd+rdLprJpVSlSVV3qkTeknzQ="; + "supergfxctl-5.1.2" = "sha256-1XCIltd7o+Bc+UXmeuPAXdPKU86UP0p+Qh0gTZyrbH8="; }; }; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index d90028205c9..62be45cba27 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.36"; + version = "2.36.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-TCCVdPhrR4NWwqNjEAySSsiW2D7gCdLAiD+UeuvBJvI="; + hash = "sha256-jq9Frh3rufI9Q3auh2Qfoo89x+jKsbxBB8ojreVgmjc="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index 4d2ac7e7030..688e6eff949 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -2,20 +2,21 @@ , buildGoModule , fetchFromGitHub , stdenv +, nix-update-script }: buildGoModule rec { pname = "kraftkit"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-+aZrJqxgPGIoWEW4PZj6Nib7Z49HitxqMbeoyIe14iM="; + hash = "sha256-3dI3F1cCeLEOd+zusWUDZWLrVaaKHXzwOL/mF/yPZC8="; }; - vendorHash = "sha256-4V7GTqCDSHybuwIrnmO1MJ+DwMpkKOdA7UC72YJqStM="; + vendorHash = "sha256-4zciooCUNVLTQ/0tctqV3hExR5vRY5VumHzGtL8xdws="; ldflags = [ "-s" @@ -25,6 +26,12 @@ buildGoModule rec { subPackages = [ "cmd/kraft" ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "^v([0-9.]+)" ]; + }; + }; + meta = { description = "Build and use highly customized and ultra-lightweight unikernel VMs"; homepage = "https://github.com/unikraft/kraftkit"; |