diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:11 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:11 +0200 |
| commit | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (patch) | |
| tree | 4c7212dd0f5244a3f09b8dcd5abca15737cffedf /pkgs/applications/networking | |
| parent | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (diff) | |
| parent | 4a1189e0abdbe26e34fc05555cf49c25583dfe3d (diff) | |
| download | nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.gz nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.bz2 nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.lz nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.xz nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.zst nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/discord/default.nix | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index c4182785e829..66b947946cdc 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -13,14 +13,13 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.6.0.1"; + version = "28.7.0"; src = fetchFromGitHub { - name = "${pname}-${version}"; owner = "MoonchildProductions"; repo = "UXP"; rev = "PM${version}_Release"; - sha256 = "1adgajy5vsghvjlv2nqyrbp6mnv3k6slqxxi8r949xlb5h6d210b"; + sha256 = "0i6fy1mvjy6vpqnvhh516mxbv4d2z73yghk3frln4ql8zavba7qq"; }; desktopItem = makeDesktopItem { @@ -91,8 +90,6 @@ in stdenv.mkDerivation rec { " ''; - hardeningDisable = [ "format" ]; - buildPhase = '' $src/mach build ''; @@ -129,7 +126,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://www.palemoon.org/"; license = licenses.mpl20; - maintainers = with maintainers; [ rnhmjoj AndersonTorres OPNA2608 ]; + maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f5883875fcdc..6bedde3ebd64 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,10 +17,10 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.15"; + version = "0.0.16"; src = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/linux/0.0.15/discord-ptb-0.0.15.tar.gz"; - sha256 = "0znqb0a3yglgx7a9ypkb81jcm8kqgc6559zi7vfqn02zh15gqv6a"; + url = "https://dl-ptb.discordapp.net/apps/linux/0.0.16/discord-ptb-0.0.16.tar.gz"; + sha256 = "1ia94xvzygim9rx1sjnnss518ggw0i20mhp9pby33q70ha35n0aq"; }; }; canary = callPackage ./base.nix { |