From bb60969483b83ace611219cfee068ba186abb517 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Tue, 25 Jun 2024 00:01:48 +0200 Subject: root: don't explicitly set tmva-pymva=OFF Building this component of ROOT doesn't require anything that is not already in the dependencies. --- pkgs/applications/science/misc/root/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index ded47a661a21a..3f20b0a3120d7 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -166,7 +166,6 @@ stdenv.mkDerivation rec { "-Dmysql=OFF" "-Dpgsql=OFF" "-Dsqlite=OFF" - "-Dtmva-pymva=OFF" "-Dvdt=OFF" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" -- cgit 1.4.1 From 5e2823d5fee58a5e991759009cbfe5211b5dddca Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Tue, 25 Jun 2024 00:09:02 +0200 Subject: root: 6.32.00 -> 6.32.02 --- pkgs/applications/science/misc/root/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 3f20b0a3120d7..81f2f75be6517 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.32.00"; + version = "6.32.02"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-EvIDaBpZBBxHTOlSN2Hm8OiGGzvueN9feZqNtVGJ5dI="; + hash = "sha256-PQ92vwWFfhgHzPssngFPUlvLYl+UojcLRV9LFklhYC0="; }; clad_src = fetchgit { -- cgit 1.4.1 From 551b0f3bef2bc2650552349766ae05326a67c932 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jun 2024 14:05:12 +0000 Subject: otpclient: 3.6.0 -> 3.7.0 --- pkgs/applications/misc/otpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 0ab84ea083720..8ca73be27547c 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Nv2ci8MBjvWc7gF5UOJnyfSV8XK0REN1XwI8RUYgWI="; + hash = "sha256-Xw6Z/xDPQEVMdxMzrhtPAl3nOD7oMlZhKDb9bD8GEO8="; }; nativeBuildInputs = [ -- cgit 1.4.1 From db99d98201d752d291484aad4f7637392f77b9cc Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 28 Jun 2024 12:13:39 -0400 Subject: root: add comment with link to clad cmake files --- pkgs/applications/science/misc/root/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 81f2f75be6517..5200b3f36006f 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -69,7 +69,9 @@ stdenv.mkDerivation rec { clad_src = fetchgit { url = "https://github.com/vgvassilev/clad"; - rev = "refs/tags/v1.5"; # Make sure that this is the same tag as in the ROOT build files! + # Make sure that this is the same tag as in the ROOT build files! + # https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt#L76 + rev = "refs/tags/v1.5"; hash = "sha256-s0DbHfLthv51ZICnTd30O4qG/DyZPk5tADeu3bBRoOw="; }; -- cgit 1.4.1 From 848699d4c1f669af01918b7cfdb438329667ddc2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 28 Jun 2024 12:13:50 -0400 Subject: root: fix darwin build --- pkgs/applications/science/misc/root/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 5200b3f36006f..5d01a33e5dcc4 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -223,6 +223,9 @@ stdenv.mkDerivation rec { ]}" ''; + # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-faligned-allocation"; + # To use the debug information on the fly (without installation) # add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format) # and make sure that gdb from Nixpkgs can be found in PATH. -- cgit 1.4.1 From 243e565d757dc19bcf3990cc468ce952e2d5cd86 Mon Sep 17 00:00:00 2001 From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:30:58 -0400 Subject: treewide: fix name for appimages --- pkgs/applications/blockchains/trezor-suite/default.nix | 8 +++----- pkgs/applications/misc/mobilecoin-wallet/default.nix | 7 ++----- pkgs/applications/networking/cluster/lens/linux.nix | 8 ++------ .../applications/networking/instant-messengers/beeper/default.nix | 3 +-- .../networking/instant-messengers/ripcord/default.nix | 2 +- pkgs/applications/networking/pcloud/default.nix | 2 +- pkgs/applications/office/super-productivity/default.nix | 3 +-- pkgs/applications/video/freetube/default.nix | 3 +-- pkgs/by-name/im/immersed-vr/linux.nix | 3 +-- pkgs/by-name/wo/wowup-cf/package.nix | 6 ++---- pkgs/os-specific/linux/uhk-agent/default.nix | 3 +-- 11 files changed, 16 insertions(+), 32 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 040cdac18b0cb..b341ca102b86e 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -9,7 +9,6 @@ let pname = "trezor-suite"; version = "24.6.2"; - name = "${pname}-${version}"; suffix = { aarch64-linux = "linux-arm64"; @@ -17,7 +16,7 @@ let }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; + url = "https://github.com/trezor/trezor-suite/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' aarch64-linux = "sha512-fJnka//9DbvTTq7GEN++6thU8f8BL4cHh1J4P/Tu9Eu94KWCHDG2IwFALOXEvZnwLbxFYiu3Cqldp2RIxYFXTA=="; x86_64-linux = "sha512-/gRQR1EriiwrDj04BTnhXlsawJgHp6TqgHpgVCMO1r+U2zGiFLdNfwG/SYwARE+55X8Umls5hCt/wuCpTEPkEg=="; @@ -25,16 +24,15 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources cp -a ${appimageContents}/locales/ $out/share/${pname} diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 42bbae72af5ae..367a4d75f3b58 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -3,21 +3,18 @@ let pname = "mobilecoin-wallet"; version = "1.8.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; hash = "sha256-XGU/xxsMhOBAh+MeMtL2S707yH8HnoO9w5l7zqjO6rs="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/locales $out/share/${pname} cp -a ${appimageContents}/resources $out/share/${pname} diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix index c76a1607760da..4a68ce6468924 100644 --- a/pkgs/applications/networking/cluster/lens/linux.nix +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,20 +1,16 @@ { pname, version, src, meta, appimageTools, makeWrapper }: let - - name = "${pname}-${version}"; - appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src meta; + inherit pname version src meta; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 87d1d53c9ddea..4b04be48d11e9 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,7 +11,6 @@ let pname = "beeper"; version = "3.106.2"; - name = "${pname}-${version}"; src = fetchurl { url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.106.2-build-240604xwl5q01pr-x86_64.AppImage"; hash = "sha256-WbAWJJzk58UVmRN3RHmU/V6zPiLWAb7m7hns4gmP55M="; @@ -25,7 +24,7 @@ let }; in stdenvNoCC.mkDerivation rec { - inherit name pname version; + inherit pname version; src = appimage; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 82d1fdff2e808..7e40f880d2761 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { - name = "${pname}-${version}"; + inherit pname version; src = appimage; }; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 08cdc3498811d..ccc0d924cac37 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -48,7 +48,7 @@ let }; appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; + inherit pname version; src = "${src}/pcloud"; }; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 1e404ddc24c12..54773afe7604f 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { }; appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; }; dontUnpack = true; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 72bdd1f97916e..1f21fabb78f96 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.freetube; appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; }; dontUnpack = true; diff --git a/pkgs/by-name/im/immersed-vr/linux.nix b/pkgs/by-name/im/immersed-vr/linux.nix index cab32531fd7f3..60d19900afc9c 100644 --- a/pkgs/by-name/im/immersed-vr/linux.nix +++ b/pkgs/by-name/im/immersed-vr/linux.nix @@ -4,7 +4,6 @@ , meta , appimageTools }: -appimageTools.wrapType2 rec { +appimageTools.wrapType2 { inherit pname version src meta; - name = "${pname}-${version}"; } diff --git a/pkgs/by-name/wo/wowup-cf/package.nix b/pkgs/by-name/wo/wowup-cf/package.nix index a9243ef3adb56..0a5fbe1fe4f41 100644 --- a/pkgs/by-name/wo/wowup-cf/package.nix +++ b/pkgs/by-name/wo/wowup-cf/package.nix @@ -3,19 +3,17 @@ let version = "2.12.0"; pname = "wowup-cf"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage"; hash = "sha256-uWz/EQBX/d1UBfpc9EL4x+UH72kINd6pqFIvJkV16e8="; }; - appimageContents = appimageTools.extractType1 { inherit name src; }; + appimageContents = appimageTools.extractType1 { inherit pname version src; }; in appimageTools.wrapType1 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 553e471faaffa..8177c7d1efda6 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -21,8 +21,7 @@ let }; appimageContents = appimageTools.extract { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; }; in stdenvNoCC.mkDerivation { -- cgit 1.4.1 From 72e6c1678022d03bb10e4c712689701fbb3b100f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 29 Jun 2024 18:28:53 +0200 Subject: vimPlugins.sniprun: 1.3.13 -> 1.3.14 Diff: https://github.com/michaelb/sniprun/compare/refs/tags/v1.3.13...v1.3.14 Changelog: https://github.com/michaelb/sniprun/releases/tag/v1.3.14 --- pkgs/applications/editors/vim/plugins/overrides.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index fbb76ddb838f2..f2d7640a83e1e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1348,12 +1348,12 @@ sniprun = let - version = "1.3.13"; + version = "1.3.14"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-PQ3nAZ+bMbHHJWD7cV6h1b3g3TzrakA/N8vVumIooMg="; + hash = "sha256-9vglmQ9sy0aCbj4H81ublHclpoSfOA7ss5CNdoX54sY="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; @@ -1363,7 +1363,7 @@ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-I8R2V9zoLqiM4lu0D7URoVof68wtKHI+8T8fVrUg7i4="; + cargoHash = "sha256-p4rZBgB3xQC14hRRTjNZT1G1gbaKydlKu6MYNSLk6iA="; nativeBuildInputs = [ makeWrapper ]; @@ -1385,6 +1385,12 @@ ''; propagatedBuildInputs = [ sniprun-bin ]; + + meta = { + homepage = "https://github.com/michaelb/sniprun/"; + changelog = "https://github.com/michaelb/sniprun/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; }; # The GitHub repository returns 404, which breaks the update script -- cgit 1.4.1