summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/editors/notepadqq/default.nix8
-rw-r--r--pkgs/applications/graphics/awesomebump/default.nix61
-rw-r--r--pkgs/applications/graphics/gthumb/default.nix4
-rw-r--r--pkgs/applications/graphics/shotwell/default.nix6
-rw-r--r--pkgs/applications/kde/default.nix2
-rw-r--r--pkgs/applications/kde/krdc.nix25
-rw-r--r--pkgs/applications/kde/minuet.nix22
-rw-r--r--pkgs/applications/networking/msmtp/default.nix5
-rw-r--r--pkgs/applications/office/libreoffice/default.nix2
-rw-r--r--pkgs/applications/office/libreoffice/still.nix4
-rw-r--r--pkgs/applications/virtualization/open-vm-tools/default.nix3
11 files changed, 105 insertions, 37 deletions
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 9b3896e32d6..6d1bba8c4d5 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
+{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit}:
 
 let
-  version = "0.53.0";
+  version = "1.2.0";
 in stdenv.mkDerivation {
   name = "notepadqq-${version}";
   src = fetchgit {
     url = "https://github.com/notepadqq/notepadqq.git";
-    rev = "3b0751277fb268ec72b466b37d0f0977c536bc1b";
-    sha256 = "0hw94mn2xg2r58afvz1xg990jinv9aa33942zgwq54qwj61r93hi";
+    rev = "ab074d30e02d49e0fe6957c1523e7fed239aff7d";
+    sha256 = "0j8vqsdw314qpk5lrgccm9n7gbyr14ac3s65sl1qn87pxhrz1hpg";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f1958ca35be..f190b421b05 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,36 +1,49 @@
-{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }:
+{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
 
-stdenv.mkDerivation {
-  name = "awesomebump-4.0";
 
-  src = fetchurl {
-    url = https://github.com/kmkolasinski/AwesomeBump/archive/Linuxv4.0.tar.gz;
-    sha256 = "1rp4m4y2ld49hibzwqwy214cbiin80i882d9l0y1znknkdcclxf2";
+let
+  version = "5.1";
+
+  src = fetchgit {
+    url = "https://github.com/kmkolasinski/AwesomeBump.git";
+    rev = "Winx32v${version}";
+    sha256 = "1c8b9jki0v8kzkvsvyv7q1w3s7j40br6ph15hh2xi0a1mpwckq56";
+    fetchSubmodules = true;
   };
 
-  setSourceRoot = "sourceRoot=$(echo */Sources)";
+  qtnproperty = stdenv.mkDerivation {
+    name = "qtnproperty";
+    inherit src;
+    sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
+    buildInputs = [ qtscript qtbase qtdeclarative ];
+    nativeBuildInputs = [ qmake flex bison ];
+    postInstall = ''
+      install -D bin-linux/QtnPEG $out/bin/QtnPEG
+    '';
+  };
+in stdenv.mkDerivation rec {
+  name = "awesomebump-${version}";
 
-  nativeBuildInputs = [ makeWrapper qmake ];
-  buildInputs = [ qtbase ];
+  inherit src;
 
-  enableParallelBuilding = true;
+  buildInputs = [ qtbase qtscript qtdeclarative ];
 
-  installPhase =
-    ''
-      d=$out/libexec/AwesomeBump
-      mkdir -p $d $out/bin
-      cp AwesomeBump $d/
-      cp -prd ../Bin/Configs ../Bin/Core $d/
+  nativeBuildInputs = [ qmake makeWrapper ];
 
-      # AwesomeBump expects to find Core and Configs in its current
-      # directory.
-      makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
-        --run "cd $d"
-    '';
+  preBuild = ''
+    ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
+  '';
+
+  postInstall = ''
+    d=$out/libexec/AwesomeBump
 
-  # RPATH in /tmp hack
-  preFixup = ''
-    rm -r $NIX_BUILD_TOP/__nix_qt5__
+    mkdir -p $d
+    cp -vr workdir/`cat workdir/current`/bin/AwesomeBump $d/
+    cp -prd Bin/Configs Bin/Core $d/
+
+    # AwesomeBump expects to find Core and Configs in its current directory.
+    makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
+        --run "cd $d"
   '';
 
   meta = {
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 93894d0c6cb..d9e0f42e53e 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -6,12 +6,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "gthumb";
-  version = "${major}.1";
+  version = "${major}.3";
   major = "3.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
-    sha256 = "1hxnjskrq57d5ycn2fyif7363n1bav931pkjvq1fr2r4yrj0d202";
+    sha256 = "0hka1b3l8mf94zsk7jff87wsb8bz4pj5pixjrs0w2j8jbsa9sggk";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 3f31b86fe49..a3be867d6ed 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
-  major = "0.26";
-  minor = "2";
+  major = "0.27";
+  minor = "0";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "0frjqa6nmh025clwnb74z2rzbdq65wjcp2lf9csgcbkpahyjhrag";
+    sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 2053d183ff1..6e10afe637b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -124,6 +124,7 @@ let
       korganizer = callPackage ./korganizer.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       kqtquickcharts = callPackage ./kqtquickcharts.nix {};
+      krdc = callPackage ./krdc.nix {};
       krfb = callPackage ./krfb.nix {};
       ktnef = callPackage ./ktnef.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
@@ -142,6 +143,7 @@ let
       marble = callPackage ./marble.nix {};
       mbox-importer = callPackage ./mbox-importer.nix {};
       messagelib = callPackage ./messagelib.nix {};
+      minuet = callPackage ./minuet.nix {};
       okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
       pimcommon = callPackage ./pimcommon.nix {};
diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix
new file mode 100644
index 00000000000..87204c1fe9f
--- /dev/null
+++ b/pkgs/applications/kde/krdc.nix
@@ -0,0 +1,25 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, makeWrapper,
+  kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
+  libvncserver, freerdp
+}:
+
+mkDerivation {
+  name = "krdc";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+  buildInputs = [
+    kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons
+    freerdp libvncserver
+  ];
+  postFixup = ''
+    wrapProgram $out/bin/krdc \
+      --prefix PATH : ${lib.makeBinPath [ freerdp ]}
+  '';
+  meta = with lib; {
+    homepage = http://www.kde.org;
+    license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix
new file mode 100644
index 00000000000..fd628a7aacf
--- /dev/null
+++ b/pkgs/applications/kde/minuet.nix
@@ -0,0 +1,22 @@
+{ mkDerivation
+, lib, extra-cmake-modules
+, drumstick, fluidsynth
+, kcoreaddons, kcrash, kdoctools
+, qtquickcontrols2, qtsvg, qttools
+}:
+
+mkDerivation {
+  name = "minuet";
+  meta = with lib; {
+    license = with licenses; [ lgpl21 gpl3 ];
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    drumstick fluidsynth
+    kcoreaddons kcrash
+    qtquickcontrols2 qtsvg qttools
+  ];
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 85e5abdc9b6..1a409fc885a 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, autoreconfHook, pkgconfig
 , openssl, netcat-gnu, gnutls, gsasl, libidn, Security
+, withKeyring ? true, libsecret ? null
 , systemd ? null }:
 
 let
@@ -20,7 +21,9 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ openssl gnutls gsasl libidn ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+    ++ stdenv.lib.optional stdenv.isDarwin Security
+    ++ stdenv.lib.optional withKeyring libsecret;
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   configureFlags =
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 830692f08eb..830ae68fd1b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -13,7 +13,7 @@
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
 , defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
 , withHelp ? true
 , kdeIntegration ? false
 }:
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index dfe6e947080..a3991b8b35c 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -13,7 +13,7 @@
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
 , defaultIconTheme, glib, ncurses
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
 , withHelp ? true
 , kdeIntegration ? false
 }:
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
   # It also seems not to mention libdl explicitly in some places.
   NIX_LDFLAGS = "-lcups -ldl";
 
-  # For some reason librdf_redland sometimes refers to rasqal.h instead 
+  # For some reason librdf_redland sometimes refers to rasqal.h instead
   # of rasqal/rasqal.h
   NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
 
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index bc280823a3c..c7f8ea696b5 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
 
      # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
      sed 1i'#include <sys/sysmacros.h>' -i lib/wiper/wiperPosix.c
+
+     # Make reboot work, shutdown is not in /sbin on NixOS
+     sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
   '';
 
   configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-30 07:13:19 +0000