diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
commit | 5621b77a33b311e82c8870f6872a2beffef9dbd0 (patch) | |
tree | 1d561826278871fa8c065ff84cdadc0922cb758b /pkgs/tools | |
parent | 658335d6a88b623ab926dea99425e2716afa7f4e (diff) | |
parent | 322fa6b06cfbe66ef1bc12b1bfd5fd37d63cbf87 (diff) | |
download | nixlib-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar nixlib-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.gz nixlib-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.bz2 nixlib-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.lz nixlib-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.xz nixlib-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.zst nixlib-5621b77a33b311e82c8870f6872a2beffef9dbd0.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools')
22 files changed, 162 insertions, 57 deletions
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 4024ab9b91f2..2b663cd3bcee 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; - depsSha256 = "1n57i9wkak76ram748mwq0dn32d041ajd31laqc13c76pp29agrp"; + cargoSha256 = "1fcl2nnplcic729cmvall2k7wf3jdm7dspvlbxji99bn813ackig"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index c4678c8d4b77..759230c6a293 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; - depsSha256 = "0wzr8hk63gh3nm8f7dbzwj8pgc3cm8p8mr2q7bbgvri1a5i83sfb"; + cargoSha256 = "0q3mrcvl1yyrx4a88kanjlfcx6slf7r79i0dh4w81sj6gp07sssm"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index e98b62bd0ea7..a4ac74e9f2da 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; - depsSha256 = "0nax7h7f5qgalgxsfidrxrv1ybl5xvrpc1k7xc1kmaf955gqmc46"; + cargoSha256 = "0qwbgwxrjc0dvjbpqa59jixy5nq7lng2c1z91rw48qc91v7fa664"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix index 4c22268a1c8d..d2a82dc357b5 100644 --- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -12,7 +12,7 @@ buildRustPackage rec { sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp"; }; - depsSha256 = "04jlz7nzsmg86i73w75i8rmlbk635xrg8m1dfac8h17dwb29yj6a"; + cargoSha256 = "0dmn9bccicxhqcj9zrsxxp0vb5ma12a1hs9brpc22n4g1qy4yzcn"; buildInputs = [ lzo zlib ]; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 488f7482b154..cb77edf0d29a 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -6,7 +6,7 @@ buildRustPackage rec { name = "exa-${version}"; version = "0.8.0"; - depsSha256 = "0yz41prkjs5rmvdhr9k58a52l7hvwy5mfg8rcpsq4ybgf601lja2"; + cargoSha256 = "08zzn3a32xfjkmpawcjppn1mr26ws3iv40cckiz8ldz4qc8y9gdh"; src = fetchFromGitHub { owner = "ogham"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 07d8a661d7b7..54d17e6f64cc 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv"; }; - depsSha256 = "17fjlmdwp8582dvv68b5h3zzvmd71yd9sw9xalyrrww46h7fd84g"; + cargoSha256 = "1v9wg4dq4c7i85bkdhd79bj8gx7200z6np05wsyj2ycbv97p095j"; meta = { description = "A simple, fast and user-friendly alternative to find"; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 516e27dee7f9..11cbd87024f1 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.3.2"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1zms24w4lnisjqgkj4a8cmnmlvpsqjl1sab5k99dyknq7b31x0sd"; + sha256 = "0mzrhzbyblspia3qp85hvv5kdc7v3aird02q2pxrxbwca6wjlxcs"; }; dontBuild = true; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 499b4a87bc43..e7ddcf572aed 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7"; }; - depsSha256 = "05mj84a5k65ai492grwg03c3wq6ardhs114bv951fgysc9rs07p5"; + cargoSha256 = "0kqkzjd90v19qvl3iv1vv2fi8h0z75b0yn0z5jq8w4m94fvh0p95"; # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index d731e856790d..5796f6335c0b 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,32 +1,46 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig +, ncurses }: stdenv.mkDerivation rec { - name = "minicom-2.7"; + name = "minicom-2.7.1"; src = fetchurl { - url = "http://alioth.debian.org/frs/download.php/file/3977/${name}.tar.gz"; - sha256 = "1x04m4k7c71j5cnhzpjrbz43dd96k4mpkd0l87v5skrgp1isdhws"; + url = "https://alioth.debian.org/frs/download.php/latestfile/3/${name}.tar.gz"; + sha256 = "1wa1l36fa4npd21xa9nz60yrqwkk5cq713fa3p5v0zk7g9mq6bsk"; }; - buildInputs = [ncurses]; + buildInputs = [ ncurses ]; - configureFlags = [ "--sysconfdir=/etc" "--enable-lock-dir=/var/lock" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - preConfigure = - # Have `configure' assume that the lock directory exists. - '' sed -i "configure" -e's/test -d \$UUCPLOCK/true/g' - ''; + enableParallelBuilding = true; - meta = { - description = "Modem control and terminal emulation program"; - homepage = http://alioth.debian.org/projects/minicom/; + configureFlags = [ + "--sysconfdir=/etc" + "--enable-lock-dir=/var/lock" + ]; + + patches = [ ./xminicom_terminal_paths.patch ]; - longDescription = - '' Minicom is a menu driven communications program. It emulates ANSI - and VT102 terminals. It has a dialing directory and auto zmodem - download. - ''; + preConfigure = '' + # Have `configure' assume that the lock directory exists. + substituteInPlace configure \ + --replace 'test -d $UUCPLOCK' true + + substituteInPlace src/rwconf.c \ + --replace /usr/bin/ascii-xfr $out/bin/ascii-xfr + ''; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + meta = with stdenv.lib; { + description = "Modem control and terminal emulation program"; + homepage = https://alioth.debian.org/projects/minicom/; + license = licenses.gpl2; + longDescription = '' + Minicom is a menu driven communications program. It emulates ANSI + and VT102 terminals. It has a dialing directory and auto zmodem + download. + ''; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch b/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch new file mode 100644 index 000000000000..18535253d9f5 --- /dev/null +++ b/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch @@ -0,0 +1,79 @@ +diff --git a/src/xminicom b/src/xminicom +index a59aa08..cef153b 100755 +--- a/src/xminicom ++++ b/src/xminicom +@@ -7,57 +7,39 @@ + # + # version $Id: xminicom,v 1.4 2008-06-09 20:48:35 al-guest Exp $ + +-findcmd() +-{ +- IFS=: +- for i in $PATH +- do +- if [ -x $i\/$1 ] +- then +- result=$i\/$1 +- IFS= +- return 0 +- fi +- done +- result= +- IFS= +- return 1 ++findcmd() { ++ result=$(command -v $1) + } + +-if findcmd x-terminal-emulator +-then ++if findcmd x-terminal-emulator ; then + exec $result -T minicom -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" + exit 1 + fi + +-if findcmd color_xterm +-then ++if findcmd konsole ; then ++ exec $result -T minicom -geometry 80x25 -e minicom -m -c on "$@" ++ exit 1 ++fi ++ ++if findcmd gnome-terminal ; then ++ exec $result -T minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" ++ exit 1 ++fi ++ ++if findcmd color_xterm ; then + exec $result -T minicom -bg black -fg grey -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" + exit 1 + fi + +-if findcmd rxvt +-then ++if findcmd rxvt ; then + exec $result -bg black -fg grey -n minicom -T minicom -sl 0 -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" + exit 1 + fi + +-if findcmd kterm +-then ++if findcmd xterm ; then + exec $result -T minicom -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" + exit 1 + fi + +-if findcmd xterm +-then +- if [ -f /etc/debian_version ] +- then +- exec $result -T minicom -n minicom -bg black -fg grey -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" +- else +- exec $result -T minicom -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" +- fi +- exit 1 +-fi +- +-echo "xminicom: rxvt, color_xterm or xterm NOT found!" 1>&2 ++echo "xminicom: konsole, gnome-terminal, rxvt, color_xterm or xterm NOT found!" 1>&2 + exit 1 diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 6ef042abb159..156db640acdf 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "screen-${version}"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://gnu/screen/${name}.tar.gz"; - sha256 = "0r3wpfxnr5kw73b8ndja26jk03nfbks06iyfmgb5aqb2rdkazadb"; + sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v"; }; configureFlags= [ diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index e1829bcaf7d8..68fb72ff7d9e 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan, log4cplus +{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus , boost, python3, postgresql, mysql, gmp, bzip2 }: stdenv.mkDerivation rec { @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--with-botan-config=${botan}/bin/botan-config-1.10" "--with-dhcp-pgsql=${postgresql}/bin/pg_config" "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" ]; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ openssl log4cplus boost python3 mysql.client - botan gmp bzip2 + botan2 gmp bzip2 ]; enableParallelBuilding = true; diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 4a34e62322d2..ecb0708eb307 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { buildInputs = [ zlib openssl ]; - depsSha256 = "1v7ir56j6biximnnhyvadd98azcj3i5hc8aky0am2nf0swq0jimq"; + cargoSha256 = "1m4yb7472g1n900dh3xqvdcywk3v01slj3bkk7bk7a9p5x1kyjfn"; meta = with stdenv.lib; { description = "A utility for managing cargo dependencies from the command line"; @@ -23,5 +23,6 @@ buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ jb55 ]; platforms = platforms.all; + broken = true; }; } diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 70cd83b87a3b..df5a39d6a031 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -12,7 +12,7 @@ buildRustPackage rec { rev = "v${version}"; sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5"; }; - depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl"; + cargoSha256 = "0cxdrzjmqq3ywdh0f5mzkcf50hbbgd3bak4398v2ls5gy5s9fcz2"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl curl]; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 42b6024fb214..6caf88973a61 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "softhsm-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "https://dist.opendnssec.org/source/${name}.tar.gz"; - sha256 = "1xw53zkv5xb9pxa8q84kh505yd6pkavxd12x2fjgqi6s12p2hsgb"; + sha256 = "09y1ladg7j0j5n780b1hdzwd2g2b5j5c54pfs7bzjviskb409mjy"; }; configureFlags = [ diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 5d60f4c7c5c3..b914ffaa0cb6 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -15,6 +15,7 @@ in buildGoPackage rec { postInstall = '' wrapProgram $bin/bin/journalbeat \ + --argv0 journalbeat \ --prefix LD_LIBRARY_PATH : ${libPath} ''; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 640750b4f2d3..8cf7f81381ff 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchFromGitHub, fetchpatch , talloc, docutils -, enableStatic ? false }: +, enableStatic ? true }: -stdenv.mkDerivation rec { +({ version, rev, sha256, patches }: stdenv.mkDerivation { name = "proot-${version}"; - version = "5.1.0"; + inherit version; src = fetchFromGitHub { - sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz"; - rev = "v${version}"; + inherit rev sha256; repo = "proot"; owner = "cedric-vincent"; }; @@ -18,12 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - (fetchpatch { # debian patch for aarch64 build - sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv"; - url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch"; - }) - ]; + inherit patches; preBuild = stdenv.lib.optionalString enableStatic '' export LDFLAGS="-static" @@ -48,4 +42,20 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ ianwookim nckx makefu ]; }; -} +}) +(if stdenv.isAarch64 then rec { + version = "5.1.0"; + sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz"; + rev = "v${version}"; + patches = [ + (fetchpatch { # debian patch for aarch64 build + sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv"; + url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch"; + }) + ]; +} else { + version = "5.1.0.20171015"; + sha256 = "0jam87msh5jx8vpb19n6xwxw1xlig5amdcqif7gn2rc8nhswpxif"; + rev = "0bf2ee17daafeeadfed079cec97fe1ac781e696a"; + patches = []; +}) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 8ddfa7d7be46..9a93ec2d7674 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "1cnvwxbznmsn1gand8hhy5zadax5p67lvm46fkj1a1s89f158w3a"; + sha256 = "0z3f83vhy464k93bc55i9lr6z41163q96if938p9ndhx2q3a20ql"; }; - depsSha256 = "1kx9xazhj93xa3cnys39wwr84qqjqrlsbbi5ih71vxppskdpvd6m"; + cargoSha256 = "1d6s01gmyfzb0vdf7flq6nvlapwcgbj0mzcprzyg4nj5gjkvznrn"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix index 34e1413150f2..973585abc81f 100644 --- a/pkgs/tools/text/staccato/default.nix +++ b/pkgs/tools/text/staccato/default.nix @@ -11,9 +11,10 @@ rustPlatform.buildRustPackage rec { sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm"; }; - depsSha256 = "1gwfkh3ck8n3zcy43ch2mnc28a6y10p3srhnx9dh8gwnwbpb733c"; + cargoSha256 = "074mfyanwdykg6wci2ia63wcnnyik741g8n624pac215sg4i95h7"; meta = { + broken = true; description = "A command line program that lets you compute statistics from values from a file or standard input"; longDescription = '' Staccato (`st` for short) is a command line program that lets you diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index db84eac4a237..23f172f4ebe1 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2"; }; - depsSha256 = "13hy835871zxdnakwsr4bjm4krahlz4aqk5lh0rw78avfla89q9q"; + cargoSha256 = "0pdzh2xr40dgwravh3i58g602bpszj6c8inggzgmq2kfk8ck6rgj"; meta = with stdenv.lib; { description = "A fast CSV toolkit written in Rust"; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index ed6e741b3f9e..e125c8e7f2fe 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.29"; + name = "hevea-2.31"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6"; + sha256 = "15xrnnqlacz8dpr09h7jgijm65wss99rmy9mb1zmapplmwhavmzv"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f6c3be63e033..3fdebd19f3cb 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0k5vkn112bjwh4wnxryzqz79dlja64k7s105mf3yaik136hqnmqv"; }; - depsSha256 = "1vxvkh1v9x6j4ggbh6sysi5i3089hrs0mjbp910a1jljiav7l8nj"; + cargoSha256 = "03bqhgz8c4ipdkd3g448bcrr6d188h87vskcfcc3mqlcxg77b8q5"; nativeBuildInputs = [ pkgconfig ]; |