diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
35 files changed, 79 insertions, 183 deletions
diff --git a/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index cf2ac98bc090..1539c1693e64 100644 --- a/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -59,7 +59,7 @@ let homepage = "https://1password.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; + maintainers = with maintainers; [ timstott savannidgerinel amaxine sebtm ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; diff --git a/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/nixpkgs/pkgs/applications/misc/birdtray/default.nix index 167b4df79bcd..534107f615a6 100644 --- a/nixpkgs/pkgs/applications/misc/birdtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/birdtray/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "birdtray"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "gyunaev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3SZf0ZK4AV/kuFttaHnPJuOJ9rn7CqFfv28d8ancPKw="; + sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index 21c5d7d1c33a..a71984dd2c40 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { license = if unrarSupport then lib.licenses.unfreeRedistributable else lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ pSub AndersonTorres ]; + maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; diff --git a/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix b/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix index e42f022df7f2..5b52aae8df42 100644 --- a/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix +++ b/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-/9Af/1ZP2Hkc0PP9yXObNDNmxe6riBNWSv+JaM7O5Vs="; + hash = "sha256-zGxuvS4T1olMH+QOqrPcsFjfO3PDERmFQOa+ISN9u0c="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; @@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/camunda/camunda-modeler"; description = "An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"; - maintainers = with maintainers; [ n0emis ]; + maintainers = teams.wdz.members; license = licenses.mit; inherit (electron.meta) platforms; }; diff --git a/nixpkgs/pkgs/applications/misc/darkman/default.nix b/nixpkgs/pkgs/applications/misc/darkman/default.nix index a20b8ab72625..89678b7d0fa8 100644 --- a/nixpkgs/pkgs/applications/misc/darkman/default.nix +++ b/nixpkgs/pkgs/applications/misc/darkman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6SNXVe6EfVwcXH9O6BxNw+v4/uhKhCtVS3XE2GTc2Sc="; }; - vendorSha256 = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY="; + vendorHash = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY="; nativeBuildInputs = [ scdoc ]; diff --git a/nixpkgs/pkgs/applications/misc/expenses/default.nix b/nixpkgs/pkgs/applications/misc/expenses/default.nix index e838bd3eda2a..220cd1178564 100644 --- a/nixpkgs/pkgs/applications/misc/expenses/default.nix +++ b/nixpkgs/pkgs/applications/misc/expenses/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0="; }; - vendorSha256 = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo="; + vendorHash = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo="; # package does not contain any tests as of v0.2.3 doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 4b5ee339b1ab..5c6614b98263 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -38,6 +38,7 @@ buildPythonApplication rec { homepage = "https://github.com/mikf/gallery-dl"; changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Only; + mainProgram = "gallery-dl"; maintainers = with maintainers; [ dawidsowa marsam ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix b/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix index dc64b1142b49..463d1d50ab54 100644 --- a/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix +++ b/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = version; hash = "sha256-nKNSLVBBdZI5mkbEUkMv0CIOQIyH3OX+SEFf5O47DFY="; }; - vendorSha256 = "sha256-Cx8x8AISRVTA4Ufd73vOVky97LX23NkizHDingr/zVk="; + vendorHash = "sha256-Cx8x8AISRVTA4Ufd73vOVky97LX23NkizHDingr/zVk="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/nixpkgs/pkgs/applications/misc/go-jira/default.nix index 4a368e92ec33..a3d31d034ee5 100644 --- a/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-h/x77xGqdOxPBxdchElZU9GFgjnNo89o9gx4fYM5dME="; }; - vendorSha256 = "sha256-r69aFl3GwgZ1Zr4cEy4oWlqsrjNCrqjwW9BU9+d8xDQ="; + vendorHash = "sha256-r69aFl3GwgZ1Zr4cEy4oWlqsrjNCrqjwW9BU9+d8xDQ="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix b/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix index 99a8f5a510c0..9dd571735e62 100644 --- a/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix +++ b/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { pkg-config ]; - vendorSha256 = "sha256-4zgsoExdhEqvycGerNVxZ6LnjeRRO+f6DhJdINR5ZyI="; + vendorHash = "sha256-4zgsoExdhEqvycGerNVxZ6LnjeRRO+f6DhJdINR5ZyI="; postInstall = '' mkdir -p $out/share/thumbnailers diff --git a/nixpkgs/pkgs/applications/misc/gsctl/default.nix b/nixpkgs/pkgs/applications/misc/gsctl/default.nix index 73bc11d4940d..bf47ee1899b3 100644 --- a/nixpkgs/pkgs/applications/misc/gsctl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gsctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-eemPsrSFwgUR1Jz7283jjwMkoJR38QiaiilI9G0IQuo="; }; - vendorSha256 = "sha256-6b4H8YAY8d/qIGnnGPYZoXne1LXHLsc0OEq0lCeqivo="; + vendorHash = "sha256-6b4H8YAY8d/qIGnnGPYZoXne1LXHLsc0OEq0lCeqivo="; ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/applications/misc/hamster/default.nix b/nixpkgs/pkgs/applications/misc/hamster/default.nix index d727257fbec5..925d246ba844 100644 --- a/nixpkgs/pkgs/applications/misc/hamster/default.nix +++ b/nixpkgs/pkgs/applications/misc/hamster/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 -, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, waf }: +, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { pname = "hamster"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook intltool itstool - waf.hook + wafHook glib gobject-introspection ]; diff --git a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index fb4e484dc572..7f783eb371ec 100644 --- a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,24 +2,24 @@ let pname = "joplin-desktop"; - version = "2.11.11"; + version = "2.12.16"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; suffix = { - x86_64-linux = "AppImage"; - x86_64-darwin = "dmg"; - aarch64-darwin = "dmg"; + x86_64-linux = ".AppImage"; + x86_64-darwin = ".dmg"; + aarch64-darwin = "-arm64.dmg"; }.${system} or throwSystem; src = fetchurl { - url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; + url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-r64+y+LfMrJnUdabVdak5+LQB50YLOuMXftlZ4s3C/w="; - x86_64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg="; - aarch64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg="; + x86_64-linux = "sha256-9ib8lymmSINqC0oXUxkKcpKfPh7qmU3YytU1/4aKMLg="; + x86_64-darwin = "sha256-vWc5yx3i5Ru8vrQbrTQwr43ZMBzOAb9254cxTHg6A/Q="; + aarch64-darwin = "sha256-dhwPqT+zfBYOVUV5JprPfgrSJR2ZNsC3LJmRHGJVM4k="; }.${system} or throwSystem; }; diff --git a/nixpkgs/pkgs/applications/misc/kiln/default.nix b/nixpkgs/pkgs/applications/misc/kiln/default.nix index 8a64668393d8..ed9575ffa0ba 100644 --- a/nixpkgs/pkgs/applications/misc/kiln/default.nix +++ b/nixpkgs/pkgs/applications/misc/kiln/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ scdoc installShellFiles ]; - vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; + vendorHash = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; postInstall = '' scdoc < docs/kiln.1.scd > docs/kiln.1 diff --git a/nixpkgs/pkgs/applications/misc/kratos/default.nix b/nixpkgs/pkgs/applications/misc/kratos/default.nix index dadaae3a9018..9031b7d6d566 100644 --- a/nixpkgs/pkgs/applications/misc/kratos/default.nix +++ b/nixpkgs/pkgs/applications/misc/kratos/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-KDpc0zc65rvvpPojghFEujoS0aewyjv7B/bmpC2i1dA="; }; - vendorSha256 = "sha256-Y/Sd2hu1bPUb0TQRD1pANz+rtqKcHBXvjKpYwKgxHMQ="; + vendorHash = "sha256-Y/Sd2hu1bPUb0TQRD1pANz+rtqKcHBXvjKpYwKgxHMQ="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/misc/kupfer/default.nix b/nixpkgs/pkgs/applications/misc/kupfer/default.nix index 2e6eedc0cea8..fbb33c7e096f 100644 --- a/nixpkgs/pkgs/applications/misc/kupfer/default.nix +++ b/nixpkgs/pkgs/applications/misc/kupfer/default.nix @@ -10,7 +10,7 @@ , desktop-file-utils , shared-mime-info , wrapGAppsHook -, waf +, wafHook , bash , dbus }: @@ -31,7 +31,7 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook intltool # For setup hook - gobject-introspection waf.hook + gobject-introspection wafHook itstool # for help pages desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info diff --git a/nixpkgs/pkgs/applications/misc/lemonade/default.nix b/nixpkgs/pkgs/applications/misc/lemonade/default.nix index b428d59aaab9..68622718e048 100644 --- a/nixpkgs/pkgs/applications/misc/lemonade/default.nix +++ b/nixpkgs/pkgs/applications/misc/lemonade/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "sha256-wjQfTKVNmehu4aU5425gS0YWKj53dosVSTLgdu9KjKc="; + vendorHash = "sha256-wjQfTKVNmehu4aU5425gS0YWKj53dosVSTLgdu9KjKc="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/misc/markmind/default.nix b/nixpkgs/pkgs/applications/misc/markmind/default.nix deleted file mode 100644 index e44b7fe54ad5..000000000000 --- a/nixpkgs/pkgs/applications/misc/markmind/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: - -stdenv.mkDerivation rec { - pname = "markmind"; - version = "1.3.1"; - - src = fetchurl { - url = "https://github.com/MarkMindCkm/Mark-Mind/releases/download/v${version}/Mark.Mind-${version}.AppImage"; - sha256 = "sha256-iOJ0IOIzleA69rv94Qd35rMbHc+XSi8OPatf2V6sYrI="; - }; - - appimageContents = appimageTools.extractType2 { - name = "markmind-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/markmind $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/markmind - cp -a ${appimageContents}/mind.desktop $out/share/applications/markmind.desktop - cp -a ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/markmind.desktop \ - --replace 'Exec=AppRun' 'Exec=markmind' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/markmind \ - --add-flags $out/share/markmind/resources/app.asar - ''; - - meta = with lib; { - description = "Mind map and outliner editor"; - homepage = "https://github.com/MarkMindCkm/Mark-Mind"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix b/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix new file mode 100644 index 000000000000..2a9c118d77a1 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "matcha-rss-digest"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "piqoni"; + repo = "matcha"; + rev = "v${version}"; + hash = "sha256-Zk85k2SllPR9zznLGevwH6hS1EEW2qEa9YXbSguRVeM="; + }; + + vendorHash = "sha256-Dw1z23DRG0OtakJfrgpTfd71F58KfGsqz215zK0XOdI="; + + meta = with lib; { + homepage = "https://github.com/piqoni/matcha"; + description = "Daily digest generator from a list of RSS feeds"; + license = licenses.mit; + mainProgram = "matcha"; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/mob/default.nix b/nixpkgs/pkgs/applications/misc/mob/default.nix index 74ab67739d02..ed08ee5c09ea 100644 --- a/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.4.5"; + version = "4.4.6"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/Kr5K0QkjARWKR8YhDsOQ2CoUzUu5LWUq6smhB0yDCM="; + sha256 = "sha256-UunFfP0Rn4t8lSJiubbqZ0bImK9OhIdC0gSGbkg6Ohw="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/misc/mop/default.nix b/nixpkgs/pkgs/applications/misc/mop/default.nix index e07fce797507..ddd02d45df0c 100644 --- a/nixpkgs/pkgs/applications/misc/mop/default.nix +++ b/nixpkgs/pkgs/applications/misc/mop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-oe8RG8E7xcp3ZqdDXYvpOVF3AfeSBFMherHD1YYFE/M="; }; - vendorSha256 = "sha256-kLQH7mMmBSsS9av+KnnEuBwiH6hzBOSozrn+1X+8774="; + vendorHash = "sha256-kLQH7mMmBSsS9av+KnnEuBwiH6hzBOSozrn+1X+8774="; preConfigure = '' for i in *.go **/*.go; do diff --git a/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix b/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix index 98609665c4fe..a911873dee41 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; + vendorHash = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 38736866b242..cb9b1a7f6aa8 100644 --- a/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.4.5"; + version = "1.4.11"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime qbit ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 ]; }; 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-1xGlXjQrJ8gNtKYlCBiIfNnTZU591JZdU6NJqMA5gug=" else "sha256-Y/RlT+3xBbF9tjCbRQnQ+j8ogzLMfsQPnOdiCVj+NK0="; + sha256 = if stdenv.isDarwin then "sha256-bJLWXdeVzbVrb8jmIRpyQG6a5H1jMydhO9ioHOGk3Ms=" else "sha256-Z4DojO90PAlGGsItcZugPsi+48UPnOjvCn2BIzrDQpc="; }; icon = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/openring/default.nix b/nixpkgs/pkgs/applications/misc/openring/default.nix index 3a3db0242bde..e311dfbb3b7c 100644 --- a/nixpkgs/pkgs/applications/misc/openring/default.nix +++ b/nixpkgs/pkgs/applications/misc/openring/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-BY2AtgZXzPLqHk3hd6D+XXbrwvWS9DNTKwLqsua/3uw="; }; - vendorSha256 = "sha256-BbBTmkGyLrIWphXC+dBaHaVzHuXRZ+4N/Jt2k3nF7Z4="; + vendorHash = "sha256-BbBTmkGyLrIWphXC+dBaHaVzHuXRZ+4N/Jt2k3nF7Z4="; # The package has no tests. doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/pomotroid/default.nix b/nixpkgs/pkgs/applications/misc/pomotroid/default.nix deleted file mode 100644 index dfe76aa92f4c..000000000000 --- a/nixpkgs/pkgs/applications/misc/pomotroid/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, electron }: - -let - version = "0.13.0"; - appIcon = fetchurl { - url = "https://raw.githubusercontent.com/Splode/pomotroid/v${version}/static/icon.png"; - sha256 = "sha256-BEPoOBErw5ZCeK4rtdxdwZZLimbpglu1Cu++4xzuVUs="; - }; - -in stdenv.mkDerivation rec { - pname = "pomotroid"; - inherit version; - - src = fetchurl { - url = "https://github.com/Splode/pomotroid/releases/download/v${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-AwpVnvwWQd/cgmZvtr5NprnLyeXz6ym4Fywc808tcSc="; - }; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "pomotroid"; - icon = "pomotroid"; - comment = meta.description; - desktopName = "Pomotroid"; - genericName = "Pomodoro Application"; - }) - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/pomotroid $out/share/pomotroid $out/share/pixmaps - - cp -r ./ $out/opt/pomotroid - mv $out/opt/pomotroid/{locales,resources} $out/share/pomotroid - cp ${appIcon} $out/share/pixmaps/pomotroid.png - - makeWrapper ${electron}/bin/electron $out/bin/pomotroid \ - --add-flags $out/share/pomotroid/resources/app.asar - - runHook postInstall - ''; - - meta = with lib; { - description = "Simple and visually-pleasing Pomodoro timer"; - homepage = "https://splode.github.io/pomotroid"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix index 2da548619b14..b09e0fe04724 100644 --- a/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-7pwCd9tey7w5B8UgsMLHegPqmmY1prLM+Sk9o42X9lY="; }; - vendorSha256 = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg="; + vendorHash = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/retool/default.nix b/nixpkgs/pkgs/applications/misc/retool/default.nix index a88e719c6ddd..8d7811120979 100644 --- a/nixpkgs/pkgs/applications/misc/retool/default.nix +++ b/nixpkgs/pkgs/applications/misc/retool/default.nix @@ -19,17 +19,18 @@ python3.pkgs.buildPythonApplication { hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s="; }; - patches = [ - # pythonRelaxDepsHook will not work in this package until - # https://github.com/NixOS/nixpkgs/pull/248516 hits master - ./relax_deps.patch - ]; - nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook qt6.wrapQtAppsHook ]; + pythonRelaxDeps = true; + + # ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none) + # ERROR: No matching distribution found for PySide6 + pythonRemoveDeps = [ "PySide6" ]; + buildInputs = [ qt6.qtbase ] ++ diff --git a/nixpkgs/pkgs/applications/misc/retool/relax_deps.patch b/nixpkgs/pkgs/applications/misc/retool/relax_deps.patch deleted file mode 100644 index 528d2b47d970..000000000000 --- a/nixpkgs/pkgs/applications/misc/retool/relax_deps.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 6e62347..34600a0 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -13,12 +13,14 @@ packages = [ - - [tool.poetry.dependencies] - python = ">=3.10,<3.12" --strictyaml = "^1.6.2" --lxml = "^4.9.2" --PySide6 = "^6.4.2" --validators = "^0.20.0" --alive-progress = "^3.0.1" --psutil = "^5.9.4" -+strictyaml = "*" -+lxml = "*" -+# ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none) -+# ERROR: No matching distribution found for PySide6 -+# PySide6 = "*" -+validators = "*" -+alive-progress = "*" -+psutil = "*" - - [tool.poetry.scripts] - retool = "retool:main" diff --git a/nixpkgs/pkgs/applications/misc/senv/default.nix b/nixpkgs/pkgs/applications/misc/senv/default.nix index c2ab9ad29d87..b45085610d13 100644 --- a/nixpkgs/pkgs/applications/misc/senv/default.nix +++ b/nixpkgs/pkgs/applications/misc/senv/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-TjlIX8FPNiPDQo41pIt04cki/orc+v30pV3o2bQQhAQ="; }; - vendorSha256 = "sha256-zOWX0AiLAs1FtOn+VtRexfn6oOmJT1PoTPHkcpwvxRY="; + vendorHash = "sha256-zOWX0AiLAs1FtOn+VtRexfn6oOmJT1PoTPHkcpwvxRY="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/misc/slides/default.nix b/nixpkgs/pkgs/applications/misc/slides/default.nix index c6c73115eb69..55229c206f18 100644 --- a/nixpkgs/pkgs/applications/misc/slides/default.nix +++ b/nixpkgs/pkgs/applications/misc/slides/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "sha256-c3YCf22L5+rTmH5ePeJ0/goRj5rKY6v+Zon3183MhMY="; + vendorHash = "sha256-c3YCf22L5+rTmH5ePeJ0/goRj5rKY6v+Zon3183MhMY="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/misc/sqls/default.nix b/nixpkgs/pkgs/applications/misc/sqls/default.nix index 6ac9275570a3..53785539adc7 100644 --- a/nixpkgs/pkgs/applications/misc/sqls/default.nix +++ b/nixpkgs/pkgs/applications/misc/sqls/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xtvm/NVL98dRzQL1id/WwT/NdsnB7qTRVR7jfrRsabY="; }; - vendorSha256 = "sha256-sowzyhvNr7Ek3ex4BP415HhHSKnqPHy5EbnECDVZOGw="; + vendorHash = "sha256-sowzyhvNr7Ek3ex4BP415HhHSKnqPHy5EbnECDVZOGw="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ]; diff --git a/nixpkgs/pkgs/applications/misc/tasktimer/default.nix b/nixpkgs/pkgs/applications/misc/tasktimer/default.nix index 34ba140331d1..18439e02e2b9 100644 --- a/nixpkgs/pkgs/applications/misc/tasktimer/default.nix +++ b/nixpkgs/pkgs/applications/misc/tasktimer/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CAqOsxmJxDgQRMx8cN23TajHd6BNiCFraFvhf5kKnzc="; }; - vendorSha256 = "sha256-Tk0yI/WFr0FV0AxJDStlP3XLem3v78ueuXyadhrLAog="; + vendorHash = "sha256-Tk0yI/WFr0FV0AxJDStlP3XLem3v78ueuXyadhrLAog="; postInstall = '' mv $out/bin/tasktimer $out/bin/tt diff --git a/nixpkgs/pkgs/applications/misc/tsukae/default.nix b/nixpkgs/pkgs/applications/misc/tsukae/default.nix index 893f35f6e42f..0a01758b2c47 100644 --- a/nixpkgs/pkgs/applications/misc/tsukae/default.nix +++ b/nixpkgs/pkgs/applications/misc/tsukae/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-1y/WYLW6/HMGmuaX2wOlQbwYn0LcgQCMb4qw8BtCgxQ="; }; - vendorSha256 = "sha256-Q0WOzyJGnTXTmj7ZPKyVSnWuWb4bbDjDpgftQ1Opf/I="; + vendorHash = "sha256-Q0WOzyJGnTXTmj7ZPKyVSnWuWb4bbDjDpgftQ1Opf/I="; meta = with lib; { description = "Show off your most used shell commands."; diff --git a/nixpkgs/pkgs/applications/misc/writefreely/default.nix b/nixpkgs/pkgs/applications/misc/writefreely/default.nix index 1f9c048e71f4..17f03c787d94 100644 --- a/nixpkgs/pkgs/applications/misc/writefreely/default.nix +++ b/nixpkgs/pkgs/applications/misc/writefreely/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-GnuqYgiwXdKM+os5RzuUYe9ADOhZaxou5dD7GCEE1Ns="; }; - vendorSha256 = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; + vendorHash = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; nativeBuildInputs = [ go-bindata ]; diff --git a/nixpkgs/pkgs/applications/misc/ydict/default.nix b/nixpkgs/pkgs/applications/misc/ydict/default.nix index 078d6abccf50..93b06323e0f4 100644 --- a/nixpkgs/pkgs/applications/misc/ydict/default.nix +++ b/nixpkgs/pkgs/applications/misc/ydict/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M="; }; - vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; + vendorHash = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; ldflags = [ "-s" |