commit 20d2157eed88ff7856b1a07f6a933322c40d7cb0
parent bf54dc5733e7d964d99ee1013bd80d82c485b16e
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 29 Jul 2022 10:53:58 +0300
Up
Diffstat:
22 files changed, 71 insertions(+), 69 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1656817495,
- "narHash": "sha256-QEWkUBH4gu6ntNkF+9xIqDM22bto4PB+LSHIL6oWFpM=",
+ "lastModified": 1658937758,
+ "narHash": "sha256-FxQB/tWX15Faq3GBM+qTfVzd9qJqy/3CEgBp2zpHeNc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "db43c2a1ac04fdb1879f2fdca037fcd027a92dd5",
+ "rev": "8f73de28e63988da02426ebb17209e3ae07f103b",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -28,7 +28,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2022-07-09";
+ version = "2022-07-23";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,75 +1,75 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-zYnmpGaDws+bQfMUQz29UJUMVnNVDkrui3U1WXXt74c="
+ "hash": "sha256-HGr2v8T94L2A+UHktkyNb69+wYULUTJsq79Ksp+oc1w="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-qnpJ/L4E+HirB/mS7ttPr3MpmtVvXJELrvR/sOnYBRU="
+ "hash": "sha256-Qp5Qa4+AEYatPngRtABJ6aVX44ACL88k1IFPSqG8Iu8="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-zfO8vedWsH/1uC7ogj0YDYBdYVr5OUuGdGVc4Bs3cfg="
+ "hash": "sha256-Zd1NtRC+MXuiliCLt99RK1/KWio/rr1nyc6ZTdP6KMo="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-rbkAODnXKwydt/jPpN6IBTdAyRn+0e61xu4tL3iGu/Q="
+ "hash": "sha256-EbYLLQKXlQizOvqnMElnQD8brK5ItxL2GVWOkp0zDco="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-Kk8IxuW6vTD0gh1oZubPu7vyYet5HT7VCwYAP5D2wP0="
+ "hash": "sha256-KWlsQpvPe4cndkWUS+6NglA27F1HNv7vJVRCw+2yxJM="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-So3SkA1oVi8VdGRqQbCbs/sTHVeUpUAFA1It2OkS6I4="
+ "hash": "sha256-6Zx8hof/59PGmRQfwvPy7DMU1HD39gFYfHOeJFEjQOo="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-3Hcmn06E/1f9HtRL9UNDqOwTP9sCMIQFm8aDtKMctzQ="
+ "hash": "sha256-nnnTaRhx7Xj8z60wTwECU7EOnxdmwoto/WLiQEHlYvY="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-DzXIzm+AGpnB9SzDq+UegSMsrjVLpZfLY5IvV81r5ag="
+ "hash": "sha256-SpetkGBCOftNAG9+nEPQQ8E7czJ22ptqT/SoviunI5c="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-uxc1xx6wmd45yeQ5HoTDoThM2rknlCKYJ/Wg5va5gZc="
+ "hash": "sha256-e/uRxblL5oly18DegfG2l377KCGmac+w+HVRpAju+yA="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-ZhcKX71A2876NYYmyU8PfmMPnwMbgF/PS31V7T7wwI4="
+ "hash": "sha256-g2CTH+xYQEKqmArgPKpsSKgJSuJOmt1eFuUtn5ohEFM="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-B/kqB2MuPTAsd1JNWc+XuR3xKBOvyeMcgyUrcsZ52mI="
+ "hash": "sha256-yam/vuEmz/ddLPXEtZpCf3M1/BHiUyLEnphUVv2t9Pk="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-n3Kxd7WPq8tIjssL8WRVmkrc6g0gZ8R8ovDFMiH47E8="
+ "hash": "sha256-S9jjSasZ7A/K3BMc34VwS9LzhAvZHwzaV4NrxvZZr+M="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-Z1zra/XOe10m1ZWpKACBSbyO/IxW1XFr+cDQBbDOVNQ="
+ "hash": "sha256-GlRBppo22D8D2gkk8aS/8TxzBtUZ1255vZRccG4X/eY="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-THatfi2yHdcIENZJA6qMJ8oPQhgfvbINPsMJ8pZRDB8="
+ "hash": "sha256-/piMrB3I5JTiMJNAdbl9CGA7RoADr0sgGOXwHCQXcOQ="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-Gb1Uv2tc2RAPxT+FEUan9sk1W6j+Y9xC2nFRRK29imc="
+ "hash": "sha256-mxQ27Qn8Y/jfv561Q60bL6cn8vi4gPVMXM7v3Uyeyg0="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-EAwGjJsLRrtiBwQQKNjidORYZCPQf6012O+T/lL//DA="
+ "hash": "sha256-zwzDzdUiNfetW2yd26Hk9BjunZryc9W2plP3Nl+tMXY="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-zhYtGOIHin+ZNkHhbbr/KDv0ZBtxr6ObO/S9FbZ/aqs="
+ "hash": "sha256-tQVhqKFLs9fsfo/ADWxyHTmGztMTvtYW3G+KBGS/IZQ="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-RgXzuaV5CREvJsbe+RFpPuJT+bH9UPuo0b4vrs6viiE="
+ "hash": "sha256-/D8GSvfph+Pzq6d50VP4/7zxa7vpkrUzl+3sNOA1Sc0="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -77,15 +77,15 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-NeLoR8u+myley2JNYq8uyg08HVjNDAvJ2x2LsvMmAok="
+ "hash": "sha256-7VatFHymVlBTjLWXvkwI/a0q26S/IVOl1TbUIF6g/wM="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-wQwESgW9nXi+GUbaHZwpKVJNRDH5wC/YBbQ/J7fgFr8="
+ "hash": "sha256-5Gs+AcGbOBWaVKH1pDd9aF5bZZA40QKSLHGKyj/4kvc="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-XczWg2p1zgZy0Mj/JA9Pu2BLOb9an1eDLwO5m8H74Z8="
+ "hash": "sha256-oZCX5px6KNMJ/U8zsdAca9jS1BzarurjbHsEjPl+RbA="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -93,26 +93,26 @@
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
- "hash": "sha256-ZjMWTHHaE3Le3l1bhYnJlW99QCCVrMZ1lxOsDrFXgD4="
+ "hash": "sha256-VfVouKfFESy4PfAz474V2tW0wcvWkNda1xqhuA/DWFY="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-U+CA7js2/z4RI69iLc1lB9fMY7eG87NiKY3m03X+Btw="
+ "hash": "sha256-TOhQbJOufakqwvxgKPZfiIMlMMVJpQC/R8xKYhsJRUE="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-NKneEuZJBA19Ez8ir8dc8kZRcmukEW/zDE2jILPwCuE="
+ "hash": "sha256-xNia/qo051fi2X481DEo6wXgjSjS+eEdZfQANwGVdAg="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
- "hash": "sha256-J9MRYDmttowi1HOPKcaz/5x8AFeTmJmNy6AY5W59Scw="
+ "hash": "sha256-tSV9LH03hwS1H+ospMURbgFXt33TKSdH6g2rIF4jtMc="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-MdRbROJEYIZvBy5UYCM4EvO4w5Yp4SlmuYSK+CZ7KDs="
+ "hash": "sha256-KKWgSZhO3M5Vj+aa9zAUvMsWKGLkwOInr05xZpOEJKE="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-OgKwBKnSKNNt0eojuCx+rRty11rzAQjE8uMViLWDYMQ="
+ "hash": "sha256-mEYm4Ad38JNzXTHSA8VZCinlGFvN5rTgQl+KuX6Lj3o="
}
}
diff --git a/pkgs/suckless/amused/default.nix b/pkgs/suckless/amused/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "omar-polo";
- repo = pname;
+ repo = "amused";
rev = version;
hash = "sha256-A2f37oI3BT30bqRYgoWy4B1dvPeZBoE4F3lkmET0td8=";
};
diff --git a/pkgs/suckless/chibicc/default.nix b/pkgs/suckless/chibicc/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "rui314";
- repo = pname;
+ repo = "chibicc";
rev = "90d1f7f199cc55b13c7fdb5839d1409806633fdb";
hash = "sha256-sGSPQv9JPXTnyv+7CnmzWq1objCJRctK4wKII8GM26s=";
};
diff --git a/pkgs/suckless/cproc/default.nix b/pkgs/suckless/cproc/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cproc";
- version = "unstable-2022-05-19";
+ version = "2022-07-12";
src = fetchFromSourcehut {
owner = "~mcf";
- repo = pname;
- rev = "c88c649fc658a6acf4e03999268d6546b9dad87e";
- hash = "sha256-zqZJfSuwA61rWhT4g63R7+oeNlkIn4eL6B1y/R+Q7WQ=";
+ repo = "cproc";
+ rev = "83116cabc84ff3478ea19be38e8891d83a60acd6";
+ hash = "sha256-xQ7tms9b11+qmLpS2k+LudTuwxIvui1aNs9PoTliumo=";
};
buildInputs = [ qbe ];
diff --git a/pkgs/suckless/dragon/default.nix b/pkgs/suckless/dragon/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mwh";
- repo = pname;
+ repo = "dragon";
rev = "v${version}";
hash = "sha256-wqG6idlVvdN+sPwYgWu3UL0la5ssvymZibiak3KeV7M=";
};
diff --git a/pkgs/suckless/farbfeld-utils/default.nix b/pkgs/suckless/farbfeld-utils/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "farbfeld-utils";
- version = "2021-06-22";
+ version = "2022-07-12";
src = fetchfossil {
url = "http://zzo38computer.org/fossil/farbfeld.ui";
- rev = "c3ca188ebb3bdff06aedd2941964e20c76293d2d";
- sha256 = "sha256-JPzEb3ZHQzKTSBGEt0v8iqDV/KmzhRmUiHxsaov1LNQ=";
+ rev = "76efb47dff46e97052f3215d40c2b7cfa277d048";
+ sha256 = "sha256-guxTyZmi6w4jrGp+sdLddAur+PJUV3sUoyXC0lmC1LA=";
};
buildInputs = [ libGL libX11 SDL ghostscript ];
diff --git a/pkgs/suckless/ff-tools/default.nix b/pkgs/suckless/ff-tools/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "sirjofri";
- repo = pname;
+ repo = "ff-tools";
rev = "ca02af149a0915caae2c4b8de39baac21d3e596b";
hash = "sha256-V++8FI8u7N9ALDjoAyd/wD7vg/43E9D/wuwwKiB1NfQ=";
};
diff --git a/pkgs/suckless/ffshot/default.nix b/pkgs/suckless/ffshot/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "shinyblink";
- repo = pname;
+ repo = "ffshot";
rev = "07d86c717d764690cbb765ea658405f14364556c";
hash = "sha256-lPHPwieotSgA6qF3EGDZk+lME0rqglOnEreYLk0/oUY=";
};
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imscript";
- version = "2022-06-09";
+ version = "2022-07-27";
src = fetchFromSourcehut {
owner = "~coco";
- repo = pname;
- rev = "2d9fb483df60a15ca128a9f19a1b679ea48dfa2b";
- hash = "sha256-hS2OqTCojfxyvdmfGKeR5LiFgPOUN7zEcadFOyn3pNo=";
+ repo = "imscript";
+ rev = "258369bbb75422a3938041c8b11626e2c6e60088";
+ hash = "sha256-8iU4dEwKHWXACLUSAzGP7ykeWmZBdkydiwUg8ip1bBQ=";
};
buildInputs = [ libpng libjpeg libtiff libwebp fftwFloat libX11 gsl ];
diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lacc";
- version = "unstable-2022-05-21";
+ version = "2022-05-21";
src = fetchFromGitHub {
owner = "larmel";
- repo = pname;
+ repo = "lacc";
rev = "30839843daaff9d87574b5854854c9ee4610cdcd";
hash = "sha256-aJDc0zqzdOciBxF06tps9Ow9YL3WKgZmZC74wxju9rs=";
};
diff --git a/pkgs/suckless/libst/default.nix b/pkgs/suckless/libst/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "jeremybobbin";
- repo = pname;
+ repo = "libst";
rev = "4bcd511e6dd0d88730b9359fd5a4d12781c2344a";
hash = "sha256-vpU1Hbd6c/c0M/eUvQqW7RXHG2bz707LkcKlgFrzHtc=";
};
diff --git a/pkgs/suckless/mage/default.nix b/pkgs/suckless/mage/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mage";
- version = "2022-03-15";
+ version = "2022-07-12";
src = fetchFromGitHub {
owner = "explosion-mental";
- repo = pname;
- rev = "8e5a13ef208eb2867fda1d62d227dc6c48f25cfd";
- hash = "sha256-5/q4EPl915V1CLkY/WGcWlt5PO27KPk6gapNcOemWO0=";
+ repo = "mage";
+ rev = "6349749dc18deda13e4ac6b7ce0ade8ccb896512";
+ hash = "sha256-mLCK38Jm1vVVIYz/e+PJs0qAI3ojmcqmA1+ahiQ6Hk8=";
};
configFile = lib.optionalString (conf!=null) (builtins.toFile "config.h" conf);
diff --git a/pkgs/suckless/makel/default.nix b/pkgs/suckless/makel/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "maandree";
- repo = pname;
+ repo = "makel";
rev = "0650e17761ffc45b4fc5d32287514796d6da332d";
hash = "sha256-ItZaByPpheCuSXdd9ej+ySeX3P6DYgnNNAQlAQeNEDA=";
};
diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nextvi";
- version = "2022-06-10";
+ version = "2022-07-17";
src = fetchFromGitHub {
owner = "kyx0r";
- repo = pname;
- rev = "ffe30839b4ab24ca17ad762ae1f882447f040882";
- hash = "sha256-voS+v4DFNSN2rU3Njhc3ydo8PwVgcPyH7JQoIzrkow4=";
+ repo = "nextvi";
+ rev = "7c9f5b609ae95cc85916366d1880ac2c91b31e84";
+ hash = "sha256-6MfX9oj7obr83+azPA1hmQzM6ACzqCOGCsZ3nfpzvEg=";
};
buildPhase = ''
diff --git a/pkgs/suckless/nsxiv/default.nix b/pkgs/suckless/nsxiv/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nsxiv";
- version = "29";
+ version = "30";
src = fetchFromGitHub {
owner = "nsxiv";
- repo = pname;
+ repo = "nsxiv";
rev = "v${version}";
- hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE=";
+ hash = "sha256-swzTdQ6ow1At4bKRORqz6fb0Ej92yU9rlI/OgcinPu4=";
};
configFile = lib.optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libXft imlib2 giflib libexif libwebp ];
+ makeFlags = [ "CC:=$(CC)" ];
+
installFlags = [ "PREFIX=$(out)" ];
postInstall = ''
diff --git a/pkgs/suckless/pista/default.nix b/pkgs/suckless/pista/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "xandkar";
- repo = pname;
+ repo = "pista";
rev = version;
sha256 = "sha256-lre6SIVyxCwEohLlvSfYs+JnHS1VXTbl3FlUNZ3TGy4=";
};
diff --git a/pkgs/suckless/se/default.nix b/pkgs/suckless/se/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "screen-editor";
- repo = pname;
+ repo = "se";
rev = "se-${version}";
hash = "sha256-2LyYZXaL/Q3G/StCUiY6MUXG55g2YQvkpoF/lcsifD8=";
};
diff --git a/pkgs/suckless/sthkd/default.nix b/pkgs/suckless/sthkd/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "jeremybobbin";
- repo = pname;
+ repo = "sthkd";
rev = "2cb198a8e0bc46b9e88c4a7b0f533b35d197a8f0";
hash = "sha256-P7RWdsxYv/P7K+BfvzkOzCCSMppSxacKVj19MPgeV7I=";
};
diff --git a/pkgs/suckless/svtm/default.nix b/pkgs/suckless/svtm/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "jeremybobbin";
- repo = pname;
+ repo = "svtm";
rev = "4edb0e561b5a7ceed75050a1b10340fe03f65616";
hash = "sha256-kqUBBTDcV7XFINNBGRWq5Mf37DIyBy3+2rk+BVBqAPM=";
};
diff --git a/pkgs/suckless/xprompt/default.nix b/pkgs/suckless/xprompt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xprompt";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "phillbush";
- repo = pname;
+ repo = "xprompt";
rev = "v${version}";
- hash = "sha256-/Hyi0ZvOxS2MWzeX4Ng0QqOGzPGQytkBHwQufT39JAI=";
+ hash = "sha256-pOayKngUlrMY3bFsP4Fi+VsOLKCUQU3tdkZ+0OY1SCo=";
};
buildInputs = [ libX11 libXft libXinerama ];
