Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
78fc07ec ae20452a

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