commit 5d0f2db8accc48f9fdfce3790d7ab6395a97e917
parent 0e8a7ab184222b0316d196c286e4a9d5ca7a20bd
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 16 Feb 2021 14:40:10 +0300
Up
Diffstat:
6 files changed, 162 insertions(+), 117 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -114,15 +114,15 @@
"docker-reg-tool": {
"branch": "master",
"builtin": false,
- "date": "2019-10-13T09:07:48Z",
+ "date": "2021-02-15T13:13:33Z",
"description": "Docker registry cli tool, primarily for deleting images",
"homepage": "https://github.com/byrnedo/docker-reg-tool",
"owner": "byrnedo",
"repo": "docker-reg-tool",
- "rev": "c5e7ff63fa476cac1eed717d0aef238beb50c21c",
- "sha256": "02ilwyanfgcsncnhwyy1y6l4bc6phcx610xckb7rnklkplw4c04m",
+ "rev": "23292d234289b1fd114b53786c9e4f9fece3674b",
+ "sha256": "0vwcdkxyg575dhchyshcjnkl7764ib1h21zqzb35gmncvkms0sx3",
"type": "tarball",
- "url": "https://github.com/byrnedo/docker-reg-tool/archive/c5e7ff63fa476cac1eed717d0aef238beb50c21c.tar.gz",
+ "url": "https://github.com/byrnedo/docker-reg-tool/archive/23292d234289b1fd114b53786c9e4f9fece3674b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"docx2csv": {
@@ -170,15 +170,15 @@
"embox": {
"branch": "master",
"builtin": false,
- "date": "2021-02-09T08:20:56Z",
+ "date": "2021-02-16T09:26:43Z",
"description": "Modular and configurable OS for embedded applications",
"homepage": "http://embox.github.io",
"owner": "embox",
"repo": "embox",
- "rev": "cdb1feb178aac73b0b6ab6fce32860a620ed2aa0",
- "sha256": "0cv5nbrsjjvglwgbw2pl257cnj9xr8khg6rk39rjyvhb57b86xkc",
+ "rev": "77b56a7432ffdb5e550576dcf05412c7cec44bc8",
+ "sha256": "1wvjkyxcg4y83w0i8m3mi03j1qxxnag67l82g47y1mjqmhn0yfsy",
"type": "tarball",
- "url": "https://github.com/embox/embox/archive/cdb1feb178aac73b0b6ab6fce32860a620ed2aa0.tar.gz",
+ "url": "https://github.com/embox/embox/archive/77b56a7432ffdb5e550576dcf05412c7cec44bc8.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"foma": {
@@ -226,15 +226,15 @@
"gef": {
"branch": "dev",
"builtin": false,
- "date": "2021-02-06T20:05:44Z",
+ "date": "2021-02-15T19:07:43Z",
"description": "GEF - GDB Enhanced Features for exploit devs & reversers",
"homepage": "http://gef.rtfd.io",
"owner": "hugsy",
"repo": "gef",
- "rev": "54e93efd89ec59e5d178fbbeda1fed890098d18d",
- "sha256": "1n6ijw5xvv7gg9622sa7sh2lzjc4j1mn1fqgkrcg42r6l7mlm5xg",
+ "rev": "716f76a23069c9150b3c9f50925e95750b3848a6",
+ "sha256": "1hh88y64i4379wdz2y0v7w8cki883af5jsvfnhffa9xrclygqcq1",
"type": "tarball",
- "url": "https://github.com/hugsy/gef/archive/54e93efd89ec59e5d178fbbeda1fed890098d18d.tar.gz",
+ "url": "https://github.com/hugsy/gef/archive/716f76a23069c9150b3c9f50925e95750b3848a6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"geminid": {
@@ -253,27 +253,27 @@
},
"geofabrik-estonia": {
"builtin": false,
- "sha256": "0jvrgrln48zfb7m9c1bk73jbdlp190m02zmy0krh7kr0v5hspymq",
+ "sha256": "03551mkyqrfv18m9wi63w24a40m3jr76pd2x28max2r77hwkrwxj",
"type": "file",
- "url": "https://download.geofabrik.de/europe/estonia-210207.osm.pbf",
+ "url": "https://download.geofabrik.de/europe/estonia-210214.osm.pbf",
"url_template": "https://download.geofabrik.de/europe/estonia-<version>.osm.pbf",
- "version": "210207"
+ "version": "210214"
},
"geofabrik-finland": {
"builtin": false,
- "sha256": "1mns34822z10kpivr8qr2aql8g6lik6n3xg8qyxda15prharnygb",
+ "sha256": "04r4qy86bjsf808m8dqhqr7hps1rkmf31jpzyylk2cki6asdyg2v",
"type": "file",
- "url": "https://download.geofabrik.de/europe/finland-210207.osm.pbf",
+ "url": "https://download.geofabrik.de/europe/finland-210214.osm.pbf",
"url_template": "https://download.geofabrik.de/europe/finland-<version>.osm.pbf",
- "version": "210207"
+ "version": "210214"
},
"geofabrik-russia-nwfd": {
"builtin": false,
- "sha256": "1lki6wv3vs2cykfk41fmc24w13mx4f1cx3dcjdm36rqx5abivmwa",
+ "sha256": "0m3kwkz2mi3fi38wma1fvkiy5llfff1nl5mwdlji1s9q4mrm7bk1",
"type": "file",
- "url": "https://download.geofabrik.de/russia/northwestern-fed-district-210207.osm.pbf",
+ "url": "https://download.geofabrik.de/russia/northwestern-fed-district-210214.osm.pbf",
"url_template": "https://download.geofabrik.de/russia/northwestern-fed-district-<version>.osm.pbf",
- "version": "210207"
+ "version": "210214"
},
"gimgtools": {
"branch": "master",
@@ -405,29 +405,29 @@
"branch": "master",
"builtin": false,
"changelog": "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes",
- "date": "2021-02-08T18:57:14Z",
+ "date": "2021-02-15T22:52:10Z",
"description": "GPS log file viewer and analyzer",
"homepage": "https://www.gpxsee.org",
"owner": "tumic0",
"repo": "GPXSee",
- "rev": "060c4df170ca5eef048fa334cdd816ee2631832a",
- "sha256": "0pij7sm14nn203ikfh0g1f096p5h5kz916jk55wcf5s2ggq4q06a",
+ "rev": "7e41069cde8be8c2aa27c6fe0e6e25d6693c0e83",
+ "sha256": "0cpab5521vc2v621sxvay3scsmpf24a8fdi0c2zyrzvkk4rr89qb",
"type": "tarball",
- "url": "https://github.com/tumic0/GPXSee/archive/060c4df170ca5eef048fa334cdd816ee2631832a.tar.gz",
+ "url": "https://github.com/tumic0/GPXSee/archive/7e41069cde8be8c2aa27c6fe0e6e25d6693c0e83.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"gpxsee-maps": {
"branch": "master",
"builtin": false,
- "date": "2021-02-08T19:44:17Z",
+ "date": "2021-02-14T12:05:20Z",
"description": "GPXSee maps",
"homepage": "https://tumic0.github.io/GPXSee-maps",
"owner": "tumic0",
"repo": "GPXSee-maps",
- "rev": "18d6710d645cba8e6890ad14bff54fa66cde4e97",
- "sha256": "1anlncydgn9frx3faxj6yprlcir13ay2rbsqzqxmmg6hjzjd8ppv",
+ "rev": "7580c993d3d7ab782f0d708b9a7ba765b319d2b4",
+ "sha256": "1drfpc8f139ycdgqikc9by9mplfsh7kagv1k426nk9dwb8z2idgd",
"type": "tarball",
- "url": "https://github.com/tumic0/GPXSee-maps/archive/18d6710d645cba8e6890ad14bff54fa66cde4e97.tar.gz",
+ "url": "https://github.com/tumic0/GPXSee-maps/archive/7580c993d3d7ab782f0d708b9a7ba765b319d2b4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"gpxtools": {
@@ -503,15 +503,15 @@
"hfst": {
"branch": "master",
"builtin": false,
- "date": "2021-01-31T16:27:05Z",
+ "date": "2021-02-12T15:17:27Z",
"description": "Helsinki Finite-State Technology (library and application suite)",
"homepage": "https://hfst.github.io",
"owner": "hfst",
"repo": "hfst",
- "rev": "d7dc9950f5d70d98ae02b923ced43fb6021c41a2",
- "sha256": "1y4czwfbpng5fanc4yz2s1nas990w2h31k7pb7fpn28wfiqz7h6s",
+ "rev": "1eafb28ffe9f843540aaf355bf7193cea963ccb0",
+ "sha256": "0vkbsrwhiq3rm9nplxh5y3vpk3gvv09nqxnrqrxfvpp4sdm7vs30",
"type": "tarball",
- "url": "https://github.com/hfst/hfst/archive/d7dc9950f5d70d98ae02b923ced43fb6021c41a2.tar.gz",
+ "url": "https://github.com/hfst/hfst/archive/1eafb28ffe9f843540aaf355bf7193cea963ccb0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"how-to-use-pvs-studio-free": {
@@ -715,11 +715,11 @@
"description": "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin",
"homepage": "https://maptourist.org",
"region": "szfo",
- "sha256": "02sqpkfj731f4cs1i28xk47phdmzw0v15s53wqdgyp902b5xs8qz",
+ "sha256": "19d508v3cdfvkph8zaxa894pycl2397wdix65ciiigzpaw7g2b8s",
"type": "file",
- "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2021-02-07.zip",
+ "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2021-02-14.zip",
"url_template": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-<region>-RU_<version>.zip",
- "version": "2021-02-07"
+ "version": "2021-02-14"
},
"md2gemini": {
"branch": "master",
@@ -832,15 +832,15 @@
"nnn": {
"branch": "master",
"builtin": false,
- "date": "2021-02-08T01:43:16Z",
+ "date": "2021-02-11T15:34:37Z",
"description": "n³ The missing terminal file manager for X",
"homepage": "https://github.com/jarun/nnn",
"owner": "jarun",
"repo": "nnn",
- "rev": "118657020e43fa75ab89bada281a7d9f25d69684",
- "sha256": "176p20sj23d26vbficsfy2591zj6kcyyyn7a055xaz9l7y817h1p",
+ "rev": "7e307bc2ffec54a301aeffd6caf4794e4c6034e7",
+ "sha256": "0x88r3yjb4fbancnv9kwip0qk18p1lch90dxr5raky6xr9hzqsm7",
"type": "tarball",
- "url": "https://github.com/jarun/nnn/archive/118657020e43fa75ab89bada281a7d9f25d69684.tar.gz",
+ "url": "https://github.com/jarun/nnn/archive/7e307bc2ffec54a301aeffd6caf4794e4c6034e7.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"odict": {
@@ -944,29 +944,29 @@
"py-staticmaps": {
"branch": "master",
"builtin": false,
- "date": "2021-01-16T16:11:35Z",
+ "date": "2021-02-11T20:03:49Z",
"description": "A python module to create static map images with markers, geodesic lines, etc.",
"homepage": "https://github.com/flopp/py-staticmaps",
"owner": "flopp",
"repo": "py-staticmaps",
- "rev": "1d0a2623117858001fcf79f60385865949d00e9f",
- "sha256": "0jnpkwzrih7wl8mkg7a448kxm0l8m84a1gpvv5if0kld04sr6j7y",
+ "rev": "c88a905beb7068a3ad7060e3a87f8d77bc956dc9",
+ "sha256": "0v6aiwys7gdsswv16g8clldbzc2rwsl420ikcb8rz5b6i1kzagwi",
"type": "tarball",
- "url": "https://github.com/flopp/py-staticmaps/archive/1d0a2623117858001fcf79f60385865949d00e9f.tar.gz",
+ "url": "https://github.com/flopp/py-staticmaps/archive/c88a905beb7068a3ad7060e3a87f8d77bc956dc9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"pyephem": {
"branch": "master",
"builtin": false,
- "date": "2021-01-30T14:15:21Z",
+ "date": "2021-02-10T03:09:53Z",
"description": "Scientific-grade astronomy routines for Python",
"homepage": "https://rhodesmill.org/pyephem",
"owner": "brandon-rhodes",
"repo": "pyephem",
- "rev": "800999d61fc61b1334beb0c607cf5fe4116807e0",
- "sha256": "06j54vpzb6dfgn5llaqnk20fry3ghd4hflxhqj61iksg7gq5krrm",
+ "rev": "e29c04f909308c1e429dac30e77303351d72ea46",
+ "sha256": "06n1ic2al4p86zqf3yafz36i97vwwl1gx7qh7km7pk2q9pa7h4wi",
"type": "tarball",
- "url": "https://github.com/brandon-rhodes/pyephem/archive/800999d61fc61b1334beb0c607cf5fe4116807e0.tar.gz",
+ "url": "https://github.com/brandon-rhodes/pyephem/archive/e29c04f909308c1e429dac30e77303351d72ea46.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"pymbtiles": {
@@ -1025,16 +1025,6 @@
"url": "https://github.com/sidewalklabs/s2sphere/archive/d1d067e8c06e5fbaf0cc0158bade947b4a03a438.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "sasplanet": {
- "builtin": false,
- "description": "SAS.Planet is a program designed for viewing and downloading high-resolution satellite imagery and conventional maps",
- "homepage": "http://www.sasgis.org/sasplaneta/",
- "sha256": "05pi0vr75y9yggya0bvf3bkyn3q3j9alriipy4lm9lsih4r7q09l",
- "type": "file",
- "url": "http://www.sasgis.org/programs/sasplanet/SASPlanet_200606.zip",
- "url_template": "http://www.sasgis.org/programs/sasplanet/SASPlanet_<version>.zip",
- "version": "200606"
- },
"stardict-3": {
"branch": "master",
"builtin": false,
@@ -1136,15 +1126,15 @@
"xtr": {
"branch": "master",
"builtin": false,
- "date": "2020-04-17T09:49:07Z",
+ "date": "2021-02-14T10:34:29Z",
"description": "Translation tools for rust",
"homepage": "https://github.com/woboq/tr",
"owner": "woboq",
"repo": "tr",
- "rev": "d8e4517fb38f617b23cb050955ad8038342d6f31",
- "sha256": "0qa7jc42n796yjxg17mm4jw1r8zrnjhwiya6q84zxxw609cvhbjl",
+ "rev": "28f8b95ccb8055cf785382f71d11aa9bbd35dab4",
+ "sha256": "0457467drkiwxc3fwrz63j37jgczz23b2zs9qf3d6w7dj5qq4212",
"type": "tarball",
- "url": "https://github.com/woboq/tr/archive/d8e4517fb38f617b23cb050955ad8038342d6f31.tar.gz",
+ "url": "https://github.com/woboq/tr/archive/28f8b95ccb8055cf785382f71d11aa9bbd35dab4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"zdict": {
diff --git a/pkgs/applications/gis/sasplanet/bin.nix b/pkgs/applications/gis/sasplanet/bin.nix
@@ -1,14 +1,13 @@
-{ lib, stdenv, unzip, wine, makeWrapper, sources }:
-let
- year = lib.substring 0 2 sources.sasplanet.version;
- month = lib.substring 2 2 sources.sasplanet.version;
- day = lib.substring 4 2 sources.sasplanet.version;
-in
-stdenv.mkDerivation {
+{ lib, stdenv, fetchurl, unzip, wine, makeWrapper }:
+
+stdenv.mkDerivation rec {
pname = "sasplanet-bin";
- version = "20${year}-${month}-${day}";
+ version = "200606";
- src = sources.sasplanet;
+ src = fetchurl {
+ url = "http://www.sasgis.org/programs/sasplanet/SASPlanet_${version}.zip";
+ sha256 = "05pi0vr75y9yggya0bvf3bkyn3q3j9alriipy4lm9lsih4r7q09l";
+ };
nativeBuildInputs = [ unzip makeWrapper ];
@@ -24,7 +23,8 @@ stdenv.mkDerivation {
preferLocalBuild = true;
meta = with lib; {
- inherit (sources.sasplanet) description homepage;
+ description = "SAS.Planet is a program designed for viewing and downloading high-resolution satellite imagery and conventional maps";
+ homepage = "http://www.sasgis.org/sasplaneta/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gpxsee-bin";
- version = "8.5";
+ version = "8.6";
src = fetchurl {
url = "mirror://sourceforge/gpxsee/GPXSee-${version}.dmg";
- sha256 = "1lvjvsa6knddk2lvyp30606iyppkvp6h9n3qdpdrp4z441dl5y6n";
+ sha256 = "1acfazwrl1c7d9pl5b6vvw5c04z10j4526ivf0lh7aliw9c8894s";
};
preferLocalBuild = true;
diff --git a/pkgs/development/tools/xtr/cargo-lock.patch b/pkgs/development/tools/xtr/cargo-lock.patch
@@ -1,16 +1,16 @@
diff --git c/Cargo.lock i/Cargo.lock
new file mode 100644
-index 0000000..1d64459
+index 0000000..cd630be
--- /dev/null
+++ i/Cargo.lock
-@@ -0,0 +1,385 @@
+@@ -0,0 +1,440 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
-+version = "0.7.13"
++version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+dependencies = [
+ "memchr",
+]
@@ -26,9 +26,9 @@ index 0000000..1d64459
+
+[[package]]
+name = "anyhow"
-+version = "1.0.32"
++version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
++checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
+
+[[package]]
+name = "atty"
@@ -54,26 +54,34 @@ index 0000000..1d64459
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
++name = "block"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
++
++[[package]]
+name = "byteorder"
-+version = "1.3.4"
++version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
+
+[[package]]
+name = "cc"
-+version = "1.0.59"
++version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
++checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+
+[[package]]
+name = "chrono"
-+version = "0.4.15"
++version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+dependencies = [
++ "libc",
+ "num-integer",
+ "num-traits",
+ "time",
++ "winapi",
+]
+
+[[package]]
@@ -167,9 +175,9 @@ index 0000000..1d64459
+
+[[package]]
+name = "gettext-rs"
-+version = "0.4.4"
++version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "df454a42d8a718280c78666efe0707c120873736961ae91ead898f17ac66ce7c"
++checksum = "1b95fa19cca70adf9888150e979839ae9bd58f85a1a42e4753699112875189e1"
+dependencies = [
+ "gettext-sys",
+ "locale_config",
@@ -186,9 +194,9 @@ index 0000000..1d64459
+
+[[package]]
+name = "hermit-abi"
-+version = "0.1.15"
++version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+dependencies = [
+ "libc",
+]
@@ -201,32 +209,43 @@ index 0000000..1d64459
+
+[[package]]
+name = "libc"
-+version = "0.2.76"
++version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
+
+[[package]]
+name = "locale_config"
-+version = "0.2.3"
++version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "73ac19ebe45489e5d53b4346d8b90bb3dd03275c5fdf2ce22a982516d86b535c"
++checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
+dependencies = [
+ "lazy_static",
++ "objc",
++ "objc-foundation",
+ "regex",
+ "winapi",
+]
+
+[[package]]
++name = "malloc_buf"
++version = "0.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
++dependencies = [
++ "libc",
++]
++
++[[package]]
+name = "memchr"
-+version = "2.3.3"
++version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "num-integer"
-+version = "0.1.43"
++version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+dependencies = [
+ "autocfg",
+ "num-traits",
@@ -234,36 +253,71 @@ index 0000000..1d64459
+
+[[package]]
+name = "num-traits"
-+version = "0.2.12"
++version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
++name = "objc"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
++dependencies = [
++ "malloc_buf",
++]
++
++[[package]]
++name = "objc-foundation"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
++dependencies = [
++ "block",
++ "objc",
++ "objc_id",
++]
++
++[[package]]
++name = "objc_id"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
++dependencies = [
++ "objc",
++]
++
++[[package]]
++name = "once_cell"
++version = "1.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
++
++[[package]]
+name = "proc-macro2"
-+version = "1.0.19"
++version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
-+version = "1.0.7"
++version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
-+version = "1.3.9"
++version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
++checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
@@ -273,9 +327,9 @@ index 0000000..1d64459
+
+[[package]]
+name = "regex-syntax"
-+version = "0.6.18"
++version = "0.6.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
+
+[[package]]
+name = "strsim"
@@ -285,9 +339,9 @@ index 0000000..1d64459
+
+[[package]]
+name = "syn"
-+version = "1.0.39"
++version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9"
++checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -305,11 +359,11 @@ index 0000000..1d64459
+
+[[package]]
+name = "thread_local"
-+version = "1.0.1"
++version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
++checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+dependencies = [
-+ "lazy_static",
++ "once_cell",
+]
+
+[[package]]
@@ -325,7 +379,7 @@ index 0000000..1d64459
+
+[[package]]
+name = "tr"
-+version = "0.1.3"
++version = "0.1.6"
+dependencies = [
+ "gettext",
+ "gettext-rs",
@@ -380,12 +434,13 @@ index 0000000..1d64459
+
+[[package]]
+name = "xtr"
-+version = "0.1.5"
++version = "0.1.6"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "clap",
+ "proc-macro2",
++ "quote",
+ "syn",
+ "tr",
+]
diff --git a/pkgs/development/tools/xtr/default.nix b/pkgs/development/tools/xtr/default.nix
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage {
src = sources.xtr;
cargoPatches = [ ./cargo-lock.patch ];
- cargoSha256 = "1s1w8kdc9wjzvr975vdcrxwj3fvhfksb7ij5rnchz4c4pyzl3xmc";
+ cargoSha256 = "1pyidpfk18j50bkrhj8xk4k03h80w2q0l1f0yfkpwss2nfdvpp9x";
meta = with lib; {
inherit (sources.xtr) description homepage;
diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/ascii-dash/ASCII-DASH-${version}.zip";
- sha256 = "0mm04rz6a7kraprh7yjh5qmv9kd237lh85mknnm2nm6ff3mx6pf6";
+ sha256 = "0wkfj7h16ini1jcx7f38lv8sf15xim1cp1bs0k5islg7jlsfrplb";
};
postPatch = ''
