diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/ft2-clone/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/krop/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/hamster/default.nix | 62 | ||||
-rw-r--r-- | pkgs/applications/networking/ssb-patchwork/default.nix (renamed from pkgs/applications/networking/ssb/patchwork/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/ssb/patchwork-classic/default.nix | 106 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/verilator/default.nix | 4 |
6 files changed, 71 insertions, 113 deletions
diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index c5661f3336f7..acf373fc41af 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.24"; + version = "1.25_fix"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0wb7xsc2m9f4q5zsf5ai6h6c0558lkziv30b5a8ic64wp0layr6k"; + sha256 = "0q2mcp3xpgwilmiwzr9nnxlyg9c1kynh6cxzlyd95n520j00s6i7"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 2337dfb370ef..ee4906769770 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -2,22 +2,24 @@ python3Packages.buildPythonApplication rec { pname = "krop"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "arminstraub"; repo = pname; rev = "v${version}"; - sha256 = "0b1zqpks4vzq7sfhf7r9qrshr77f1ncj18x7d0fa3g29rxa42dcr"; + sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s"; }; propagatedBuildInputs = with python3Packages; [ pyqt5 pypdf2 poppler-qt5 - libsForQt5.poppler ghostscript ]; + buildInputs = [ + libsForQt5.poppler + ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix new file mode 100644 index 000000000000..57b36e00436e --- /dev/null +++ b/pkgs/applications/misc/hamster/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool +, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: + +python3Packages.buildPythonApplication rec { + pname = "hamster"; + version = "3.0.2"; + + format = "other"; + + src = fetchFromGitHub { + owner = "projecthamster"; + repo = pname; + rev = "v${version}"; + sha256 = "09ikiwc2izjvwqbbyp8knn190x5y4anwslkmb9k2h3r3jwrg2vd2"; + }; + + nativeBuildInputs = [ + python3Packages.setuptools + wrapGAppsHook + intltool + itstool + wafHook + glib + gobject-introspection + ]; + + buildInputs = [ + pango + gdk-pixbuf + atk + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pycairo + pyxdg + dbus-python + ]; + + # Setup hooks have trouble with strict deps. + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + dontWrapGApps = true; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapPythonProgramsIn $out/libexec "$out $pythonPath" + ''; + + meta = with stdenv.lib; { + description = "Time tracking application"; + homepage = "http://projecthamster.org/"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.fabianhauser ]; + }; +} diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index db33e7e6bb21..db33e7e6bb21 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix deleted file mode 100644 index 74a02f47c3bf..000000000000 --- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv, fetchurl, lib, makeWrapper, - # build dependencies - alsaLib, atk, cairo, cups, dbus, expat, fontconfig, - freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg, - glibc, systemd -}: - -stdenv.mkDerivation { - - version = "2.12.0"; - - pname = "patchwork-classic"; - - src = fetchurl { - url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; - sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj"; - }; - - sourceRoot = "."; - - unpackCmd = '' - ar p "$src" data.tar.xz | tar xJ - ''; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -R usr/share opt $out/ - - # fix the path in the desktop file - substituteInPlace \ - $out/share/applications/ssb-patchwork-electron.desktop \ - --replace /opt/ $out/opt/ - - # symlink the binary to bin/ - ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic - ''; - - - preFixup = let - packages = [ - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gnome2.GConf - gnome2.gtk - gnome2.pango - nspr - nss - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - stdenv.cc.cc.lib - stdenv.cc.cc - glibc - ]; - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - in '' - # patch executable - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \ - $out/opt/ssb-patchwork-electron/ssb-patchwork-electron - - # patch libnode - patchelf \ - --set-rpath "${libPath}" \ - $out/opt/ssb-patchwork-electron/libnode.so - - # libffmpeg is for some reason not executable - chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so - - # fix missing libudev - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1 - wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \ - --prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron - ''; - - meta = with stdenv.lib; { - description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser"; - homepage = "https://github.com/ssbc/patchwork-classic-electron"; - license = licenses.gpl3; - maintainers = with maintainers; [ mrVanDalo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 189e09f8241b..0613e22bbda0 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.034"; + version = "4.036"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "02xqvl9ic21jpda0xldh4ihqwl4ss8389s8fklgx5d98xq37pval"; + sha256 = "1sy02pgq3kvk8548l57hsh08vfbqdg8dghj8mwlybdi8fdjz4z1h"; }; enableParallelBuilding = true; |