diff options
Diffstat (limited to 'pkgs/development')
52 files changed, 576 insertions, 152 deletions
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 4660d563c6b45..34b75b05d87f9 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -36,7 +36,7 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202302"; + version = "202305"; patches = [ # pass targetPrefix as an env var @@ -52,7 +52,7 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "sha256-KZ5bTdaStO2M1hLPx9LsUSMl9NEiZeYMmFiShxCJqJM="; + hash = "sha256-htOvV43Hw5K05g0SF3po69HncLyma3BtgpqYSdzRG4s="; }; nativeBuildInputs = [ pythonEnv ]; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index ba2a6f6092aae..95758fb56ab04 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -5,7 +5,7 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - mkFlutter = { version, engineVersion, dartVersion, hash, dartHash, patches }: + mkFlutter = { version, engineVersion, dartVersion, flutterHash, dartHash, patches }: let args = { inherit version engineVersion patches; @@ -21,12 +21,34 @@ let url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; sha256 = dartHash.aarch64-linux; }; + "${dartVersion}-x86_64-darwin" = fetchzip { + url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; + sha256 = dartHash.x86_64-darwin; + }; + "${dartVersion}-aarch64-darwin" = fetchzip { + url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip"; + sha256 = dartHash.aarch64-darwin; + }; }; }; - src = fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; - sha256 = hash; - }; + src = { + x86_64-linux = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; + sha256 = flutterHash.x86_64-linux; + }; + aarch64-linux = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; + sha256 = flutterHash.aarch64-linux; + }; + x86_64-darwin = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_${version}-stable.zip"; + sha256 = flutterHash.x86_64-darwin; + }; + aarch64-darwin = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_${version}-stable.zip"; + sha256 = flutterHash.aarch64-darwin; + }; + }.${stdenv.hostPlatform.system}; }; in (mkCustomFlutter args).overrideAttrs (prev: next: { @@ -55,10 +77,17 @@ in version = "3.10.5"; engineVersion = "45f6e009110df4f34ec2cf99f63cf73b71b7a420"; dartVersion = "3.0.5"; - hash = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI="; dartHash = { x86_64-linux = "sha256-UVVwPFk0qsKNR4JZMOGSGh1T482MN/8Xp4MZ3SA3C28="; aarch64-linux = "sha256-phzaFfrv7qbZOOhPq92q39R6mr5vFeBqEmYDU7e7lZQ="; + x86_64-darwin = "sha256-4gJ659bNzs2lfI1LRwFACgu/ttkj+3xIrqLijju+CaI="; + aarch64-darwin = "sha256-RJt+muq5IrcAhVLYEgdbVygcY1oB7tnVCN+iqktC+6c="; + }; + flutterHash = rec { + x86_64-linux = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI="; + aarch64-linux = x86_64-linux; + x86_64-darwin = "sha256-1ZC5aCoGVBCeTSsu/ZEl1v53lLnzulx8Ya6YXvo4yIY="; + aarch64-darwin = "sha256-TCMempLjO47IbP5MAZVHlXXvNaURGo+EbaL0K8e27wU="; }; patches = flutter3Patches; }; @@ -67,10 +96,17 @@ in version = "3.7.12"; engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314"; dartVersion = "2.19.6"; - hash = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE="; dartHash = { x86_64-linux = "sha256-4ezRuwhQHVCxZg5WbzU/tBUDvZVpfCo6coDE4K0UzXo="; aarch64-linux = "sha256-pYmClIqOo0sRPOkrcF4xQbo0mHlrr1TkhT1fnNyYNck="; + x86_64-darwin = "sha256-tuIQhIOX2ub0u99CW/l7nCya9YVNokCZNgbVFqO4ils="; + aarch64-darwin = "sha256-Oe8/0ygDN3xf5/2I3N/OBzF0bps7Mg0K2zJKj+E9Nak="; + }; + flutterHash = rec { + x86_64-linux = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE="; + aarch64-linux = x86_64-linux; + x86_64-darwin = "sha256-cJF8KB9fNb3hTZShDAPsMmr1neRdIMLvIl/m2tpzwQs="; + aarch64-darwin = "sha256-yetEE65UP2Wh9ocx7nClQjYLHO6lIbZPay1+I2tDSM4="; }; patches = flutter3Patches; }; diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 6f5d6b98d9b8f..249e9217325ba 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -2,10 +2,11 @@ , stdenv , hostPlatform , engineVersion +, fetchurl , fetchzip , autoPatchelfHook - , gtk3 +, unzip }: let @@ -44,6 +45,56 @@ let }; }; + darwin = { + "arm64" = { + base = [ + { archive = "artifacts.zip"; } + { archive = "font-subset.zip"; } + ]; + variants = lib.genAttrs [ "profile" "release" ] + (variant: [ + { archive = "artifacts.zip"; } + ]); + }; + "x64" = { + base = [ + { archive = "FlutterEmbedder.framework.zip"; } + { archive = "FlutterMacOS.framework.zip"; } + { archive = "artifacts.zip"; } + { archive = "font-subset.zip"; } + { archive = "gen_snapshot.zip"; } + ]; + variants.profile = [ + { archive = "FlutterMacOS.framework.zip"; } + { archive = "artifacts.zip"; } + { archive = "gen_snapshot.zip"; } + ]; + variants.release = [ + { archive = "FlutterMacOS.dSYM.zip"; } + { archive = "FlutterMacOS.framework.zip"; } + { archive = "artifacts.zip"; } + { archive = "gen_snapshot.zip"; } + ]; + }; + }; + + ios = + (lib.genAttrs + [ "" ] + (arch: + { + base = [ + { archive = "artifacts.zip"; } + ]; + variants.profile = [ + { archive = "artifacts.zip"; } + ]; + variants.release = [ + { archive = "artifacts.zip"; } + { archive = "Flutter.dSYM.zip"; } + ]; + })); + linux = lib.genAttrs [ "arm64" "x64" ] (arch: @@ -85,18 +136,29 @@ let let artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}"; archiveBasename = lib.removeSuffix ".${(lib.last (lib.splitString "." archive))}" archive; + overrideUnpackCmd = builtins.elem archive [ "FlutterEmbedder.framework.zip" "FlutterMacOS.framework.zip" ]; in stdenv.mkDerivation ({ pname = "flutter-artifact${lib.optionalString (platform != null) "-${artifactDirectory}"}-${archiveBasename}"; version = engineVersion; - src = fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; - stripRoot = false; - hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; - }; + nativeBuildInputs = [ unzip ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + src = + if overrideUnpackCmd then + (fetchurl { + url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; + hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; + }) else + (fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; + stripRoot = false; + hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; + }); - nativeBuildInputs = [ autoPatchelfHook ]; + setSourceRoot = if overrideUnpackCmd then "sourceRoot=`pwd`" else null; + unpackCmd = if overrideUnpackCmd then "unzip -o $src -d $out" else null; installPhase = let @@ -117,13 +179,13 @@ let (architecture: variants: { base = map (args: mkArtifactDerivation ({ - platform = "${os}-${architecture}"; + platform = "${os}${lib.optionalString (architecture != "") "-${architecture}"}"; } // args)) variants.base; variants = builtins.mapAttrs (variant: variantArtifacts: map (args: mkArtifactDerivation ({ - platform = "${os}-${architecture}"; + platform = "${os}${lib.optionalString (architecture != "") "-${architecture}"}"; inherit variant; } // args)) variantArtifacts) diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index d0749bf09783c..fb5134739f76b 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -6,10 +6,12 @@ android-arm-profile = { "artifacts.zip" = "sha256-MErLoGJWXg4yJ6b6c5bqP8Nat6O7eYSfM71mMNAAQf4="; "linux-x64.zip" = "sha256-0TZQ05HR7NRqHzeoHZ/sOrjKiSvCpMUH85YXXzV4URg="; + "darwin-x64.zip" = "sha256-gOmxGurYyuuGxPnzK+2O1s7d7x514R9MfincibxVTCI="; }; android-arm-release = { "artifacts.zip" = "sha256-hU4S4FOqUGokByZ47nzOqQ4A9QFshruqrpJvJUBHUho="; "linux-x64.zip" = "sha256-AqNlqjOht+c2sdW5ReoF66ZJWJl1W4vGKbQ3YyderRY="; + "darwin-x64.zip" = "sha256-UiJNbIvjYvIX2oFNCz+TurUdhHS8vcl9X6WEkEs5hvU="; }; android-arm64 = { "artifacts.zip" = "sha256-ApNg3Uu9gyGNsx7sdpTCz1yADVAI5ZuNHgvgiuH9IpQ="; @@ -17,10 +19,12 @@ android-arm64-profile = { "artifacts.zip" = "sha256-D/8+WKPIkOaV3PwkCHiJROFlokm4lWWmtPQb93Yqwr0="; "linux-x64.zip" = "sha256-S0RHLov6/C22VvGdvZV87Ybaxun8YBrw1gTgNklRcM0="; + "darwin-x64.zip" = "sha256-AWivGn0TCVEW+N8g9bpEP1JuKWhrccb+ANQgyLjBjfw="; }; android-arm64-release = { "artifacts.zip" = "sha256-OoYqHtwmT+VWJ+G+sMXM5+ux3h1Fnyo9Vj2za9cm5eE="; "linux-x64.zip" = "sha256-NuXclg1a+Ofw5AWJ1tajpn2jYEZw6DluWxrFVL8rPfg="; + "darwin-x64.zip" = "sha256-/j5sVfyllkhsc9mpdbOqlT7VT1H6nD3Y+mYnWXDh0yI="; }; android-x64 = { "artifacts.zip" = "sha256-hrBvnzCj/24h5kat96avlgXi6WhMsos5aPlkgxOYo8Q="; @@ -28,10 +32,12 @@ android-x64-profile = { "artifacts.zip" = "sha256-xzSj/2ah9aQoosaNGkSWFP3bMNJqRSFc0+78XEBHwzM="; "linux-x64.zip" = "sha256-HfBiz1JWlBQ8KEfmf8uDlVzFlDt3+VF2VeY82tsMjHs="; + "darwin-x64.zip" = "sha256-J5JJH9GAQaQKahimb09fLC59VchPP15iMHY9bDMfdf8="; }; android-x64-release = { "artifacts.zip" = "sha256-TcfMeA+8Uf9yRrYdEIsjip0cKmSUm2Ow1tkoE9803XY="; "linux-x64.zip" = "sha256-D6efb6pj9+xjPnJu3O+ZCmwfatBzasuFZEFRntAiU9U="; + "darwin-x64.zip" = "sha256-hDftGgKqW6tzH/+jFOYfzxssbS01XtiWEeycJr3QSoc="; }; android-x86 = { "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y="; @@ -39,8 +45,46 @@ android-x86-jit-release = { "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk="; }; + darwin-arm64 = { + "artifacts.zip" = "sha256-lfkEToKFBBOee7KgOl1z/ZeMQwEBWkmAYb2Hbfk8dfg="; + "font-subset.zip" = "sha256-W7GnLvCobED7uyhpURF4T4SL4yZIQmE2JFQVQIxl0NI="; + }; + darwin-arm64-profile = { + "artifacts.zip" = "sha256-DfYS+FEqjtq02jFRBqVR3SVWe4LAoPa5MMKWCbvF7mI="; + }; + darwin-arm64-release = { + "artifacts.zip" = "sha256-gG/OcCJE3XPO6T8bltMtPxdlYX5HQ/4qYsdHe0OdDaE="; + }; + darwin-x64 = { + "FlutterEmbedder.framework.zip" = "sha256-G84GGK6gtR+CYu9S/GhdNTL4KWqgFBp8QdvWOq+IZlk="; + "FlutterMacOS.framework.zip" = "sha256-1/txBoXDIs7Gn5zsZ4jYQXK73+iaZV4sRdYKqEBUTxU="; + "artifacts.zip" = "sha256-H7Moy6E1eRrOXYYAIgiJHOmstyy3YaCnu8O3IPr9BK8="; + "font-subset.zip" = "sha256-VSkG3zZw/4DDInwxPaMXT2B1LXIb0Ejkb2xf5SVrwW4="; + "gen_snapshot.zip" = "sha256-Pknv1fUcXGbWzt6So0DgWnvL4b43k51KMWiX1YXd2As="; + }; + darwin-x64-profile = { + "FlutterMacOS.framework.zip" = "sha256-3umN1HNX4UA00EFsBnWS0X04QRKlcCnChDYd9L6x1L4="; + "artifacts.zip" = "sha256-8Aj2+nTKKeVLEYN+swVlVqRB/3fVSwrb3i1g1JUDsNY="; + "gen_snapshot.zip" = "sha256-bi3RqSdOQODpPmY+eBUQPiNeZ/bECoOUx/pOADpTZiA="; + }; + darwin-x64-release = { + "FlutterMacOS.dSYM.zip" = "sha256-LfDQuCcBXEV3Jao/sbfIvjn1d2ZfZrWgzNzFE1zE3Rw="; + "FlutterMacOS.framework.zip" = "sha256-2xuPPJifdu/kvvtR0viMvbTOXfv8ndtNAhTmef8863o="; + "artifacts.zip" = "sha256-3p41zRjvWYCl/Kk/7/0MjV2FS10XEtyX1hYmxTHT8lU="; + "gen_snapshot.zip" = "sha256-ExXwj1QO1XQznZ49rW08tibA5BaURShE6pUYDokZfpE="; + }; "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k="; "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA="; + ios = { + "artifacts.zip" = "sha256-yqJ4+lNsedRFbe11dBK4KGMX5+Nilj1V0i2E94n7q+0="; + }; + ios-profile = { + "artifacts.zip" = "sha256-ZguLM1QoYyg5dXPw3Fl1zSLdbirShV3xZuxl1CfEf50="; + }; + ios-release = { + "Flutter.dSYM.zip" = "sha256-Y57wt1y4NIdbRMM1r/d1Dv8bekwO9/9gpLkTEcw7Hfs="; + "artifacts.zip" = "sha256-Sm4Pkm1mWu3k5S+aws+kRpth+o3yTBYITg23LhnSViE="; + }; linux-arm64 = { "artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw="; "font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU="; @@ -75,10 +119,12 @@ android-arm-profile = { "artifacts.zip" = "sha256-MZK1zaSv9yuZaVDR1dReCM7WRDxKql0yxsPa8WFc1yw="; "linux-x64.zip" = "sha256-9OlBv2C6Msj73g624TixbstudCTbdIJ6PzPMsbQENy4="; + "darwin-x64.zip" = "sha256-lVJ31F7UMaXQym3touJQ2cN8svKBaWJurDTVZPeMzCo="; }; android-arm-release = { "artifacts.zip" = "sha256-tjHckwoxQkkKoyTl6+wBKK40mFDmSDvCPNhBHVA+xxw="; "linux-x64.zip" = "sha256-zE9oYkv4WBcbgEdYfYIcdDXX3tnYfCg+3KA3oA03nYA="; + "darwin-x64.zip" = "sha256-mCr29gIn808NF4k8kdC7oLTSU6AXq7I/bJF3BBdJlAo="; }; android-arm64 = { "artifacts.zip" = "sha256-8W/JrOGhAzHWpM2Jh9vjdkaB6ODmCItqcmF47GqbNQk="; @@ -86,10 +132,12 @@ android-arm64-profile = { "artifacts.zip" = "sha256-9SGBWp05lxLQTpLuzq8FYSQQOpjo8UL93Pv4YYFD4QE="; "linux-x64.zip" = "sha256-5nH2AAxupRIhn8gNH+1V+vSP+qqfx5MS97EC4s3QHe8="; + "darwin-x64.zip" = "sha256-kkutEwKcj1wKJREbxbx8+DW53WVbizg6zKIFFVujgAM="; }; android-arm64-release = { "artifacts.zip" = "sha256-7O7RBfEo6enZtVNsnt4HH0bex8Xpz9mqCvb2LNLbg3Q="; "linux-x64.zip" = "sha256-loucmX4+0R11L1nzewiMTeRZoB6wLK0WasW5W3rIvYU="; + "darwin-x64.zip" = "sha256-0bpNQDfIzQqwQpzThLfOXEEEpH/uCJCRF331d0/pzfs="; }; android-x64 = { "artifacts.zip" = "sha256-j7AezbyzH07yOR0/W1ttfCjMHMdOlXLQjAsu/ExqmqA="; @@ -97,10 +145,12 @@ android-x64-profile = { "artifacts.zip" = "sha256-J8cqdcHoj1hpo6zY5R6S9lvkVXp7wvzQlurM7TEUe+k="; "linux-x64.zip" = "sha256-YuRHctkDjLZVGQr+m5uM+AxYNLkfqycV4UNcAp7JavE="; + "darwin-x64.zip" = "sha256-Mw8C279cVbQHTdIsHhIT5HWe52X8XXbkIDpVcEz1tWc="; }; android-x64-release = { "artifacts.zip" = "sha256-uhq3fXcxXjF4/YHSkf6V4wToL9jOUKBm3978j/7xI/s="; "linux-x64.zip" = "sha256-iJfatLW7jVcrfNdVx/QOPiyON5ce0tSNGOBx0TILrKE="; + "darwin-x64.zip" = "sha256-3P3QZ+jW3Jl6PJvRY9pBHQdhj8UcsHFAjln8q6UlL+A="; }; android-x86 = { "artifacts.zip" = "sha256-/xLacCi65hg1gEahty0btrc+NR/jfebSAIt31qwIlZY="; @@ -108,8 +158,46 @@ android-x86-jit-release = { "artifacts.zip" = "sha256-Ntq0i+sFruDhlyp9VBxBnsNqqGoQeXMeIwfi+BNlr0Q="; }; + darwin-arm64 = { + "artifacts.zip" = "sha256-A21Tnn4jC5IzdL3c7n6/q9H6uJ/ofvJ+K9W8PPpAoYM="; + "font-subset.zip" = "sha256-NhnUOK1Gn4ekKOf5rDoy4HodzhlS8ylf/MN/6l4Dk18="; + }; + darwin-arm64-profile = { + "artifacts.zip" = "sha256-aDWrz3bebC6kZRe2LgunsmFhbxJhmP1bsZv5A/SGF2Y="; + }; + darwin-arm64-release = { + "artifacts.zip" = "sha256-F44e39KSX8juojFBV/CSvFES+RQW+gHKDWtfnydqiNo="; + }; + darwin-x64 = { + "FlutterEmbedder.framework.zip" = "sha256-+S2unNH8cpfqUiPLTwGUUW00DdNYFDN8KM/O1pMdxQs="; + "FlutterMacOS.framework.zip" = "sha256-iCGXzxBhJGR6rWcECRg0W5Qv4I6ePo7UrWIqjQK1bWI="; + "artifacts.zip" = "sha256-2Ng0rxVDeMCH3kFHS7rhVd6R8oiJqvfsNDp+rzgtA50="; + "font-subset.zip" = "sha256-5IyNNLUT27WUCr61LjnMjmAZEv63ZaF+rl/p2XHFlVU="; + "gen_snapshot.zip" = "sha256-zPJaXPdvbQGx79c41XdRrBW/+3aV/INaPtO47+hHdxM="; + }; + darwin-x64-profile = { + "FlutterMacOS.framework.zip" = "sha256-PV4sTACDGeLLPz+AchxngWrQypmmUVQ48bQlAfH323w="; + "artifacts.zip" = "sha256-LBosuXu9mPh5WT0Mmgu9rX5Nuy+iIGN8Xvi7uVAyFhc="; + "gen_snapshot.zip" = "sha256-douXVnavzSGBuld3WhwHagBNK6FEU679puM8/fNGz2I="; + }; + darwin-x64-release = { + "FlutterMacOS.dSYM.zip" = "sha256-A8kyc1fmsGemgUVhI46yTC6XNkrXdoPYvwXomHoW6kM="; + "FlutterMacOS.framework.zip" = "sha256-dZ/MO9J+zanoGfvPaAinnANte92bQOlh697fd/LvGqA="; + "artifacts.zip" = "sha256-T/wxPd1LmstfGHr2Fx6cfhRifaGm6CUlig6cBMcOO5g="; + "gen_snapshot.zip" = "sha256-qeZxVp6btr/fUQRf7nOhlnSC03+QTcRaggiVOmPxVuo="; + }; "flutter_patched_sdk.zip" = "sha256-kRRFCqQGBDimqwMiSn4yRMNRfZHt03YJqsKW47IBIvQ="; "flutter_patched_sdk_product.zip" = "sha256-BowamIQHPZgfcZbWG7OFrB5GeEwdcA7AdUrF2Y+KIds="; + ios = { + "artifacts.zip" = "sha256-VoofDPEBUW2jBrXg3Z556uC2UdrD9JCpioZNhX1p/P0="; + }; + ios-profile = { + "artifacts.zip" = "sha256-5jDIqk7tWuRxXsAzrjBq9xzQrt/eREmmoEF3zc2xQ5M="; + }; + ios-release = { + "Flutter.dSYM.zip" = "sha256-TuDld2LcHshl1mXcuIwfZgWLm1My4RpXUwI2B/QbLRk="; + "artifacts.zip" = "sha256-bGuUCKVqNNWWGVccVVKIBmCxTqgu4Q2Kj/Znnl9ZR2Q="; + }; linux-arm64 = { "artifacts.zip" = "sha256-jME3ivE+M+ceAt3aGPSeVwPaW8UhwGQOoL5lmRUqrOU="; "font-subset.zip" = "sha256-MqavBMXOlx5JX94Oe/8GGuuDNh7A2UkjiOrEhCDW5cc="; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 59492f81231c5..49dcb4c3658d5 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -5,6 +5,7 @@ , src , lib , stdenv +, darwin , git , which }: @@ -18,6 +19,8 @@ let outputs = [ "out" "cache" ]; buildInputs = [ git ]; + nativeBuildInputs = [ ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; preConfigure = '' if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then @@ -69,8 +72,8 @@ let # Certain prebuilts should be replaced with Nix-built (or at least Nix-patched) equivalents. rm -r \ - bin/cache/dart-sdk \ - bin/cache/artifacts/engine + $FLUTTER_ROOT/bin/cache/dart-sdk \ + $FLUTTER_ROOT/bin/cache/artifacts/engine ''; installPhase = '' @@ -84,7 +87,8 @@ let ''; doInstallCheck = true; - nativeInstallCheckInputs = [ which ]; + nativeInstallCheckInputs = [ which ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; installCheckPhase = '' runHook preInstallCheck @@ -112,7 +116,7 @@ let ''; homepage = "https://flutter.dev"; license = licenses.bsd3; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ babariviere ericdallo FlafyDev gilice hacker1024 ]; }; }; diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 50c522fd0e047..5685ddebd7813 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -1,9 +1,12 @@ { lib , stdenv +, darwin , callPackage , flutter , supportsLinuxDesktop ? stdenv.hostPlatform.isLinux -, supportsAndroid ? stdenv.hostPlatform.isx86_64 +, supportsAndroid ? (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin) +, supportsDarwin ? stdenv.hostPlatform.isDarwin +, supportsIOS ? stdenv.hostPlatform.isDarwin , includedEngineArtifacts ? { common = [ "flutter_patched_sdk" @@ -12,6 +15,10 @@ platform = { android = lib.optionalAttrs supportsAndroid ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; }); + darwin = lib.optionalAttrs supportsDarwin + ((lib.genAttrs [ "arm64" "x64" ] (architecture: [ "profile" "release" ]))); + ios = lib.optionalAttrs supportsIOS + ((lib.genAttrs [ "" ] (architecture: [ "profile" "release" ]))); linux = lib.optionalAttrs supportsLinuxDesktop (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) (architecture: [ "debug" "profile" "release" ])); @@ -158,7 +165,9 @@ let in (callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped" { - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; passthru = flutter.passthru // { inherit (flutter) version; diff --git a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix b/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix index 1313a9aeada39..a97fa50aebf2c 100644 --- a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix +++ b/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix @@ -14,7 +14,7 @@ buildFHSEnv { pyserial ])) ]); - multiPkgs = null; + multiArch = false; extraInstallCommands = '' ${lib.optionalString withGui '' diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index ffd922c20dfe5..af496df582c1f 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeDesktopItem, copyDesktopItems, icoutils, fdupes, imagemagick, jdk11, fetchzip }: +{ lib, stdenv, makeDesktopItem, icoutils, fdupes, imagemagick, jdk11, fetchzip }: # TODO: JDK16 causes STM32CubeMX to crash right now, so we fixed the version to JDK11 # This may be fixed in a future version of STM32CubeMX. This issue has been reported to ST: # https://community.st.com/s/question/0D53W00000jnOzPSAU/stm32cubemx-crashes-on-launch-with-openjdk16 @@ -17,22 +17,28 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ icoutils fdupes imagemagick copyDesktopItems]; - desktopItems = [ - (makeDesktopItem { - name = "stm32CubeMX"; - exec = "stm32cubemx"; - desktopName = "STM32CubeMX"; - categories = [ "Development" ]; - comment = "STM32Cube initialization code generator"; - icon = "stm32cubemx"; - }) - ]; + nativeBuildInputs = [ icoutils fdupes imagemagick ]; + desktopItem = makeDesktopItem { + name = "STM32CubeMX"; + exec = "stm32cubemx"; + desktopName = "STM32CubeMX"; + categories = [ "Development" ]; + icon = "stm32cubemx"; + comment = meta.description; + terminal = false; + startupNotify = false; + mimeTypes = [ + "x-scheme-handler/sgnl" + "x-scheme-handler/signalcaptcha" + ]; + }; buildCommand = '' - mkdir -p $out/{bin,opt/STM32CubeMX} + mkdir -p $out/{bin,opt/STM32CubeMX,share/applications} + cp -r $src/MX/. $out/opt/STM32CubeMX/ chmod +rx $out/opt/STM32CubeMX/STM32CubeMX + cat << EOF > $out/bin/${pname} #!${stdenv.shell} ${jdk11}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX @@ -52,6 +58,8 @@ stdenv.mkDerivation rec { $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png fi done; + + cp ${desktopItem}/share/applications/*.desktop $out/share/applications ''; meta = with lib; { diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index cf118beaabce7..3d1e6bfb23d42 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -13,8 +13,8 @@ mkDerivation { buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications - kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras kirigami2 + kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras qtquickcontrols2 ]; - propagatedBuildInputs = [ kpackage kservice qtbase ]; + propagatedBuildInputs = [ kpackage kservice qtbase kirigami2 ]; } diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 98fc4ae1774df..99a847af0b876 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.25"; + version = "4.3.26"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-9nqp7VM5korICwzZF0XTlC4uKwjSY5MoILVJBzKulPk="; + sha256 = "sha256-lHkYoppJ/wo6RRE6V4iN6JXz5OoErJUl4IyrwiCB9FM="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libnitrokey/default.nix b/pkgs/development/libraries/libnitrokey/default.nix index 2f06fe8eafba4..6b847a8e742d6 100644 --- a/pkgs/development/libraries/libnitrokey/default.nix +++ b/pkgs/development/libraries/libnitrokey/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "Nitrokey"; repo = "libnitrokey"; rev = "v${finalAttrs.version}"; - hash = "sha256-9ZMR1g04gNzslax6NpD6KykfUfjpKFIizaMMn06iJa0="; + hash = "sha256-4PEZ31QyVOmdhpKqTN8fwcHoLuu+w+OJ3fZeqwlE+io="; + # On OSX, libnitrokey depends on a custom version of hidapi in a submodule. + # Monitor https://github.com/Nitrokey/libnitrokey/issues/140 to see if we + # can remove this extra work one day. + fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/development/libraries/libsegfault/default.nix index e3a27c2128479..721570f330b3c 100644 --- a/pkgs/development/libraries/libsegfault/default.nix +++ b/pkgs/development/libraries/libsegfault/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { sha256 = "vKtY6ZEkyK2K+BzJCSo30f9MpERpPlUnarFIlvJ1Giw="; }; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin) "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1"; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/php-packages/inotify/default.nix b/pkgs/development/php-packages/inotify/default.nix index 28270a2510c43..4296df1d81ba6 100644 --- a/pkgs/development/php-packages/inotify/default.nix +++ b/pkgs/development/php-packages/inotify/default.nix @@ -1,6 +1,5 @@ { buildPecl , lib -, stdenv }: buildPecl { @@ -11,11 +10,11 @@ buildPecl { doCheck = true; - meta = with lib; { - broken = stdenv.isDarwin; # no inotify support + meta = { description = "Inotify bindings for PHP"; - license = licenses.php301; homepage = "https://github.com/arnaud-lb/php-inotify"; - maintainers = teams.php.members; + license = lib.licenses.php301; + maintainers = lib.teams.php.members; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index f9951f3e84eab..337e6fb2459eb 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.46.0"; + version = "3.47.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-d8RhnMcTeHFDpVS+c5lETRz75vFPOMIaqbqPGVG4vHY="; + hash = "sha256-42YG+brxKCo16xp72+EhmCkgABC2BAFYNWTKqTT1jeE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index c7a47f9b48ff3..3cdc55f634999 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.4.0"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4xUFNIVNrFPU8Hg42Mv7Is4NRdQuugX5bWbE9IQ81Vo="; + hash = "sha256-t8ZlE8VFZpCimO2IfJAW3tQvFeNl0WFC5yi3T3z/7oI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 1d25ecbf357f6..7412fb2077b7d 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bids-validator"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QIxWdIt8+Yz3wxgi8zqNicXm59tSVMNFEH6NUnV2/1M="; + hash = "sha256-X569N5zfbTg+mDwQU5iGv16kiOTr8rwhKTEl9RCJMRY="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 65a5fc6444ec9..a74769d0ec571 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.6.1"; + version = "1.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-3qZlk6zV/AeFG4OSRONQ7EMw9Kk/yHjVHV2o64bxCGM="; + hash = "sha256-NC0l3wbQKz4MVM0kHbXBAUol74ir7V/JQgeYCVuyRs4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index f5bb83c7734fe..ce89d52dc9055 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.19.0"; + version = "1.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-lIVZhWtGWJutmHgReT4k4G5hJZuD52AaJhwmwTmqHIY="; + hash = "sha256-hvnOVyXaC74pMlERZQQlrk5keyWAvE/UONwErJ7RA5c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/celery-singleton/default.nix b/pkgs/development/python-modules/celery-singleton/default.nix new file mode 100644 index 0000000000000..bb3ac446a6005 --- /dev/null +++ b/pkgs/development/python-modules/celery-singleton/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchFromGitHub +, poetry-core +, celery +, redis +, pytestCheckHook +, pytest-celery +}: + +buildPythonPackage rec { + pname = "celery-singleton"; + version = "0.3.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "steinitzu"; + repo = "celery-singleton"; + rev = version; + hash = "sha256-fHlakxxjYIADELZdxIj6rvsZ/+1QfnKvAg3w5cdzvDc="; + }; + + postPatch = '' + # Disable coverage reporting in tests + substituteInPlace setup.cfg \ + --replace "--cov" "" \ + --replace "--no-cov-on-fail" "" + ''; + + patches = [ + # chore(poetry): use poetry-core + # https://github.com/steinitzu/celery-singleton/pull/54 + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/steinitzu/celery-singleton/pull/54/commits/634a001c92a1dff1fae513fc95d733ea9b87e4cf.patch"; + hash = "sha256-lXN4khwyL96pWyBS+iuSkGEkegv4HxYtym+6JUcPa94="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + celery + redis + ]; + + checkInputs = [ + pytestCheckHook + pytest-celery + ]; + + pytestFlagsArray = [ "tests" ]; + + # Tests require a running Redis backend + disabledTests = [ + "TestLock" + "TestUnlock" + "TestClear" + "TestSimpleTask" + "TestRaiseOnDuplicateConfig" + "TestUniqueOn" + ]; + + pythonImportsCheck = [ "celery_singleton" ]; + + meta = with lib; { + description = "Seamlessly prevent duplicate executions of celery tasks"; + homepage = "https://github.com/steinitzu/celery-singleton"; + changelog = "https://github.com/steinitzu/celery-singleton/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix new file mode 100644 index 0000000000000..f52a3aa46e62a --- /dev/null +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, django-debug-toolbar +, psycopg2 +, beautifulsoup4 +, python +}: + +buildPythonPackage rec { + pname = "django-cachalot"; + version = "2.5.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "noripyt"; + repo = "django-cachalot"; + rev = "v${version}"; + hash = "sha256-ayAN+PgK3aIpt4R8aeC6c6mRGTnfObycmkoXPTjx4WI="; + }; + + patches = [ + # Disable tests for unsupported caching and database types which would + # require additional running backends + ./disable-unsupported-tests.patch + ]; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + beautifulsoup4 + django-debug-toolbar + psycopg2 + ]; + + pythonImportsCheck = [ "cachalot" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} runtests.py + runHook postCheck + ''; + + meta = with lib; { + description = "No effort, no worry, maximum performance"; + homepage = "https://github.com/noripyt/django-cachalot"; + changelog = "https://github.com/noripyt/django-cachalot/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-cachalot/disable-unsupported-tests.patch b/pkgs/development/python-modules/django-cachalot/disable-unsupported-tests.patch new file mode 100644 index 0000000000000..8683fffbb146b --- /dev/null +++ b/pkgs/development/python-modules/django-cachalot/disable-unsupported-tests.patch @@ -0,0 +1,65 @@ +diff --git a/cachalot/tests/models.py b/cachalot/tests/models.py +index 8c48640..817602c 100644 +--- a/cachalot/tests/models.py ++++ b/cachalot/tests/models.py +@@ -77,11 +77,6 @@ class PostgresModel(Model): + date_range = DateRangeField(null=True, blank=True) + datetime_range = DateTimeRangeField(null=True, blank=True) + +- class Meta: +- # Tests schema name in table name. +- db_table = '"public"."cachalot_postgresmodel"' +- +- + class UnmanagedModel(Model): + name = CharField(max_length=50) + +diff --git a/settings.py b/settings.py +index 19d7560..7095367 100644 +--- a/settings.py ++++ b/settings.py +@@ -8,18 +8,9 @@ DATABASES = { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': 'cachalot.sqlite3', + }, +- 'postgresql': { +- 'ENGINE': 'django.db.backends.postgresql', +- 'NAME': 'cachalot', +- 'USER': 'cachalot', +- 'PASSWORD': 'password', +- 'HOST': '127.0.0.1', +- }, +- 'mysql': { +- 'ENGINE': 'django.db.backends.mysql', +- 'NAME': 'cachalot', +- 'USER': 'root', +- 'HOST': '127.0.0.1', ++ 'test': { ++ 'ENGINE': 'django.db.backends.sqlite3', ++ 'NAME': ':memory:', + }, + } + if 'MYSQL_PASSWORD' in os.environ: +@@ -36,22 +27,6 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" + DATABASE_ROUTERS = ['cachalot.tests.db_router.PostgresRouter'] + + CACHES = { +- 'redis': { +- 'BACKEND': 'django_redis.cache.RedisCache', +- 'LOCATION': 'redis://127.0.0.1:6379/0', +- 'OPTIONS': { +- # Since we are using both Python 2 & 3 in tests, we need to use +- # a compatible pickle version to avoid unpickling errors when +- # running a Python 2 test after a Python 3 test. +- 'PICKLE_VERSION': 2, +- }, +- }, +- 'memcached': { +- 'BACKEND': 'django.core.cache.backends.memcached.' +- + ('PyMemcacheCache' if __DJ_V[0] > 2 +- and (__DJ_V[1] > 1 or __DJ_V[0] > 3) else 'MemcachedCache'), +- 'LOCATION': '127.0.0.1:11211', +- }, + 'locmem': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + 'OPTIONS': { diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 299e34d6db142..cadde12cafd1f 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-jQgE/eR8Gd9nMGijH9unhHCrLUn7DbWFkTauoz3O/sM="; + hash = "sha256-XWuWg8PzXdLIuUTZ5dnpFmFmqEhOReqIEmBbCpzdzrg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 4da7851a147f1..71c700bdfe0ae 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.12.0"; + version = "1.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-dtSGNLQUG4Co+p/sPBgKxMhB7drZAMxUas+eH6g/cS8="; + hash = "sha256-sDHqBGRJQuAj2zB7hcIy3u5iNCxBHO1ub0eHxfgd7kI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 768f636103ac7..ffeab054f9ea2 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.6.1"; + version = "2023.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-67zl530tvA7h4bpC9qasVsvjzoN9fxtPO9TZmxvABlc="; + hash = "sha256-5J/arrr8ymODSqtATJZuKsuOsCDKV9P2v8vN6D22FuE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index e9eda5a0d0411..272a192e3adab 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -6,9 +6,7 @@ , hatchling , ipykernel , ipython -, ipython_genutils , jupyter-client -, packaging , psutil , python-dateutil , pythonOlder @@ -39,9 +37,7 @@ buildPythonPackage rec { entrypoints ipykernel ipython - ipython_genutils jupyter-client - packaging psutil python-dateutil pyzmq diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index bc4fddea73e91..8ef4b30c7fe73 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.7.2"; + version = "23.7.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wdnYHpIrSGEOBC1mw8aHXCcSney0IDc1MKSFsbGNjq0="; + hash = "sha256-DYlJ/xI/V+T/Am4SASVg/L7/uTAeUVM63aqxyMG6o+4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 03f8b1d69959f..4147e01668a39 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.20.2"; + version = "0.20.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TumqpNaxH9YET56PhTXJVG/OQw3syXaYNtHn+Vyh6xI="; + hash = "sha256-dHgd6vnmlg+VXMp7QUZoT2aic1X05lJGm8hDrowALvk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix index 5e97286bd483f..1e56b59c1fd4c 100644 --- a/pkgs/development/python-modules/python-barcode/default.nix +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-barcode"; - version = "0.14.0"; + version = "0.15.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JBs0qlxctqmImIL5QJsBgpA6LF0ZtCGL42Cc271f/fk="; + hash = "sha256-Oxgl+9sR5ZdGbf9ChrTqmx6GpXcXtZ5WOuZ5cm/IVN4="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Create standard barcodes with Python"; homepage = "https://github.com/WhyNotHugo/python-barcode"; + changelog = "https://github.com/WhyNotHugo/python-barcode/blob/v${version}/docs/changelog.rst"; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; }; diff --git a/pkgs/development/python-modules/pyxbe/default.nix b/pkgs/development/python-modules/pyxbe/default.nix index 8db0c5e0ea237..cc09a5e0f1ad2 100644 --- a/pkgs/development/python-modules/pyxbe/default.nix +++ b/pkgs/development/python-modules/pyxbe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyxbe"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mborgerson"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oOY0g1F5sxGUxXAT19Ygq5q7pnxEhIAKmyYELR1PHEA="; + hash = "sha256-sm8/Lcsk3aL8/MB0cVrKNb8MoQPxGCGpHkEPWv+mPdo="; }; nativeCheckInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { # Update location for run with pytest preCheck = '' substituteInPlace tests/test_load.py \ - --replace "'xbefiles'" "'tests/xbefiles'" + --replace '"xbefiles"' '"tests/xbefiles"' ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index f07a4341aed9d..e97486649965a 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.7.1"; + version = "0.8.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-2UC1ZE8U5JscbnkCueyKDHWEEJ+/OA+hgRWDGmQZJ8g="; + hash = "sha256-MAuFeXQLBuJGI4tzDmNvMUp9jcR1vhhoZQ9dPdwpoNg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-BAoE0oRQGf5ze/8uAH6gsFP77lPvOvYy8W9iDrqUn3Q="; + hash = "sha256-jg9oos4wqewIHe31c3DixIp6fssk742kqt4taWyOq4U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 7dafe6f2cd6d0..5a41b89f4197f 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.16.0"; + version = "2.16.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GJmeAhakNCocSR/HtUsSiNsrFdFmUK6eI5U2mHXD/5c="; + hash = "sha256-J3QX4utnr64xNMt81kwGX6VJlDz6qe5oz+sjH5JATZQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 16b4d4a4067a9..6969247daf8c6 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.27.0"; + version = "1.27.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-MU/Uaul46jfVg30zMYgx5QJdXociFqZY+vsi53NqY5c="; + hash = "sha256-IXmSQg5I78wwKIzKyuJHypAJeMMGu2vuoo3bqyK1K+c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix index de552ca673c92..19c41c35ac118 100644 --- a/pkgs/development/python-modules/socid-extractor/default.nix +++ b/pkgs/development/python-modules/socid-extractor/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socid-extractor"; - version = "0.0.23"; + version = "0.0.24"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "soxoj"; repo = pname; - rev = "v${version}"; - hash = "sha256-tDKwYgW1vEyPzuouPGK9tdTf3vNr+UaosHtQe23srG0="; + rev = "refs/tags/v${version}"; + hash = "sha256-INewgfm+E2t4QfE+SRAm5a74AKsifNtnwC0WPBqPUns="; }; propagatedBuildInputs = [ @@ -28,9 +28,9 @@ buildPythonPackage rec { ]; postPatch = '' - # https://github.com/soxoj/socid-extractor/pull/125 + # https://github.com/soxoj/socid-extractor/pull/150 substituteInPlace requirements.txt \ - --replace "beautifulsoup4~=4.10.0" "beautifulsoup4>=4.10.0" + --replace "beautifulsoup4~=4.11.1" "beautifulsoup4>=4.10.0" ''; # Test require network access @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract details from personal pages"; homepage = "https://github.com/soxoj/socid-extractor"; + changelog = "https://github.com/soxoj/socid-extractor/blob/v${version}/CHANGELOG.md"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix index 0d2e00e59e542..b33220898cd33 100644 --- a/pkgs/development/python-modules/sunweg/default.nix +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sunweg"; - version = "1.0.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rokam"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fGaPn4pp1nDL4MX7K8zP2Vq2R/uRtd8rHSaWEG5Ye7s="; + hash = "sha256-S92PybN+pReI9WtJr9as95uceicsSMadMQfh9JxsE8U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 26354784aff2b..13a70a9f5131c 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.31.2"; + version = "0.32.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-t7LFAWdqbJLOmrac6IXgo+9TK53B7FWLFo1YAY4sPqs="; + hash = "sha256-jxhFBfz5CWycEXx86jL9inlP8nxNK7vbVn2U8EzQ7QA="; }; - vendorHash = "sha256-AbHjwHwgFwDOwgbuQI3D+zNY71ikA5CPlJUFQIDjhm0="; + vendorHash = "sha256-C2YXjfn3Pk0kL4G/cHsmr2VHUYGO+3s3eSiWVJZ2dX8="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/development/tools/database/beekeeper-studio/default.nix b/pkgs/development/tools/database/beekeeper-studio/default.nix index 12e5a656d1aa8..be53f57cac61f 100644 --- a/pkgs/development/tools/database/beekeeper-studio/default.nix +++ b/pkgs/development/tools/database/beekeeper-studio/default.nix @@ -18,7 +18,7 @@ in appimageTools.wrapType2 { inherit name src; - multiPkgs = null; # no 32bit needed + multiArch = false; # no 32bit needed extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index e9c12e1a13185..f366f2f32306b 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.7"; + version = "0.16.11"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-VI7whlEekFalORlRTX/CEelm2zNi/QTqVgU/XkF3K48="; + sha256 = "sha256-B418oQpwB1yhsWRo58TGc2PonTlx3Lrcx1pJrbdJ2KM="; }; vendorHash = null; diff --git a/pkgs/development/tools/fastgron/default.nix b/pkgs/development/tools/fastgron/default.nix index 17996d697e631..47817041703af 100644 --- a/pkgs/development/tools/fastgron/default.nix +++ b/pkgs/development/tools/fastgron/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastgron"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "adamritter"; repo = "fastgron"; rev = "v${finalAttrs.version}"; - hash = "sha256-SqJdJnepfX/qHiACjpaTNM+/lApcADCCbcX+BNgXswg="; + hash = "sha256-614edimiz+n8Gwr4vYq7PvQmceItfQL2Gt4cYgsxISc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 9e25356b4fb91..ed35f4bb7f6a5 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.26.0"; + version = "3.27.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-BmQL9e7/53IEDUGeiTcFQbK64/JDTwJvBVRrxGFmzMA="; + hash = "sha256-MwZtdxoWo5yeJKzbMIfigt0WUjZ52B8MeRsx43D8n1k="; }; - vendorHash = "sha256-iO4VzY/UyPJeSxDYAPq+dLuAD2FOaac8rlmAVM4GYB8="; + vendorHash = "sha256-05+/NbLks9Dp9Z7KscK9yeEzFJug7VFBqViievX6UOs="; doCheck = false; diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index 2ef5b04529ce3..beb15b4056c30 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "jet"; - version = "0.5.25"; + version = "0.6.26"; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-4uXK9MRBXLjfHDNl6KJY1n9b02uXg+BlIr/q1DGeRKU="; + sha256 = "sha256-zlSIIZ0YV6ussgAylz8QGmKBi8MwIIMzmloIf4bHvHU="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 59944edfde630..9a95071bb4804 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.3.7"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qaPRC5W+dLNbrCYc8fKdaSm54OuObJ20tVYCF7ZANYs="; + sha256 = "sha256-U2Ne0wDgPkNZa68KbJ9Hke5l+tBAf7imu1Cj+r/uZUE="; }; nativeBuildInputs = [ perl python3 pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil ] ++ lib.optional stdenv.isDarwin AppKit; - cargoHash = "sha256-Z//EsuizhCZIItKfxF8xJs0aQQlhiprV0I2cIWEGsqg="; + cargoHash = "sha256-dX5p+eLhZlU1Xg2SoqtEYb8T3/lvoJa78zgQStLPZNE="; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index b63c76fda5853..bbf18316d7821 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.22"; + version = "3.6.23"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-0A5bbWoZtfL6NLG9nr8u4k1pLP1Fj/+A4ep2uN7x41o="; + sha256 = "sha256-tax4Pb99khAMDE6KH288Gihr8McpKg3DHBNVJnPnXbs="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index 723e56810e7ee..5f6cf13b54d20 100644 --- a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildNpmPackage, fetchFromGitHub, vscode }: +{ lib, stdenv, buildNpmPackage, fetchFromGitHub, vscodium, vscode-extensions }: buildNpmPackage rec { pname = "vscode-langservers-extracted"; @@ -11,20 +11,14 @@ buildNpmPackage rec { hash = "sha256-RLRDEHfEJ2ckn0HTMu0WbMK/o9W20Xwm+XI6kCq57u8="; }; - npmDepsHash = "sha256-QhiSj/DigsI4Bfwmk3wG4lDQOWuDDduc/sfJlXiEoGE="; - - postPatch = '' - # TODO: Add vscode-eslint as a dependency - # Eliminate the vscode-eslint bin - sed -i '/^\s*"vscode-eslint-language-server":.*bin\//d' package.json package-lock.json - ''; + npmDepsHash = "sha256-DhajWr+O0zgJALr7I/Nc5GmkOsa9QXfAQpZCaULV47M="; buildPhase = let extensions = if stdenv.isDarwin - then "${vscode}/Applications/Visual\\ Studio\\ Code.app/Contents/Resources/app/extensions" - else "${vscode}/lib/vscode/resources/app/extensions"; + then "${vscodium}/Applications/VSCodium.app/Contents/Resources/app/extensions" + else "${vscodium}/lib/vscode/resources/app/extensions"; in '' npx babel ${extensions}/css-language-features/server/dist/node \ @@ -35,11 +29,13 @@ buildNpmPackage rec { --out-dir lib/json-language-server/node/ npx babel ${extensions}/markdown-language-features/server/dist/node \ --out-dir lib/markdown-language-server/node/ + cp -r ${vscode-extensions.dbaeumer.vscode-eslint}/share/vscode/extensions/dbaeumer.vscode-eslint/server/out \ + lib/eslint-language-server mv lib/markdown-language-server/node/workerMain.js lib/markdown-language-server/node/main.js ''; meta = with lib; { - description = "HTML/CSS/JSON/ESLint language servers extracted from vscode."; + description = "HTML/CSS/JSON/ESLint language servers extracted from vscode"; homepage = "https://github.com/hrsh7th/vscode-langservers-extracted"; license = licenses.mit; maintainers = with maintainers; [ lord-valen ]; diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/development/tools/ls-lint/default.nix index 550931d9d1ebd..bae79bd14c7a6 100644 --- a/pkgs/development/tools/ls-lint/default.nix +++ b/pkgs/development/tools/ls-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ls-lint"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "loeffel-io"; repo = "ls-lint"; rev = "v${version}"; - sha256 = "sha256-eEP/l3vdObdxUYIp8eSSCn3W0ypcmykbwQTDP083MVE="; + sha256 = "sha256-JG3gDmPfeGyiiIsFX0jFN1Xi9lY4eednmEfJLdu0atA="; }; - vendorHash = "sha256-nSHhU6z3ItCKBZy8ENBcAkXqSVo3DU6hAyezQczKShM="; + vendorHash = "sha256-/6Y20AvhUShaE1sNTccB62x8YkVLLjhl6fg5oY4gL4I="; meta = with lib; { description = "An extremely fast file and directory name linter"; diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix new file mode 100644 index 0000000000000..ab091655dd56c --- /dev/null +++ b/pkgs/development/tools/misc/complgen/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage { + pname = "complgen"; + version = "unstable-2023-07-05"; + + src = fetchFromGitHub { + owner = "adaszko"; + repo = "complgen"; + rev = "e23474c3bd4544a8e6f7b51947616dbdb18fe1dd"; + hash = "sha256-Ura4/yMLVRlgTiNiXNPMtKu4cPWge0bLQp/n+tgeDiM="; + }; + + cargoHash = "sha256-P7wHKrRUVlrLAaLYhVH/p3oOc7UCGP3aQZotVxyeJTs="; + + meta = with lib; { + description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; + homepage = "https://github.com/adaszko/complgen"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/development/tools/misc/spruce/default.nix index 7c10a6ee0ca7e..9db1c5613dda9 100644 --- a/pkgs/development/tools/misc/spruce/default.nix +++ b/pkgs/development/tools/misc/spruce/default.nix @@ -2,17 +2,16 @@ buildGoModule rec { pname = "spruce"; - version = "unstable-2022-02-10"; + version = "1.30.2"; src = fetchFromGitHub { owner = "geofffranks"; repo = pname; - rev = "473931f33fceae90b3f5cfb7616c296343a9559b"; - sha256 = "sha256-TFyWkoAKmj3KH2pqhVKMtP6QKTtu0s7H5gNP+fotUzg="; + rev = "v${version}"; + hash = "sha256-flY81xiUfOyfdavhF0AyIwrB2G8N6BWltdGMT2uf9Co="; }; - deleteVendor = true; - vendorSha256 = "sha256-VeC5c/BgcxK3Qawb2QOhqtfTIgbQbrQj546zX6yPD+s="; + vendorHash = null; meta = with lib; { description = "A BOSH template merge tool"; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 175f2b016e337..fa2f798a35942 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -1,18 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-ls"; - version = "0.30.1"; + version = "0.31.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-enPnj4/p83hQkVv821MGyGipgEmVo12IZzy/3y8UprQ="; + hash = "sha256-OzqJ/F3GeIaX4/z1KJdok8kUfualRzHv1AIM8dt8Kik="; }; - vendorSha256 = "sha256-U3zslBDVz5nvhNgcn5L84hSUolf7XFCuh7zMZxyW/gQ="; - ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; + vendorHash = "sha256-pEuen7CWniFzLgL1v+Xt1l6hde3YpyOMmQalj08UBX8="; + + ldflags = [ "-s" "-w" ]; # There's a mixture of tests that use networking and several that fail on aarch64 doCheck = false; @@ -21,7 +22,7 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/terraform-ls --help - $out/bin/terraform-ls version | grep "v${version}" + $out/bin/terraform-ls --version | grep "${version}" runHook postInstallCheck ''; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 62ee400a25ca4..31997a8661323 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.22"; + version = "0.5.23"; src = fetchCrate { inherit pname version; - sha256 = "sha256-nvDeKHOpDhszLxPFh1CZhA+NrFnKbminv8qlIT0qvx0="; + sha256 = "sha256-sAuarLfvgX6qjZV2eum3+wY5gRiCbRSbJUBgFIHd8y0="; }; - cargoSha256 = "sha256-krpvo55PNECVLh1SjZhXwFVjI6s2u7l/MPCYeDFsylM="; + cargoSha256 = "sha256-gGzVQqPHvjERvQV2Yo3wFP7n/w3atuLrHSch1CWui4I="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 2a5be7018c374..eee42285b0981 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchFromGitHub +, fetchCrate , installShellFiles , stdenv , nix-update-script @@ -9,16 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.18"; + version = "0.2.19"; - src = fetchFromGitHub { - owner = "pacak"; - repo = "cargo-show-asm"; - rev = version; - hash = "sha256-K7hWXRS6bb9XZxIgZQeu22Gtt3WmXI63Xd97Unm6mHs="; + src = fetchCrate { + inherit pname version; + hash = "sha256-bIaEXlMIEQ2pnzjp7ll6iJFGAQjGb3HVBTbfGSPHrvg="; }; - cargoHash = "sha256-fLvJyWoZ2ncbw8ksKfuQ/0oTYFOdzBBCrmtVbbMSXjo="; + cargoHash = "sha256-qmxd6qt8pL/5TWPDCiBQrvqb6r7VAJOrSR1OSpibQFU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index f2fbf64473264..d4668c4496ef1 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-a4uM2WjDhjz4zTiM2HWoDHQQ9aT38HV9GNUJAJmZR+w="; + hash = "sha256-PSBwwF6tIQ6EZD/nWj5Lw0ifk1aLLJl/qaj5EsksBBo="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix index 59ab32131c2d0..037e7f4931a1c 100644 --- a/pkgs/development/web/bloomrpc/default.nix +++ b/pkgs/development/web/bloomrpc/default.nix @@ -21,7 +21,7 @@ appimageTools.wrapType2 { export LC_ALL=C.UTF-8 ''; - multiPkgs = null; # no 32bit needed + multiArch = false; # no 32bit needed extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index ef56724d7a023..1bfff83710ddc 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.43"; + version = "0.1.51"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-mvB5TCPkRWDAkDd4PV50EKjtlaZSFqTl6IDMTnPDrng="; + hash = "sha256-5wokG37aP15VGRbH14kyVVH1VfKbbvMZrZl7gP0WbSE="; }; - vendorHash = "sha256-2us72JBzLXaxJ6X6T/Hc2y4YVoAJ6YvJVJdO3KzsbkE="; + vendorHash = "sha256-7cwe0POozQeeabQQxtnJNWRmM5bWqmzVx/2TDPeoCx8="; subPackages = [ "." ]; |