Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-01-08 00:02:22 +00:00
committed by GitHub
28 changed files with 419 additions and 131 deletions
@@ -9,21 +9,21 @@
let
appName = "LibreOffice.app";
scriptName = "soffice";
version = "7.5.5";
version = "7.6.4";
dist = {
aarch64-darwin = rec {
arch = "aarch64";
archSuffix = arch;
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
sha256 = "75a7d64aa5d08b56c9d9c1c32484b9aff07268c1642cc01a03e45b7690500745";
sha256 = "44d141603010771b720fb047a760cb1c184e767528d7c4933b5456c64ebaddb2";
};
x86_64-darwin = rec {
arch = "x86_64";
archSuffix = "x86-64";
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
sha256 = "4aad9f08ef7a4524b85fc46b3301fdf4f5ab8ab63dd01d01c297f96ff474804a";
sha256 = "58ecd09fd4b57805d03207f0daf2d3549ceeb774e54bd4a2f339dc6c7b15dbc9";
};
};
in
@@ -392,6 +392,10 @@ in stdenv.mkDerivation (finalAttrs: {
find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
'' + optionalString stdenv.isAarch64 ''
sed -e '/CPPUNIT_TEST(testStatisticalFormulasFODS);/d' -i './sc/qa/unit/functions_statistical.cxx'
'' + optionalString (variant == "fresh") ''
sed -e '/CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage3Objs->size());/d' -i './sw/qa/core/text/porrst.cxx'
sed -e '/CPPUNIT_ASSERT(pPage4Objs);/d' -i './sw/qa/core/text/porrst.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage4Objs->size());/d' -i './sw/qa/core/text/porrst.cxx'
'';
makeFlags = [ "SHELL=${bash}/bin/bash" ];
+48 -48
View File
@@ -77,11 +77,11 @@
md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz";
}
{
name = "libcmis-0.5.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz";
sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2";
name = "libcmis-0.6.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz";
sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074";
md5 = "";
md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz";
md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz";
}
{
name = "CoinMP-1.7.6.tgz";
@@ -98,11 +98,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "curl-8.2.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz";
sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894";
name = "curl-8.4.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.4.0.tar.xz";
sha256 = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d";
md5 = "";
md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz";
md5name = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d-curl-8.4.0.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@@ -301,11 +301,11 @@
md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
}
{
name = "harfbuzz-8.0.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-8.0.0.tar.xz";
sha256 = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79";
name = "harfbuzz-8.2.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz";
sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3";
md5 = "";
md5name = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79-harfbuzz-8.0.0.tar.xz";
md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz";
}
{
name = "hsqldb_1_8_0.zip";
@@ -427,11 +427,11 @@
md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
}
{
name = "language-subtag-registry-2023-05-11.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2";
sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da";
name = "language-subtag-registry-2023-08-02.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-08-02.tar.bz2";
sha256 = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb";
md5 = "";
md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2";
md5name = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb-language-subtag-registry-2023-08-02.tar.bz2";
}
{
name = "lcms2-2.12.tar.gz";
@@ -469,11 +469,11 @@
md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz";
}
{
name = "libffi-3.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz";
sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056";
name = "libffi-3.4.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz";
sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676";
md5 = "";
md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz";
md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz";
}
{
name = "libgpg-error-1.43.tar.bz2";
@@ -497,11 +497,11 @@
md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz";
}
{
name = "ltm-1.2.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/ltm-1.2.0.tar.xz";
sha256 = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1";
name = "ltm-1.2.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/ltm-1.2.1.tar.xz";
sha256 = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f";
md5 = "";
md5name = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1-ltm-1.2.0.tar.xz";
md5name = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f-ltm-1.2.1.tar.xz";
}
{
name = "libwebp-1.3.2.tar.gz";
@@ -546,11 +546,11 @@
md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz";
}
{
name = "mariadb-connector-c-3.1.8-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz";
sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b";
name = "mariadb-connector-c-3.3.7-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.7-src.tar.gz";
sha256 = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf";
md5 = "";
md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz";
md5name = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf-mariadb-connector-c-3.3.7-src.tar.gz";
}
{
name = "mdds-2.1.1.tar.xz";
@@ -623,11 +623,11 @@
md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz";
}
{
name = "openssl-3.0.10.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz";
sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323";
name = "openssl-3.0.11.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.11.tar.gz";
sha256 = "b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55";
md5 = "";
md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz";
md5name = "b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55-openssl-3.0.11.tar.gz";
}
{
name = "liborcus-0.18.1.tar.xz";
@@ -665,18 +665,18 @@
md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz";
}
{
name = "tiff-4.5.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz";
sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a";
name = "tiff-4.6.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz";
sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2";
md5 = "";
md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz";
md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz";
}
{
name = "poppler-23.06.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-23.06.0.tar.xz";
sha256 = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65";
name = "poppler-23.09.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz";
sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55";
md5 = "";
md5name = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65-poppler-23.06.0.tar.xz";
md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz";
}
{
name = "poppler-data-0.4.12.tar.gz";
@@ -791,11 +791,11 @@
md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz";
}
{
name = "libwps-0.4.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz";
sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb";
name = "libwps-0.4.14.tar.xz";
url = "https://dev-www.libreoffice.org/src/libwps-0.4.14.tar.xz";
sha256 = "365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de";
md5 = "";
md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz";
md5name = "365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de-libwps-0.4.14.tar.xz";
}
{
name = "xsltml_2.1.2.zip";
@@ -805,11 +805,11 @@
md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
}
{
name = "zlib-1.2.13.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.2.13.tar.xz";
sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98";
name = "zlib-1.3.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.3.tar.xz";
sha256 = "8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7";
md5 = "";
md5name = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98-zlib-1.2.13.tar.xz";
md5name = "8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7-zlib-1.3.tar.xz";
}
{
name = "libzmf-0.0.2.tar.xz";
@@ -1,4 +1,4 @@
{
sha256 = "0j6idhdywnbl0qaimf1ahxaqvp9s0y2hfrbcbmw32c30g812gp3b";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-help-7.6.2.1.tar.xz";
sha256 = "0y46gpnrmmpc1sah26w8pvjwnbnr9diblki9hvzygq4n800lqy7d";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-help-7.6.4.1.tar.xz";
}
@@ -1,4 +1,4 @@
{
sha256 = "18lw5gnjihjwzdsk6xql7ax5lasykxxvg5bp40q4rqics0xp7lp5";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-7.6.2.1.tar.xz";
sha256 = "07kam9q1nyzff2y77gk4a2jbx403b6m2i1p0p49n6xscyawagzhk";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz";
}
@@ -1,4 +1,4 @@
{
sha256 = "02nnys853na9hwznxnf1h0pm5ymijvpyv9chg45v11vy2ak9y8sv";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-translations-7.6.2.1.tar.xz";
sha256 = "0ybn7c569wrj3xj20sx34rym8zkxazv9aj4rv76mbp5b82z0snis";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-translations-7.6.4.1.tar.xz";
}
@@ -1 +1 @@
"7.6.2.1"
"7.6.4.1"
+20 -20
View File
@@ -77,11 +77,11 @@
md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz";
}
{
name = "libcmis-0.5.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz";
sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2";
name = "libcmis-0.6.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz";
sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074";
md5 = "";
md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz";
md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz";
}
{
name = "CoinMP-1.7.6.tgz";
@@ -98,11 +98,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "curl-8.2.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz";
sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894";
name = "curl-8.4.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.4.0.tar.xz";
sha256 = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d";
md5 = "";
md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz";
md5name = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d-curl-8.4.0.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@@ -497,11 +497,11 @@
md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz";
}
{
name = "ltm-1.0.zip";
url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip";
sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483";
name = "ltm-1.2.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/ltm-1.2.1.tar.xz";
sha256 = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f";
md5 = "";
md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
md5name = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f-ltm-1.2.1.tar.xz";
}
{
name = "libwebp-1.3.2.tar.gz";
@@ -672,18 +672,18 @@
md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz";
}
{
name = "poppler-22.12.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz";
sha256 = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0";
name = "poppler-23.09.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz";
sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55";
md5 = "";
md5name = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0-poppler-22.12.0.tar.xz";
md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz";
}
{
name = "poppler-data-0.4.11.tar.gz";
url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz";
sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c";
name = "poppler-data-0.4.12.tar.gz";
url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.12.tar.gz";
sha256 = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74";
md5 = "";
md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz";
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
name = "postgresql-13.10.tar.bz2";
@@ -1,4 +1,4 @@
{
sha256 = "0lpgcwq03qxvhbl5b9ndaz0cwswd6jin1rfm6hv3kr8q4l52jgb3";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-help-7.5.7.1.tar.xz";
sha256 = "1x9i5vihsza6gkib14nmfywk0qb4qa76m1z9333z9c3faj6wp4d3";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-help-7.5.9.2.tar.xz";
}
@@ -1,4 +1,4 @@
{
sha256 = "041bs79539w61yqmy971rfpf8qvfs4cl2m2fdjv7n1nqf6a2z4v5";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-7.5.7.1.tar.xz";
sha256 = "1ml826nngwnk96v9ghxdlqhab2f3ml1mxszxqj20j3cl3h9plaip";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-7.5.9.2.tar.xz";
}
@@ -1,4 +1,4 @@
{
sha256 = "1zxhnn8sslrlyb1cyg319slza2kn6mcc4h3li9ssnlfzkrzvxhc4";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-translations-7.5.7.1.tar.xz";
sha256 = "1wmg33cijz32mvg8dhzjibbjjpsgh7s257cn9ckr6k9kg80zrfv7";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-translations-7.5.9.2.tar.xz";
}
@@ -1 +1 @@
"7.5.7.1"
"7.5.9.2"
@@ -48,13 +48,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "81.0";
version = "82.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
hash = "sha256-Dh1XbC3uATTkc23m9rcehXs2/2zekwI6IzE04L/cXS0=";
hash = "sha256-3WULzEkjMH4PUETJeKmDKn9PdanWf581O2mI/IqN8YM=";
};
nativeBuildInputs = [
@@ -38,4 +38,6 @@ stdenvNoCC.mkDerivation {
shell = lib.getBin shell + (shell.shellPath or "");
signingUtils = lib.optionalString darwinCodeSign signingUtils;
};
meta.mainProgram = "nuke-refs";
}
+30
View File
@@ -0,0 +1,30 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libgff";
version = "2.0.0";
src = fetchFromGitHub {
owner = "COMBINE-lab";
repo = "libgff";
rev = "v${finalAttrs.version}";
hash = "sha256-ZCb3UyuB/+ykrYFQ9E5VytT65gAAULiOzIEu5IXISTc=";
};
nativeBuildInputs = [ cmake ];
meta = {
description = "A lightweight GTF/GFF parsers exposing a C++ interface";
homepage = "https://github.com/COMBINE-lab/libgff";
downloadPage = "https://github.com/COMBINE-lab/libgff/releases";
changelog = "https://github.com/COMBINE-lab/libgff/releases/tag/" +
"v${finalAttrs.version}";
license = lib.licenses.boost;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.kupac ];
};
})
@@ -0,0 +1,12 @@
diff --git a/Makefile.am b/Makefile.am
index 31286d1..2631af1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,7 @@ man_MANS = \
man/man4/Read.4
pkginclude_HEADERS = \
+ io_lib_config.h \
io_lib/Read.h \
io_lib/scf_extras.h \
io_lib/translate.h \
@@ -0,0 +1,47 @@
{ lib
, stdenv
, autoreconfHook
, fetchFromGitHub
, bzip2
, xz
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
# Same name as the Debian library
pname = "libstaden-read";
version = "1.15.0";
src = fetchFromGitHub {
owner = "jkbonfield";
repo = "io_lib";
rev = "io_lib-" + builtins.replaceStrings ["."] ["-"] finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-2Dlx+MXmqar81/Xmf0oE+6lWX461EDYijiZsZf/VD28=";
};
patches = [
# Needed so that the lib can be detected
./libstaden-install-config-header.patch
];
buildInputs = [ bzip2 xz zlib ];
nativeBuildInputs = [ autoreconfHook ];
# autoreconfHook does not descend into htscodecs folder
preAutoreconf = ''
pushd ./htscodecs
autoreconf --install --force --verbose
pushd
'';
meta = {
description = "C library for reading/writing various DNA sequence formats";
homepage = "https://staden.sourceforge.net";
downloadPage = "https://github.com/jkbonfield/io_lib/releases";
changelog = "https://github.com/jkbonfield/io_lib/blob/${finalAttrs.src.rev}/CHANGES";
license = with lib.licenses; [ bsd3 free ];
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.kupac ];
};
})
@@ -0,0 +1,60 @@
diff --git a/scripts/fetchPufferfish.sh b/scripts/fetchPufferfish.sh
index bf2574e0..42582806 100755
--- a/scripts/fetchPufferfish.sh
+++ b/scripts/fetchPufferfish.sh
@@ -11,10 +11,6 @@ CURR_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
EXTERNAL_DIR=${CURR_DIR}/../external
INSTALL_DIR=${CURR_DIR}/../external/install
-if [ -d ${EXTERNAL_DIR}/pufferfish ] ; then
- rm -fr ${EXTERNAL_DIR}/pufferfish
-fi
-
if [ -d ${INSTALL_DIR}/include/pufferfish ] ; then
rm -fr ${INSTALL_DIR}/include/pufferfish
fi
@@ -23,42 +19,10 @@ if [ -d ${INSTALL_DIR}/src/pufferfish ] ; then
rm -fr ${INSTALL_DIR}/src/pufferfish
fi
-SVER=salmon-v1.10.2
-#SVER=develop
-#SVER=sketch-mode
-
-EXPECTED_SHA256=f225b74833f71dcf767a565345224357fb091f90ce79717abc836814d9ccd101
-
-mkdir -p ${EXTERNAL_DIR}
-curl -k -L https://github.com/COMBINE-lab/pufferfish/archive/${SVER}.zip -o ${EXTERNAL_DIR}/pufferfish.zip
-
-hashcheck=""
-if exists sha256sum; then
- hashcheck="sha256sum"
-elif exists shasum; then
- hashcheck="shasum -a256"
-else
- unset hashcheck
-fi
-
-
-if [ -z "${hashcheck-}" ]; then
- echo "Couldn't find shasum command; can't verify contents of downloaded pufferfish";
-else
-
- if [[ $SVER != develop && $SVER != onetbb ]]; then
- echo "${EXPECTED_SHA256} ${EXTERNAL_DIR}/pufferfish.zip" | ${hashcheck} -c - || { echo "pufferfish.zip did not match expected SHA1! Exiting."; exit 1; }
- else
- echo "not testing sha since pulling from develop"
- fi
-fi
-
-
-rm -fr ${EXTERNAL_DIR}/pufferfish
-unzip ${EXTERNAL_DIR}/pufferfish.zip -d ${EXTERNAL_DIR}
-mv ${EXTERNAL_DIR}/pufferfish-${SVER} ${EXTERNAL_DIR}/pufferfish
mkdir -p ${INSTALL_DIR}/include/pufferfish
+# This is needed later when pufferfish is compiled for Salmon
+cp -r ${pufferFishSrc} ${EXTERNAL_DIR}/pufferfish
cp ${EXTERNAL_DIR}/pufferfish/include/ProgOpts.hpp ${INSTALL_DIR}/include/pufferfish
cp ${EXTERNAL_DIR}/pufferfish/include/BooPHF.hpp ${INSTALL_DIR}/include/pufferfish
+84
View File
@@ -0,0 +1,84 @@
{ lib
, stdenv
, autoreconfHook
, bash
, boost
, bzip2
, cereal_1_3_2
, cmake
, curl
, fetchFromGitHub
, jemalloc
, libgff
, libiconv
, libstaden-read
, pkg-config
, tbb_2021_8
, xz
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "salmon";
version = "1.10.2";
pufferFishSrc = fetchFromGitHub {
owner = "COMBINE-lab";
repo = "pufferfish";
rev = "salmon-v${finalAttrs.version}";
hash = "sha256-JKbUFBEsqnENl4vFqve1FCd4TI3n9bRi2RNHC8QGQGc=";
};
src = fetchFromGitHub {
owner = "COMBINE-lab";
repo = "salmon";
rev = "v${finalAttrs.version}";
hash = "sha256-kwqoUmVCqjr/xRxJjQKaFjjCQW+MFASHJ2f9OiAumNU=";
};
patches = [
# Use pufferfish source fetched by nix
./fetch-pufferfish.patch
];
postPatch = "patchShebangs .";
buildInputs = [
(boost.override { enableShared = false; enabledStatic = true; })
bzip2
cereal_1_3_2
curl
jemalloc
libgff
libstaden-read
tbb_2021_8
xz
zlib
] ++ lib.optionals stdenv.isDarwin [ libiconv ];
nativeBuildInputs = [ cmake pkg-config ];
strictDeps = true;
meta = {
description =
"Tool for quantifying the expression of transcripts using RNA-seq data";
longDescription = ''
Salmon is a tool for quantifying the expression of transcripts
using RNA-seq data. Salmon uses new algorithms (specifically,
coupling the concept of quasi-mapping with a two-phase inference
procedure) to provide accurate expression estimates very quickly
and while using little memory. Salmon performs its inference using
an expressive and realistic model of RNA-seq data that takes into
account experimental attributes and biases commonly observed in
real RNA-seq data.
'';
homepage = "https://combine-lab.github.io/salmon";
downloadPage = "https://github.com/COMBINE-lab/salmon/releases";
changelog = "https://github.com/COMBINE-lab/salmon/releases/tag/" +
"v${finalAttrs.version}";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.kupac ];
};
})
@@ -6,12 +6,13 @@
}:
buildPythonPackage rec {
pname = "spark_parser";
pname = "spark-parser";
version = "1.8.9";
format = "setuptools";
src = fetchPypi {
inherit pname version;
pname = "spark_parser";
inherit version;
sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7";
};
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, spark_parser
, spark-parser
, xdis
, nose
, pytest
@@ -22,7 +22,7 @@ buildPythonPackage rec {
};
nativeCheckInputs = [ nose pytest hypothesis six ];
propagatedBuildInputs = [ spark_parser xdis ];
propagatedBuildInputs = [ spark-parser xdis ];
# six import errors (yet it is supplied...)
checkPhase = ''
+43
View File
@@ -0,0 +1,43 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gocode-unstable";
version = "2020-04-06";
rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c";
goPackagePath = "github.com/mdempsky/gocode";
# we must allow references to the original `go` package,
# because `gocode` needs to dig into $GOROOT to provide completions for the
# standard packages.
allowGoReference = true;
src = fetchFromGitHub {
inherit rev;
owner = "mdempsky";
repo = "gocode";
sha256 = "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "An autocompletion daemon for the Go programming language";
longDescription = ''
Gocode is a helper tool which is intended to be integrated with your
source code editor, like vim, neovim and emacs. It provides several
advanced capabilities, which currently includes:
- Context-sensitive autocompletion
It is called daemon, because it uses client/server architecture for
caching purposes. In particular, it makes autocompletions very fast.
Typical autocompletion time with warm cache is 30ms, which is barely
noticeable.
'';
homepage = "https://github.com/mdempsky/gocode";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
};
}
+12
View File
@@ -0,0 +1,12 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a";
sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf";
};
}
]
+3 -3
View File
@@ -12,7 +12,7 @@
let
pname = "ockam";
version = "0.114.0";
version = "0.115.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage {
owner = "build-trust";
repo = pname;
rev = "ockam_v${version}";
sha256 = "sha256-oR5SzLPJ4I87bMyHTwd+Vjm7pR+modBGIEqls9s6hVI=";
sha256 = "sha256-DPRMPGxOuF4FwDXyVNxv9j2qy3K1p/9AVmrp0pPUQXM=";
};
cargoHash = "sha256-m86NT3O1PbTWxc0Q5pqkLECHHKtF4w8Vl5eDpvxjDHs=";
cargoHash = "sha256-SeBv2yO0E60C4xMGf/7LOOyTOXf8vZCxIBC1dU2CAX0=";
nativeBuildInputs = [ git pkg-config ];
buildInputs = [ openssl dbus ]
++ lib.optionals stdenv.isDarwin [ Security ];
+26 -36
View File
@@ -24,7 +24,7 @@ let
# to appear while listing all the packages available.
removeRecurseForDerivations = alias: with lib;
if alias.recurseForDerivations or false
then removeAttrs alias [ "recurseForDerivations" ]
then removeAttrs alias ["recurseForDerivations"]
else alias;
# Disabling distribution prevents top-level aliases for non-recursed package
@@ -41,11 +41,10 @@ let
else alias;
mapAliases = aliases:
lib.mapAttrs
(n: alias:
removeDistribute
(removeRecurseForDerivations
(checkInPkgs n alias)))
lib.mapAttrs (n: alias:
removeDistribute
(removeRecurseForDerivations
(checkInPkgs n alias)))
aliases;
in
@@ -60,7 +59,7 @@ mapAliases ({
a4term = a4; # Added 2023-10-06
aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03
airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19
alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28
alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream" ; # Added 2023-07-28
alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12
alsaLib = alsa-lib; # Added 2021-06-09
alsaOss = alsa-oss; # Added 2021-06-10
@@ -101,8 +100,7 @@ mapAliases ({
bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03
blender-with-packages = args:
lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"
(blender.withPackages (_: args.packages)).overrideAttrs
(lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30
(blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30
bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10
bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01
boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08
@@ -186,8 +184,8 @@ mapAliases ({
clang16Stdenv = lowPrio llvmPackages_16.stdenv;
clang17Stdenv = lowPrio llvmPackages_17.stdenv;
clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19
clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19
clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19
clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19
### D ###
@@ -216,8 +214,8 @@ mapAliases ({
dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; # Added 2020-01-19
dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; # Added 2020-09-11
drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15
dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
dylibbundler = macdylibbundler; # Added 2021-04-24
### E ###
@@ -334,14 +332,8 @@ mapAliases ({
gnuradio-with-packages = gnuradio3_7.override {
extraPackages = lib.attrVals [
"osmosdr"
"ais"
"gsm"
"nacl"
"rds"
"limesdr"
]
gnuradio3_7Packages;
"osmosdr" "ais" "gsm" "nacl" "rds" "limesdr"
] gnuradio3_7Packages;
}; # Added 2020-10-16
gmock = gtest; # moved from top-level 2021-03-14
@@ -367,7 +359,6 @@ mapAliases ({
google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18
google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10
go-thumbnailer = thud; # Added 2023-09-21
gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26
govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26
gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10
@@ -466,7 +457,7 @@ mapAliases ({
kerberos = libkrb5; # moved from top-level 2021-03-14
kexectools = kexec-tools; # Added 2021-09-03
keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14
kfctl = throw "kfctl is broken and has been archived by upstream"; # Added 2023-08-21
kfctl = throw "kfctl is broken and has been archived by upstream" ; # Added 2023-08-21
kgx = gnome-console; # Added 2022-02-19
kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-30-10
kibana = kibana7;
@@ -513,7 +504,7 @@ mapAliases ({
librewolf-wayland = librewolf; # Added 2022-11-15
libseat = seatd; # Added 2021-06-24
libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20
libsForQt515 = libsForQt5; # Added 2022-11-24
libsForQt515 = libsForQt5; # Added 2022-11-24
libtensorflow-bin = libtensorflow; # Added 2022-09-25
libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20
libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20
@@ -693,13 +684,12 @@ mapAliases ({
neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
nitrokey-udev-rules = libnitrokey; # Added 2023-03-25
nix-direnv-flakes = nix-direnv;
nix-repl = throw (
# Added 2018-08-26
nix-repl = throw ( # Added 2018-08-26
"nix-repl has been removed because it's not maintained anymore, " +
"use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"
);
nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10
nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20
nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained" ; # Added 2023-11-20
nixFlakes = nixVersions.stable; # Added 2021-05-21
nixStable = nixVersions.stable; # Added 2022-01-24
nixUnstable = nixVersions.unstable; # Added 2022-01-26
@@ -850,7 +840,7 @@ mapAliases ({
qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17
qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20
qt515 = qt5; # Added 2022-11-24
qt515 = qt5; # Added 2022-11-24
qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
@@ -938,7 +928,7 @@ mapAliases ({
sgtpuzzles = throw "'sgtpuzzles' has been renamed to 'sgt-puzzles'"; # Added 2023-10-06
sgtpuzzles-mobile = throw "'sgtpuzzles-mobile' has been renamed to 'sgt-puzzles-mobile'"; # Added 2023-10-06
inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17
shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-"; # Added 2023-08-08
shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-" ; # Added 2023-08-08
shipyard = jumppad; # Added 2023-06-06
signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17
simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09
@@ -1055,7 +1045,7 @@ mapAliases ({
vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26
vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
ventoy-bin = ventoy; # Added 2023-04-12
ventoy-bin-full = ventoy-full; # Added 2023-04-12
ViennaRNA = viennarna; # Added 2023-08-23
@@ -1152,7 +1142,7 @@ mapAliases ({
});
/* If these are in the scope of all-packages.nix, they cause collisions
between mixed versions of qt. See:
between mixed versions of qt. See:
https://github.com/NixOS/nixpkgs/pull/101369 */
inherit (plasma5Packages)
@@ -1175,9 +1165,9 @@ mapAliases ({
plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent
powerdevil qqc2-breeze-style sddm-kcm skanlite skanpage spectacle
systemsettings xdg-desktop-portal-kde yakuake zanshin
;
;
kalendar = merkuro; # Renamed in 23.08
kalendar = merkuro; # Renamed in 23.08
kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08";
inherit (plasma5Packages.thirdParty)
@@ -1188,11 +1178,11 @@ mapAliases ({
kwin-tiling
plasma-applet-caffeine-plus
plasma-applet-virtual-desktop-bar
;
;
inherit (libsForQt5)
sddm
;
;
inherit (pidginPackages)
pidgin-indicator
@@ -1220,6 +1210,6 @@ mapAliases ({
tdlib-purple
pidgin-opensteamworks
purple-facebook
;
;
})
+2
View File
@@ -28398,6 +28398,8 @@ with pkgs;
go-outline = callPackage ../development/tools/go-outline { };
gocode = callPackage ../development/tools/gocode { };
gocode-gomod = callPackage ../development/tools/gocode-gomod { };
goconst = callPackage ../development/tools/goconst { };
+1
View File
@@ -446,6 +446,7 @@ mapAliases ({
somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01
sorl_thumbnail = sorl-thumbnail; # added 2023-11-12
SPARQLWrapper = sparqlwrapper;
spark_parser = spark-parser; # added 2024-01-07
sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24
sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11
sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03
+1 -1
View File
@@ -13454,7 +13454,7 @@ self: super: with self; {
spake2 = callPackage ../development/python-modules/spake2 { };
spark_parser = callPackage ../development/python-modules/spark_parser { };
spark-parser = callPackage ../development/python-modules/spark-parser { };
sparklines = callPackage ../development/python-modules/sparklines { };