diff options
88 files changed, 1327 insertions, 1696 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7c95ab8b8ec5..57ce13aa230e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4782,6 +4782,12 @@ githubId = 11016164; name = "Fedor Pakhomov"; }; + pamplemousse = { + email = "xav.maso@gmail.com"; + github = "Pamplemousse"; + githubId = 2647236; + name = "Xavier Maso"; + }; panaeon = { email = "vitalii.voloshyn@gmail.com"; github = "panaeon"; diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 6ab4c3927955..a522834e4294 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -1,6 +1,6 @@ pkgs: with pkgs.lib; -{ +rec { # Check whenever fileSystem is needed for boot fsNeededForBoot = fs: fs.neededForBoot diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index ff3c456c3644..c72815d5ca25 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -6,18 +6,18 @@ , curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: -mkDerivation { +mkDerivation rec { pname = "amarok"; - version = "2.9.0-20190731"; + version = "2.9.0-20190824"; src = fetchgit { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out url = git://anongit.kde.org/amarok.git; - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.CZ"; - rev = "783da6d8e93737f5e41a3bc017906dc1f94bb94f"; - sha256 = "08bypxk5kaay98hbwz9pj3hwgiyk3qmn9qw99bnjkkkw9wzsxiy6"; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; + sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 7185b3510601..933e5773edad 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -2,37 +2,37 @@ stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.5"; + version = "1.1.6"; - src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; - sha256 = "1iq7qkpq073yq1bz8pam4cbm2myznhpjr3g9afblvmxwgbdjxak0"; - }; + src = fetchurl { + url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; + sha256 = "1i7fhaj9chjlm7qg0h3azy4djnm9rxskbr3dzjj0n9rw8cjdqyq6"; + }; - dontBuild = true; - dontPatchELF = true; + dontBuild = true; + dontPatchELF = true; - desktopItem = makeDesktopItem { - name = "wasabi"; - exec = "wasabiwallet"; - desktopName = "Wasabi"; - genericName = "Bitcoin wallet"; - comment = meta.description; - categories = "Application;Network;Utility;"; - }; + desktopItem = makeDesktopItem { + name = "wasabi"; + exec = "wasabiwallet"; + desktopName = "Wasabi"; + genericName = "Bitcoin wallet"; + comment = meta.description; + categories = "Application;Network;Utility;"; + }; installPhase = '' - mkdir -p $out/opt/${pname} $out/bin $out/share/applications - cp -Rv . $out/opt/${pname} - cd $out/opt/${pname} - for i in $(find . -type f -name '*.so') wassabee - do - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i - done - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee - ln -s $out/opt/${pname}/wassabee $out/bin/${pname} - cp -v $desktopItem/share/applications/* $out/share/applications - ''; + mkdir -p $out/opt/${pname} $out/bin $out/share/applications + cp -Rv . $out/opt/${pname} + cd $out/opt/${pname} + for i in $(find . -type f -name '*.so') wassabee + do + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i + done + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee + ln -s $out/opt/${pname}/wassabee $out/bin/${pname} + cp -v $desktopItem/share/applications/* $out/share/applications + ''; meta = with stdenv.lib; { description = "Privacy focused Bitcoin wallet"; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index eb48333997ca..2535f7514f1d 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 5c72e78c5820..ee19f5cebfe2 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.08.1/ ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index fb0581cb3411..9e5346be9cd5 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1739 +3,1739 @@ { akonadi = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-19.08.0.tar.xz"; - sha256 = "ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831"; - name = "akonadi-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-19.08.1.tar.xz"; + sha256 = "32233b59c696a5053f2ee4b7368804635a04e2a5f6d3605848eadafa0306c44d"; + name = "akonadi-19.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-19.08.0.tar.xz"; - sha256 = "74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b"; - name = "akonadi-calendar-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-calendar-19.08.1.tar.xz"; + sha256 = "5e8c66d4c86e6458469dbb393458ee8b5e6afc1b4712ce8395709d4226864d6c"; + name = "akonadi-calendar-19.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-tools-19.08.0.tar.xz"; - sha256 = "9620a4418245a74334c6f57db4ba5558825879440aee5903f5614db08f61e976"; - name = "akonadi-calendar-tools-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-calendar-tools-19.08.1.tar.xz"; + sha256 = "033fae40bcbdcfa52981026f783b7cc8fecde384d6683747cd3f307bd43b2570"; + name = "akonadi-calendar-tools-19.08.1.tar.xz"; }; }; akonadiconsole = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadiconsole-19.08.0.tar.xz"; - sha256 = "a683b184109cddbc4d66c55ee3efa2c69092a72e2cd9e78903c4dcf7f442c055"; - name = "akonadiconsole-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadiconsole-19.08.1.tar.xz"; + sha256 = "9a0f88903757eaf0d3271d4438b3a170640b7cb01a7b2f0fbf10a75fa0093184"; + name = "akonadiconsole-19.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-contacts-19.08.0.tar.xz"; - sha256 = "912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4"; - name = "akonadi-contacts-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-contacts-19.08.1.tar.xz"; + sha256 = "f182883b4cc16034a798feb966df268e84d9c5b8d3c6e14d5698f7ead85a21d7"; + name = "akonadi-contacts-19.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-import-wizard-19.08.0.tar.xz"; - sha256 = "e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915"; - name = "akonadi-import-wizard-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-import-wizard-19.08.1.tar.xz"; + sha256 = "d66088ded8917f6034de8981ce71d5d0e1808f6d58f7fdb7e0a806ff0834e27b"; + name = "akonadi-import-wizard-19.08.1.tar.xz"; }; }; akonadi-mime = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-mime-19.08.0.tar.xz"; - sha256 = "32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4"; - name = "akonadi-mime-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-mime-19.08.1.tar.xz"; + sha256 = "0a4f4652a665229b290431adb59940890effba0804fe33a0e79a24322f90b35c"; + name = "akonadi-mime-19.08.1.tar.xz"; }; }; akonadi-notes = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-notes-19.08.0.tar.xz"; - sha256 = "26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3"; - name = "akonadi-notes-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-notes-19.08.1.tar.xz"; + sha256 = "44896f17fc2f625f9fc8c77690acd787291c5e08e8261c5d113c94045bd5bdd8"; + name = "akonadi-notes-19.08.1.tar.xz"; }; }; akonadi-search = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akonadi-search-19.08.0.tar.xz"; - sha256 = "fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0"; - name = "akonadi-search-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akonadi-search-19.08.1.tar.xz"; + sha256 = "c68387f3452bcd390f1c99549531c72d95db0def29d8ba10330e68891b0d0b53"; + name = "akonadi-search-19.08.1.tar.xz"; }; }; akregator = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/akregator-19.08.0.tar.xz"; - sha256 = "d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820"; - name = "akregator-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/akregator-19.08.1.tar.xz"; + sha256 = "b73fcf1c509398ff496864f0105491792b5b15f37c52f9a8ca74ca254a75494a"; + name = "akregator-19.08.1.tar.xz"; }; }; analitza = { - version = "19.08.0"; + version = "19.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.0/src/analitza-19.08.0.tar.xz"; - sha256 = "516f29f089be92fecf5e17dcf466a9daf8525ec9e594f52f04338603914c2003"; - name = "analitza-19.08.0.tar.xz"; + url = "${mirror}/stable/applications/19.08.1/src/analitza-19.08.1.tar.xz"; + sha256 = "f963a8abe31d4c0d2b0e0a7e78ec78ced8eb7a0af60df1620ccc2f2409df6a91"; |