diff options
-rw-r--r-- | pkgs/applications/misc/mkgmap/splitter/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/misc/snakemake/default.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/et/etlegacy-unwrapped/package.nix | 5 | ||||
-rw-r--r-- | pkgs/by-name/et/etlegacy/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/go/go-critic/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/nh/nh/package.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/meshtastic/default.nix | 67 | ||||
-rw-r--r-- | pkgs/development/python-modules/playwrightcapture/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/tencentcloud-sdk-python/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/zha-quirks/default.nix | 31 | ||||
-rw-r--r-- | pkgs/development/tools/rust/cargo-deps/default.nix | 21 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/atool/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/garage/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
17 files changed, 77 insertions, 102 deletions
diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 801af789d47d8..c16b97f4a7e9d 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "653"; + version = "654"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; rev = version; - sha256 = "sha256-iw414ecnOfeG3FdlIaoVOPv9BXZ95uUHuPzCQGH4G+A="; + sha256 = "sha256-y/pl8kIQ6fiF541ho72LMgJFWJdkUBqPToQGCGmmcfg="; }; patches = [ diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 1027590d0de84..d355412e54f0a 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.10.4"; + version = "8.10.6"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SZf//Z1rLHyvW/f0U6kEBzV1NjDEDG1OcFl9/JR+i/g="; + hash = "sha256-THp8sqAFZVA5V2k0ruv9qwmPNjSVi2uVx8tla0Y3awE="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 8bacd93e1a2b0..84526ae11ada5 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -92,11 +92,6 @@ stdenv.mkDerivation { "-DINSTALL_DEFAULT_BINDIR=${placeholder "out"}/bin" ]; - postInstall = '' - makeWrapper $out/bin/etl.* $out/bin/etl - makeWrapper $out/bin/etlded.* $out/bin/etlded - ''; - hardeningDisable = [ "fortify" ]; meta = { diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix index e98b63c7a3527..446659c0148fb 100644 --- a/pkgs/by-name/et/etlegacy/package.nix +++ b/pkgs/by-name/et/etlegacy/package.nix @@ -18,10 +18,12 @@ symlinkJoin { ]; postBuild = '' - makeWrapper $out/bin/etl.* $out/bin/etl \ + wrapProgram $out/bin/etl.* \ --add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy" - makeWrapper $out/bin/etlded.* $out/bin/etlded \ + wrapProgram $out/bin/etlded.* \ --add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy" + makeWrapper $out/bin/etl.* $out/bin/etl + makeWrapper $out/bin/etlded.* $out/bin/etlded ''; meta = { diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index ea59125410635..aee7e0da791f8 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-critic"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; rev = "v${version}"; - hash = "sha256-xej9ROsJYrjvlitxnAjUKPsp0kb8INvFnkdNfYiycz8="; + hash = "sha256-GEwUz6iH9y+d2UoKY68VHOKomn4EUkzoUgNHTqluW8I="; }; - vendorHash = "sha256-pYdnZjCGx+skF/kqA1QO3NuVqOfsMJNVhFBpwtdZhIA="; + vendorHash = "sha256-rfqX76SQnLQFwheHlS3GZD+jeaVd38qfSnQCH7OH6+I="; subPackages = [ "cmd/gocritic" diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 83cc94ae2ff4d..780e3b2a0693e 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.7"; + version = "3.5.10"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-gpvOzL+7PP22juK6yI01EiGUEVVo4lHGXCs5OmCAX+s="; + hash = "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-DcYvovD2Qx4ybpV7YckwYvy8hsoq50YGZI8fl2BXFLI="; + cargoHash = "sha256-/aqs/l+Qi2b8zxHXqxdHLBpSr5+vVsd6pY/QnHbkmb0="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index bc00d859f6b83..7fab04572aa61 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -1,27 +1,28 @@ -{ lib -, bleak -, buildPythonPackage -, dotmap -, fetchFromGitHub -, pexpect -, protobuf -, pygatt -, pypubsub -, pyqrcode -, pyserial -, pytap2 -, pytestCheckHook -, pythonOlder -, pyyaml -, requests -, setuptools -, tabulate -, timeago +{ + lib, + bleak, + buildPythonPackage, + dotmap, + fetchFromGitHub, + pexpect, + protobuf, + pygatt, + pypubsub, + pyqrcode, + pyserial, + pytap2, + pytestCheckHook, + pythonOlder, + pyyaml, + requests, + setuptools, + tabulate, + timeago, }: buildPythonPackage rec { pname = "meshtastic"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,12 +31,10 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-kydZgOiQHDovQ5RwyLru2nyHoCEVZClq8wJit/mnbvU="; + hash = "sha256-WxiddF1n9lyxKkZk1MU40NzLh6goLVs81mbJZ3F33R8="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ bleak @@ -54,9 +53,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - tunnel = [ - pytap2 - ]; + tunnel = [ pytap2 ]; }; nativeCheckInputs = [ @@ -68,19 +65,21 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; - pythonImportsCheck = [ - "meshtastic" - ]; + pythonImportsCheck = [ "meshtastic" ]; disabledTests = [ # TypeError - "test_main_info" - "test_main_support" + "test_main_info_with_seriallog_output_txt" + "test_main_info_with_seriallog_stdout" "test_main_info_with_tcp_interfa" + "test_main_info" "test_main_no_proto" - "test_main_info_with_seriallog_stdout" - "test_main_info_with_seriallog_output_txt" + "test_main_support" + "test_MeshInterface" + "test_message_to_json_shows_all" + "test_SerialInterface_single_port" "test_support_info" + "test_TCPInterface" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index e619ebeb89d8a..e9b1e8398824c 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.1"; + version = "1.24.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-+2BxXgIC595FM3FDIbFjFpWIEkqQrDILWFjQkyN5nao="; + hash = "sha256-1VLdQFTB2YG8JUNA9+ys8p1kE/5a5qvzMtEtboejOpc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 5efe78255f189..507652c5a78d9 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1125"; + version = "3.0.1126"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-4oof7FDgwTORGnaI+C5pTd1Fj5EgyBFfsVJPhRhu96o="; + hash = "sha256-o8MECOLzs8JUxUTgAzSM5MpY3pK39Pt3hF/IQQrGMrA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 7652eee0350c2..03413fc6f1fcf 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -1,17 +1,18 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools -, zigpy +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + zigpy, }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.113"; + version = "0.0.114"; pyproject = true; disabled = pythonOlder "3.12"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-Th0JF7sauDhFIZH7BY4STgJZ2o+zqQmtUqNLNeaB6As="; + hash = "sha256-FipD4VCz2/FYlf17+q7LTej9ZtT72/R4ELkAQtw7RvE="; }; postPatch = '' @@ -29,9 +30,7 @@ buildPythonPackage rec { --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -50,9 +49,7 @@ buildPythonPackage rec { "test_smart_air_sensor" ]; - pythonImportsCheck = [ - "zhaquirks" - ]; + pythonImportsCheck = [ "zhaquirks" ]; meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; diff --git a/pkgs/development/tools/rust/cargo-deps/default.nix b/pkgs/development/tools/rust/cargo-deps/default.nix deleted file mode 100644 index 4265873a71acc..0000000000000 --- a/pkgs/development/tools/rust/cargo-deps/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, fetchCrate, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-deps"; - version = "1.5.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-qnSHG4AhBrleYKZ4SJ4AwHdJyiidj8NTeSSphBRo7gg="; - }; - - cargoHash = "sha256-dpCbFA9AZmIFPx69tw0CqHF+lVw7uhUlwAeVX1+lIK8="; - - meta = with lib; { - description = "Cargo subcommand for building dependency graphs of Rust projects"; - mainProgram = "cargo-deps"; - homepage = "https://github.com/m-cat/cargo-deps"; - license = licenses.mit; - maintainers = with maintainers; [ arcnmx matthiasbeyer ]; - }; -} diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 125b6cb78b9b8..a34e1285e3071 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.5"; + version = "23.2.6"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-M+x/8mh6WfqqUrmwmqjK8Rjn7Lau2JU/UmpiX/n0vZA="; + hash = "sha256-HJo2a058ytug+b0xPFnq4S0jvXJUOyKibq+LIINc/G0="; }; depsBuildBuild = [ diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 8303a1b4277b0..daeaec9de3b2c 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Archive command line helper"; platforms = lib.platforms.unix; license = lib.licenses.gpl3; + mainProgram = "atool"; }; } diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b48e2696f09c8..baff7f0303874 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -68,5 +68,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.gpl3Plus; + + mainProgram = "gzip"; }; } diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 520a6951941ad..b0cf599ea4f1b 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -103,14 +103,14 @@ rec { garage_0_8 = garage_0_8_7; - garage_0_9_3 = generic { - version = "0.9.3"; - sha256 = "sha256-NN2HoheSW2+SAFX71K12KTe0wpaBEwkwxvZDi0Bdx+8="; - cargoSha256 = "sha256-OabgWVMkccFFAtBHEf3z+MRVcWaO+NCk/pumEqdNNRs="; + garage_0_9_4 = generic { + version = "0.9.4"; + sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; + cargoSha256 = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA="; broken = stdenv.isDarwin; }; - garage_0_9 = garage_0_9_3; + garage_0_9 = garage_0_9_4; garage = garage_0_9; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 31e2bf54ed5c5..8e9d506706d80 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -151,6 +151,7 @@ mapAliases ({ cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 + cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-espflash = espflash; cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4b6d202885e8..db8d02340712c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8352,7 +8352,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_7 garage_0_9_3; + garage_0_8_7 garage_0_9_4; garmintools = callPackage ../development/libraries/garmintools { }; @@ -16771,7 +16771,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-deb = callPackage ../development/tools/rust/cargo-deb { }; - cargo-deps = callPackage ../development/tools/rust/cargo-deps { }; cargo-docset = callPackage ../development/tools/rust/cargo-docset { }; cargo-duplicates = callPackage ../development/tools/rust/cargo-duplicates { }; cargo-edit = callPackage ../development/tools/rust/cargo-edit { |