diff --git a/nix/sources.json b/nix/sources.json
index 24d37cea8a06c2436ea4079e19dc0b20c8e422c7..76ba78233126d33fa859512cd91e1bec0184b74e 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -156,29 +156,29 @@ },
"elevation-server": {
"branch": "master",
"builtin": false,
"date": "2020-06-22T13:35:45Z",
"date": "2020-12-05T18:04:12Z",
"description": "The server providing elevation data for https://nakarte.me written in go",
"homepage": "https://github.com/wladich/elevation_server",
"owner": "wladich",
"repo": "elevation_server",
"rev": "f8f944b4fb7190782aa57b5eeb467bdff8b349bd",
"sha256": "0619jxchha0iy8x7g5k5pfyw7x62iwjd19m29b69w53y3dsiswbc",
"rev": "ed023fee8e7a4347f240d35fc0c855fdfff0464f",
"sha256": "0187ygkk5g2xz2vfnl49xbgqgvkbnxy18xvakfb5y8fahdp42sns",
"type": "tarball",
"url": "https://github.com/wladich/elevation_server/archive/f8f944b4fb7190782aa57b5eeb467bdff8b349bd.tar.gz",
"url": "https://github.com/wladich/elevation_server/archive/ed023fee8e7a4347f240d35fc0c855fdfff0464f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"embox": {
"branch": "master",
"builtin": false,
"date": "2020-12-18T19:44:21Z",
"date": "2020-12-22T16:25:15Z",
"description": "Modular and configurable OS for embedded applications",
"homepage": "http://embox.github.io",
"owner": "embox",
"repo": "embox",
"rev": "9908deac8a53f000e7244bdeb0fcc9df7a9cb104",
"sha256": "1pzlyh7dxsv0mp2w007l6w0z349zl1vfwbar0fsskmln715xnr6p",
"rev": "7bf982ac3a742f7d5754d3ceba309f30f7557eae",
"sha256": "05j0dlpgz13frkz55g83rcga4sq9ags7c5lhwh9mas86wpdgjz2f",
"type": "tarball",
"url": "https://github.com/embox/embox/archive/9908deac8a53f000e7244bdeb0fcc9df7a9cb104.tar.gz",
"url": "https://github.com/embox/embox/archive/7bf982ac3a742f7d5754d3ceba309f30f7557eae.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"foma": {
@@ -239,27 +239,27 @@ "url_template": "https://github.com///archive/.tar.gz"
},
"geofabrik-estonia": {
"builtin": false,
"sha256": "04pmpw95bh17r4ydzghd4xfv3lr5r758df47r8a0n0f1py34bj7c",
"sha256": "0xhjcvii2pq8dhg0ar3ppazm8b8mpf9a96qadqzv22l1wkq3fjf5",
"type": "file",
"url": "https://download.geofabrik.de/europe/estonia-201217.osm.pbf",
"url": "https://download.geofabrik.de/europe/estonia-201221.osm.pbf",
"url_template": "https://download.geofabrik.de/europe/estonia-<version>.osm.pbf",
"version": "201217"
"version": "201221"
},
"geofabrik-finland": {
"builtin": false,
"sha256": "0abpg7k32lwz5xr8yjvslfns8qq5nz097dy2a2vaag1rfm1smh7w",
"sha256": "00912cwyb52bvgl297si8x0jz8dwv8z91naabbijcgjb4jvx9dkh",
"type": "file",
"url": "https://download.geofabrik.de/europe/finland-201217.osm.pbf",
"url": "https://download.geofabrik.de/europe/finland-201221.osm.pbf",
"url_template": "https://download.geofabrik.de/europe/finland-<version>.osm.pbf",
"version": "201217"
"version": "201221"
},
"geofabrik-russia-nwfd": {
"builtin": false,
"sha256": "07lcp32vr01jj6cm3wfq8da9qn4vz0yahzn7315xvgfwapcgq4qp",
"sha256": "12ack4y6bh3knkqqsdgdrbmm99bpd9fz5v5r8pajdii6pb1i989f",
"type": "file",
"url": "https://download.geofabrik.de/russia/northwestern-fed-district-201217.osm.pbf",
"url": "https://download.geofabrik.de/russia/northwestern-fed-district-201221.osm.pbf",
"url_template": "https://download.geofabrik.de/russia/northwestern-fed-district-<version>.osm.pbf",
"version": "201217"
"version": "201221"
},
"gimgtools": {
"branch": "master",
@@ -377,15 +377,15 @@ "gpxsee": {
"branch": "master",
"builtin": false,
"changelog": "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes",
"date": "2020-12-15T23:25:31Z",
"date": "2020-12-22T21:50:46Z",
"description": "GPS log file viewer and analyzer",
"homepage": "https://www.gpxsee.org",
"owner": "tumic0",
"repo": "GPXSee",
"rev": "b5972c832883c35b333d6cb0eefc642e070ef064",
"sha256": "107bvjl7n343iqqxdpb06m0rw2wm8h9vm6xp7q9z0lagay6g89cv",
"rev": "86dd6ed7724000e454f7b1224c6b8f937d01f2c0",
"sha256": "0v58gn7sqr72vqpg9nv53y732w31irf0lknh2awsg2ff4gfnsdcm",
"type": "tarball",
"url": "https://github.com/tumic0/GPXSee/archive/b5972c832883c35b333d6cb0eefc642e070ef064.tar.gz",
"url": "https://github.com/tumic0/GPXSee/archive/86dd6ed7724000e454f7b1224c6b8f937d01f2c0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"gpxsee-maps": {
@@ -673,11 +673,11 @@ "builtin": false,
"description": "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin",
"homepage": "https://maptourist.org",
"region": "szfo",
"sha256": "1sa4zm2lxcl8227nnqskp2qaka0rivhqx711yng27l9kmynjppbl",
"sha256": "1fkz75h4hhjidlq4w6im9szhxjw3gbgd0qcw69a9w46zys52dn6v",
"type": "file",
"url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-12-20.zip",
"url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-12-22.zip",
"url_template": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-<region>-RU_<version>.zip",
"version": "2020-12-20"
"version": "2020-12-22"
},
"mercantile": {
"branch": "master",
@@ -940,15 +940,15 @@ },
"stardict-3": {
"branch": "master",
"builtin": false,
"date": "2020-11-29T06:47:31Z",
"date": "2020-12-22T01:58:39Z",
"description": "Automatically exported from code.google.com/p/stardict-3",
"homepage": "https://github.com/huzheng001/stardict-3",
"owner": "huzheng001",
"repo": "stardict-3",
"rev": "e51e6656e6b693554853d37a4b36b92fb39b9f82",
"sha256": "1giiaxgraqd34iaa9y2d1j5w57a71jm5fliv1vrj2zqsdbv6llfa",
"rev": "0055a654da11b21e8485f28cf76b8489b9e95c22",
"sha256": "1w1jyj2ix6y35v6aca8chpvl85c92q0bx6w7s4d3q3vqb8mdrj0d",
"type": "tarball",
"url": "https://github.com/huzheng001/stardict-3/archive/e51e6656e6b693554853d37a4b36b92fb39b9f82.tar.gz",
"url": "https://github.com/huzheng001/stardict-3/archive/0055a654da11b21e8485f28cf76b8489b9e95c22.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"supermercado": {
@@ -1052,15 +1052,15 @@ },
"zdict": {
"branch": "master",
"builtin": false,
"date": "2020-12-17T12:52:59Z",
"date": "2020-12-21T07:20:48Z",
"description": "The last online dictionary framework you need",
"homepage": "https://pypi.org/project/zdict/",
"owner": "zdict",
"repo": "zdict",
"rev": "a42d769ff520265abbb390cf7e18ea0b50f37333",
"sha256": "1r98lj7yl66zljnc7lbmhzz8xzx049251ynm6wz99a1xdh4c1hvz",
"rev": "96b4e09f4a4fae359429045f75db8ed578e14da6",
"sha256": "0zz0ma8j5hs8znqhjwqzxjjnpzpchrcl7kmyfjd1r6262wyy6awq",
"type": "tarball",
"url": "https://github.com/zdict/zdict/archive/a42d769ff520265abbb390cf7e18ea0b50f37333.tar.gz",
"url": "https://github.com/zdict/zdict/archive/96b4e09f4a4fae359429045f75db8ed578e14da6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
diff --git a/pkgs/applications/anki/bin.nix b/pkgs/applications/anki/bin.nix
index eec5a5d2f7d6cc618a735c2733560e45c4b1b2f1..bdd9d61b8c22995805497ddfce79e9dc8d889271 100644
--- a/pkgs/applications/anki/bin.nix
+++ b/pkgs/applications/anki/bin.nix
@@ -2,13 +2,13 @@ { stdenv, fetchfromgh, undmg }:
stdenv.mkDerivation rec {
pname = "anki-bin";
src = fetchfromgh {
owner = "ankitects";
repo = "anki";
name = "anki-${version}-mac.dmg";
inherit version;
};
diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix
index b2dee1e2d7b25b2cffa9dc3fdfb7db10c430c452..598c802686e03e17c724054e924800191a76df1d 100644
--- a/pkgs/applications/gpxsee/bin.nix
+++ b/pkgs/applications/gpxsee/bin.nix
@@ -2,11 +2,11 @@ { stdenv, fetchurl, undmg, sources }:
stdenv.mkDerivation rec {
pname = "gpxsee-bin";
src = fetchurl {
url = "mirror://sourceforge/gpxsee/GPXSee-${version}.dmg";
};
preferLocalBuild = true;
diff --git a/pkgs/applications/window-managers/amethyst/bin.nix b/pkgs/applications/window-managers/amethyst/bin.nix
index cab3d1386a266bcd54bb469035c9f1a9d0fd876f..3045c6e7674b9d0bd380219300e1a22f2090cb81 100644
--- a/pkgs/applications/window-managers/amethyst/bin.nix
+++ b/pkgs/applications/window-managers/amethyst/bin.nix
@@ -6,7 +6,7 @@ version = "0.15.4";
src = fetchfromgh {
owner = "ianyh";
version = "v${version}";
name = "Amethyst.zip";
sha256 = "16n5vdyjs6m4saqibv3fb420w6x83lsiw182qm3prnilh4q9qld3";
diff --git a/pkgs/applications/window-managers/yabai/default.nix b/pkgs/applications/window-managers/yabai/default.nix
index 849b0cf922b0915648463c330871e1ff3d2bfc7a..1212905895dffe7d4bfd8530ae72b5b0aeaf8ce1 100644
--- a/pkgs/applications/window-managers/yabai/default.nix
+++ b/pkgs/applications/window-managers/yabai/default.nix
@@ -2,13 +2,13 @@ { stdenv, fetchFromGitHub, Cocoa, ScriptingBridge, xxd }:
stdenv.mkDerivation rec {
pname = "yabai";
src = fetchFromGitHub {
owner = "koekeishiya";
repo = pname;
rev = "v${version}";
};
nativeBuildInputs = [ xxd ];
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
index 99b8922d5cec4e97f9510264b32bbcaac6301b89..16a7bd395a08529b02d175be576425daa76b3f4d 100644
--- a/pkgs/data/dicts/tatoeba/default.nix
+++ b/pkgs/data/dicts/tatoeba/default.nix
@@ -20,7 +20,7 @@ tatoeba = builtins.fromJSON (builtins.readFile ./tatoeba.json);
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
index f6c6ecf32e2a9272988906049cea8a696a217a74..d58e7bd2a96a4106d3fa53e0f5a7d9d9a6cd1e61 100644
--- a/pkgs/data/dicts/tatoeba/tatoeba.json
+++ b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,59 +1,59 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -61,15 +61,15 @@ "sha256": "1ryja7587cmvyh63jcmpnqis7nlwmk6igbllirfsrflyja2q108p"
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix
index 2d037217f92a513cb820c934c2beb423fd14dc5f..a3a6aaf657fea734061dd0b4a9c2fab8e590acf3 100644
--- a/pkgs/development/libraries/geographiclib/default.nix
+++ b/pkgs/development/libraries/geographiclib/default.nix
@@ -1,14 +1,12 @@
{ stdenv, fetchurl }:
-let
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "geographiclib";
src = fetchurl {
url = "mirror://sourceforge/geographiclib/GeographicLib-${version}.tar.gz";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/kiln/default.nix b/pkgs/development/tools/kiln/default.nix
index 69d4c258f89694be79403cdd613e1d61bb9ed437..d7690d5fd5079e7bb1a718cda0374fcf8fcc8665 100644
--- a/pkgs/development/tools/kiln/default.nix
+++ b/pkgs/development/tools/kiln/default.nix
@@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchgit, sources }:
-buildGoModule {
+buildGoModule rec {
pname = "kiln";
src = fetchgit {
url = "https://git.sr.ht/~adnano/kiln";
};
vendorSha256 = "1vqzbw4a2rh043cim17ys0yn33qxk0d7szxr9gkcs5dqlaa8z36y";
diff --git a/pkgs/development/tools/pvs-studio/default.nix b/pkgs/development/tools/pvs-studio/default.nix
index 47c806ffc89a0258fecc1fd0628ae73b67909b8f..a2fbd25552041febd183909fa550035478e16f47 100644
--- a/pkgs/development/tools/pvs-studio/default.nix
+++ b/pkgs/development/tools/pvs-studio/default.nix
@@ -10,13 +10,13 @@ }.${system} or throwSystem;
in
stdenv.mkDerivation rec {
pname = "pvs-studio";
src = fetchurl {
url = "https://files.viva64.com/pvs-studio-${version}-${suffix}.tgz";
sha256 = {
x86_64-linux = "0m8h9ghhhqqakl5lks9hncswfr3w9f4gjsnspqak1h9wcgznzk53";
x86_64-darwin = "1fcwvj9klhwlv6w5w7sx4brrw6xkx0w4hysprbzn89q6y6mraq9p";
x86_64-linux = "1mrqfz5fbizafhsqfp67mrrhr6hfx7f53g9bixrxi1m1albgm062";
x86_64-darwin = "0jz6rgk44c8r94s2sqb1d16rclh33rf1w8dcpy8h6csdxsbdnqk5";
}.${system} or throwSystem;
};
application/octet-stream
This content has been proxied by September (3851b).