Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub f1df5161 3f084952

+122 -366
+4 -2
pkgs/applications/networking/browsers/brave/default.nix
··· 88 88 89 89 stdenv.mkDerivation rec { 90 90 pname = "brave"; 91 - version = "1.18.75"; 91 + version = "1.18.77"; 92 92 93 93 src = fetchurl { 94 94 url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; 95 - sha256 = "1njgdw7ml30xs517brc7z7piy6lcylrfjhz6wn1dp7gywsxfgx1h"; 95 + sha256 = "AV3bqtWaoy6AVnt8K/Qo+7hguAIsPJPZhgLSeOvJ7JY="; 96 96 }; 97 97 98 98 dontConfigure = true; ··· 146 146 ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings 147 147 ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime 148 148 ''; 149 + 150 + passthru.updateScript = ./update.sh; 149 151 150 152 meta = with stdenv.lib; { 151 153 homepage = "https://brave.com/";
+5
pkgs/applications/networking/browsers/brave/update.sh
··· 1 + #!/usr/bin/env nix-shell 2 + #!nix-shell -i bash -p curl gnused common-updater-scripts 3 + 4 + version="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" 5 + update-source-version brave "$version"
+9 -9
pkgs/applications/networking/sync/desync/default.nix
··· 1 - { stdenv, buildGoPackage, fetchFromGitHub }: 1 + { stdenv, buildGoModule, fetchFromGitHub }: 2 2 3 - buildGoPackage rec { 3 + buildGoModule rec { 4 4 pname = "desync"; 5 - version = "0.4.0"; 6 - rev = "v${version}"; 7 - 8 - goPackagePath = "github.com/folbricht/desync"; 5 + version = "0.9.0"; 9 6 10 7 src = fetchFromGitHub { 11 - inherit rev; 8 + rev = "v${version}"; 12 9 owner = "folbricht"; 13 10 repo = "desync"; 14 - sha256 = "17qh0g1paa7212j761q9z246k10a3xrwd8fgiizw3lr9adn50kdk"; 11 + sha256 = "0j9hixgkja268r2zn2dglrmlrb2z57sgz6q3wqb8dfwpan7b5rsy"; 15 12 }; 16 13 17 - goDeps = ./deps.nix; 14 + vendorSha256 = "1gajh99jb6mbwk93dypddhl7r7n8h2s11s3s82firbrb5k24s4pz"; 15 + 16 + # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad. 17 + doCheck = false; 18 18 19 19 meta = with stdenv.lib; { 20 20 description = "Content-addressed binary distribution system";
-312
pkgs/applications/networking/sync/desync/deps.nix
··· 1 - [ 2 - 3 - { 4 - goPackagePath = "github.com/datadog/zstd"; 5 - fetch = { 6 - type = "git"; 7 - url = "https://github.com/datadog/zstd"; 8 - rev = "v1.3.4"; 9 - sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8"; 10 - }; 11 - } 12 - 13 - { 14 - goPackagePath = "github.com/davecgh/go-spew"; 15 - fetch = { 16 - type = "git"; 17 - url = "https://github.com/davecgh/go-spew"; 18 - rev = "v1.1.1"; 19 - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; 20 - }; 21 - } 22 - 23 - { 24 - goPackagePath = "github.com/dchest/siphash"; 25 - fetch = { 26 - type = "git"; 27 - url = "https://github.com/dchest/siphash"; 28 - rev = "v1.2.0"; 29 - sha256 = "01qhv9zd9l6p7pwf1fj022mp9s5496rk4lnm3yvpjsiwp6k4af8c"; 30 - }; 31 - } 32 - 33 - { 34 - goPackagePath = "github.com/fatih/color"; 35 - fetch = { 36 - type = "git"; 37 - url = "https://github.com/fatih/color"; 38 - rev = "v1.7.0"; 39 - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; 40 - }; 41 - } 42 - 43 - { 44 - goPackagePath = "github.com/folbricht/tempfile"; 45 - fetch = { 46 - type = "git"; 47 - url = "https://github.com/folbricht/tempfile"; 48 - rev = "v0.0.1"; 49 - sha256 = "0vz08qvbniqxc24vhmcbq5ncnz97ncp4jbxgcf0hziazxfp114z3"; 50 - }; 51 - } 52 - 53 - { 54 - goPackagePath = "github.com/go-ini/ini"; 55 - fetch = { 56 - type = "git"; 57 - url = "https://github.com/go-ini/ini"; 58 - rev = "v1.38.2"; 59 - sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9"; 60 - }; 61 - } 62 - 63 - { 64 - goPackagePath = "github.com/gopherjs/gopherjs"; 65 - fetch = { 66 - type = "git"; 67 - url = "https://github.com/gopherjs/gopherjs"; 68 - rev = "0210a2f0f73c"; 69 - sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j"; 70 - }; 71 - } 72 - 73 - { 74 - goPackagePath = "github.com/hanwen/go-fuse"; 75 - fetch = { 76 - type = "git"; 77 - url = "https://github.com/hanwen/go-fuse"; 78 - rev = "1d35017e9701"; 79 - sha256 = "11rggvkd6lc5lcpsfvc9iip4z9cingzpkpshaskv2cirbxdynyi8"; 80 - }; 81 - } 82 - 83 - { 84 - goPackagePath = "github.com/inconshreveable/mousetrap"; 85 - fetch = { 86 - type = "git"; 87 - url = "https://github.com/inconshreveable/mousetrap"; 88 - rev = "v1.0.0"; 89 - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; 90 - }; 91 - } 92 - 93 - { 94 - goPackagePath = "github.com/jtolds/gls"; 95 - fetch = { 96 - type = "git"; 97 - url = "https://github.com/jtolds/gls"; 98 - rev = "v4.2.1"; 99 - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; 100 - }; 101 - } 102 - 103 - { 104 - goPackagePath = "github.com/kr/fs"; 105 - fetch = { 106 - type = "git"; 107 - url = "https://github.com/kr/fs"; 108 - rev = "v0.1.0"; 109 - sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q"; 110 - }; 111 - } 112 - 113 - { 114 - goPackagePath = "github.com/mattn/go-colorable"; 115 - fetch = { 116 - type = "git"; 117 - url = "https://github.com/mattn/go-colorable"; 118 - rev = "v0.0.9"; 119 - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; 120 - }; 121 - } 122 - 123 - { 124 - goPackagePath = "github.com/mattn/go-isatty"; 125 - fetch = { 126 - type = "git"; 127 - url = "https://github.com/mattn/go-isatty"; 128 - rev = "v0.0.4"; 129 - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; 130 - }; 131 - } 132 - 133 - { 134 - goPackagePath = "github.com/mattn/go-runewidth"; 135 - fetch = { 136 - type = "git"; 137 - url = "https://github.com/mattn/go-runewidth"; 138 - rev = "v0.0.3"; 139 - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; 140 - }; 141 - } 142 - 143 - { 144 - goPackagePath = "github.com/minio/minio-go"; 145 - fetch = { 146 - type = "git"; 147 - url = "https://github.com/minio/minio-go"; 148 - rev = "v6.0.6"; 149 - sha256 = "0bgivqw1n1189lksp85djw1rqcan2axyh4jv9q54iclrjkpbab37"; 150 - }; 151 - } 152 - 153 - { 154 - goPackagePath = "github.com/mitchellh/go-homedir"; 155 - fetch = { 156 - type = "git"; 157 - url = "https://github.com/mitchellh/go-homedir"; 158 - rev = "v1.0.0"; 159 - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; 160 - }; 161 - } 162 - 163 - { 164 - goPackagePath = "github.com/pkg/errors"; 165 - fetch = { 166 - type = "git"; 167 - url = "https://github.com/pkg/errors"; 168 - rev = "v0.8.0"; 169 - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; 170 - }; 171 - } 172 - 173 - { 174 - goPackagePath = "github.com/pkg/sftp"; 175 - fetch = { 176 - type = "git"; 177 - url = "https://github.com/pkg/sftp"; 178 - rev = "v1.8.2"; 179 - sha256 = "040flbir6sv213xzs75vkd5fd7bmm3fqxfcnsx8fr77zkn52hm4m"; 180 - }; 181 - } 182 - 183 - { 184 - goPackagePath = "github.com/pmezard/go-difflib"; 185 - fetch = { 186 - type = "git"; 187 - url = "https://github.com/pmezard/go-difflib"; 188 - rev = "v1.0.0"; 189 - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; 190 - }; 191 - } 192 - 193 - { 194 - goPackagePath = "github.com/smartystreets/assertions"; 195 - fetch = { 196 - type = "git"; 197 - url = "https://github.com/smartystreets/assertions"; 198 - rev = "7c9eb446e3cf"; 199 - sha256 = "1dix6qgaj6kw38hicy3zs3lvacl1kn0n267b3xw0vvdkqf1v0395"; 200 - }; 201 - } 202 - 203 - { 204 - goPackagePath = "github.com/smartystreets/goconvey"; 205 - fetch = { 206 - type = "git"; 207 - url = "https://github.com/smartystreets/goconvey"; 208 - rev = "ef6db91d284a"; 209 - sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7"; 210 - }; 211 - } 212 - 213 - { 214 - goPackagePath = "github.com/spf13/cobra"; 215 - fetch = { 216 - type = "git"; 217 - url = "https://github.com/spf13/cobra"; 218 - rev = "v0.0.3"; 219 - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; 220 - }; 221 - } 222 - 223 - { 224 - goPackagePath = "github.com/spf13/pflag"; 225 - fetch = { 226 - type = "git"; 227 - url = "https://github.com/spf13/pflag"; 228 - rev = "v1.0.2"; 229 - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; 230 - }; 231 - } 232 - 233 - { 234 - goPackagePath = "github.com/stretchr/testify"; 235 - fetch = { 236 - type = "git"; 237 - url = "https://github.com/stretchr/testify"; 238 - rev = "v1.2.2"; 239 - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; 240 - }; 241 - } 242 - 243 - { 244 - goPackagePath = "golang.org/x/crypto"; 245 - fetch = { 246 - type = "git"; 247 - url = "https://go.googlesource.com/crypto"; 248 - rev = "0709b304e793"; 249 - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; 250 - }; 251 - } 252 - 253 - { 254 - goPackagePath = "golang.org/x/net"; 255 - fetch = { 256 - type = "git"; 257 - url = "https://go.googlesource.com/net"; 258 - rev = "161cd47e91fd"; 259 - sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; 260 - }; 261 - } 262 - 263 - { 264 - goPackagePath = "golang.org/x/sync"; 265 - fetch = { 266 - type = "git"; 267 - url = "https://go.googlesource.com/sync"; 268 - rev = "1d60e4601c6f"; 269 - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; 270 - }; 271 - } 272 - 273 - { 274 - goPackagePath = "golang.org/x/sys"; 275 - fetch = { 276 - type = "git"; 277 - url = "https://go.googlesource.com/sys"; 278 - rev = "49385e6e1522"; 279 - sha256 = "0spbldahns09fdxkxflb1x24f8k2awdlnr6k5i7ci4fqd19r1dv4"; 280 - }; 281 - } 282 - 283 - { 284 - goPackagePath = "golang.org/x/text"; 285 - fetch = { 286 - type = "git"; 287 - url = "https://go.googlesource.com/text"; 288 - rev = "v0.3.0"; 289 - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; 290 - }; 291 - } 292 - 293 - { 294 - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; 295 - fetch = { 296 - type = "git"; 297 - url = "https://gopkg.in/cheggaaa/pb.v1"; 298 - rev = "v1.0.25"; 299 - sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp"; 300 - }; 301 - } 302 - 303 - { 304 - goPackagePath = "gopkg.in/ini.v1"; 305 - fetch = { 306 - type = "git"; 307 - url = "https://gopkg.in/ini.v1"; 308 - rev = "v1.38.2"; 309 - sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9"; 310 - }; 311 - } 312 - ]
+3 -3
pkgs/data/fonts/unifont/default.nix
··· 4 4 5 5 stdenv.mkDerivation rec { 6 6 pname = "unifont"; 7 - version = "13.0.04"; 7 + version = "13.0.05"; 8 8 9 9 ttf = fetchurl { 10 10 url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; 11 - sha256 = "sha256-p0wSTyXCXuWIw+hDZ4HZPxgdBJ6oOOqOuX6FzZJmwrE="; 11 + sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf"; 12 12 }; 13 13 14 14 pcf = fetchurl { 15 15 url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; 16 - sha256 = "sha256-sKY2qshNV3zXfD2BSbfs0qom1gPt7vD5QmVEkACmx18="; 16 + sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r"; 17 17 }; 18 18 19 19 nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
+2 -2
pkgs/data/fonts/unifont_upper/default.nix
··· 1 1 { lib, fetchzip }: 2 2 3 3 let 4 - version = "13.0.04"; 4 + version = "13.0.05"; 5 5 in fetchzip rec { 6 6 name = "unifont_upper-${version}"; 7 7 ··· 9 9 10 10 postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; 11 11 12 - sha256 = "0bji0crx84nbjf1m1lzql7icrb02zbs3l66dn21pvr9czsry870f"; 12 + sha256 = "1cpi44fzsiq3yqg38763awgri1ma46421c3v8167bsxzsx7vzlkp"; 13 13 14 14 meta = with lib; { 15 15 description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
+9 -1
pkgs/development/libraries/java/lombok/default.nix
··· 1 - { stdenv, fetchurl }: 1 + { stdenv, fetchurl, makeWrapper, jdk }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "lombok-1.18.16"; ··· 8 8 sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; 9 9 }; 10 10 11 + buildInputs = [ makeWrapper ]; 12 + 13 + outputs = [ "out" "bin" ]; 14 + 11 15 buildCommand = '' 12 16 mkdir -p $out/share/java 13 17 cp $src $out/share/java/lombok.jar 18 + 19 + makeWrapper ${jdk}/bin/java $bin/bin/lombok \ 20 + --add-flags "-cp ${jdk}/lib/openjdk/lib/tools.jar:$out/share/java/lombok.jar" \ 21 + --add-flags lombok.launch.Main 14 22 ''; 15 23 16 24 meta = {
+34
pkgs/development/libraries/qrcodegen/default.nix
··· 1 + { stdenv, fetchFromGitHub }: 2 + stdenv.mkDerivation rec { 3 + pname = "qrcodegen"; 4 + version = "1.6.0"; 5 + 6 + src = fetchFromGitHub { 7 + owner = "nayuki"; 8 + repo = "QR-Code-generator"; 9 + rev = "v${version}"; 10 + sha256 = "0iq9sv9na0vg996aqrxrjn9rrbiyy7sc9vslw945p3ky22pw3lql"; 11 + }; 12 + 13 + preBuild = "cd c"; 14 + installPhase = '' 15 + mkdir -p $out/lib $out/include/qrcodegen 16 + cp libqrcodegen.a $out/lib 17 + cp qrcodegen.h $out/include/qrcodegen/ 18 + ''; 19 + 20 + meta = with stdenv.lib; 21 + { 22 + description = "qrcode generator library in multiple languages"; 23 + 24 + longDescription = '' 25 + This project aims to be the best, clearest library for generating QR Codes. My primary goals are flexible options and absolute correctness. Secondary goals are compact implementation size and good documentation comments. 26 + ''; 27 + 28 + homepage = "https://github.com/nayuki/QR-Code-generator"; 29 + 30 + license = licenses.mit; 31 + platforms = platforms.all; 32 + maintainers = with maintainers; [ mcbeth ]; 33 + }; 34 + }
+3
pkgs/development/python-modules/parsimonious/default.nix
··· 17 17 checkInputs = [ nose ]; 18 18 propagatedBuildInputs = [ six ]; 19 19 20 + # performance tests tend to fail sometimes 21 + NOSE_EXCLUDE = "test_benchmarks"; 22 + 20 23 meta = with stdenv.lib; { 21 24 homepage = "https://github.com/erikrose/parsimonious"; 22 25 description = "Fast arbitrary-lookahead parser written in pure Python";
+16 -5
pkgs/development/python-modules/wordcloud/default.nix
··· 3 3 , mock 4 4 , numpy 5 5 , pillow 6 + , cython 7 + , pytestcov 6 8 , pytest 7 - , pytestcov 9 + , fetchpatch 8 10 }: 9 11 10 12 buildPythonPackage rec { 11 13 pname = "word_cloud"; 12 - version = "1.6.0"; 14 + version = "1.8.1"; 13 15 14 16 # tests are not included in pypi tarball 15 17 src = fetchFromGitHub { 16 18 owner = "amueller"; 17 19 repo = pname; 18 20 rev = version; 19 - sha256 = "1ncjr90m3w3b4zi23kw6ai11gxahdyah96x8jb2yn2x4573022x2"; 21 + sha256 = "sha256-4EFQfv+Jn9EngUAyDoJP0yv9zr9Tnbrdwq1YzDacB9Q="; 20 22 }; 21 23 24 + nativeBuildInputs = [ cython ]; 22 25 propagatedBuildInputs = [ matplotlib numpy pillow ]; 23 26 24 27 # Tests require extra dependencies 25 28 checkInputs = [ mock pytest pytestcov ]; 26 - # skip tests which make assumptions about installation 29 + 27 30 checkPhase = '' 28 - pytest -k 'not cli_as_executable' 31 + PATH=$out/bin:$PATH pytest test 29 32 ''; 33 + 34 + patches = [ 35 + (fetchpatch { 36 + # https://github.com/amueller/word_cloud/pull/616 37 + url = "https://github.com/amueller/word_cloud/commit/858a8ac4b5b08494c1d25d9e0b35dd995151a1e5.patch"; 38 + sha256 = "sha256-+aDTMPtOibVwjPrRLxel0y4JFD5ERB2bmJi4zRf/asg="; 39 + }) 40 + ]; 30 41 31 42 meta = with stdenv.lib; { 32 43 description = "A little word cloud generator in Python";
+12 -10
pkgs/games/chiaki/default.nix
··· 1 - { lib, mkDerivation, fetchFromGitHub 2 - , cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf 3 - , python3Packages, SDL2 }: 1 + { lib, mkDerivation, fetchgit 2 + , cmake, ffmpeg, libevdev, libopus, udev, qtbase, qtmacextras, qtmultimedia 3 + , qtsvg , pkg-config, protobuf , python3Packages, SDL2, stdenv }: 4 4 5 + with stdenv.lib; 5 6 mkDerivation rec { 6 7 pname = "chiaki"; 7 - version = "1.3.0"; 8 + version = "2.0.1"; 8 9 9 - src = fetchFromGitHub { 10 + src = fetchgit { 11 + url = "https://git.sr.ht/~thestr4ng3r/chiaki"; 10 12 rev = "v${version}"; 11 - owner = "thestr4ng3r"; 12 - repo = "chiaki"; 13 13 fetchSubmodules = true; 14 - sha256 = "07w7srxxr8zjp91p5n1sqf4j8lljfrm78lz1m15s2nzlm579015h"; 14 + sha256 = "0l532i9j6wmzbxqx7fg69kgfd1zy1r1wlw6f756vpxpgswivi892"; 15 15 }; 16 16 17 17 nativeBuildInputs = [ 18 - cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf 18 + cmake pkg-config protobuf python3Packages.python python3Packages.protobuf 19 19 ]; 20 - buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; 20 + buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ] 21 + ++ optionals stdenv.hostPlatform.isLinux [ libevdev udev] 22 + ++ optionals (stdenv.isDarwin) [ qtmacextras ]; 21 23 22 24 doCheck = true; 23 25 installCheckPhase = "$out/bin/chiaki --help";
+3 -3
pkgs/tools/security/jwt-cli/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "jwt-cli"; 5 - version = "3.2.1"; 5 + version = "3.3.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "mike-engel"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws"; 11 + sha256 = "09zi55ffkhsckvqj84xnxn9bgfkrj9wnzqbh9hfsxzbk4xy7fc2h"; 12 12 }; 13 13 14 - cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04"; 14 + cargoSha256 = "1k13pw202fr5mvd0ys39n3dxwcl3sd01j6izfb28k06b6pav3wc8"; 15 15 16 16 buildInputs = stdenv.lib.optional stdenv.isDarwin Security; 17 17
+14 -11
pkgs/top-level/all-packages.nix
··· 5222 5222 libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; 5223 5223 5224 5224 libcoap = callPackage ../applications/networking/libcoap { 5225 - autoconf = autoconf269; 5225 + autoconf = buildPackages.autoconf269; 5226 5226 }; 5227 5227 5228 5228 libcryptui = callPackage ../development/libraries/libcryptui { ··· 8141 8141 verilator = callPackage ../applications/science/electronics/verilator {}; 8142 8142 8143 8143 verilog = callPackage ../applications/science/electronics/verilog { 8144 - autoconf = autoconf269; 8144 + autoconf = buildPackages.autoconf269; 8145 8145 }; 8146 8146 8147 8147 versus = callPackage ../applications/networking/versus { }; ··· 8251 8251 8252 8252 watchman = callPackage ../development/tools/watchman { 8253 8253 inherit (darwin.apple_sdk.frameworks) CoreServices; 8254 - autoconf = autoconf269; 8254 + autoconf = buildPackages.autoconf269; 8255 8255 }; 8256 8256 8257 8257 wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; ··· 8377 8377 uhttpmock = callPackage ../development/libraries/uhttpmock { }; 8378 8378 8379 8379 uim = callPackage ../tools/inputmethods/uim { 8380 - autoconf = autoconf269; 8380 + autoconf = buildPackages.autoconf269; 8381 8381 }; 8382 8382 8383 8383 uhub = callPackage ../servers/uhub { }; ··· 8572 8572 # It needs a cross compiler for mipsel to build the firmware it will 8573 8573 # load into the Ben Nanonote 8574 8574 gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; 8575 - autoconf = autoconf269; 8575 + autoconf = buildPackages.autoconf269; 8576 8576 }; 8577 8577 8578 8578 clipnotify = callPackage ../tools/misc/clipnotify { }; ··· 11119 11119 11120 11120 autobuild = callPackage ../development/tools/misc/autobuild { }; 11121 11121 11122 - autoconf = autoconf270; 11122 + autoconf = buildPackages.autoconf270; 11123 11123 11124 11124 autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; 11125 11125 ··· 13371 13371 gnutls = callPackage ../development/libraries/gnutls/default.nix { 13372 13372 inherit (darwin.apple_sdk.frameworks) Security; 13373 13373 util-linux = util-linuxMinimal; # break the cyclic dependency 13374 + autoconf = buildPackages.autoconf269; 13374 13375 }; 13375 13376 13376 13377 gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { ··· 14564 14565 libmatchbox = callPackage ../development/libraries/libmatchbox { }; 14565 14566 14566 14567 libmatheval = callPackage ../development/libraries/libmatheval { 14567 - autoconf = autoconf269; 14568 + autoconf = buildPackages.autoconf269; 14568 14569 guile = guile_2_0; 14569 14570 }; 14570 14571 ··· 21935 21936 java = if stdenv.isLinux then jre else jdk; 21936 21937 }; 21937 21938 21939 + qrcodegen = callPackage ../development/libraries/qrcodegen { }; 21940 + 21938 21941 qrencode = callPackage ../development/libraries/qrencode { }; 21939 21942 21940 21943 geeqie = callPackage ../applications/graphics/geeqie { }; ··· 24740 24743 vbindiff = callPackage ../applications/editors/vbindiff { }; 24741 24744 24742 24745 vcprompt = callPackage ../applications/version-management/vcprompt { 24743 - autoconf = autoconf269; 24746 + autoconf = buildPackages.autoconf269; 24744 24747 }; 24745 24748 24746 24749 vcs = callPackage ../applications/video/vcs { }; ··· 25207 25210 }; 25208 25211 25209 25212 x11basic = callPackage ../development/compilers/x11basic { 25210 - autoconf = autoconf269; 25213 + autoconf = buildPackages.autoconf269; 25211 25214 }; 25212 25215 25213 25216 x11vnc = callPackage ../tools/X11/x11vnc { }; ··· 25516 25519 zeronet = callPackage ../applications/networking/p2p/zeronet { }; 25517 25520 25518 25521 zexy = callPackage ../applications/audio/pd-plugins/zexy { 25519 - autoconf = autoconf269; 25522 + autoconf = buildPackages.autoconf269; 25520 25523 }; 25521 25524 25522 25525 zgrviewer = callPackage ../applications/graphics/zgrviewer {}; ··· 26909 26912 }; 26910 26913 26911 26914 kallisto = callPackage ../applications/science/biology/kallisto { 26912 - autoconf = autoconf269; 26915 + autoconf = buildPackages.autoconf269; 26913 26916 }; 26914 26917 26915 26918 kssd = callPackage ../applications/science/biology/kssd { };
+8 -8
pkgs/top-level/beam-packages.nix
··· 1 - { callPackage, wxGTK30, openssl_1_0_2, autoconf269 }: 1 + { callPackage, wxGTK30, openssl_1_0_2, buildPackages }: 2 2 3 3 rec { 4 4 lib = callPackage ../development/beam-modules/lib.nix {}; ··· 20 20 wxGTK = wxGTK30; 21 21 # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 22 22 parallelBuild = true; 23 - autoconf = autoconf269; 23 + autoconf = buildPackages.autoconf269; 24 24 }; 25 25 erlangR23_odbc = erlangR23.override { odbcSupport = true; }; 26 26 erlangR23_javac = erlangR23.override { javacSupport = true; }; ··· 34 34 wxGTK = wxGTK30; 35 35 # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 36 36 parallelBuild = true; 37 - autoconf = autoconf269; 37 + autoconf = buildPackages.autoconf269; 38 38 }; 39 39 erlangR22_odbc = erlangR22.override { odbcSupport = true; }; 40 40 erlangR22_javac = erlangR22.override { javacSupport = true; }; ··· 46 46 # R21 47 47 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { 48 48 wxGTK = wxGTK30; 49 - autoconf = autoconf269; 49 + autoconf = buildPackages.autoconf269; 50 50 }; 51 51 erlangR21_odbc = erlangR21.override { odbcSupport = true; }; 52 52 erlangR21_javac = erlangR21.override { javacSupport = true; }; ··· 58 58 # R20 59 59 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { 60 60 wxGTK = wxGTK30; 61 - autoconf = autoconf269; 61 + autoconf = buildPackages.autoconf269; 62 62 }; 63 63 erlangR20_odbc = erlangR20.override { odbcSupport = true; }; 64 64 erlangR20_javac = erlangR20.override { javacSupport = true; }; ··· 71 71 erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { 72 72 wxGTK = wxGTK30; 73 73 openssl = openssl_1_0_2; 74 - autoconf = autoconf269; 74 + autoconf = buildPackages.autoconf269; 75 75 }; 76 76 erlangR19_odbc = erlangR19.override { odbcSupport = true; }; 77 77 erlangR19_javac = erlangR19.override { javacSupport = true; }; ··· 84 84 erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { 85 85 wxGTK = wxGTK30; 86 86 openssl = openssl_1_0_2; 87 - autoconf = autoconf269; 87 + autoconf = buildPackages.autoconf269; 88 88 }; 89 89 erlangR18_odbc = erlangR18.override { odbcSupport = true; }; 90 90 erlangR18_javac = erlangR18.override { javacSupport = true; }; ··· 95 95 96 96 # Basho fork, using custom builder. 97 97 erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { 98 - autoconf = autoconf269; 98 + autoconf = buildPackages.autoconf269; 99 99 }; 100 100 erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { 101 101 odbcSupport = true;