git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #147733 from TredwellGit/libreoffice-fresh
commit9fa479834973c866d7ad0c6e6eb0d7c20329fd7c authorSandro <sandro.jaeckel@gmail.com> dateMon 29 Nov 2021, 20:23 (5 years ago) parentf830d70722bfae
2 files changed+21−21
pkgs/applications/office/libreoffice/src-fresh/download.nix+17−17 pkgs/applications/office/libreoffice/src-fresh/primary.nix+4−4
pkgs/applications/office/libreoffice/src-fresh/download.nix+17−17
@@ -49,11 +49,11 @@
4949 md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
5050 }
5151 {
52− name = "bzip2-1.0.6.tar.gz";
53− url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
54− sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd";
55− md5 = "00b516f4704d4a7cb50a1d97e6e8e15b";
56− md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
52+ name = "bzip2-1.0.8.tar.gz";
53+ url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz";
54+ sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269";
55+ md5 = "";
56+ md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz";
5757 }
5858 {
5959 name = "cairo-1.16.0.tar.xz";
@@ -112,11 +112,11 @@
112112 md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
113113 }
114114 {
115− name = "curl-7.78.0.tar.xz";
116− url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz";
117− sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5";
115+ name = "curl-7.79.1.tar.xz";
116+ url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz";
117+ sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689";
118118 md5 = "";
119− md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz";
119+ md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz";
120120 }
121121 {
122122 name = "libe-book-0.1.3.tar.xz";
@@ -665,11 +665,11 @@
665665 md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
666666 }
667667 {
668− name = "openldap-2.4.45.tgz";
669− url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
670− sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
668+ name = "openldap-2.4.59.tgz";
669+ url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz";
670+ sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34";
671671 md5 = "";
672− md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
672+ md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz";
673673 }
674674 {
675675 name = "openssl-1.1.1l.tar.gz";
@@ -728,11 +728,11 @@
728728 md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz";
729729 }
730730 {
731− name = "postgresql-13.1.tar.bz2";
732− url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2";
733− sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f";
731+ name = "postgresql-13.5.tar.bz2";
732+ url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2";
733+ sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3";
734734 md5 = "";
735− md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
735+ md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2";
736736 }
737737 {
738738 name = "Python-3.8.10.tar.xz";
pkgs/applications/office/libreoffice/src-fresh/primary.nix+4−4
@@ -8,7 +8,7 @@ rec {
88
99 major = "7";
1010 minor = "2";
11− patch = "2";
11+ patch = "3";
1212 tweak = "2";
1313
1414 subdir = "${major}.${minor}.${patch}";
@@ -17,13 +17,13 @@ rec {
1717
1818 src = fetchurl {
1919 url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
20− sha256 = "0w9bn3jhrhaj80qbbs8wp3q5yc0rrpwvqj3abgrllg4clk5c6fw1";
20+ sha256 = "sha256-VslzdJVtmMjvzW1YdxwJUMimQe2E/WTbZjgohMTDtFE=";
2121 };
2222
2323 # FIXME rename
2424 translations = fetchSrc {
2525 name = "translations";
26− sha256 = "1rhwrax5fxgdvizv74npysam5i67669myysldiplqiah5np672lq";
26+ sha256 = "sha256-B/UVlPyzL7M3PpQwS63huRtti1VR+OaI2nd+T1IESOw=";
2727 };
2828
2929 # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@@ -31,6 +31,6 @@ rec {
3131
3232 help = fetchSrc {
3333 name = "help";
34− sha256 = "1hn56irlkk2ng7wzhiv8alpjcnf7xf95n3syzlbnmcj177kpg883";
34+ sha256 = "sha256-CH4URClK/lq0nqN6LHjAVcKjkADol5AX3WuyAl0srnk=";
3535 };
3636}