diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 2eff322d9601..434931ccae5a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -461,7 +461,9 @@ in # If requested enable modesetting via kernel parameter. boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" - ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"; + ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" + # proprietary driver is not compiled with support for X86_KERNEL_IBT + ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off"; services.udev.extraRules = '' diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 68eb295c4852..358c1f0e7900 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -2,6 +2,9 @@ stdenv , fetchFromGitHub , fetchurl +, cmake +, dbus +, file , freetype , jansson , lib @@ -11,32 +14,44 @@ , libXext , libXrandr , libarchive +, libjack2 , liblo , libsamplerate -, mesa +, libsndfile +, makeWrapper , pkg-config , python3 , speexdsp +, libglvnd }: stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.11"; + version = "22.12"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - sha256 = "sha256-xYQi209whY5/lN+6Fp7PTp7JSzL6RS6VL+Exst7RrS0="; + sha256 = "sha256-fyko5cWjBNNaw8qL9uyyRxW5MFXKmOsBoR5u05AWxWY="; }; prePatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; + strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cmake + file + pkg-config + makeWrapper + python3 + ]; buildInputs = [ + dbus freetype jansson libGL @@ -44,18 +59,25 @@ stdenv.mkDerivation rec { libXcursor libXext libXrandr - libXrandr libarchive liblo libsamplerate - mesa - python3 + libsndfile speexdsp + libglvnd ]; hardeningDisable = [ "format" ]; makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/Cardinal \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]} + + # this doesn't work and is mainly just a test tool for the developers anyway. + rm -f $out/bin/CardinalNative + ''; + meta = { description = "Plugin wrapper around VCV Rack"; homepage = "https://github.com/DISTRHO/cardinal"; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 4ba4d992835c..b4c169b36d8b 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -46,11 +46,11 @@ let inherit (python3.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.30"; + version = "8.0.32"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "d094b391760948f42a3b879e8473040ae9bb26991eced482eb982a52c8ff8185"; + sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI="; }; patches = [ @@ -148,7 +148,7 @@ in stdenv.mkDerivation rec { "-Wno-error=narrowing" ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ # Needed with GCC 12 but problematic with some old GCCs - "-Wno-error=maybe-uninitalized" + "-Wno-error=maybe-uninitialized" ]); cmakeFlags = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 20ac6785a63b..09417129199b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "110.0.5481.100", - "sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd", - "sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr", + "version": "110.0.5481.177", + "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", + "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", "deps": { "gn": { "version": "2022-12-12", @@ -19,9 +19,9 @@ } }, "beta": { - "version": "111.0.5563.19", - "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w", - "sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza", + "version": "111.0.5563.41", + "sha256": "0yx5zywbkvdp589906hbwhc2ivzfzd9zvahaxhh8zrh2ar7vqxay", + "sha256bin64": "0vnj0422dvpp42w8vgmip4k8c8k6hpvc84cdfvyhipas47dxvh6w", "deps": { "gn": { "version": "2022-12-12", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 184000c6bf19..8777bd249545 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.25"; - ptb = "0.0.38"; + ptb = "0.0.39"; canary = "0.0.148"; } else { stable = "0.0.264"; @@ -18,7 +18,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s="; + sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 0036ffc77ca5..177671f21c00 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -46,7 +46,11 @@ let version = versions.linux; src = fetchurl { - url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb"; + urls = [ + "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" + # NOTE: the archive.org timestamp must also be updated if the version changes. + "https://web.archive.org/web/20221130115842if_/https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" + ]; hash = hashes.linux; }; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index d06d4d776a11..a6bb64bbdf7c 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.6.4"; + version = "2.6.6"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-2Cze8R22Wrvp+FJq/7Kp36i7Areo5e9fdBo3DQ+rvZY="; + sha256 = "sha256-hmZeXQneKh3Kca/Goct3KP5q+Ce6lpYWDqFfqbcT644="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 9479011d5f14..ad22d57882ed 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -26,12 +26,12 @@ buildPythonApplication rec { pname = "streamlit"; - version = "1.16.0"; + version = "1.18.1"; format = "wheel"; # source currently requires pipenv src = fetchPypi { inherit pname version format; - hash = "sha256-TBNWIe3m646dbnOMxUltkNZr23g0Dqsestvxl4zHr4A="; + hash = "sha256-lO2QfM/G+4M55f8JCZBwk10SkMp4gXb68KncHm90k7g="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index a5c0ebc85b13..c1a329c60886 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DMXNET_CUDA_ARCH=${cudaFlags.cudaCapabilitiesSemiColonString}" + "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.cudaRealArches}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index bec74dd46a97..1053ca11cb3c 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.1.1"; + version = "1.1.8"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-IYodi0Uz16Qg4MHCz/K06pEXblrsBxHD25fb6LrW8To="; + hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI="; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildKodiAddon rec { }; meta = with lib; { - homepage = "https://github.com/known-as-bmf/plugin.video.arteplussept"; + homepage = "https://github.com/thomas-ernest/plugin.video.arteplussept"; description = "Watch videos available on Arte+7"; license = licenses.mit; maintainers = teams.kodi.members; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index d8bfa140fa87..8f206666e408 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "podman"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-Uha5ueOGNmG2f+1I89uFQKA3pSSp1d02FGy86Fc2eWE="; + hash = "sha256-337PFsPGm7pUgnFeNJKwT+/7AdbWSfCx4kXyAvHyWJQ="; }; patches = [ diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index 24f653ded29b..8e1e54723b2e 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -2,7 +2,18 @@ , lib , cudatoolkit }: + +# Type aliases +# Gpu = { +# archName: String, # e.g., "Hopper" +# computeCapability: String, # e.g., "9.0" +# minCudaVersion: String, # e.g., "11.8" +# maxCudaVersion: String, # e.g., "12.0" +# } + let + inherit (lib) attrsets lists strings trivial versions; + cudaVersion = cudatoolkit.version; # Flags are determined based on your CUDA toolkit by default. You may benefit # from improved performance, reduced file size, or greater hardware suppport by @@ -13,66 +24,116 @@ let # # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351 - defaultCudaCapabilities = rec { - cuda9 = [ - "3.0" - "3.5" - "5.0" - "5.2" - "6.0" - "6.1" - "7.0" - ]; + # gpus :: List Gpu + gpus = builtins.import ./gpus.nix; - cuda10 = cuda9 ++ [ - "7.5" - ]; + # isVersionIn :: Gpu -> Bool + isSupported = gpu: + let + inherit (gpu) minCudaVersion maxCudaVersion; + lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion; + upperBoundSatisfied = !(strings.versionOlder maxCudaVersion cudaVersion); + in + lowerBoundSatisfied && upperBoundSatisfied; - cuda11 = [ - "3.5" - "5.0" - "5.2" - "6.0" - "6.1" - "7.0" - "7.5" - "8.0" - "8.6" - ]; + # supportedGpus :: List Gpu + # GPUs which are supported by the provided CUDA version. + supportedGpus = builtins.filter isSupported gpus; - }; + # cudaArchNameToVersions :: AttrSet String (List String) + # Maps the name of a GPU architecture to different versions of that architecture. + # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ]. + cudaArchNameToVersions = + lists.groupBy' + (versions: gpu: versions ++ [ gpu.computeCapability ]) + [ ] + (gpu: gpu.archName) + supportedGpus; - cudaMicroarchitectureNames = { - "3" = "Kepler"; - "5" = "Maxwell"; - "6" = "Pascal"; - "7" = "Volta"; - "8" = "Ampere"; - "9" = "Hopper"; - }; + # cudaArchNames :: List String + # NOTE: It's important that we don't rely on builtins.attrNames cudaArchNameToVersions here; + # otherwise, we'll get the names sorted in alphabetical order. The JSON array we read them + # from is already sorted, so we'll preserve that order here. + cudaArchNames = lists.unique (lists.map (gpu: gpu.archName) supportedGpus); - defaultCudaArchList = defaultCudaCapabilities."cuda${lib.versions.major cudatoolkit.version}"; - cudaRealCapabilities = config.cudaCapabilities or defaultCudaArchList; - capabilitiesForward = "${lib.last cudaRealCapabilities}+PTX"; + # cudaComputeCapabilityToName :: AttrSet String String + # Maps the version of a GPU architecture to the name of that architecture. + # For example, "8.0" maps to "Ampere". + cudaComputeCapabilityToName = builtins.listToAttrs ( + lists.map + (gpu: { + name = gpu.computeCapability; + value = gpu.archName; + }) + supportedGpus + ); - dropDot = ver: builtins.replaceStrings ["."] [""] ver; + # cudaComputeCapabilities :: List String + # NOTE: It's important that we don't rely on builtins.attrNames cudaComputeCapabilityToName here; + # otherwise, we'll get the versions sorted in alphabetical order. The JSON array we read them + # from is already sorted, so we'll preserve that order here. + # Use the user-provided list of CUDA capabilities if it's provided. + cudaComputeCapabilities = config.cudaCapabilities + or (lists.map (gpu: gpu.computeCapability) supportedGpus); - archMapper = feat: map (ver: "${feat}_${dropDot ver}"); - gencodeMapper = feat: map (ver: "-gencode=arch=compute_${dropDot ver},code=${feat}_${dropDot ver}"); - cudaRealArchs = archMapper "sm" cudaRealCapabilities; - cudaPTXArchs = archMapper "compute" cudaRealCapabilities; - cudaArchs = cudaRealArchs ++ [ (lib.last cudaPTXArchs) ]; + # cudaForwardComputeCapability :: String + cudaForwardComputeCapability = (lists.last cudaComputeCapabilities) + "+PTX"; - cudaArchNames = lib.unique (map (v: cudaMicroarchitectureNames.${lib.versions.major v}) cudaRealCapabilities); - cudaCapabilities = cudaRealCapabilities ++ lib.optional (config.cudaForwardCompat or true) capabilitiesForward; - cudaGencode = gencodeMapper "sm" cudaRealCapabilities ++ lib.optionals (config.cudaForwardCompat or true) (gencodeMapper "compute" [ (lib.last cudaPTXArchs) ]); + # cudaComputeCapabilitiesAndForward :: List String + # The list of supported CUDA architectures, including the forward compatibility architecture. + # If forward compatibility is disabled, this will be the same as cudaComputeCapabilities. + cudaComputeCapabilitiesAndForward = cudaComputeCapabilities + ++ lists.optional (config.cudaForwardCompat or true) cudaForwardComputeCapability; - cudaCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaCapabilities; - cudaCapabilitiesSemiColonString = lib.strings.concatStringsSep ";" cudaCapabilities; - cudaRealCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaRealCapabilities; + # dropDot :: String -> String + dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver; + + # archMapper :: String -> List String -> List String + # Maps a feature across a list of architecture versions to produce a list of architectures. + # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "sm_80" "sm_86" "sm_87" ]. + archMapper = feat: lists.map (computeCapability: "${feat}_${dropDot computeCapability}"); + + # gencodeMapper :: String -> List String -> List String + # Maps a feature across a list of architecture versions to produce a list of gencode arguments. + # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "-gencode=arch=compute_80,code=sm_80" + # "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_87,code=sm_87" ]. + gencodeMapper = feat: lists.map ( + computeCapability: + "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}" + ); + + # cudaRealArches :: List String + # The real architectures are physical architectures supported by the CUDA version. + # For example, "sm_80". + cudaRealArches = archMapper "sm" cudaComputeCapabilities; + + # cudaVirtualArches :: List String + # The virtual architectures are typically used for forward compatibility, when trying to support + # an architecture newer than the CUDA version allows. + # For example, "compute_80". + cudaVirtualArches = archMapper "compute" cudaComputeCapabilities; + + # cudaArches :: List String + # By default, build for all supported architectures and forward compatibility via a virtual + # architecture for the newest supported architecture. + cudaArches = cudaRealArches ++ + lists.optional (config.cudaForwardCompat or true) (lists.last cudaVirtualArches); + + # cudaGencode :: List String + # A list of CUDA gencode arguments to pass to NVCC. + cudaGencode = + let + base = gencodeMapper "sm" cudaComputeCapabilities; + forwardCompat = gencodeMapper "compute" [ (lists.last cudaComputeCapabilities) ]; + in + base ++ lists.optionals (config.cudaForwardCompat or true) forwardCompat; in { - inherit cudaArchs cudaArchNames cudaCapabilities cudaCapabilitiesCommaString cudaCapabilitiesSemiColonString - cudaRealCapabilities cudaRealCapabilitiesCommaString cudaGencode cudaRealArchs cudaPTXArchs; + inherit + cudaArchNames + cudaArchNameToVersions cudaComputeCapabilityToName + cudaRealArches cudaVirtualArches cudaArches + cudaGencode; + cudaCapabilities = cudaComputeCapabilitiesAndForward; } diff --git a/pkgs/development/compilers/cudatoolkit/gpus.nix b/pkgs/development/compilers/cudatoolkit/gpus.nix new file mode 100644 index 000000000000..e938e9129747 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/gpus.nix @@ -0,0 +1,110 @@ +[ + { + archName = "Kepler"; + computeCapability = "3.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.2"; + } + { + archName = "Kepler"; + computeCapability = "3.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.2"; + } + { + archName = "Kepler"; + computeCapability = "3.5"; + minCudaVersion = "10.0"; + maxCudaVersion = "11.8"; + } + { + archName = "Kepler"; + computeCapability = "3.7"; + minCudaVersion = "10.0"; + maxCudaVersion = "11.8"; + } + { + archName = "Maxwell"; + computeCapability = "5.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Maxwell"; + computeCapability = "5.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Maxwell"; + computeCapability = "5.3"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.1"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Volta"; + computeCapability = "7.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Volta"; + computeCapability = "7.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Turing"; + computeCapability = "7.5"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.0"; + minCudaVersion = "11.2"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.6"; + minCudaVersion = "11.2"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.7"; + minCudaVersion = "11.5"; + maxCudaVersion = "12.0"; + } + { + archName = "Ada"; + computeCapability = "8.9"; + minCudaVersion = "11.8"; + maxCudaVersion = "12.0"; + } + { + archName = "Hopper"; + computeCapability = "9.0"; + minCudaVersion = "11.8"; + maxCudaVersion = "12.0"; + } +] diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index f014676a1809..272a1209b492 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -48,7 +48,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-llvm-${targetName}"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -65,7 +65,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-iyr3cstC8CB1YaACadNqBs/oI8lh4bJzK0WtEB0wZvg="; + hash = "sha256-BDvC6QFDFtahA9hmJDLiM6K4mrO3j9E9rEXm7KulcuA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index ba08fc61f568..a35a256b5505 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DGVM_RUN_DIR=$out/run/gvm" + "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; meta = with lib; { diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index f7f2a619a1c9..45f030270152 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.24"; + version = "1.18.26"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-01hLwtsD8Fn5hPsKnBGarB+g2leKRI5p/D9os2WEx0k="; + sha256 = "sha256-KvH6g2hIdhtuUUQOxii0ncOAgOmHG7NScB+4yDWAh88="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index d8948b08672c..5429dd62c802 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.31"; + version = "8.0.32"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-HSF7yEybmzzDQvl1cwUZ/mlXqVXxnIHqg2a/HfJtELA="; + hash = "sha256-+9t/IUQnYy9CPoS6dZS+H5IF6sgSjGsYVyA7L1RVzvM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index b7223690f435..f70cbbcff5d8 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/gcc" "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/g++" "-DMAGMA_ENABLE_CUDA=ON" - "-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArchs}" + "-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArches}" ] ++ lib.optionals useROCM [ "-DCMAKE_C_COMPILER=${hip}/bin/hipcc" "-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc" diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 43b181fc348f..286b34379dc2 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.17"; + version = "1.4.19"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4o1sKxlWeAgZZm01sPV2yIR3xXZwzPJwqcGCkz6+Cfc="; + sha256 = "sha256-KP79i1yYJ6jrsdtS85fHOmJV+oAL/MNgc9On4RfOTwo="; }; patches = [ diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index cf364347fa44..346083ddadb3 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -4,13 +4,14 @@ buildDunePackage rec { pname = "functoria"; - version = "4.2.0"; + version = "4.3.4"; + duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; - sha256 = "sha256-rZ9y8+wbDjqjY1sx+TmSoR42hUKRMGpehCCR2cEgbv8="; + hash = "sha256-ZN8La2+N19wVo/vBUfIj17JU6FSp0jX7h2nDoIpR1XY="; }; propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ]; diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 410475b6b5c0..98d96cf146f0 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -8,6 +8,7 @@ buildDunePackage rec { inherit (mirage-runtime) version src; minimalOCamlVersion = "4.08"; + duneVersion = "3"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 0be98209ca2e..7d8bdd5d3a3b 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.4.0"; + version = "13.4.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-auqG+2Y+Dgwtkwbidi430n4t+GnZlBHIPUmsfl1aPa0="; + hash = "sha256-J0nhHJQkmcAPpkNRfyFyhJun54J3g18js47dSS3pvas="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 37a97121b034..f51a1bd3ec6b 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Mi8CJ3OU27zJ2PNkrqu0BytTI5ZaQezi8DIW3yXCzDI="; + hash = "sha256-5TV9cTMTx8R6jf9HypieinCyNgHC4LSHTRQd9RXApG4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index e204d816dc0d..2fb7d3efcdc2 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -48,13 +48,13 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.44.0"; + version = "2.45.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-5fnZxv2ZkFlv8vGDIt/6EL41v9P1iKa1tEd1nezq+PU="; + hash = "sha256-e+6Vt+SlOxi16udsdx7WFoDWYupuXhggpoEZPe4tPr0="; }; patches = [ @@ -76,11 +76,15 @@ buildPythonPackage rec { # See https://github.com/NixOS/nixpkgs/issues/193613 "protobuf" - # As of apache-beam v2.44.0, the requirement is httplib2>=0.8,<0.21.0, but + # As of apache-beam v2.45.0, the requirement is httplib2>=0.8,<0.21.0, but # the current (2023-02-08) nixpkgs's httplib2 version is 0.21.0. This can be # removed once beam is upgraded since the current requirement on master is # for httplib2>=0.8,<0.22.0. "httplib2" + + # As of apache-beam v2.45.0, the requirement is pyarrow<10.0.0,>=0.15.1, but + # the current (2023-02-22) nixpkgs's pyarrow version is 11.0.0. + "pyarrow" ]; sourceRoot = "source/sdks/python"; diff --git a/pkgs/development/python-modules/arpy/default.nix b/pkgs/development/python-modules/arpy/default.nix new file mode 100644 index 000000000000..229e15d24ff3 --- /dev/null +++ b/pkgs/development/python-modules/arpy/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "arpy"; + version = "2.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "viraptor"; + repo = pname; + rev = version; + hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s="; + }; + + checkInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "arpy" ]; + + meta = with lib; { + description = "A library for accessing the archive files and reading the contents"; + homepage = "https://github.com/viraptor/arpy"; + license = licenses.bsd2; + maintainers = with maintainers; [ thornycrackers ]; + }; +} diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 37678b93d195..2acfe17327b6 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8="; + hash = "sha256-2JaEuN6eNKKkOzRg+8oH0J1uJc6FjfTVpEJAQDthePU="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cstruct/default.nix b/pkgs/development/python-modules/cstruct/default.nix new file mode 100644 index 000000000000..688fe787af2b --- /dev/null +++ b/pkgs/development/python-modules/cstruct/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "cstruct"; + version = "5.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "andreax79"; + repo = "python-cstruct"; + rev = "v${version}"; + hash = "sha256-Dwogf0mmxFyBV7tPsuKV6gMZLPSCm7YhzqgJNHpaPFA="; + }; + + pythonImportsCheck = [ + "cstruct" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "C-style structs for Python"; + homepage = "https://github.com/andreax79/python-cstruct"; + changelog = "https://github.com/andreax79/python-cstruct/blob/v${version}/changelog.txt"; + license = licenses.mit; + maintainers = with maintainers; [ tnias ]; + }; +} diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index f526438afafc..d9c5b1b4464d 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.14.3"; + version = "0.14.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zHbo03Ll40H8okBIaqrWSJby4aQAg7ukETNHerUPX28="; + hash = "sha256-AkHmEflRvjJFlycI5adpuxg6+/zu7Dzy7vbYCvd1b70="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 316e20f91d0e..3c03a9e0fdcf 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.38.1"; + version = "0.40.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xuNxsG8wMpdwyA0BkEYepnGjIZGmUzTivN5paLtM68Q="; + hash = "sha256-kJABNVUFoaN8Q7IVJKW/LF2kJwB4HcsvMEDmE6eTAxg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 2ccc61cf97ca..58b409741f15 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , funcy @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.0.17"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GDfrkcKP/EZZ/ONZ2Afoxj4Q8sp8mRmtZf93kXcNQcg="; + hash = "sha256-1nXNi++vNNRxoA/ptTDN9PtePP67oWdkAtqAbZpTfDg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,6 +51,10 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.table ++ passthru.optional-dependencies.markdown; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/test_vega.py" + ]; + pythonImportsCheck = [ "dvc_render" ]; diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index d81a9765bb0c..348246a939ce 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -1,14 +1,17 @@ { lib , buildPythonPackage -, pythonOlder -, flake8 -, pytestCheckHook , fetchPypi +, flake8 +, flit-core +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "flake8-length"; version = "0.3.1"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -16,22 +19,31 @@ buildPythonPackage rec { sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ flake8 ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "flake8_length" ]; - nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ + "tests/" + ]; - pytestFlagsArray = [ "tests/" ]; - - meta = { + meta = with lib; { description = "Flake8 plugin for a smart line length validation"; homepage = "https://github.com/orsinium-labs/flake8-length"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sauyon ]; + changelog = "https://github.com/orsinium-labs/flake8-length/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sauyon ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index e32bcf970264..4e6c6aaae870 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.17.1"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EFMiiPlHwKkc7tjOcbqiAlnb+3oBsTBlg6Ey0vvs+Mc="; + hash = "sha256-BW+zYDmK9CPmzePAgQWXRQ8JrQNgEulPGtQgUdnrY4I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 9948b7243c94..021d9533b445 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.14.1"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wDb1vy1rj0yBOk7Q1pMzNw3foOXHk18YwIbY4ZcYCxM="; + hash = "sha256-78o/MQFUREOW21BsSezK1QqciPVAEwOd15TRfAhxTWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index baa9a0dc1abf..2c13defe4383 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -164,7 +164,7 @@ let build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}" build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}" build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" - build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${cudaFlags.cudaRealCapabilitiesCommaString}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.cudaRealArches}" '' + '' CFG ''; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 100298e0fc0b..c648ec9fed6b 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchPypi , marshmallow +, packaging , sqlalchemy , pytest-lazy-fixture , pytestCheckHook @@ -10,16 +11,19 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.28.1"; - disabled = pythonOlder "3.6"; + version = "0.28.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qjdnRylngKVjVeMGe5yL9DoqHET/mF3oKzpdnhYcorg="; + hash = "sha256-KrDxKAx5Plrsgd6rPmPsI2iN3+BeXzislgNooQeVIKE="; }; propagatedBuildInputs = [ marshmallow + packaging sqlalchemy ]; @@ -33,9 +37,10 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; description = "SQLAlchemy integration with marshmallow"; + homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; + changelog = "https://github.com/marshmallow-code/marshmallow-sqlalchemy/blob/${version}/CHANGELOG.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index e467023a8793..3737bea08243 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -23,16 +23,18 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.2"; + version = "0.13.3"; disabled = pythonOlder "3.5"; + format = "setuptools"; + src = fetchFromGitLab { domain = "0xacab.org"; owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-gZl2VH7qCmjrM/UrXPief8hCQKkBHdjG8w0MQvkZ7wk="; + hash = "sha256-x3vGltGuFjI435lEXZU3p4eQcgRm0Oodqd6pTWO7ZX8="; }; patches = [ @@ -56,6 +58,7 @@ buildPythonPackage rec { ]; postPatch = '' + rm pyproject.toml substituteInPlace dolphin/mat2.desktop \ --replace "@mat2@" "$out/bin/mat2" \ --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg" diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 53f72ce94637..c2c156885c19 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -13,7 +13,7 @@ index 41c8de4..11df258 100644 +Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U +Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py -index cdfce3d..1e83520 100644 +index 2b91ac2..5fcf6e5 100644 --- a/libmat2/exiftool.py +++ b/libmat2/exiftool.py @@ -1,8 +1,6 @@ @@ -23,13 +23,13 @@ index cdfce3d..1e83520 100644 import os -import shutil import subprocess - from typing import Union + from typing import Union, Set, Dict @@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser): return False return True --@functools.lru_cache +-@functools.lru_cache(maxsize=None) def _get_exiftool_path() -> str: # pragma: no cover - which_path = shutil.which('exiftool') - if which_path: @@ -42,7 +42,7 @@ index cdfce3d..1e83520 100644 - raise RuntimeError("Unable to find exiftool") + return '@exiftool@' diff --git a/libmat2/video.py b/libmat2/video.py -index 4d33aa4..6388664 100644 +index 39059c5..82fe1e7 100644 --- a/libmat2/video.py +++ b/libmat2/video.py @@ -1,6 +1,4 @@ @@ -51,12 +51,12 @@ index 4d33aa4..6388664 100644 -import shutil import logging - from typing import Union + from typing import Union, Dict @@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser): } --@functools.lru_cache() +-@functools.lru_cache(maxsize=None) def _get_ffmpeg_path() -> str: # pragma: no cover - which_path = shutil.which('ffmpeg') - if which_path: diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 989e9e00aa47..40f57408703f 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -2,32 +2,52 @@ , buildPythonPackage , fetchPypi , future +, joblib , numpy , pytest +, pythonOlder +, scikit-learn }: buildPythonPackage rec { - pname = "MDP"; + pname = "mdp"; version = "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e"; + pname = "MDP"; + inherit version; + hash = "sha256-rFKmUsy67RhX/xIJhi8Dv5sG0JOxJgb7QQeH2jqmWg4="; }; - propagatedBuildInputs = [ future numpy ]; - - nativeCheckInputs = [ pytest ]; - - doCheck = true; - - pythonImportsCheck = [ "mdp" "bimdp" ]; - postPatch = '' # https://github.com/mdp-toolkit/mdp-toolkit/issues/92 - substituteInPlace mdp/utils/routines.py --replace numx.typeDict numx.sctypeDict + substituteInPlace mdp/utils/routines.py \ + --replace numx.typeDict numx.sctypeDict + substituteInPlace mdp/test/test_NormalizingRecursiveExpansionNode.py \ + --replace py.test"" "pytest" + substituteInPlace mdp/test/test_RecursiveExpansionNode.py \ + --replace py.test"" "pytest" ''; + propagatedBuildInputs = [ + future + numpy + ]; + + nativeCheckInputs = [ + joblib + pytest + scikit-learn + ]; + + pythonImportsCheck = [ + "mdp" + "bimdp" + ]; + checkPhase = '' runHook preCheck @@ -39,7 +59,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for building complex data processing software by combining widely used machine learning algorithms"; - homepage = "https://mdp-toolkit.sourceforge.net"; + homepage = "https://mdp-toolkit.github.io/"; + changelog = "https://github.com/mdp-toolkit/mdp-toolkit/blob/MDP-${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ nico202 ]; }; diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index c2783642b514..5369d7b08b8d 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,28 +1,70 @@ -{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : -buildPythonPackage rec { - pname = "OWSLib"; - version = "0.27.2"; +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyproj +, pytestCheckHook +, python-dateutil +, pythonOlder +, pytz +, pyyaml +, requests +, python +}: - src = fetchPypi { - inherit pname version; - sha256 = "sha256-4QKqJETf4MhDmrHhd2zA+kfOoowJuKKCEsiTxgF8F5s="; +buildPythonPackage rec { + pname = "owslib"; + version = "0.28.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "geopython"; + repo = "OWSLib"; + rev = "refs/tags/${version}"; + hash = "sha256-o/sNhnEZ9e0BsftN9AhJKuUjKHAHNRPe0grxdAWRVao="; }; - # as now upstream https://github.com/geopython/OWSLib/pull/824 postPatch = '' - substituteInPlace requirements.txt \ - --replace 'pyproj ' 'pyproj #' + substituteInPlace tox.ini \ + --replace " --doctest-modules --doctest-glob 'tests/**/*.txt' --cov-report term-missing --cov owslib" "" ''; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ]; + propagatedBuildInputs = [ + pyproj + python-dateutil + pytz + pyyaml + requests + ]; - # 'tests' dir not included in pypy distribution archive. - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "owslib" + ]; + + preCheck = '' + # _pytest.pathlib.ImportPathMismatchError: ('owslib.swe.sensor.sml', '/build/source/build/... + export PY_IGNORE_IMPORTMISMATCH=1 + ''; + + disabledTests = [ + # Tests require network access + "test_ows_interfaces_wcs" + "test_wfs_110_remotemd" + "test_wfs_200_remotemd" + "test_wms_130_remotemd" + "test_wmts_example_informatievlaanderen" + ]; meta = with lib; { - description = "client for Open Geospatial Consortium web service interface standards"; - license = licenses.bsd3; + description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; + changelog = "https://github.com/geopython/OWSLib/blob/${version}/CHANGES.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index f171d211a688..6880c5d7c1e7 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "12.0.2"; + version = "12.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TfIzTbVXhS+DxroxBqfodS4HAQBPJQ4/Vo4Jh8VjYfM="; + hash = "sha256-6DuvA1HAMr4A9mNH9jFKH9IWOt4010iZewldCDWWmPE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 859564e1d13d..385239b5ad52 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , importlib-metadata , jaconv +, py-cpuinfo , pytest-benchmark , pytestCheckHook , pythonOlder @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miurahr"; repo = pname; - rev = "v${version}"; - sha256 = "ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM="; + rev = "refs/tags/v${version}"; + hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + py-cpuinfo pytest-benchmark pytestCheckHook ]; @@ -56,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman"; homepage = "https://github.com/miurahr/pykakasi"; + changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 9e85ceb51ce0..dbbf42c9b6a0 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.3.0"; + version = "2.1.4"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-o4eWjWJSVzjNnzalKAEzFtfZFc8Mz1vhRqOOf/+gu6k="; + hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 8e84f1e2fd8b..4aa36b38735d 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.14.2"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-Xyj9yA4Rif3/BWEBnFubXQxwMM0IkHQ1koFZ+HWYQcI="; + hash = "sha256-SEW10ka0aQAXtW2UNCVJHMVhhZ9JTTj4IbskL87/Dn4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 2bc59b553507..3baf811140f9 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.9.1"; - format = "setuptools"; + version = "0.10.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pXSUVeTrxtSqKTa286xdCAAFipg38iR4XSO6CRfWXtc="; + hash = "sha256-OKxPPKcVVrEVUGR8Zaphn7ur9HOuqQKa9gnMo2RQQME="; }; nativeBuildInputs = [ @@ -47,6 +47,8 @@ buildPythonPackage rec { "build/lib*" # Avoid failure due to user warning: Distutils was imported before Setuptools "-p no:warnings" + # Uses network + "--ignore build/lib*/reproject/interpolation/" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index d295c73b2fe2..b212af78a26c 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.11.0"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EMWsKDpPW2f/rW0fJf9+4CYUJ1DFxdyGh0bNkE9hfDM="; + hash = "sha256-iy4oNyQj6T8mMSIIqScuIqli3dCnnWP5poaTtq9f8Yc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index d41526552f4b..f7d920c37221 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -301,7 +301,7 @@ let TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; - TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArchs; + TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArches; postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 8fe9e1fed629..86889be4ee16 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -41,6 +41,7 @@ }: let + inherit (lib) lists strings trivial; inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; in @@ -54,6 +55,45 @@ assert !cudaSupport || magma.cudatoolkit == cudatoolkit; let setBool = v: if v then "1" else "0"; + + # https://github.com/pytorch/pytorch/blob/v1.13.1/torch/utils/cpp_extension.py#L1751 + supportedTorchCudaCapabilities = + let + real = ["3.5" "3.7" "5.0" "5.2" "5.3" "6.0" "6.1" "6.2" "7.0" "7.2" "7.5" "8.0" "8.6"]; + ptx = lists.map (x: "${x}+PTX") real; + in + real ++ ptx; + + # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements + # of the first list *from* the second list. That means: + # lists.subtractLists a b = b - a + + # For CUDA + supportedCudaCapabilities = lists.intersectLists cudaFlags.cudaCapabilities supportedTorchCudaCapabilities; + unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities cudaFlags.cudaCapabilities; + + # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified. + gpuArchWarner = supported: unsupported: + trivial.throwIf (supported == [ ]) + ( + "No supported GPU targets specified. Requested GPU targets: " + + strings.concatStringsSep ", " unsupported + ) + supported; + + # Create the gpuTargetString. + gpuTargetString = strings.concatStringsSep ";" ( + if gpuTargets != [ ] then + # If gpuTargets is specified, it always takes priority. + gpuTargets + else if cudaSupport then + gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities + else if rocmSupport then + hip.gpuTargets + else + throw "No GPU targets specified" + ); + cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; # nccl is here purely for semantic grouping it could be moved to nativeBuildInputs @@ -146,14 +186,14 @@ in buildPythonPackage rec { ''; preConfigure = lib.optionalString cudaSupport '' - export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}" + export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '' + lib.optionalString (cudaSupport && cudnn != null) '' export CUDNN_INCLUDE_DIR=${cudnn}/include '' + lib.optionalString rocmSupport '' export ROCM_PATH=${rocmtoolkit_joined} export ROCM_SOURCE_DIR=${rocmtoolkit_joined} - export PYTORCH_ROCM_ARCH="${lib.strings.concatStringsSep ";" (if gpuTargets == [ ] then hip.gpuTargets else gpuTargets)}" + export PYTORCH_ROCM_ARCH="${gpuTargetString}" export CMAKE_CXX_FLAGS="-I${rocmtoolkit_joined}/include -I${rocmtoolkit_joined}/include/rocblas" python tools/amd_build/build_amd.py ''; @@ -320,7 +360,8 @@ in buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; passthru = { - inherit cudaSupport cudaPackages; + inherit cudaSupport cudaPackages gpuTargetString; + cudaCapabilities = supportedCudaCapabilities; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; }; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index de8852035c90..d36beb6575e0 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -15,13 +15,13 @@ }: let - inherit (torch.cudaPackages) cudatoolkit cudaFlags cudnn; + inherit (torch) gpuTargetString; + inherit (torch.cudaPackages) cudatoolkit cudnn; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; paths = [ cudatoolkit.out cudatoolkit.lib ]; }; - cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; version = "0.14.1"; @@ -45,7 +45,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ numpy pillow torch scipy ]; preBuild = lib.optionalString cudaSupport '' - export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}" + export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export FORCE_CUDA=1 ''; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index d09b5e7824f9..a0d41a3e839b 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.19.3"; + version = "3.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-03C6BPjVmsSTsJSIUnhyxonSqvTEc3ZkBw8xQeAIwWw="; + sha256 = "sha256-JZl3I1X0bdQ2alz2zozPo6AyIvCLHDlklNRb9clYGNE="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 6dd20021b743..34dec9ee0b6a 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ev2m3YWiTWOBgK3dr7Gv8Od4tm5Rh4hmB5VJdL7MEOg="; + hash = "sha256-ka1CkDm8ahyj0VaxfRIHOt5rqrVWj2EZa2LXE2gqXlI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index 791dfd87798a..9f363bd150c5 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-pBXt7t7Cs7F0bxvB8N67XaY/uvYhZPw10+bei/3QSfw="; + hash = "sha256-4q6/+/neWw0BFPjhCPXuLiCwyGqQn96D2pSyK/Yl6U8="; }; postPatch = '' diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 8a4b279179af..7cfb8e54f275 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -154,8 +154,8 @@ let overrideRDepends = overrides: old: lib.mapAttrs (name: value: (builtins.getAttr name old).overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ value; - propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs ++ value; + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ value; + propagatedNativeBuildInputs = (attrs.propagatedNativeBuildInputs or []) ++ value; }) ) overrides; diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index 3eb953bd4803..5fcfb20147b0 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-rJYnKQYrwj2zSg3dBHOI7zxwXTAO7ImAj0dkbVmUvHU="; + hash = "sha256-TgYX7FKTi5FBlCRDskGC/OUyh5yvS0nsLUtfCCC4S1w="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index dad7193dd25d..2e1a77eda918 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.4.1"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-Zp2Va5l4IKNuQjzzXUgqqZhJJUuWWM72hERZkS39v7g="; + hash = "sha256-96EzipCd5GX1bkpZIXZp1ZUVO+Oe4t5bhthGZHUVmFk="; }; mesonFlags = [ diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index bc0fc26fc749..da180f0d4b7a 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -44,8 +44,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime cmakeFlags = [ - "-DCMAKE_C_FLAGS_RELEASE:STRING=" - "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" "-Ddisable32bit=ON" ]; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 85a3563f020c..f49972839a09 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "0.1.20", + "version": "0.2.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0gb6xmv5qm77nfn49p7r180hz91a3kpilw27s9all8zcmca2xhml" + "sha256": "0fv4ph1pf924wf3vmzri68s79i4kxgmp2fl9qy9v14ff71bbnyv5" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1ax9yqzp4l7aa74x3lgr75h58pl3w92921fjsg8yw3imi2j57h09" + "sha256": "1h5kvd1wf6x3xis15bdrsvrivs8zmbvggcaspr9brsjw38q13c7q" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1i5g8afgcg701g7n22sgbs2639mlwgjmr5jhmw7bz6wvj8h5nz1z" + "sha256": "1p4gkghbfs5cac4k7760nnsdf7m5i5d4f568m8xsyfx8nkhpyw1w" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0a53kxhl9n6p9mblk4r0zy8aklhpsvkg0g42il8hqvf72y0kl4ks" + "sha256": "0xk4n71lgg91kkjk0633sz04s2ypyjkig9vsxg60b16gzm7z4j22" } } } diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index f12cf2a07c96..ab2e047264eb 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://pgloader.io/"; description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; maintainers = with maintainers; [ mguentner ]; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 4e7135233baa..1dc10747ddcb 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -2,43 +2,36 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , ruby , which }: rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.12.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "FnUUX7qQWVZMHtWvneTLzBL1YYwF8v4e1913Op4Lvbw="; + hash = "sha256-e6ZCRIJVKl3xbJym+h+ah/J4c+s7wf1laF7p63ubE4A="; }; - cargoSha256 = "98vmUoWSehX/9rMlHNSvKHJvJxW99pOhS08FI3OeLGo="; + cargoHash = "sha256-yhZ0QM9vZxyFCjTShbV7+Rn8w4lkPW7E7zKhrK4qa1E="; doCheck = true; - patches = [ - # Backport rust 1.62 support. Should be removed in the next rbspy release. - (fetchpatch { - name = "rust-1.62.patch"; - url = "https://github.com/rbspy/rbspy/commit/f5a8eecfbf2ad0b3ff9105115988478fb760d54d.patch"; - sha256 = "sha256-+04rvEXU7/lx5IQkk3Bhe+KLN8PwxZ0j4nH5ySnS154="; - }) - ]; - - # Tests in initialize.rs rely on specific PIDs being queried and attaching - # tracing to forked processes, which don't work well with the isolated build. + # The current implementation of rbspy fails to detect the version of ruby + # from nixpkgs during tests. preCheck = '' substituteInPlace src/core/process.rs \ --replace /usr/bin/which '${which}/bin/which' substituteInPlace src/sampler/mod.rs \ - --replace /usr/bin/which '${which}/bin/which' - substituteInPlace src/core/initialize.rs \ - --replace 'fn test_initialize_with_disallowed_process(' '#[ignore] fn test_initialize_with_disallowed_process(' \ - --replace 'fn test_get_exec_trace(' '#[ignore] fn test_get_exec_trace(' \ + --replace /usr/bin/which '${which}/bin/which' \ + --replace 'fn test_sample_single_process_with_time_limit(' '#[ignore] fn test_sample_single_process_with_time_limit(' \ + --replace 'fn test_sample_single_process(' '#[ignore] fn test_sample_single_process(' \ + --replace 'fn test_sample_subprocesses(' '#[ignore] fn test_sample_subprocesses(' + substituteInPlace src/core/ruby_spy.rs \ + --replace 'fn test_get_trace(' '#[ignore] fn test_get_trace(' \ + --replace 'fn test_get_trace_when_process_has_exited(' '#[ignore] fn test_get_trace_when_process_has_exited(' ''; nativeBuildInputs = [ ruby which ]; diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 3cb64641153a..3c777c5b27fb 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback # software rendering. GCC is needed so that libgcc_s.so can be found # when Mesa is used. - makeWrapper ${env}/ioquake3.* $out/bin/quake3 \ + makeWrapper ${env}/bin/ioquake3.* $out/bin/quake3 \ --suffix-each LD_LIBRARY_PATH ':' "${libPath}" \ --add-flags "+set fs_basepath ${env} +set r_allowSoftwareGL 1" - makeWrapper ${env}/ioq3ded.* $out/bin/quake3-server \ + makeWrapper ${env}/bin/ioq3ded.* $out/bin/quake3-server \ --add-flags "+set fs_basepath ${env}" ''; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 7849de17cf6d..244f317065cd 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.4.13-gp"; + version = "4.4.19"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-HVjBuqzi+LpqkxureKSi7zXzmTALtErW6rPJyzQBgXk="; + hash = "sha256-+f/cl+a8AQ4VUui8ds8PhY9G9Xkag+qv7FuansXRd34="; }; dontUnpack = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 74addc6c5010..ea9dbcabd0e9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -127,8 +127,7 @@ let platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" - # proprietary driver currently does not support X86_KERNEL_IBT, which is scheduled to be added in linux 6.2 - broken = broken || (kernel != null && kernel.kernelAtLeast "6.2"); + inherit broken; }; }; diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/servers/asterisk/sccp/default.nix index 756699e5adb9..5d60d4278137 100644 --- a/pkgs/servers/asterisk/sccp/default.nix +++ b/pkgs/servers/asterisk/sccp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, binutils-unwrapped, patchelf, asterisk }: stdenv.mkDerivation rec { pname = "asterisk-module-sccp"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "chan-sccp"; repo = "chan-sccp"; rev = "v${version}"; - sha256 = "sha256-YGHK4A03Ba/tnVTnu9VuhIy/xQ5C/7ZX8h9mxqKsnZI="; + sha256 = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU="; }; nativeBuildInputs = [ patchelf ]; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 7c826efbf4cf..094c29c6e306 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , fetchNpmDeps , cacert @@ -14,22 +14,22 @@ , stdenv }: -buildGoModule rec { +buildGo120Module rec { pname = "evcc"; - version = "0.112.5"; + version = "0.113.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-UoBepu+9A4nuv9HdjYacMXzXqdS24KU4hYuRlEhsdKQ="; + hash = "sha256-ikpcuOihkghRMsSj1gy4FxqZ/ojH4bk218O3LUkEHIQ="; }; - vendorHash = "sha256-sfASvLsNUp+7T0ib87HkLNBDp5fbk3hEV0LIKK46O4g="; + vendorHash = "sha256-xzD/CKecRG0qKICVwuUGh8wTgVCz0iwYzcXmUZFLLso="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-bUdyRrrU+lWGouGHweNHRhHe3/jEb4nSviU1t4AriMU="; + hash = "sha256-LGlM+itulqtlwyVKfVGiZtTpcCmx+lVvE3JOFkYRHXk="; }; nativeBuildInputs = [ diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 29416b6357ed..879d89428351 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2023-02-16"; + version = "2023-02-23"; pname = "oh-my-zsh"; - rev = "8a68bf67720a6a5442ae947d10d74b1dd3558d91"; + rev = "8a008e1f51d451db21232edd6f1709e6c5ea334e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "n6gfuvzz62l9AvQqWOwNjecLnHj4tsa5FDpunUeHZ/k="; + sha256 = "GXrDcM3MMDLHJ64xyyiORK6UPepFPaNbaZ5rNmV4zlk="; }; strictDeps = true; diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 565f3b789f01..c441e996300a 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,7 +8,7 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.714.0) + aws-partitions (1.716.0) aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.212.0) + fastlane (2.212.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -160,7 +160,7 @@ GEM naturally (2.2.1) optparse (0.1.1) os (1.1.4) - plist (3.6.0) + plist (3.7.0) public_suffix (5.0.1) rake (13.0.6) representable (3.2.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 40fa2e8e9007..5bd70e1f6ad8 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dpdx2l1h0nglxxd82khijyxdfa0p2v4s6b5fv2j33jd3k97da05"; + sha256 = "1dy4pxcblfl67gdw64ffjh9zxv10nnjszri861f8xa6cfqr3hqp1"; type = "gem"; }; - version = "1.714.0"; + version = "1.716.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -368,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7j1w0jyxn8gfk69s2h1v1pxfpk9s1hc8a9inblkj0zlba7cikl"; + sha256 = "0b22m2dkydyv2si55b1jzznzgxf2ycx2aarv1j5p25k861h2gsml"; type = "gem"; }; - version = "2.212.0"; + version = "2.212.1"; }; gh_inspector = { groups = ["default"]; @@ -648,10 +648,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; + sha256 = "0wzhnbzraz60paxhm48c50fp9xi7cqka4gfhxmiq43mhgh5ajg3h"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; public_suffix = { groups = ["default"]; diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index 6b4a77fdb058..a1c22835752b 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -1,24 +1,26 @@ { lib, stdenv, fetchurl, autoPatchelfHook, installShellFiles }: let - version = "6.12"; + version = "6.21"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; + # Use `nix store prefetch-file ` to generate the hashes for the other systems + # TODO: create update script srcUrl = { i686-linux = { url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - hash = "sha256-Vh8Hyd3Y2tDapXY+xZ+6W+X7SQGDsy1x61L28sieYKw="; + hash = "sha256-mDeRmLTjF0ZLv4JoLrgI8YBFFulBSKfOPb6hrxDZIkU="; }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - hash = "sha256-ZaGn5OzqVzDojJn8bTrbRh1wvYXM7SK91jl96mbNAeA="; + hash = "sha256-3fr5aVkh/r6OfBEcZULJSZp5ydakJOLRPlgzMdlwGTM="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - hash = "sha256-SR80VxKgLrJqO0JGWMMGUuIuIgGgxcVH+5fCWnVqJks="; + hash = "sha256-OR9HBlRteTzuyQ06tyXTSrFTBHFwmZ41kUfvgflogT4="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-9gfKEr3DE4hMWm9QT79mKgURvzn+BKmyppTJhs00u2c="; + hash = "sha256-UN3gmEuIpCXwmw3/l+KdarAYLy1DxGoPAOB2bfJTGbw="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); manSrc = fetchurl { diff --git a/pkgs/tools/filesystems/jefferson/default.nix b/pkgs/tools/filesystems/jefferson/default.nix new file mode 100644 index 000000000000..f16e1d316882 --- /dev/null +++ b/pkgs/tools/filesystems/jefferson/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "jefferson"; + version = "0.4.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "onekey-sec"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zW38vcDw4Jz5gO9IHrWRlvUznKvUyPbxkYMxn7VSTpA="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + cstruct + python-lzo + ]; + + pythonImportsCheck = [ + "jefferson" + ]; + + # upstream has no tests + doCheck = false; + + meta = with lib; { + description = "JFFS2 filesystem extraction tool"; + homepage = "https://github.com/onekey-sec/jefferson"; + license = licenses.mit; + maintainers = with maintainers; [ tnias ]; + }; +} diff --git a/pkgs/tools/filesystems/ubi_reader/default.nix b/pkgs/tools/filesystems/ubi_reader/default.nix new file mode 100644 index 000000000000..0d2e059b78f0 --- /dev/null +++ b/pkgs/tools/filesystems/ubi_reader/default.nix @@ -0,0 +1,29 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ubi_reader"; + version = "0.8.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "jrspruitt"; + repo = pname; + rev = "v${version}-master"; + hash = "sha256-tjQs1F9kcFrC9FDkfdnax0C8O8Bg7blkpL7GU56eeWU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ python-lzo ]; + + # There are no tests in the source + doCheck = false; + + meta = with lib; { + description = "Collection of Python scripts for reading information about and extracting data from UBI and UBIFS images"; + homepage = "https://github.com/jrspruitt/ubi_reader"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ vlaci ]; + }; +} diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index a2bd46321b74..96915f5c9fdf 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20221229"; + version = "20230201"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-a2oQmsrwVpz3Zg0g3NFTuD4yjpuT2uTnO5hbvMaxi/g="; + sha256 = "sha256-J/QwB5Hny8+dFfiEIfmONdOu5mMRNoQwYk4sGlqL5oM="; }; meta = with lib; { diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index 1642bb2944d4..ae6c495b6c87 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shadowsocks-v2ray-plugin"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "v2ray-plugin"; rev = "v${version}"; - sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; + sha256 = "sha256-sGsGdJp20mXvJ6Ov1QjztbJxNpDaDEERcRAAyGgenVk="; }; - vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; + vendorSha256 = "sha256-vW8790Z4BacbdqANWO41l5bH5ac/TSZIdVNvOFVTsZ8="; meta = with lib; { description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index cad8c032271b..b8f358a53ead 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-LLvAoPA3rLGfhrWD37OVyWd4tC9mwgpE1WjK2pY27xU="; + hash = "sha256-dgWpfpJiPYQmVg7CHRE8f9hX5vgC2TuLpTfMAksDurs="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorSha256 = "sha256-xBNVyPN9PRkraPRzZXOguGemYPm+Jw8hl04vWV8TZaA="; + vendorSha256 = "sha256-BEMdh1zQdjVEu0GJt6KJyWN5P9cUHfs04iNZWxzZ0Yo="; ldflags = [ "-s" "-w" "-buildid=" ]; diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/tools/system/htop/htop-vim.nix index c2ec5b9ddffb..7f020f54f9de 100644 --- a/pkgs/tools/system/htop/htop-vim.nix +++ b/pkgs/tools/system/htop/htop-vim.nix @@ -2,17 +2,17 @@ htop.overrideAttrs (oldAttrs: rec { pname = "htop-vim"; - version = "unstable-2022-05-24"; + version = "unstable-2023-02-16"; src = fetchFromGitHub { owner = "KoffeinFlummi"; repo = pname; - rev = "830ef7144940875d9d9716e33aff8651d164026e"; - sha256 = "sha256-ojStkpWvhb+W3dWyRev0VwjtCVL/I9L8FhtXcQ+ODLA="; + rev = "b2b58f8f152343b70c33b79ba51a298024278621"; + hash = "sha256-ZfdBAlnjoy8g6xwrR/i2+dGldMOfLlX6DRlNqB8pkGM="; }; meta = with lib; { - inherit (htop.meta) platforms license; + inherit (oldAttrs.meta) platforms license; description = "An interactive process viewer for Linux, with vim-style keybindings"; homepage = "https://github.com/KoffeinFlummi/htop-vim"; maintainers = with maintainers; [ thiagokokada ]; diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index 69f16d65c576..ef56a9ea1d6b 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -24,6 +25,15 @@ buildGoModule rec { vendorHash = "sha256-gDwppx0ORG+pXzTdGtUVbiFyTD/P7avt+/V89Gl0QYY="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd nsc \ + --bash <($out/bin/nsc completion bash) \ + --fish <($out/bin/nsc completion fish) \ + --zsh <($out/bin/nsc completion zsh) + ''; + preCheck = '' # Tests attempt to write to the home directory. export HOME=$(mktemp -d) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22fd545152de..2a2d6df9bb5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12915,6 +12915,8 @@ with pkgs; ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; + ubi_reader = callPackage ../tools/filesystems/ubi_reader { }; + ubridge = callPackage ../tools/networking/ubridge { }; ubertooth = callPackage ../applications/radio/ubertooth { }; @@ -20611,6 +20613,8 @@ with pkgs; jbigkit = callPackage ../development/libraries/jbigkit { }; + jefferson = callPackage ../tools/filesystems/jefferson { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; jose = callPackage ../development/libraries/jose { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a8d444a0ed04..028091180f89 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -123,6 +123,7 @@ mapAliases ({ logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 + MDP = mdp; # added 2023-02-24 MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0482f822498..81fb67e51e79 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -600,6 +600,8 @@ self: super: with self; { ariadne = callPackage ../development/python-modules/ariadne { }; + arpy = callPackage ../development/python-modules/arpy { }; + arnparse = callPackage ../development/python-modules/arnparse { }; arrayqueues = callPackage ../development/python-modules/arrayqueues { }; @@ -2122,6 +2124,8 @@ self: super: with self; { cssutils = callPackage ../development/python-modules/cssutils { }; + cstruct = callPackage ../development/python-modules/cstruct { }; + csvw = callPackage ../development/python-modules/csvw { }; cu2qu = callPackage ../development/python-modules/cu2qu { }; @@ -5812,7 +5816,7 @@ self: super: with self; { mdutils = callPackage ../development/python-modules/mdutils { }; - MDP = callPackage ../development/python-modules/mdp { }; + mdp = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { };