lol

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
cd4ded4f 63655bda

+176 -104
+25 -18
pkgs/applications/emulators/dosbox-staging/default.nix
··· 1 - { lib 2 - , stdenv 1 + { alsa-lib 2 + , copyDesktopItems 3 3 , fetchFromGitHub 4 - , SDL2 5 - , SDL2_net 6 - , alsa-lib 7 - , copyDesktopItems 8 4 , fluidsynth 5 + , glib 9 6 , gtest 7 + , lib 10 8 , libGL 11 9 , libGLU 10 + , libjack2 11 + , libmt32emu 12 12 , libogg 13 13 , libpng 14 + , libpulseaudio 14 15 , libslirp 16 + , libsndfile 15 17 , makeDesktopItem 16 18 , makeWrapper 17 19 , meson 18 - , libmt32emu 19 20 , ninja 20 21 , opusfile 21 22 , pkg-config 22 - , libpulseaudio 23 - , glib 24 - , libjack2 25 - , libsndfile 23 + , irr1 24 + , SDL2 25 + , SDL2_image 26 + , SDL2_net 27 + , speexdsp 28 + , stdenv 26 29 }: 27 30 28 31 stdenv.mkDerivation rec { 29 32 pname = "dosbox-staging"; 30 - version = "0.78.1"; 33 + version = "0.80.1"; 31 34 32 35 src = fetchFromGitHub { 33 36 owner = pname; 34 37 repo = pname; 35 38 rev = "v${version}"; 36 - hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk="; 39 + hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; 37 40 }; 38 41 39 42 nativeBuildInputs = [ ··· 46 49 ]; 47 50 48 51 buildInputs = [ 49 - SDL2 50 - SDL2_net 51 52 alsa-lib 52 53 fluidsynth 53 54 glib 55 + irr1 54 56 libGL 55 57 libGLU 56 58 libjack2 ··· 61 63 libslirp 62 64 libsndfile 63 65 opusfile 66 + SDL2 67 + SDL2_image 68 + SDL2_net 69 + speexdsp 64 70 ]; 65 71 66 - NIX_CFLAGS_COMPILE = [ 67 - "-I${SDL2_net}/include/SDL2" 68 - ]; 72 + NIX_CFLAGS_COMPILE = [ 73 + "-I${SDL2_image}/include/SDL2" 74 + "-I${SDL2_net}/include/SDL2" 75 + ]; 69 76 70 77 desktopItems = [ 71 78 (makeDesktopItem {
+10 -3
pkgs/applications/networking/cluster/helm/default.nix
··· 1 - { lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: 1 + { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubernetes-helm }: 2 2 3 3 buildGoModule rec { 4 4 pname = "kubernetes-helm"; ··· 20 20 "-X helm.sh/helm/v3/internal/version.gitCommit=${src.rev}" 21 21 ]; 22 22 23 + __darwinAllowLocalNetworking = true; 24 + 23 25 preCheck = '' 24 26 # skipping version tests because they require dot git directory 25 27 substituteInPlace cmd/helm/version_test.go \ 26 28 --replace "TestVersion" "SkipVersion" 27 - '' + lib.optionalString stdenv.isLinux '' 28 - # skipping plugin tests on linux 29 + # skipping plugin tests 29 30 substituteInPlace cmd/helm/plugin_test.go \ 30 31 --replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \ 31 32 --replace "TestLoadPlugins" "SkipLoadPlugins" ··· 40 41 $out/bin/helm completion fish > helm.fish 41 42 installShellCompletion helm.{bash,zsh,fish} 42 43 ''; 44 + 45 + passthru.tests.version = testers.testVersion { 46 + package = kubernetes-helm; 47 + command = "helm version"; 48 + version = "v${version}"; 49 + }; 43 50 44 51 meta = with lib; { 45 52 homepage = "https://github.com/kubernetes/helm";
+3 -3
pkgs/applications/networking/cluster/linkerd/default.nix
··· 2 2 3 3 (callPackage ./generic.nix { }) { 4 4 channel = "stable"; 5 - version = "2.12.3"; 6 - sha256 = "01vnqhn5lc4pv1rgwmmzzf7ynqc4ss0jysqhjq0m5yzll2k40d8z"; 7 - vendorSha256 = "sha256-7CkeWbgiQIKhuCrJErZrkkx0MD41qxaWAY/18VafLZE="; 5 + version = "2.12.4"; 6 + sha256 = "1nl831xjhxyw1r2zvdxy3455sfn1cnn6970n02q7aalmqgz9rpdd"; 7 + vendorSha256 = "sha256-c7x2vNO6ap5Ecx4+1hKy6PImFuclSQqvkBKr0LPdX4M="; 8 8 }
+2 -2
pkgs/applications/networking/ids/suricata/default.nix
··· 34 34 in 35 35 stdenv.mkDerivation rec { 36 36 pname = "suricata"; 37 - version = "6.0.8"; 37 + version = "6.0.10"; 38 38 39 39 src = fetchurl { 40 40 url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; 41 - sha256 = "sha256-JTzjzA35Z62TcdbqjU7tkexZPfPtBOCCKcfPhXgMkaM="; 41 + sha256 = "sha256-Wb/Rv12cFZYib6SBW/dmQ85ZaYhmwQeiYmnEgfElxNc="; 42 42 }; 43 43 44 44 nativeBuildInputs = [
+4 -4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
··· 1 1 { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { 2 2 signal-desktop = { 3 3 dir = "Signal"; 4 - version = "6.4.1"; 5 - hash = "sha256-/Rrph74nVr64Z6blNNn3oMM25YK92MZY/vuF1d+r6Yc="; 4 + version = "6.5.1"; 5 + hash = "sha256-At4ILl6nHltP1TMI5cjK7gE4NENAccS4MPMHXJoGveM="; 6 6 }; 7 7 signal-desktop-beta = { 8 8 dir = "Signal Beta"; 9 - version = "6.5.0-beta.2"; 10 - hash = "sha256-cAX9oU3bJrTOH3RbbfUK+49OiRSLjEZLdpJNOMAa94I="; 9 + version = "6.6.0-beta.1"; 10 + hash = "sha256-txSvMg7Q+r9UWJMC9Rj2XQ8y1WN3xphMruvOZok/VPk="; 11 11 }; 12 12 }
+5 -5
pkgs/applications/networking/p2p/qbittorrent/default.nix
··· 10 10 assert trackerSearch -> (python3 != null); 11 11 12 12 mkDerivation rec { 13 - pname = "qbittorrent"; 14 - version = "4.4.5"; 13 + pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; 14 + version = "4.5.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "qbittorrent"; 18 18 repo = "qBittorrent"; 19 19 rev = "release-${version}"; 20 - sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g="; 20 + hash = "sha256-mDjY6OAegMjU/z5+/BUbodxJjntFbk5bsfOfqIWa87o="; 21 21 }; 22 22 23 23 enableParallelBuilding = true; ··· 43 43 44 44 postInstall = lib.optionalString stdenv.isDarwin '' 45 45 mkdir -p $out/{Applications,bin} 46 - cp -R src/qbittorrent.app $out/Applications 47 - makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent 46 + cp -R src/${pname}.app $out/Applications 47 + makeWrapper $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} 48 48 ''; 49 49 50 50 meta = with lib; {
+3 -3
pkgs/applications/version-management/forgejo/default.nix
··· 20 20 21 21 buildGoModule rec { 22 22 pname = "forgejo"; 23 - version = "1.18.3-0"; 23 + version = "1.18.3-1"; 24 24 25 25 src = fetchurl { 26 26 name = "${pname}-src-${version}.tar.gz"; 27 27 # see https://codeberg.org/forgejo/forgejo/releases 28 - url = "https://codeberg.org/attachments/384fd9ab-7c64-4c29-9b1b-cdb803c48103"; 29 - hash = "sha256-zBGd+wPJDw7bwRvAlscqbQHDG6po3dlbpYccfanbtyU="; 28 + url = "https://codeberg.org/attachments/3fdf0967-d3f4-4488-a2bf-276c4a64d97c"; 29 + hash = "sha256-H69qKdmz5qHJ353UZYztUlStpj/RyE6LA8cDaRnVYAQ="; 30 30 }; 31 31 32 32 vendorHash = null;
+3 -3
pkgs/applications/window-managers/sway/lock.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "swaylock"; 8 - version = "1.7"; 8 + version = "1.7.2"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "swaywm"; 12 12 repo = "swaylock"; 13 - rev = version; 14 - hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE="; 13 + rev = "v${version}"; 14 + hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; 15 15 }; 16 16 17 17 strictDeps = true;
+9 -7
pkgs/development/compilers/gcc-arm-embedded/12/default.nix
··· 10 10 version = "12.2.rel1"; 11 11 12 12 platform = { 13 - aarch64-linux = "aarch64"; 14 - x86_64-darwin = "darwin-x86_64"; 15 - x86_64-linux = "x86_64"; 13 + aarch64-darwin = "darwin-arm64"; 14 + aarch64-linux = "aarch64"; 15 + x86_64-darwin = "darwin-x86_64"; 16 + x86_64-linux = "x86_64"; 16 17 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 17 18 18 19 src = fetchurl { 19 20 url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; 20 21 sha256 = { 21 - aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; 22 - x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; 23 - x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; 22 + aarch64-darwin = "0j12n631bmbfvnfbmv4q7cfhmh4l7ka3vcjcvyw0vjqb4msyia91"; 23 + aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; 24 + x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; 25 + x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; 24 26 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 25 27 }; 26 28 ··· 47 49 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 48 50 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 49 51 maintainers = with maintainers; [ prusnak ]; 50 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; 52 + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 51 53 }; 52 54 }
+28
pkgs/development/libraries/irr1/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + }: 6 + 7 + stdenv.mkDerivation rec { 8 + pname = "irr1"; 9 + version = "1.9.4"; 10 + 11 + src = fetchFromGitHub { 12 + owner = "berndporr"; 13 + repo = "iir1"; 14 + rev = version; 15 + hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs="; 16 + }; 17 + 18 + nativeBuildInputs = [ cmake ]; 19 + 20 + meta = { 21 + description = "A DSP IIR realtime filter library written in C++"; 22 + downloadPage = "https://github.com/berndporr/iir1"; 23 + homepage = "http://berndporr.github.io/iir1/"; 24 + license = lib.licenses.mit; 25 + maintainers = [ lib.maintainers.AndersonTorres ]; 26 + platforms = lib.platforms.unix; 27 + }; 28 + }
+2 -2
pkgs/development/libraries/usbredir/default.nix
··· 11 11 12 12 stdenv.mkDerivation rec { 13 13 pname = "usbredir"; 14 - version = "0.12.0"; 14 + version = "0.13.0"; 15 15 16 16 src = fetchFromGitLab { 17 17 domain = "gitlab.freedesktop.org"; 18 18 owner = "spice"; 19 19 repo = "usbredir"; 20 20 rev = "${pname}-${version}"; 21 - sha256 = "sha256-OVLc3FWLBjWJnqIhhe6k+pl/HsJGzqD6xp/fXXEgRwY="; 21 + sha256 = "sha256-zehf0DkqSSvmatbk/UB1oySjyqiFUYTuIhqb5xKeK7I="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+18 -4
pkgs/development/python-modules/huey/default.nix
··· 1 - { lib, buildPythonPackage, fetchFromGitHub, redis }: 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , setuptools 5 + , wheel 6 + , redis 7 + }: 2 8 3 9 buildPythonPackage rec { 4 10 pname = "huey"; 5 - version = "2.4.2"; 11 + version = "2.4.5"; 12 + 13 + format = "pyproject"; 6 14 7 15 src = fetchFromGitHub { 8 16 owner = "coleifer"; 9 17 repo = pname; 10 - rev = version; 11 - sha256 = "00fi04991skq61gjrmig8ry6936pc8zs7p8py8spfipbxf1irkjg"; 18 + rev = "refs/tags/${version}"; 19 + hash = "sha256-7ZMkA5WzWJKSwvpOoZYQO9JgedCdxNGrkFuPmYm4aRE="; 12 20 }; 13 21 22 + nativeBuildInputs = [ 23 + setuptools 24 + wheel 25 + ]; 26 + 14 27 propagatedBuildInputs = [ redis ]; 15 28 16 29 # connects to redis 17 30 doCheck = false; 18 31 19 32 meta = with lib; { 33 + changelog = "https://github.com/coleifer/huey/blob/${src.rev}/CHANGELOG.md"; 20 34 description = "A little task queue for python"; 21 35 homepage = "https://github.com/coleifer/huey"; 22 36 license = licenses.mit;
+2 -2
pkgs/development/python-modules/pyrogram/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "pyrogram"; 13 - version = "2.0.97"; 13 + version = "2.0.98"; 14 14 15 15 disabled = pythonOlder "3.7"; 16 16 ··· 20 20 owner = "pyrogram"; 21 21 repo = "pyrogram"; 22 22 rev = "v${version}"; 23 - hash = "sha256-cYwH2o2ss8qnOST8Cjh+88PNM5NTO2B11PW7mWS1ctk="; 23 + hash = "sha256-pxhErSlJxaQmms3T/AelsudPFYfH7YaH3ePSR5L33tY="; 24 24 }; 25 25 26 26 propagatedBuildInputs = [
+10 -8
pkgs/development/tools/misc/mdl/Gemfile.lock
··· 1 1 GEM 2 2 remote: https://rubygems.org/ 3 3 specs: 4 - chef-utils (16.7.61) 5 - kramdown (2.3.0) 4 + chef-utils (18.1.0) 5 + concurrent-ruby 6 + concurrent-ruby (1.2.0) 7 + kramdown (2.4.0) 6 8 rexml 7 9 kramdown-parser-gfm (1.1.0) 8 10 kramdown (~> 2.0) 9 - mdl (0.11.0) 11 + mdl (0.12.0) 10 12 kramdown (~> 2.3) 11 13 kramdown-parser-gfm (~> 1.1) 12 14 mixlib-cli (~> 2.1, >= 2.1.1) 13 15 mixlib-config (>= 2.2.1, < 4) 14 16 mixlib-shellout 15 17 mixlib-cli (2.1.8) 16 - mixlib-config (3.0.9) 18 + mixlib-config (3.0.27) 17 19 tomlrb 18 - mixlib-shellout (3.2.2) 20 + mixlib-shellout (3.2.7) 19 21 chef-utils 20 - rexml (3.2.4) 21 - tomlrb (2.0.0) 22 + rexml (3.2.5) 23 + tomlrb (2.0.3) 22 24 23 25 PLATFORMS 24 26 ruby ··· 27 29 mdl 28 30 29 31 BUNDLED WITH 30 - 2.1.4 32 + 2.4.6
+25 -14
pkgs/development/tools/misc/mdl/gemset.nix
··· 1 1 { 2 2 chef-utils = { 3 + dependencies = ["concurrent-ruby"]; 3 4 groups = ["default"]; 4 5 platforms = []; 5 6 source = { 6 7 remotes = ["https://rubygems.org"]; 7 - sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz"; 8 + sha256 = "0ckbnra3cs71syrvfhgcrg1icqxh6pj21by2f9sy6r6kbr19g4w3"; 8 9 type = "gem"; 9 10 }; 10 - version = "16.7.61"; 11 + version = "18.1.0"; 12 + }; 13 + concurrent-ruby = { 14 + groups = ["default"]; 15 + platforms = []; 16 + source = { 17 + remotes = ["https://rubygems.org"]; 18 + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; 19 + type = "gem"; 20 + }; 21 + version = "1.2.0"; 11 22 }; 12 23 kramdown = { 13 24 dependencies = ["rexml"]; ··· 15 26 platforms = []; 16 27 source = { 17 28 remotes = ["https://rubygems.org"]; 18 - sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; 29 + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; 19 30 type = "gem"; 20 31 }; 21 - version = "2.3.0"; 32 + version = "2.4.0"; 22 33 }; 23 34 kramdown-parser-gfm = { 24 35 dependencies = ["kramdown"]; ··· 37 48 platforms = []; 38 49 source = { 39 50 remotes = ["https://rubygems.org"]; 40 - sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq"; 51 + sha256 = "1gk42gayn8d2084ak6wvdwch00wb0acvncglfdhi5n0ap93q6wb6"; 41 52 type = "gem"; 42 53 }; 43 - version = "0.11.0"; 54 + version = "0.12.0"; 44 55 }; 45 56 mixlib-cli = { 46 57 groups = ["default"]; ··· 58 69 platforms = []; 59 70 source = { 60 71 remotes = ["https://rubygems.org"]; 61 - sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; 72 + sha256 = "0j0122lv2qgccl61njqi0pj6sp6nb85y07gcmw16bwg4k0c8nx6p"; 62 73 type = "gem"; 63 74 }; 64 - version = "3.0.9"; 75 + version = "3.0.27"; 65 76 }; 66 77 mixlib-shellout = { 67 78 dependencies = ["chef-utils"]; ··· 69 80 platforms = []; 70 81 source = { 71 82 remotes = ["https://rubygems.org"]; 72 - sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; 83 + sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6"; 73 84 type = "gem"; 74 85 }; 75 - version = "3.2.2"; 86 + version = "3.2.7"; 76 87 }; 77 88 rexml = { 78 89 groups = ["default"]; 79 90 platforms = []; 80 91 source = { 81 92 remotes = ["https://rubygems.org"]; 82 - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; 93 + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; 83 94 type = "gem"; 84 95 }; 85 - version = "3.2.4"; 96 + version = "3.2.5"; 86 97 }; 87 98 tomlrb = { 88 99 groups = ["default"]; 89 100 platforms = []; 90 101 source = { 91 102 remotes = ["https://rubygems.org"]; 92 - sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr"; 103 + sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2"; 93 104 type = "gem"; 94 105 }; 95 - version = "2.0.0"; 106 + version = "2.0.3"; 96 107 }; 97 108 }
+2 -2
pkgs/development/tools/oh-my-posh/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "oh-my-posh"; 9 - version = "14.2.4"; 9 + version = "14.2.5"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "jandedobbeleer"; 13 13 repo = pname; 14 14 rev = "refs/tags/v${version}"; 15 - hash = "sha256-4o0Z3xXsVTr2dE5td/i2uQoaqsBGOMSrzt2X6C9gYbA="; 15 + hash = "sha256-XhpahA2BPtZeymNwlZ40FzLC5biThBBLna28zRw81Bw="; 16 16 }; 17 17 18 18 vendorHash = "sha256-ehG71B351u+LoXDuKQkuEdEpUdHslVU2HcPKUz6FAnQ=";
+3 -3
pkgs/development/tools/stylua/default.nix
··· 7 7 8 8 rustPlatform.buildRustPackage rec { 9 9 pname = "stylua"; 10 - version = "0.16.0"; 10 + version = "0.16.1"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "johnnymorganz"; 14 14 repo = pname; 15 15 rev = "v${version}"; 16 - sha256 = "sha256-DDK/ANBR0wH87/9wnZYwyYMbCl/N/m4KUvQJ/dB8las="; 16 + sha256 = "sha256-PpkJwCVZr21P1WmU2Kid+X9JwKdJs1krY6keQoMqDvc="; 17 17 }; 18 18 19 - cargoSha256 = "sha256-xgOPjdy+uoUOdtYXq/lXR872QdzA1/r8Shi0q1E+e9Q="; 19 + cargoSha256 = "sha256-oCoE+Fk2zcVlV8H+f/soAWlhXNsLTysmqLXx9yjdnFY="; 20 20 21 21 # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu 22 22 postPatch = ''
+2 -2
pkgs/games/unciv/default.nix
··· 25 25 in 26 26 stdenv.mkDerivation rec { 27 27 pname = "unciv"; 28 - version = "4.4.11"; 28 + version = "4.4.13-gp"; 29 29 30 30 src = fetchurl { 31 31 url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; 32 - hash = "sha256-UvTEqptA9Dp1wdri12sAYDB6rjiZCvk2tiG5i0AWU78="; 32 + hash = "sha256-HVjBuqzi+LpqkxureKSi7zXzmTALtErW6rPJyzQBgXk="; 33 33 }; 34 34 35 35 dontUnpack = true;
+2 -2
pkgs/os-specific/linux/qmk-udev-rules/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "qmk-udev-rules"; 9 - version = "0.15.25"; 9 + version = "0.19.11"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "qmk"; 13 13 repo = "qmk_firmware"; 14 14 rev = version; 15 - sha256 = "4U1/9DgoKZ1Al76lZ2P8x4LIvtqaJPLq81cCSCy+9iE="; 15 + hash = "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI="; 16 16 }; 17 17 18 18 dontBuild = true;
+3 -3
pkgs/servers/libreddit/default.nix
··· 8 8 9 9 rustPlatform.buildRustPackage rec { 10 10 pname = "libreddit"; 11 - version = "0.29.0"; 11 + version = "0.29.1"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "libreddit"; 15 15 repo = pname; 16 16 rev = "refs/tags/v${version}"; 17 - hash = "sha256-ZH1mtFfbM+acEY1oyoFXPltgPbtgI1kzoO59op1zZfo="; 17 + hash = "sha256-W/vUOioZpA2UYPyJOVTGC1mek574m48NKQXG2o7emjU="; 18 18 }; 19 19 20 - cargoHash = "sha256-2DBptAvJ0J65AehgHG7f4JZf1QA4ZXn8dqG09wcXsiU="; 20 + cargoHash = "sha256-WrkUW9fV69RswS3qBMqBGxNBq6W4eJmJaTrEDp9byrM="; 21 21 22 22 buildInputs = lib.optionals stdenv.isDarwin [ 23 23 Security
+1
pkgs/servers/mjolnir/default.nix
··· 38 38 runHook preBuild 39 39 40 40 ln -s ${nodeDependencies}/lib/node_modules . 41 + export HOME=$(mktemp -d) 41 42 export PATH="${nodeDependencies}/bin:$PATH" 42 43 npm run build 43 44
-2
pkgs/shells/nushell/default.nix
··· 12 12 , xorg 13 13 , libiconv 14 14 , AppKit 15 - , Foundation 16 15 , Security 17 16 # darwin.apple_sdk.sdk 18 17 , sdk ··· 47 46 buildInputs = [ openssl zstd ] 48 47 ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] 49 48 ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ 50 - Foundation 51 49 ( 52 50 # Pull a header that contains a definition of proc_pid_rusage(). 53 51 # (We pick just that one because using the other headers from `sdk` is not
+3 -3
pkgs/tools/admin/lego/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "lego"; 5 - version = "4.9.1"; 5 + version = "4.10.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "go-acme"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-YaJT+gTnw9A2joL8D3P7fs/NTyHpH4gDhg6STv19SZU="; 11 + sha256 = "sha256-FT1cXnMyMrEpZpTMp+kE8ueHReAYf2XQZ/9Nw53TYbg="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-gHwyXzmws99tPRJKR/boc0Hf+b5h9ZkzH2aiN8u6Z0I="; 14 + vendorSha256 = "sha256-Rf1HY2Q0t3iOuopnPRCkDKauWLFy9qhRh94QiwbDuOQ="; 15 15 16 16 doCheck = false; 17 17
+2 -2
pkgs/tools/audio/abcmidi/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "abcMIDI"; 5 - version = "2023.02.07"; 5 + version = "2023.02.08"; 6 6 7 7 src = fetchzip { 8 8 url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; 9 - hash = "sha256-/EET65zdkHtVCNMurydskk1CO9pObCfWn7qVGGD9U3M="; 9 + hash = "sha256-cJrRt+if3Ymn/nMCGsw2iObkRQF3hDxaUT9OEYp6j/g="; 10 10 }; 11 11 12 12 meta = with lib; {
+2 -2
pkgs/tools/package-management/reuse/default.nix
··· 2 2 3 3 python3Packages.buildPythonApplication rec { 4 4 pname = "reuse"; 5 - version = "1.1.1"; 5 + version = "1.1.2"; 6 6 format = "pyproject"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "fsfe"; 10 10 repo = "reuse-tool"; 11 11 rev = "refs/tags/v${version}"; 12 - hash = "sha256-4L5VQtjpJ1P95S3vkbgLYTO/lTFReGiSAVuWSwh14i4="; 12 + hash = "sha256-J+zQrokrAX5tRU/2RPPSaFDyfsACPHHQYbK5sO99CMs="; 13 13 }; 14 14 15 15 nativeBuildInputs = with python3Packages; [
+3 -3
pkgs/tools/text/mdbook/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "mdbook"; 5 - version = "0.4.25"; 5 + version = "0.4.26"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "rust-lang"; 9 9 repo = "mdBook"; 10 10 rev = "refs/tags/v${version}"; 11 - sha256 = "sha256-9zq3y7fNbGkprekzPDnJV4/IkAFUGEydkWAtr49mhdg="; 11 + sha256 = "sha256-+K2mbVbOMQDumcPgiPtqDts/RGi+E0lF7Cftt86X/5A="; 12 12 }; 13 13 14 - cargoSha256 = "sha256-6UiE/b6iJkuM/9g5yhB33WwTZ2VYlWFWQdfdHzA39CM="; 14 + cargoHash = "sha256-C9ziW3LUBGR/K+nR3mDr62KoE9p3mn+50nfd/3NFjro="; 15 15 16 16 auditable = true; # TODO: remove when this is the default 17 17
+4 -2
pkgs/top-level/all-packages.nix
··· 20455 20455 20456 20456 ip2location-c = callPackage ../development/libraries/ip2location-c { }; 20457 20457 20458 + irr1 = callPackage ../development/libraries/irr1 { }; 20459 + 20458 20460 irrlicht = if !stdenv.isDarwin then 20459 20461 callPackage ../development/libraries/irrlicht { } 20460 20462 else callPackage ../development/libraries/irrlicht/mac.nix { ··· 26211 26213 26212 26214 nsh = callPackage ../shells/nsh { }; 26213 26215 26214 - nushell = callPackage ../shells/nushell { 26215 - inherit (darwin.apple_sdk.frameworks) AppKit Foundation Security; 26216 + nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell { 26217 + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; 26216 26218 inherit (darwin.apple_sdk) sdk; 26217 26219 }; 26218 26220