diff --git a/flake.lock b/flake.lock
index 675a685449cd9cecf947e1eea3ba44f59a845960..f260f4c597be78afada8680d225988828b776406 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@ }
},
"nixpkgs": {
"locked": {
"lastModified": 1672219412,
"narHash": "sha256-xcUV6+DhTdxm6PbLTnJTyexfOGA/5uQ+1KCtoOKqw+M=",
"lastModified": 1672428209,
"narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8b6d55d9695afa3a5fe2634428ad9d507ad20fa3",
"rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
index 5a18640171bd75afe4f74992c36a76f72000028a..19aadacc58a45130f3524f0045fd1700d960d9d1 100644
--- a/pkgs/data/dicts/tatoeba/default.nix
+++ b/pkgs/data/dicts/tatoeba/default.nix
@@ -32,7 +32,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 6e571bfda1231b598ab5b7330218ce825f7f8469..48392480a9024958579035ce8ab664da0dc339a5 100644
--- a/pkgs/data/dicts/tatoeba/tatoeba.json
+++ b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,19 +1,19 @@
{
"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",
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
@@ -21,35 +21,35 @@ "hash": "sha256-y56tV9ATPYxx8IWSMauUp7Q5FgC77St6aYQrnsBZvjs="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_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-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
@@ -57,27 +57,27 @@ "hash": "sha256-MLg9HPaurRPZUQ3rT5QcX3uwy6ZY7uEGwOru+M5AHsU="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_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",
@@ -93,15 +93,15 @@ "hash": "sha256-eP5bg1qsWfKgXCR8R2yvyVJc0TDcozLEF88Ie2Xt/qI="
},
"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",
@@ -113,26 +113,26 @@ "hash": "sha256-oNC/ugk47b145Vwo5IlGpRZcMOhBxnVgrdtQA0kqqJs="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
}
}
diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix
index fe0a7a2e5db04d93f30c9ef9496f81b14db22f0e..bb2699597f296f640ff9fdf62b454db0734fb1fd 100644
--- a/pkgs/osm/osm-3s/default.nix
+++ b/pkgs/osm/osm-3s/default.nix
@@ -2,18 +2,16 @@ { lib, stdenv, fetchurl, expat, lz4, zlib }:
stdenv.mkDerivation (finalAttrs: {
pname = "osm-3s";
src = fetchurl {
url = "http://dev.overpass-api.de/releases/osm-3s_v${finalAttrs.version}.tar.gz";
};
buildInputs = [ expat lz4 zlib ];
configureFlags = [ "--enable-lz4" ];
meta = with lib; {
description = "A database engine to query the OpenStreetMap data";
diff --git a/pkgs/radio/aprsc/default.nix b/pkgs/radio/aprsc/default.nix
index 56fd81afcb648b462820b5eda824e7e1958d92eb..0038c7c63c78c9b2d2c90a40920d27b6cc642b2c 100644
--- a/pkgs/radio/aprsc/default.nix
+++ b/pkgs/radio/aprsc/default.nix
@@ -2,13 +2,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, perl, libevent, openssl, testers }:
stdenv.mkDerivation (finalAttrs: {
pname = "aprsc";
src = fetchFromGitHub {
owner = "hessu";
repo = "aprsc";
rev = "release/${finalAttrs.version}";
};
patches = [
diff --git a/pkgs/suckless/farbfeld-utils/default.nix b/pkgs/suckless/farbfeld-utils/default.nix
index b4ced335344b9324ae72d36686c33cc9011c5f8c..9f03763373ea152ee2d67b6fe07157bf2c7d26c1 100644
--- a/pkgs/suckless/farbfeld-utils/default.nix
+++ b/pkgs/suckless/farbfeld-utils/default.nix
@@ -1,16 +1,22 @@
-{ lib, stdenv, fetchfossil, libGL, libX11, SDL, ghostscript }:
+{ lib, stdenv, fetchfossil, libGL, libX11, SDL, ghostscript, memstreamHook }:
stdenv.mkDerivation {
pname = "farbfeld-utils";
src = fetchfossil {
url = "http://zzo38computer.org/fossil/farbfeld.ui";
};
buildPhase = ''
runHook preBuild
application/octet-stream
This content has been proxied by September (3851b).