diff options
Diffstat (limited to 'pkgs/applications')
15 files changed, 120 insertions, 62 deletions
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index ef9d49c5d1572..1b4f4508fbf0b 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper +, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland @@ -72,7 +72,8 @@ let ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar - (wrapGAppsHook.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) ]; dontBuild = true; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 55aba845b0c04..51841f9852a57 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.0.3"; + version = "1.1.9"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-DYF9fEpZaP4tD/eeZAegDahR7UZyroqNB9bn2U7sgXs=" else "sha256-MpQk5g4184ZkCAjLU5Ug0ReWgVADskS1QuMcnPdNofs="; + sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index f518acd24a201..3d6e42bd628d6 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.1.10"; + version = "0.1.11"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2NX2iW3cT9027j2gUsDTtdIFDmJKIGPfSzrGGwvK/VA="; + sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA="; }; - cargoSha256 = "sha256-//GI+roOsCLkKgMDUDK0YhJWmeIaYCMBt9r14+Rz8UQ="; + cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 2a29eab29730d..9ae1b348e3d47 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -1,28 +1,27 @@ -{ - lib, - stdenv, - fetchFromGitHub, - zig, - wayland, - pkg-config, - scdoc, - wayland-protocols, - libxkbcommon, - pam, +{ lib +, stdenv +, fetchFromGitHub +, zig +, wayland +, pkg-config +, scdoc +, wayland-protocols +, libxkbcommon +, pam }: stdenv.mkDerivation rec { pname = "waylock"; - version = "0.4.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yWjWcnGa4a+Dpc82H65yr8H7v88g/tDq0FSguubhbEI="; + hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w="; fetchSubmodules = true; }; - nativeBuildInputs = [zig wayland scdoc pkg-config]; + nativeBuildInputs = [ zig wayland scdoc pkg-config ]; buildInputs = [ wayland-protocols @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dman-pages --prefix $out install + zig build -Drelease-safe -Dman-pages -Dcpu=baseline --prefix $out install runHook postInstall ''; @@ -47,6 +46,6 @@ stdenv.mkDerivation rec { description = "A small screenlocker for Wayland compositors"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [jordanisaacs]; + maintainers = with maintainers; [ jordanisaacs ]; }; } diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index e2426fc7d56d8..877dddfa1e2b2 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "3.72.2"; + version = "3.73.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-qw45Ifp8JcJyKaKL1St0HAQGS7JiUestiPGyZcV3gx8="; + sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs="; }; - vendorSha256 = "sha256-FmpnRgU3w2zthgUJuAG5AqLl2UxMb0yywN5Sk9WoWBI="; + vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index b1a7727207750..271d82f4d86cf 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.193"; + version = "1.2.195"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-4q+LtPwJa3gioOY90gUfCL4F/8jmtfkBKxBShg2xQas="; + hash = "sha256-rNhCZO4Axeuc5jEAndjma7/jnst1kDNdtb/h/jD2rtE="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index eb4be8d98d279..c113618bbb75f 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -43,7 +43,7 @@ let rev = "v${version}"; hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w="; }; - vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; in buildNpmPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index e8ac07b50cfb5..67f294ea6a555 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-uIzOKiCbHiSVRlXcpE0B/+Ats3cfw4u7eA+KyPriwhk="; + hash = "sha256-gHRB3thDH+CKRXTgrD37e2zf0rVDIVl4Zhxf5lsLjyc="; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index d7e7a94a511e1..241828fdfc3c4 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -6,7 +6,6 @@ let pname = "zulip"; version = "5.9.4"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; @@ -15,14 +14,14 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ $out/share/icons/hicolor/512x512/apps/zulip.png diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 3757d57df8160..28c6580d8911c 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.38"; + version = "3.39"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-LYMGkv1rgUtA/TwulBhgw0w+8kbICtEgr7/K6exalxM="; + hash = "sha256-mbeTdrKptPaMw1OA3jFftjJPOmUnJcjbv81yDSlFeaU="; }; vendorHash = "sha256-mwfs/tdq1Qq2auEwz24emf7pjpIJAncI78oxhAn2WkI="; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index bb27f0d4ec906..158c2389a3139 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,29 +1,66 @@ -{ mkDerivation, lib, stdenv, fetchurl -, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets -, qtx11extras, qtwayland +{ lib +, stdenv +, fetchurl +, qmake +, qttools +, qtbase +, qtdeclarative +, qtsvg +, qtwayland +, qtwebsockets +, qtx11extras +, qtxmlpatterns +, makeWrapper +, wrapQtAppsHook }: -mkDerivation rec { +let pname = "qownnotes"; - version = "22.12.3"; + appname = "QOwnNotes"; + version = "23.1.0"; +in +stdenv.mkDerivation { + inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - # Fetch the checksum of current version with curl: - # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "sha256-fpI7RYOGmWwmau6tF8FPmY2/FtN9foWRX8/WgrNU6E8="; + sha256 = "sha256-HMs8DTL2BDSDmchadpVvbShjJMPP6W587F38uiixCuQ="; }; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ + qmake + qttools + wrapQtAppsHook + ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; - buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + buildInputs = [ + qtbase + qtdeclarative + qtsvg + qtwebsockets + qtx11extras + qtxmlpatterns + ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + + postInstall = + # Create a lowercase symlink for Linux + lib.optionalString stdenv.isLinux '' + ln -s $out/bin/${appname} $out/bin/${pname} + '' + # Wrap application for macOS as lowercase binary + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/${appname}.app $out/Applications + makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} + ''; meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration"; homepage = "https://www.qownnotes.org/"; + changelog = "https://www.qownnotes.org/changelog.html"; + downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ totoroot ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 8a143d36a29b5..e117af03b57dd 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ANTs"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; rev = "v${version}"; - sha256 = "sha256-edkvTkgBNaC87Q0N/Fsebr9nRLMhDo4mrSGoMICdnwU="; + sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index aa3fba635ffc1..4719a69c01285 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -1,18 +1,40 @@ -{ lib, stdenv, fetchurl, ocamlPackages }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, which +, ocamlPackages +}: stdenv.mkDerivation rec { pname = "cubicle"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; - sha256 = "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q"; + url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz"; + hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y="; }; + # https://github.com/cubicle-model-checker/cubicle/issues/1 postPatch = '' - substituteInPlace Makefile.in --replace "\\n" "" + substituteInPlace Makefile.in \ + --replace "@OCAMLC@" "ocamlfind ocamlc -package num" \ + --replace "@OCAMLOPT@" "ocamlfind ocamlopt -package num" ''; - buildInputs = with ocamlPackages; [ ocaml findlib functory ]; + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + which + ] ++ (with ocamlPackages; [ + findlib + ocaml + ]); + + buildInputs = with ocamlPackages; [ + functory + num + ]; meta = with lib; { description = "An open source model checker for verifying safety properties of array-based systems"; diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/applications/version-management/subgit/default.nix index 0ec06aeaaa685..a7288aa24e6e8 100644 --- a/pkgs/applications/version-management/subgit/default.nix +++ b/pkgs/applications/version-management/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.15"; + version = "3.3.16"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-2/J/d4GrlLXR/7QBxgIMepzP+xxkeLvrCBwLl7Ke8wI="; + sha256 = "sha256-p7uBEG43N4Hed+8HYf3I9lQEvmYLV61oIyRrPHuGmUA="; }; } diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 4963949927b5f..18472f03d850c 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oa7A0RMF7kPQXydysGpzAICgGoIRLWUMRibXdiftYyk="; + sha256 = "sha256-Kjonyd0xL0QLjPS+U3xDC6AhOOxQmVAZ3STLXaa8eXc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-RMxk7e/z+YneNWI/xsZDmXr7DqB7qHEY8HPvTCeSLjg="; + sha256 = "sha256-K5oOpo3xJiNg7F549JLGs83658MYcoGfuIcNoF88Njc="; }; nativeBuildInputs = [ |