JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-10-29 18:01:38 +00:00 committed by GitHub
commit 9a002bac35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 425 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View File

@ -157,7 +157,6 @@ in
gobgpd = handleTest ./gobgpd.nix {};
gocd-agent = handleTest ./gocd-agent.nix {};
gocd-server = handleTest ./gocd-server.nix {};
google-cloud-sdk = handleTest ./google-cloud-sdk.nix {};
google-oslogin = handleTest ./google-oslogin {};
gotify-server = handleTest ./gotify-server.nix {};
grafana = handleTest ./grafana.nix {};

13
nixos/tests/google-cloud-sdk.nix
View File

@ -1,13 +0,0 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "google-cloud-sdk";
meta = with pkgs.lib.maintainers; { maintainers = [ iammrinal0 ]; };
machine = { pkgs, ... }: {
environment.systemPackages = [ pkgs.google-cloud-sdk ];
};
testScript = ''
import json
assert "${pkgs.google-cloud-sdk.version}" in json.loads(machine.succeed("gcloud version --format json"))["Google Cloud SDK"]
'';
})

10
pkgs/applications/networking/cluster/sonobuoy/default.nix
View File

@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub }:
# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
let rev = "981a3ffd4368600eb1a5bca3f12a251e80895d37";
let rev = "08bb70f407d0334fa80b9dbc6850987f16eb27d3";
in
buildGoModule rec {
pname = "sonobuoy";
version = "0.53.2"; # Do not forget to update `rev` above
version = "0.54.0"; # Do not forget to update `rev` above
ldflags =
let t = "github.com/vmware-tanzu/sonobuoy";
@ -17,10 +17,10 @@ buildGoModule rec {
];
src = fetchFromGitHub {
sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY=";
rev = "v${version}";
repo = "sonobuoy";
owner = "vmware-tanzu";
repo = "sonobuoy";
rev = "v${version}";
sha256 = "sha256-Gtpky+zkFKukIIHF91F4uBZjaguk8KlOEVhSwTj+ccs=";
};
vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24=";

8
pkgs/applications/office/khronos/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "khronos";
version = "3.6.0";
version = "3.6.1";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "sha256-AETyVCBUuBzHwDgTkGRIokFYwcmXrb/F85J5GEIu4dE=";
sha256 = "sha256-+gZy8cdekM26J1ujqFmfBXTctXc9E//EY42ZoLq9rBs=";
};
nativeBuildInputs = [
@ -48,9 +48,6 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x build-aux/post_install.py
patchShebangs build-aux/post_install.py
# https://github.com/lainsce/khronos/pull/75
substituteInPlace build-aux/post_install.py \
--replace 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
'';
passthru = {
@ -65,5 +62,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
platforms = platforms.linux;
license = licenses.gpl3Plus;
mainProgram = "io.github.lainsce.Khronos";
};
}

8
pkgs/applications/office/libreoffice/default.nix
View File

@ -2,7 +2,7 @@
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, icu, boost, jdk, ant, cups, xorg, fontforge
, openssl, gperf, cppunit, poppler, util-linux
, librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
@ -310,7 +310,6 @@ in (mkDrv rec {
"--with-boost-libdir=${boost.out}/lib"
"--with-beanshell-jar=${bsh}"
"--with-vendor=NixOS"
"--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
"--disable-report-builder"
"--disable-online-update"
"--enable-python=system"
@ -324,7 +323,7 @@ in (mkDrv rec {
"--with-system-headers"
"--with-system-openssl"
"--with-system-libabw"
"--with-system-libcmis"
"--without-system-libcmis"
"--with-system-libwps"
"--with-system-openldap"
"--with-system-coinmp"
@ -365,7 +364,6 @@ in (mkDrv rec {
"--without-system-mdds" # we have mdds but our version is too new
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus"
"--without-system-qrcodegen"
"--without-system-xmlsec"
] ++ lib.optionals kdeIntegration [
"--enable-kf5"
@ -394,7 +392,7 @@ in (mkDrv rec {
glib libmysqlclient
neon nspr nss openldap openssl pam perl pkg-config poppler
python3 sane-backends unzip which zip zlib
mdds bluez5 libcmis libwps libabw libzmf
mdds bluez5 libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux
librevenge libe-book libmwaw glm ncurses epoxy
libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext

187
pkgs/applications/office/libreoffice/src-fresh/download.nix
View File

@ -6,13 +6,6 @@
md5 = "";
md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
}
{
name = "commons-logging-1.2-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz";
sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81";
md5 = "";
md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz";
}
{
name = "apr-1.5.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";
@ -28,11 +21,11 @@
md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
}
{
name = "boost_1_71_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz";
sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543";
name = "boost_1_75_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz";
sha256 = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b";
md5 = "";
md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz";
md5name = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b-boost_1_75_0.tar.xz";
}
{
name = "box2d-2.3.1.tar.gz";
@ -42,11 +35,11 @@
md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz";
}
{
name = "breakpad.zip";
url = "https://dev-www.libreoffice.org/src/breakpad.zip";
sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";
name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz";
url = "https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz";
sha256 = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91";
md5 = "";
md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip";
md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz";
}
{
name = "bsh-2.0b6-src.zip";
@ -70,11 +63,11 @@
md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz";
}
{
name = "libcdr-0.1.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz";
sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861";
name = "libcdr-0.1.7.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz";
sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4";
md5 = "";
md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz";
md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
@ -119,11 +112,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
name = "curl-7.71.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz";
sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772";
name = "curl-7.78.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz";
sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5";
md5 = "";
md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz";
md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@ -154,11 +147,11 @@
md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
}
{
name = "libetonyek-0.1.9.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz";
sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a";
name = "libetonyek-0.1.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz";
sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a";
md5 = "";
md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
}
{
name = "expat-2.4.1.tar.bz2";
@ -168,11 +161,11 @@
md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2";
}
{
name = "Firebird-3.0.0.32483-0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";
sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860";
name = "Firebird-3.0.7.33374-0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2";
sha256 = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76";
md5 = "";
md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2";
md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";
}
{
name = "fontconfig-2.13.91.tar.gz";
@ -217,11 +210,11 @@
md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz";
}
{
name = "liberation-fonts-ttf-2.00.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz";
sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45";
name = "liberation-fonts-ttf-2.1.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz";
sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef";
md5 = "";
md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz";
md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz";
}
{
name = "LinLibertineG-20120116.zip";
@ -266,11 +259,11 @@
md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz";
}
{
name = "culmus-0.131.tar.gz";
url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";
sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b";
name = "culmus-0.133.tar.gz";
url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz";
sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05";
md5 = "";
md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz";
md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz";
}
{
name = "libre-hebrew-1.0.tar.gz";
@ -378,18 +371,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
name = "icu4c-68_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz";
sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d";
name = "icu4c-69_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-69_1-src.tgz";
sha256 = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745";
md5 = "";
md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz";
md5name = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745-icu4c-69_1-src.tgz";
}
{
name = "icu4c-68_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip";
sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510";
name = "icu4c-69_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-69_1-data.zip";
sha256 = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf";
md5 = "";
md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip";
md5name = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf-icu4c-69_1-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
@ -476,11 +469,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
}
{
name = "language-subtag-registry-2021-03-05.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2";
sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a";
name = "language-subtag-registry-2021-08-06.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-08-06.tar.bz2";
sha256 = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b";
md5 = "";
md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2";
md5name = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b-language-subtag-registry-2021-08-06.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@ -560,11 +553,11 @@
md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
}
{
name = "xmlsec1-1.2.30.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz";
sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8";
name = "xmlsec1-1.2.32.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.32.tar.gz";
sha256 = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043";
md5 = "";
md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz";
md5name = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043-xmlsec1-1.2.32.tar.gz";
}
{
name = "libxml2-2.9.12.tar.gz";
@ -623,11 +616,11 @@
md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
}
{
name = "libmwaw-0.3.17.tar.xz";
url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz";
sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c";
name = "libmwaw-0.3.19.tar.xz";
url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz";
sha256 = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af";
md5 = "";
md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz";
md5name = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af-libmwaw-0.3.19.tar.xz";
}
{
name = "mythes-1.2.4.tar.gz";
@ -651,11 +644,11 @@
md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz";
}
{
name = "libodfgen-0.1.6.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";
sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2";
name = "libodfgen-0.1.8.tar.xz";
url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz";
sha256 = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625";
md5 = "";
md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
md5name = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625-libodfgen-0.1.8.tar.xz";
}
{
name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";
@ -679,11 +672,11 @@
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
name = "openssl-1.1.1i.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1i.tar.gz";
sha256 = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242";
name = "openssl-1.1.1l.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz";
sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1";
md5 = "";
md5name = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242-openssl-1.1.1i.tar.gz";
md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz";
}
{
name = "liborcus-0.16.1.tar.bz2";
@ -692,13 +685,6 @@
md5 = "";
md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb";
md5 = "";
md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
}
{
name = "libpagemaker-0.0.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";
@ -707,11 +693,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-4306.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2";
sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8";
name = "pdfium-4500.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2";
sha256 = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304";
md5 = "";
md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2";
md5name = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304-pdfium-4500.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";
@ -734,6 +720,13 @@
md5 = "";
md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz";
}
{
name = "poppler-data-0.4.10.tar.gz";
url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz";
sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30";
md5 = "";
md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz";
}
{
name = "postgresql-13.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2";
@ -742,18 +735,11 @@
md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
}
{
name = "Python-3.8.8rc1.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz";
sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6";
name = "Python-3.8.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz";
sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9";
md5 = "";
md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz";
}
{
name = "QR-Code-generator-1.4.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz";
sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a";
md5 = "";
md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz";
md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
@ -798,18 +784,18 @@
md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
}
{
name = "serf-1.2.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2";
sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700";
name = "serf-1.3.9.tar.bz2";
url = "https://dev-www.libreoffice.org/src/serf-1.3.9.tar.bz2";
sha256 = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc";
md5 = "";
md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2";
}
{
name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301";
name = "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz";
sha256 = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d";
md5 = "";
md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
md5name = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d-skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz";
}
{
name = "libstaroffice-0.0.7.tar.xz";
@ -888,4 +874,11 @@
md5 = "";
md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
}
{
name = "zxing-cpp-1.1.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz";
sha256 = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86";
md5 = "";
md5name = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86-zxing-cpp-1.1.1.tar.gz";
}
]

2
pkgs/applications/office/libreoffice/src-fresh/override.nix
View File

@ -6,6 +6,6 @@ attrs:
'';
configureFlags = attrs.configureFlags ++ [
(lib.enableFeature kdeIntegration "kf5")
"--without-system-zxing"
];
patches = [ ../xdg-open-brief.patch ]; # drop this when switching fresh to 7.2.0
}

10
pkgs/applications/office/libreoffice/src-fresh/primary.nix
View File

@ -7,8 +7,8 @@ rec {
};
major = "7";
minor = "1";
patch = "5";
minor = "2";
patch = "2";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1kl54ddpvmrcs4r1vd4dfzg5a8im0kijhaqdg37zvgb5fqv31bxf";
sha256 = "0w9bn3jhrhaj80qbbs8wp3q5yc0rrpwvqj3abgrllg4clk5c6fw1";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "0nf5s012l7mkpd1srvijl9q6x8f7svm6i84bj75dwyvipkg40rxq";
sha256 = "1rhwrax5fxgdvizv74npysam5i67669myysldiplqiah5np672lq";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "1m1hxbhrkaynpcps77rym1d0kwl380jv1p7b6ibfl4by0ii2j16a";
sha256 = "1hn56irlkk2ng7wzhiv8alpjcnf7xf95n3syzlbnmcj177kpg883";
};
}

159
pkgs/applications/office/libreoffice/src-still/download.nix
View File

@ -34,6 +34,13 @@
md5 = "";
md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz";
}
{
name = "box2d-2.3.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz";
sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c";
md5 = "";
md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz";
}
{
name = "breakpad.zip";
url = "https://dev-www.libreoffice.org/src/breakpad.zip";
@ -112,11 +119,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
name = "curl-7.71.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz";
sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772";
name = "curl-7.78.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz";
sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5";
md5 = "";
md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz";
md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@ -154,11 +161,11 @@
md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
}
{
name = "expat-2.2.8.tar.bz2";
url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";
name = "expat-2.4.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2";
sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40";
md5 = "";
md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";
md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2";
}
{
name = "Firebird-3.0.0.32483-0.tar.bz2";
@ -329,11 +336,11 @@
md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip";
}
{
name = "gpgme-1.9.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";
sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb";
name = "gpgme-1.13.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2";
sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46";
md5 = "";
md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2";
}
{
name = "graphite2-minimal-1.3.14.tgz";
@ -371,18 +378,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
name = "icu4c-67_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz";
sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc";
name = "icu4c-68_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz";
sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d";
md5 = "";
md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz";
md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz";
}
{
name = "icu4c-67_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip";
sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e";
name = "icu4c-68_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip";
sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510";
md5 = "";
md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip";
md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
@ -469,11 +476,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
}
{
name = "language-subtag-registry-2020-09-29.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";
sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f";
name = "language-subtag-registry-2021-03-05.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2";
sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a";
md5 = "";
md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2";
md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@ -483,18 +490,18 @@
md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";
}
{
name = "lcms2-2.9.tar.gz";
url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz";
sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20";
name = "lcms2-2.11.tar.gz";
url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz";
sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e";
md5 = "";
md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz";
md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz";
}
{
name = "libassuan-2.5.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";
sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449";
name = "libassuan-2.5.3.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2";
sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702";
md5 = "";
md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2";
md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2";
}
{
name = "libatomic_ops-7.6.8.tar.gz";
@ -525,11 +532,11 @@
md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz";
}
{
name = "libgpg-error-1.27.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2";
name = "libgpg-error-1.37.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2";
sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763";
md5 = "";
md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2";
md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2";
}
{
name = "liblangtag-0.6.2.tar.bz2";
@ -539,11 +546,11 @@
md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";
}
{
name = "libnumbertext-1.0.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz";
sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57";
name = "libnumbertext-1.0.7.tar.xz";
url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz";
sha256 = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc";
md5 = "";
md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz";
md5name = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc-libnumbertext-1.0.7.tar.xz";
}
{
name = "ltm-1.0.zip";
@ -560,11 +567,11 @@
md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz";
}
{
name = "libxml2-2.9.10.tar.gz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";
name = "libxml2-2.9.12.tar.gz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz";
sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92";
md5 = "";
md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";
md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz";
}
{
name = "libxslt-1.1.34.tar.gz";
@ -595,11 +602,11 @@
md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz";
}
{
name = "mdds-1.6.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2";
sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d";
name = "mdds-1.7.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2";
sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf";
md5 = "";
md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2";
md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2";
}
{
name = "mDNSResponder-878.200.35.tar.gz";
@ -616,11 +623,11 @@
md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
}
{
name = "libmwaw-0.3.16.tar.xz";
url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz";
sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868";
name = "libmwaw-0.3.17.tar.xz";
url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz";
sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c";
md5 = "";
md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz";
md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz";
}
{
name = "mythes-1.2.4.tar.gz";
@ -630,11 +637,11 @@
md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
}
{
name = "neon-0.30.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";
sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca";
name = "neon-0.31.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz";
sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678";
md5 = "";
md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz";
}
{
name = "nss-3.55-with-nspr-4.27.tar.gz";
@ -672,18 +679,18 @@
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
name = "openssl-1.0.2t.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";
sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc";
name = "openssl-1.1.1l.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz";
sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1";
md5 = "";
md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";
md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz";
}
{
name = "liborcus-0.15.4.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2";
sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61";
name = "liborcus-0.16.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2";
sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4";
md5 = "";
md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2";
md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@ -735,11 +742,11 @@
md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
}
{
name = "Python-3.7.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.7.10.tar.xz";
sha256 = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b";
name = "Python-3.8.8rc1.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz";
sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6";
md5 = "";
md5name = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b-Python-3.7.10.tar.xz";
md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz";
}
{
name = "QR-Code-generator-1.4.0.tar.gz";
@ -798,11 +805,11 @@
md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
}
{
name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760";
name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301";
md5 = "";
md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
}
{
name = "libstaroffice-0.0.7.tar.xz";
@ -854,11 +861,11 @@
md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz";
}
{
name = "libwps-0.4.11.tar.xz";
url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz";
sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1";
name = "libwps-0.4.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz";
sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb";
md5 = "";
md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz";
md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz";
}
{
name = "xsltml_2.1.2.zip";

6
pkgs/applications/office/libreoffice/src-still/override.nix
View File

@ -1,4 +1,4 @@
{ lib, kdeIntegration, ... }:
{ lib, kdeIntegration, commonsLogging, ... }:
attrs:
{
postConfigure = attrs.postConfigure + ''
@ -6,6 +6,8 @@ attrs:
'';
configureFlags = attrs.configureFlags ++ [
(lib.enableFeature kdeIntegration "kf5")
"--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
"--without-system-qrcodegen"
];
patches = [ ../xdg-open-brief.patch ];
patches = [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2
}

8
pkgs/applications/office/libreoffice/src-still/primary.nix
View File

@ -7,7 +7,7 @@ rec {
};
major = "7";
minor = "0";
minor = "1";
patch = "6";
tweak = "2";
@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "0bk1dc6g8z5akrprfxxy3dm0vdmihaaxnsprxpqbqmqrqzkzg8cn";
sha256 = "1g1nlnmgxka1xj3800ra7j28y08k1irz7a24awx1gyjs9fci58qq";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "04f76r311hppil656ajab52x0xwqszazlgssyi5w97wak2zkmqgj";
sha256 = "0kblfwcnsc0pz96wxmkghmchjd31h0w1wjxlqxqbqqpz3vbr61k3";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "1xmvlj9nrmg8448k4zfaxn5qqxa4amnvvhs1l1smi2bz3xh4xn2d";
sha256 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31";
};
}

10
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,14 +1,14 @@
{
"version": "14.4.0",
"repo_hash": "1hkx30abwbhwrlwr4sykpjgsk8k2k375d9xl1pxjhg3n8vwqncs8",
"version": "14.4.1",
"repo_hash": "0sm44iyn32frc7njg6ypgbcip77mj5c3agn3cihk3lz7z5kr48lm",
"yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.4.0-ee",
"rev": "v14.4.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.4.0",
"GITALY_SERVER_VERSION": "14.4.1",
"GITLAB_PAGES_VERSION": "1.46.0",
"GITLAB_SHELL_VERSION": "13.21.1",
"GITLAB_WORKHORSE_VERSION": "14.4.0"
"GITLAB_WORKHORSE_VERSION": "14.4.1"
}
}

11
pkgs/applications/version-management/gitlab/default.nix
View File

@ -36,6 +36,15 @@ let
buildInputs = [ file ];
buildFlags = [ "--enable-system-libraries" ];
};
# the included yarn rake task attaches the yarn:install task
# to assets:precompile, which is both unnecessary (since we
# run `yarn install` ourselves) and undoes the shebang patches
# in node_modules
railties = x.railties // {
dontBuild = false;
patches = [ ./railties-remove-yarn-install-enhancement.patch ];
patchFlags = "-p2";
};
};
groups = [
"default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"
@ -95,8 +104,6 @@ let
bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production
bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
# hack: rake gettext:po_to_json breaks the node_modules folder. We repair it by patching the shebangs again.
patchShebangs node_modules/
bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production
bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -20,7 +20,7 @@ let
};
};
};
version = "14.4.0";
version = "14.4.1";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
@ -32,7 +32,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-GnjG/LuHvulNrwj1/4r07snue7rysZ74cWpf60w48cc=";
sha256 = "sha256-bATqaB7q3MlyacEiBXdcEDs+xsJUbULVnYTSpEznxFg=";
};
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "14.4.0";
version = "14.4.1";
src = fetchFromGitLab {
owner = data.owner;

13
pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
index 0226da721a..365cdeb0f9 100644
--- a/railties/lib/rails/tasks/yarn.rake
+++ b/railties/lib/rails/tasks/yarn.rake
@@ -27,8 +27,3 @@ namespace :yarn do
exit 1
end
end
-
-# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
-if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn"))
- Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
-end

7
pkgs/applications/video/molotov/default.nix
View File

@ -3,17 +3,16 @@
let
pname = "molotov";
version = "4.4.0";
name = "${pname}-${version}";
src = fetchurl {
url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage";
sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit name src;
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D \
${appimageContents}/@molotovdesktop-wrapper.desktop \
$out/share/applications/${pname}.desktop

9
pkgs/build-support/appimage/default.nix
View File

@ -1,5 +1,4 @@
{ lib
, bash
, binutils-unwrapped
, coreutils
@ -27,7 +26,7 @@ rec {
];
};
extract = { name, src }: pkgs.runCommand "${name}-extracted" {
extract = args@{ name ? "${args.pname}-${args.version}", src, ... }: pkgs.runCommand "${name}-extracted" {
buildInputs = [ appimage-exec ];
} ''
appimage-exec.sh -x $out ${src}
@ -38,7 +37,7 @@ rec {
extractType2 = extract;
wrapType1 = wrapType2;
wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv
wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv
(defaultFhsEnvArgs // {
inherit name;
@ -46,9 +45,9 @@ rec {
++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
runScript = "appimage-exec.sh -w ${src} --";
} // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
} // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage)))));
wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
(args // {
inherit name extraPkgs;
src = extract { inherit name src; };

40
pkgs/build-support/build-dotnet-module/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, makeWrapper, dotnetCorePackages, dotnetPackages, cacert, linkFarmFromDrvs, fetchurl }:
{ lib, stdenvNoCC, linkFarmFromDrvs, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }:
{ name ? "${args.pname}-${args.version}"
, enableParallelBuilding ? true
@ -50,10 +50,35 @@ let
};
});
package = stdenv.mkDerivation (args // {
nuget-source = stdenvNoCC.mkDerivation rec {
name = "${args.pname}-nuget-source";
meta.description = "A Nuget source with the dependencies for ${args.pname}";
nativeBuildInputs = [ dotnetPackages.Nuget xml2 ];
buildCommand = ''
export HOME=$(mktemp -d)
mkdir -p $out/{lib,share}
nuget sources Add -Name nixos -Source "$out/lib"
nuget init "${_nugetDeps}" "$out/lib"
# Generates a list of all unique licenses' spdx ids.
find "$out/lib" -name "*.nuspec" -exec sh -c \
"xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses
'';
} // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion.
meta.licence = let
depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses");
getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses);
in (lib.flatten (lib.forEach depLicenses (spdx:
if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx
)));
};
package = stdenvNoCC.mkDerivation (args // {
inherit buildType;
nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnet-sdk dotnetPackages.Nuget cacert makeWrapper ];
nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnet-sdk cacert makeWrapper ];
# Stripping breaks the executable
dontStrip = true;
@ -66,18 +91,11 @@ let
export HOME=$(mktemp -d)
nuget sources Add -Name nixos -Source "$PWD/nixos"
nuget init "${_nugetDeps}" "$PWD/nixos"
# This is required due to https://github.com/NuGet/Home/issues/4413.
mkdir -p $HOME/.nuget/NuGet
cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet
dotnet restore "$projectFile" \
${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
--source "$PWD/nixos" \
--source "${nuget-source}/lib" \
"''${dotnetRestoreFlags[@]}" \
"''${dotnetFlags[@]}"

2
pkgs/development/compilers/scala-runners/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
mkdir -p $out/bin $out/lib
sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner
sed -ie "s| cs | ${coursier}/bin/cs |" scala-runner
cp scala-runner $out/lib
ln -s $out/lib/scala-runner $out/bin/scala
ln -s $out/lib/scala-runner $out/bin/scalac

3
pkgs/development/embedded/openocd/default.nix
View File

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ hidapi libftdi1 libusb1 libgpiod ];
buildInputs = [ hidapi libftdi1 libusb1 ]
++ lib.optional stdenv.isLinux libgpiod;
configureFlags = [
"--enable-jtag_vpi"

4
pkgs/development/libraries/cpp-utilities/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cpp-utilities";
version = "5.11.1";
version = "5.11.2";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-H8BDuoSF5XkWgahGj7LCSsdXBbgcSjPLTmgUgamCij8=";
sha256 = "sha256-my4799a9XFXWl9Xyq6gRfw4YTOCEWJgTvRKz0mVqrkQ=";
};
nativeBuildInputs = [ cmake ];

8
pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch
View File

@ -1,18 +1,18 @@
diff -ruN cfitsio/configure cfitsio-rpath-universal/configure
--- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200
+++ cfitsio-rpath-universal/configure 2018-05-31 12:02:25.000000000 +0200
@@ -4727,16 +4727,7 @@
+++ cfitsio-rpath-universal/configure 2021-10-27 12:02:25.000000000 +0200
@@ -4829,16 +4829,7 @@
SHLIB_SUFFIX=".dylib"
CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}"
CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}"
- case $host in
- *darwin[56789]*)
- SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
- SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}"
- ;;
- *)
- # Build 'Universal' binaries (i386 & x86_64 architectures) and
- # use rpath token on Darwin 10.x or newer:
- SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
- SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}"
- ;;
- esac
+ SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"

10
pkgs/development/libraries/science/astronomy/cfitsio/default.nix
View File

@ -1,14 +1,15 @@
{ fetchurl, lib, stdenv, bzip2 }:
{ stdenv, lib, fetchurl, bzip2, zlib }:
stdenv.mkDerivation rec {
pname = "cfitsio";
version = "3.49";
version = "4.0.0";
src = fetchurl {
url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz";
sha256 = "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav";
sha256 = "sha256-sqjvugufhtPhvWGfZipHbsGBErTyfMRBzGgKTjd3Ql4=";
};
buildInputs = [ bzip2 ];
buildInputs = [ bzip2 zlib ];
patches = [ ./darwin-rpath-universal.patch ];
@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
advanced features for manipulating and filtering the information in
FITS files.
'';
changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt";
license = licenses.mit;
maintainers = [ maintainers.xbreak ];
platforms = with platforms; linux ++ darwin;

26
pkgs/development/python-modules/gprof2dot/default.nix
View File

@ -1,18 +1,36 @@
{ lib, fetchFromGitHub, buildPythonApplication, python, graphviz }:
{ lib
, fetchFromGitHub
, buildPythonApplication
, python
, graphviz
}:
buildPythonApplication rec {
pname = "gprof2dot";
version = "2019.11.30";
version = "2021.02.21";
src = fetchFromGitHub {
owner = "jrfonseca";
repo = "gprof2dot";
rev = version;
sha256 = "1nw4cfwimd0djarw4wc756q095xir78js8flmycg6g7sl3l6p27s";
sha256 = "1jjhsjf5fdi1fkn7mvhnzkh6cynl8gcjrygd3cya5mmda3akhzic";
};
makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath [ graphviz ]}"
];
# Needed so dot is on path of the test script
checkInputs = [ graphviz ];
checkPhase = "${python.interpreter} tests/test.py";
checkPhase = ''
runHook preCheck
# if options not specified, will use unwrapped gprof2dot from original source
${python.interpreter} tests/test.py --python bash --gprof2dot $out/bin/gprof2dot
runHook postCheck
'';
meta = with lib; {
homepage = "https://github.com/jrfonseca/gprof2dot";

4
pkgs/development/python-modules/murmurhash/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "murmurhash";
version = "1.0.5";
version = "1.0.6";
src = fetchPypi {
inherit pname version;
sha256 = "98ec9d727bd998a35385abd56b062cf0cca216725ea7ec5068604ab566f7e97f";
sha256 = "00a5252b569d3f914b5bd0bce72d2efe9c0fb91a9703556ea1b608b141c68f2d";
};
postPatch = ''

4
pkgs/development/python-modules/mwdblib/default.nix
View File

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "mwdblib";
version = "3.4.0";
version = "3.4.1";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "0dbdmps4a3mav02m4h37bj2bw8pg6h52yf3gpdkhi3k9hl9f942h";
sha256 = "sha256-jCtK3Fk725EaA26GG6j6xqEMFH4Qq92QWrJ7sxcWRaY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyramid_multiauth/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pyramid_multiauth";
version = "0.9.0";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "0lprqjyg3zcji6033p1l3s4nigjigc5423wgivkfhz46vq0jmniy";
sha256 = "6d8785558e1d0bbe0d0da43e296efc0fbe0de5071d1f9b1091e891f0e4ec9682";
};
propagatedBuildInputs = [ pyramid ];

2
pkgs/development/tools/build-managers/bloop/default.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
mkdir channel
ln -s ${bloop-coursier-channel} channel/bloop.json
${coursier}/bin/coursier install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop
${coursier}/bin/cs install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop
# Remove binary part of the coursier launcher script to make derivation output hash stable
sed -i '5,$ d' $out/bloop

4
pkgs/development/tools/cloud-nuke/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PVVnls4i19Xc5KXM1AQTHLkxLgmJpIDBFkRW0EGXOUA=";
sha256 = "sha256-f93zpTA3FWfqmPVnhnvGBJSqQ2OEHMxnI6MUN74LmAk=";
};
vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80=";

4
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
View File

@ -3,13 +3,13 @@
nixosTests }:
buildGoModule rec {
name = "buildkite-agent-${version}";
version = "3.32.3";
version = "3.33.3";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
sha256 = "sha256-uckFsM8UWkiDmTpLRu34qKdjgEQrbsa+K8QtVS2PJ7A=";
sha256 = "sha256-RCKHVFYYcWraUwsGuD/anmWpNwc7cHc9jm0LwR9WRzA=";
};
vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";

6
pkgs/development/tools/ddosify/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ddosify";
version = "0.4.1";
version = "0.5.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-z7jYnEZSHh/Omg5DMNFzuPhV1d8lZSy8I+8tM86O43s=";
sha256 = "sha256-kccn6tnJfy4mx0hyBi2ggPvNPu/iQgGBMxQ6hsYy7So=";
};
vendorSha256 = "sha256-VWWik7oovVJq0J/tj/2Mm5QtvRkJLtMROJhRC2JFZdw=";
vendorSha256 = "sha256-TY8shTb77uFm8/yCvlIncAfq7brWgnH/63W+hj1rvqg=";
# triggers a different set of tests that seems to be interactive and fail (no url target defined)
ldflags = [

29
pkgs/development/tools/dyff/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub}:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "dyff";
version = "1.4.3";
version = "1.4.5";
src = fetchFromGitHub {
owner = "homeport";
repo = "dyff";
rev = "v${version}";
sha256 = "0r1nfwglyw8b46n17bpmgscfmjhjsbk83lgkpm63ysy0h5r84dq8";
sha256 = "sha256-TaGtl5TBQMHjY4/HmDUghyhrsc5fjSMmY+oqO+rKGo4=";
};
vendorSha256 = "12mirnw229x5jkzda0c45vnjnv7fjvzf0rm3fcy5f3wza6hkx6q7";
vendorSha256 = "sha256-3L3FtL/P+Jyvv0WESBvfSxJOl99v5QDyyzIqottB2EI=";
subPackages = [
"cmd/dyff"
@ -19,6 +19,27 @@ buildGoModule rec {
"internal/cmd"
];
nativeBuildInputs = [ installShellFiles ];
# test fails with the injected version
postPatch = ''
substituteInPlace internal/cmd/cmds_test.go \
--replace "version (development)" ${version}
'';
ldflags = [
"-s"
"-w"
"-X=github.com/homeport/dyff/internal/cmd.version=${version}"
];
postInstall = ''
installShellCompletion --cmd dyff \
--bash <($out/bin/dyff completion bash) \
--fish <($out/bin/dyff completion fish) \
--zsh <($out/bin/dyff completion zsh)
'';
meta = with lib; {
description = "A diff tool for YAML files, and sometimes JSON";
longDescription = ''

4
pkgs/development/tools/esbuild/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.13.0";
version = "0.13.10";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-NPpWK99P4p8GM4MNaIT8MLPzRNHiRh2yrwqG1A0KluM=";
sha256 = "sha256-RWt8PevKpn/HUX7FUsIxLwmkSyvtVCTyGEWxci7ZVMY=";
};
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";

2
pkgs/development/tools/metals/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "${pname}-deps-${version}";
buildCommand = ''
export COURSIER_CACHE=$(pwd)
${coursier}/bin/coursier fetch org.scalameta:metals_2.12:${version} \
${coursier}/bin/cs fetch org.scalameta:metals_2.12:${version} \
-r bintray:scalacenter/releases \
-r sonatype:snapshots > deps
mkdir -p $out/share/java

6
pkgs/development/tools/misc/circleci-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.15848";
version = "0.1.16122";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JybhHglqMgQzsmloUhVgIcSMPinE9XaUljvcpdQTSx4=";
sha256 = "sha256-zIBEKGp9icdBLwZBMf30d8JxmJwwWrO/arh8ZvMHTSI=";
};
vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ=";
vendorSha256 = "sha256-efrjHwHobML/t2lDSFx+UyAOca9dHjZHcAxkFzJqWEo=";
doCheck = false;

36
pkgs/development/tools/pylint-exit/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib, fetchFromGitHub, python3Packages }:
with python3Packages; buildPythonApplication rec {
pname = "pylint-exit";
version = "1.2.0";
src = fetchFromGitHub {
owner = "jongracecox";
repo = pname;
rev = "v${version}";
sha256 = "0hwfny48g394visa3xd15425fsw596r3lhkfhswpjrdk2mnk3cny";
};
# Converting the shebang manually as it is not picked up by patchShebangs
postPatch = ''
substituteInPlace pylint_exit.py \
--replace "#!/usr/local/bin/python" "#!${python.interpreter}"
'';
# See https://github.com/jongracecox/pylint-exit/pull/7
buildInputs = [ m2r ];
# setup.py reads its version from the TRAVIS_TAG environment variable
TRAVIS_TAG = version;
checkPhase = ''
${python.interpreter} -m doctest pylint_exit.py
'';
meta = with lib; {
description = "Utility to handle pylint exit codes in an OS-friendly way";
license = licenses.mit;
homepage = "https://github.com/jongracecox/pylint-exit";
maintainers = [ maintainers.fabiangd ];
};
}

6
pkgs/development/tools/rust/cargo-msrv/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-msrv";
version = "0.10.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "foresterre";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Op800CGzbSGwYvd18ba7Gvw2bVHeBHCQq1pmAMW9CUs=";
sha256 = "sha256-7GixO9aoHx07wQHTEtbEDQ52Dr3MZ0p4Xq0Ol7E/swI=";
};
cargoSha256 = "sha256-vguDrmNYtHHR8kA6GElEx8+jVj/V853o0uW6hfg/tlI=";
cargoSha256 = "sha256-cxbsTRANX1WA0Lf6CHcJoxSKrGHtBfjInSKhFJmTDnE=";
passthru = {
updateScript = nix-update-script {

6
pkgs/development/tools/rust/rusty-man/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rusty-man";
version = "0.4.3";
version = "0.5.0";
src = fetchFromSourcehut {
owner = "~ireas";
repo = pname;
rev = "v${version}";
sha256 = "1yp1clmf4hpvqbvn055hiq52584kbrz5b3cjzw8bgkw51nwxr2yx";
sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo=";
};
cargoSha256 = "sha256-mIM97YraTiDAowqlB4kAE4PdtWHgvw0UI6Nqoe1EBns=";
cargoSha256 = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0=";
meta = with lib; {
description = "A command-line viewer for documentation generated by rustdoc";

2
pkgs/development/tools/scalafix/default.nix
View File

@ -7,7 +7,7 @@ let
name = "${baseName}-deps-${version}";
buildCommand = ''
export COURSIER_CACHE=$(pwd)
${coursier}/bin/coursier fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps
${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps
mkdir -p $out/share/java
cp $(< deps) $out/share/java/
'';

2
pkgs/development/tools/scalafmt/default.nix
View File

@ -7,7 +7,7 @@ let
name = "${baseName}-deps-${version}";
buildCommand = ''
export COURSIER_CACHE=$(pwd)
${coursier}/bin/coursier fetch org.scalameta:scalafmt-cli_2.13:${version} > deps
${coursier}/bin/cs fetch org.scalameta:scalafmt-cli_2.13:${version} > deps
mkdir -p $out/share/java
cp $(< deps) $out/share/java/
'';

6
pkgs/os-specific/linux/rtw89/default.nix
View File

@ -5,13 +5,13 @@ let
in
stdenv.mkDerivation {
pname = "rtw89";
version = "unstable-2021-07-03";
version = "unstable-2021-10-21";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtw89";
rev = "cebafc6dc839e66c725b92c0fabf131bc908f607";
sha256 = "1vw67a423gajpzd5d51bxnja1qpppx9x5ii2vcfkj6cbnqwr83af";
rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c";
sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632";
};
makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

4
pkgs/servers/heisenbridge/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "heisenbridge";
version = "1.3.0";
version = "1.4.0";
# Use the release tarball because it has the version set correctly using the
# version.txt file.
src = fetchurl {
url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz";
sha256 = "sha256-fj0eJS7c1zSrzHfnlEhJICVDZ+Mo9hKgxwaZ2gn5CsY=";
sha256 = "sha256-Br+7ykTtVYC7KIhikmgS9wbQdJFHFezlVre8cUBzAx8=";
};
propagatedBuildInputs = with python3Packages; [

4
pkgs/servers/mail/dovecot/default.nix
View File

@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "dovecot";
version = "2.3.16";
version = "2.3.17";
nativeBuildInputs = [ perl pkg-config ];
buildInputs =
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "04ngqv5mml5z0i4p7fkchp4xw2awy7x7mq2mim9frnav0m9iv9q3";
sha256 = "1y9dpn4jgzrfjibp5zrc11bdk0q843d998kxhpxkyfm2fz6i4i12";
};
enableParallelBuilding = true;

4
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
View File

@ -3,11 +3,11 @@ let
dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
in stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole";
version = "0.5.16";
version = "0.5.17";
src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
sha256 = "0f79qsiqnhaxn7mrrfcrnsjyv6357kzb7wa0chhfd69vwa06g8sw";
sha256 = "0j6ng173hh5iiqxdkxfb5v9djpn39gxdrv5ki7i22cf5cqwq47h3";
};
buildInputs = [ dovecot openssl ];

4
pkgs/servers/sql/postgresql/ext/repmgr.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "repmgr";
version = "5.2.1";
version = "5.3.0";
src = fetchFromGitHub {
owner = "2ndQuadrant";
repo = "repmgr";
rev = "v${version}";
sha256 = "sha256-hIhVjSSJAgH/eXiuz0xlTFgp9q+Y41ICeCrRFGss3mk=";
sha256 = "sha256-hDBdtp6wPjvtc0MO8aG0Tdx5JiQJf8KS0f778R5xCZc=";
};
nativeBuildInputs = [ flex ];

4
pkgs/tools/admin/exoscale-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.44.0";
version = "1.45.2";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-1ntKm6OA20+/gMVufbmM6fZ2UIXG/0SzH9vZQUvsIUQ=";
sha256 = "sha256-bzm8UNFWAXHBdarovNMyARW2xA4tSXIgIHpxROx4nOI=";
};
goPackagePath = "github.com/exoscale/cli";

7
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@ -117,9 +117,10 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
passthru = {
tests = { inherit (nixosTests) google-cloud-sdk; };
};
doInstallCheck = true;
installCheckPhase = ''
$out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
'';
meta = with lib; {
description = "Tools for the google cloud platform";

6
pkgs/tools/misc/dua/default.nix
View File

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.14.7";
version = "2.14.11";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "sha256-HkNWFWdyjpnJJANfnRDhmnhYbZIhrM9aIVN/Ov3/hK0=";
sha256 = "sha256-XMhgTJiP4whw1r+WtdG5CsQl/GIZPEg7/ElIEMZyWqM=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-nfQGAjekd6cegvKPDxyOfcIhgagH61MT+2YVB2WppvQ=";
cargoSha256 = "sha256-B4e8wT/RhpwtCb11HqN8vksshBaF/CmpMPT62aBuFnw=";
doCheck = false;

6
pkgs/tools/misc/topgrade/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "8.0.0";
version = "8.0.3";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-af1W2Iu9K7epl8EdNkdyHyhNQfH3MaWcNfP5ukDriLE=";
sha256 = "sha256-yk8mW07VmABq4XSOcNKYSs04xpZQfzdDBeQFGFP6u/Y=";
};
cargoSha256 = "sha256-HInvYDDqvkqewgIGd7nQYD+djH7lTc4vp3eVzg706+8=";
cargoSha256 = "sha256-rX4ZfcGlKe+v9UvvfWODaulAVkUbq2jvtuHP504uiX4=";
buildInputs = lib.optional stdenv.isDarwin Foundation;

10
pkgs/tools/networking/dnsproxy/default.nix
View File

@ -1,24 +1,26 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "dnsproxy";
version = "0.39.7";
version = "0.39.9";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jU5O+t8muaIM7JhuNhqfWh1pWezaFvdg+oRPYAQpIkk=";
sha256 = "sha256-HcyzrGtBktScTPch6rCKj5Hr7VS9kf3cCHhDVaZKxG0=";
};
vendorSha256 = null;
ldflags = [ "-s" "-w" "-X" "main.VersionString=${version}" ];
doCheck = false;
meta = with lib; {
description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";
homepage = "https://github.com/AdguardTeam/dnsproxy";
license = licenses.gpl3;
license = licenses.asl20;
maintainers = with maintainers; [ contrun ];
};
}

37
pkgs/tools/networking/vtun/default.nix
View File

@ -1,37 +0,0 @@
{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }:
stdenv.mkDerivation rec {
pname = "vtun";
version = "3.0.4";
src = fetchurl {
url = "mirror://sourceforge/vtun/vtun-${version}.tar.gz";
sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b";
};
patches = [
(fetchpatch { url = "http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch";
sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1";
})
];
postPatch = ''
sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in
sed -i '/strip/d' Makefile.in
'';
buildInputs = [ lzo openssl zlib bison flex ];
configureFlags = [
"--with-lzo-headers=${lzo}/include/lzo"
"--with-ssl-headers=${openssl.dev}/include/openssl"
"--with-blowfish-headers=${openssl.dev}/include/openssl"
];
meta = with lib; {
description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption";
homepage = "http://vtun.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
};
}

6
pkgs/tools/text/tidy-viewer/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tidy-viewer";
version = "0.0.22";
version = "1.4.2";
src = fetchFromGitHub {
owner = "alexhallam";
repo = "tv";
rev = version;
sha256 = "sha256-OuNpp9EKiU+fQSZZO7zpI36nCiZBXK6OznJGY4KMftU=";
sha256 = "sha256-YXYz+SvL6YRwnZ7frmmx4NevNTh0rJcW7e4jSuX3TNs=";
};
cargoSha256 = "sha256-LRoNGDOrbCjmZJRe+EUKxkDJjC92bQRRwP48jqDp9PU=";
cargoSha256 = "sha256-KwnnoVacTMw7kHLQynv9557zUq8aFZfzBD+Zc9Q6XBs=";
# this test parses command line arguments
# error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context

1
pkgs/top-level/aliases.nix
View File

@ -967,6 +967,7 @@ mapAliases ({
virtmanager-qt = virt-manager-qt; # added 2019-10-29
virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21
vorbisTools = vorbis-tools; # added 2016-01-26
vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29
way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13
webkit = webkitgtk; # added 2019-03-05
webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05

6
pkgs/top-level/all-packages.nix
View File

@ -10395,10 +10395,6 @@ with pkgs;
sentry-native = callPackage ../development/libraries/sentry-native { };
vtun = callPackage ../tools/networking/vtun {
openssl = openssl_1_0_2;
};
waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp {
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
@ -14971,6 +14967,8 @@ with pkgs;
pycritty = with python3Packages; toPythonApplication pycritty;
pylint-exit = callPackage ../development/tools/pylint-exit { };
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator {
inherit (linuxPackages) perf;
};