diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml
index 1e1df867e08..2cd2615f54a 100644
--- a/doc/using/configuration.xml
+++ b/doc/using/configuration.xml
@@ -138,11 +138,11 @@
- For a more useful example, try the following. This configuration only allows unfree packages named flash player and visual studio code:
+ For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code:
{
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
- "flashplayer"
+ "roon-server"
"vscode"
];
}
diff --git a/lib/lists.nix b/lib/lists.nix
index 56af4d9daa1..e469f3ef265 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -241,7 +241,7 @@ rec {
/* Return a singleton list or an empty list, depending on a boolean
value. Useful when building lists with optional elements
- (e.g. `++ optional (system == "i686-linux") flashplayer').
+ (e.g. `++ optional (system == "i686-linux") firefox').
Type: optional :: bool -> a -> [a]
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 2105ff9f3d7..b76d0930290 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -479,6 +479,21 @@ self: super:
thinkfan documentation before updating.
+
+
+ Adobe Flash Player support has been dropped from the tree. In particular,
+ the following packages no longer support it:
+
+ chromium
+ firefox
+ qt48
+ qt5.qtwebkit
+
+ Additionally, packages flashplayer and
+ hal-flash were removed along with the
+ services.flashpolicyd module.
+
+
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7a656a58e9c..97721868660 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -374,6 +374,7 @@
./services/hardware/nvidia-optimus.nix
./services/hardware/pcscd.nix
./services/hardware/pommed.nix
+ ./services/hardware/power-profiles-daemon.nix
./services/hardware/ratbagd.nix
./services/hardware/sane.nix
./services/hardware/sane_extra_backends/brscan4.nix
@@ -650,7 +651,6 @@
./services/networking/fireqos.nix
./services/networking/firewall.nix
./services/networking/flannel.nix
- ./services/networking/flashpolicyd.nix
./services/networking/freenet.nix
./services/networking/freeradius.nix
./services/networking/gale.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1dd8b48d76b..2d07e421efe 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -71,6 +71,7 @@ with lib;
(mkRemovedOptionModule [ "services" "seeks" ] "")
(mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
# Do NOT add any option renames here, see top of the file
];
diff --git a/nixos/modules/services/hardware/power-profiles-daemon.nix b/nixos/modules/services/hardware/power-profiles-daemon.nix
new file mode 100644
index 00000000000..70b7a72b8ba
--- /dev/null
+++ b/nixos/modules/services/hardware/power-profiles-daemon.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.power-profiles-daemon;
+ package = pkgs.power-profiles-daemon;
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.power-profiles-daemon = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable power-profiles-daemon, a DBus daemon that allows
+ changing system behavior based upon user-selected power profiles.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ assertions = [
+ { assertion = !config.services.tlp.enable;
+ message = ''
+ You have set services.power-profiles-daemon.enable = true;
+ which conflicts with services.tlp.enable = true;
+ '';
+ }
+ ];
+
+ services.dbus.packages = [ package ];
+
+ services.udev.packages = [ package ];
+
+ systemd.packages = [ package ];
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix
deleted file mode 100644
index d3ac78430ca..00000000000
--- a/nixos/modules/services/networking/flashpolicyd.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.services.flashpolicyd;
-
- flashpolicyd = pkgs.stdenv.mkDerivation {
- name = "flashpolicyd-0.6";
-
- src = pkgs.fetchurl {
- name = "flashpolicyd_v0.6.zip";
- url = "https://download.adobe.com/pub/adobe/devnet/flashplayer/articles/socket_policy_files/flashpolicyd_v0.6.zip";
- sha256 = "16zk237233npwfq1m4ksy4g5lzy1z9fp95w7pz0cdlpmv0fv9sm3";
- };
-
- buildInputs = [ pkgs.unzip pkgs.perl ];
-
- installPhase = "mkdir $out; cp -pr * $out/; chmod +x $out/*/*.pl";
- };
-
- flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd"
- ''
- #! ${pkgs.runtimeShell}
- exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \
- --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \
- 2> /dev/null
- '';
-
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.flashpolicyd = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description =
- ''
- Whether to enable the Flash Policy server. This is
- necessary if you want Flash applications to make
- connections to your server.
- '';
- };
-
- policy = mkOption {
- type = types.lines;
- default =
- ''
-
-
-
-
-
-
- '';
- description = "The policy to be served. The default is to allow connections from any domain to any port.";
- };
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- services.xinetd.enable = true;
-
- services.xinetd.services = singleton
- { name = "flashpolicy";
- port = 843;
- unlisted = true;
- server = "${flashpolicydWrapper}/bin/flashpolicyd";
- };
-
- };
-
-}
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix
index be6734f439f..553638ad496 100644
--- a/nixos/modules/services/security/oauth2_proxy_nginx.nix
+++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix
@@ -31,7 +31,7 @@ in
proxyPass = cfg.proxy;
extraConfig = ''
proxy_set_header X-Scheme $scheme;
- proxy_set_header X-Auth-Request-Redirect $request_uri;
+ proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri;
'';
};
locations."/oauth2/auth" = {
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 29cb7cedcb0..fa8614e8ec1 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -79,6 +79,8 @@ let
include ${pkgs.mailcap}/etc/nginx/mime.types;
include ${cfg.package}/conf/fastcgi.conf;
include ${cfg.package}/conf/uwsgi_params;
+
+ default_type application/octet-stream;
'';
configFile = pkgs.writers.writeNginxConfig "nginx.conf" ''
diff --git a/nixos/tests/power-profiles-daemon.nix b/nixos/tests/power-profiles-daemon.nix
new file mode 100644
index 00000000000..422008316f0
--- /dev/null
+++ b/nixos/tests/power-profiles-daemon.nix
@@ -0,0 +1,45 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+{
+ name = "power-profiles-daemon";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ mvnetbiz ];
+ };
+ machine = { pkgs, ... }: {
+ services.power-profiles-daemon.enable = true;
+ environment.systemPackages = [ pkgs.glib ];
+ };
+
+ testScript = ''
+ def get_profile():
+ return machine.succeed(
+ """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \
+ --method org.freedesktop.DBus.Properties.Get 'net.hadess.PowerProfiles' 'ActiveProfile'
+ """
+ )
+
+
+ def set_profile(profile):
+ return machine.succeed(
+ """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \
+ --method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'{profile}'>"
+ """.format(
+ profile=profile
+ )
+ )
+
+
+ machine.wait_for_unit("multi-user.target")
+
+ set_profile("power-saver")
+ profile = get_profile()
+ if not "power-saver" in profile:
+ raise Exception("Unable to set power-saver profile")
+
+
+ set_profile("balanced")
+ profile = get_profile()
+ if not "balanced" in profile:
+ raise Exception("Unable to set balanced profile")
+ '';
+})
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 2a12632494b..9644182861d 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
- version = "3.3.1";
+ version = "3.3.2";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
- sha256 = "0f7xysk0cl48q7i28m25hasmrp30grgm3kah0s7xmkjgm33887pi";
+ sha256 = "sha256-R1e+eTheS9KqPIHw1QoMJgpSB1ss0gwTUGAojdJM0Zw=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index 5a610284c21..8e6113a716d 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let
- version = "0.5.4";
+ version = "0.5.5";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
- sha256 = "0h7gpjx1221jwsq3k91p8zhf1h77qaxyasakc88s3g57vawhckgk";
+ sha256 = "sha256-8eAUg+vxpoDZ7AMMmvIPXypawPHgZCwYvVWTz6qc62s=";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix
index dcfba417149..3c56e0bbb2b 100644
--- a/pkgs/applications/blockchains/turbo-geth.nix
+++ b/pkgs/applications/blockchains/turbo-geth.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "turbo-geth";
- version = "2021.01.01";
+ version = "2021.02.01";
src = fetchFromGitHub {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
- sha256 = "0a570570cmyngbz645728jdd0d2xmnyrnln2gbxnngiv4v62dxls";
+ sha256 = "sha256-9z0Hogu/VgGxvgQMKIImv+qyTqTmR40JS4NNIOk5EZI=";
};
- vendorSha256 = "1x3mhfc16slaamp51rbscfwll25qj6ama1xkysidy7rscmmsj392";
+ vendorSha256 = "sha256-Ho68+SzYELQN4DE57LNSXeHIu43zAOb7HK/jx7PFdXk=";
runVend = true;
subPackages = [
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index b2011c5d8e6..296a1eb2ad8 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -4,11 +4,11 @@
mkDerivation rec {
pname = "okteta";
- version = "0.26.4";
+ version = "0.26.5";
src = fetchurl {
url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "00qgzm5mqx0j8f0fznhnw76l9pjyw3lxirvy8ssq59nqqjbb08pg";
+ sha256 = "sha256-n8ft//c+ewWDr1QLDAUvkiHKPxHqP8NgTCvO2wnCmpc=";
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index 804ba33209a..eabc9349237 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -9,13 +9,13 @@
mkDerivation rec {
pname = "moolticute";
- version = "0.44.21";
+ version = "0.45.0";
src = fetchFromGitHub {
owner = "mooltipass";
repo = pname;
rev = "v${version}";
- sha256 = "1m3iy2v8mimyb25xisr7i4ga6qlggv1i2aji9qfgagns7ffp53nf";
+ sha256 = "sha256-azJ63NI0wzzv3acgoPaeF+lTM1WKpXg595FrK908k1U=";
};
outputs = [ "out" "udev" ];
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index da1c79865a7..474fddb2520 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -7,10 +7,10 @@ let
inherit (lib) optional;
in
stdenv.mkDerivation rec {
- name = "pcmanfm-1.3.1";
+ name = "pcmanfm-1.3.2";
src = fetchurl {
url = "mirror://sourceforge/pcmanfm/${name}.tar.xz";
- sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
+ sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc=";
};
buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ];
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 2e7c77c0935..6aa1099c35c 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "pwsafe";
- version = "3.53.0";
+ version = "3.55.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv";
+ sha256 = "sha256-+Vfwz8xGmSzFNdiN5XYkRqGmFuBVIgexXdH3B+XYY3o=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix
index a042cc53c05..2b97d2f0188 100644
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "spicetify-cli";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
- sha256 = "08rnwj7ggh114n3mhhm8hb8fm1njgb4j6vba3hynp8x1c2ngidff";
+ sha256 = "sha256-Gkq19OlX6ci2i5mno77O/v3VfUkv6FRQFcH98qaUuXs=";
};
- vendorSha256 = "0k06c3jw5z8rw8nk4qf794kyfipylmz6x6l126a2snvwi0lmc601";
+ vendorSha256 = "sha256-ARhWKYh8Wy2UEYGabn6l/kbnJ0nHYTIt4hn9wuVgBkw=";
# used at runtime, but not installed by default
postInstall = ''
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 31cfe0247ee..96a4e15adf8 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,7 +2,6 @@
, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText
## various stuff that can be plugged in
-, flashplayer, hal-flash
, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify
, gnome3/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
@@ -47,28 +46,31 @@ let
assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used
let
- enableAdobeFlash = cfg.enableAdobeFlash or false;
ffmpegSupport = browser.ffmpegSupport or false;
gssSupport = browser.gssSupport or false;
alsaSupport = browser.alsaSupport or false;
pipewireSupport = browser.pipewireSupport or false;
+ # FIXME: This should probably be an assertion now?
plugins =
let
removed = lib.filter (a: builtins.hasAttr a cfg) [
- "enableVLC"
- "enableDjvu"
- "enableMPlayer"
- "jre"
- "icedtea"
- "enableGoogleTalkPlugin"
- "enableFriBIDPlugin"
- "enableBluejeans"
+ "enableAdobeFlash"
"enableAdobeReader"
+ "enableBluejeans"
+ "enableDjvu"
+ "enableFriBIDPlugin"
+ "enableGoogleTalkPlugin"
+ "enableMPlayer"
+ "enableVLC"
+ "icedtea"
+ "jre"
];
- in if removed != []
- then throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options, except for the adobe flash player, have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."
- else lib.optional enableAdobeFlash flashplayer;
+ in if removed != [] then
+ throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."
+ else
+ []
+ ;
nativeMessagingHosts =
([ ]
@@ -88,7 +90,6 @@ let
++ lib.optional useGlvnd libglvnd
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
- ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
++ lib.optional (config.pulseaudio or true) libpulseaudio
++ lib.optional alsaSupport alsaLib
++ pkcs11Modules;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
deleted file mode 100644
index 1a4f9b4ec7b..00000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, alsaLib
-, atk
-, bzip2
-, cairo
-, curl
-, expat
-, fontconfig
-, freetype
-, gdk-pixbuf
-, glib
-, glibc
-, graphite2
-, gtk2
-, harfbuzz
-, libICE
-, libSM
-, libX11
-, libXau
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXdmcp
-, libXext
-, libXfixes
-, libXi
-, libXinerama
-, libXrandr
-, libXrender
-, libXt
-, libXxf86vm
-, libdrm
-, libffi
-, libglvnd
-, libpng
-, libvdpau
-, libxcb
-, libxshmfence
-, nspr
-, nss
-, pango
-, pcre
-, pixman
-, zlib
-, unzip
-, debug ? false
-
-/* you have to add ~/mm.cfg :
-
- TraceOutputFileEnable=1
- ErrorReportingEnable=1
- MaxWarnings=1
-
- in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
- Then FlashBug (a FireFox plugin) shows the log as well
-*/
-
-}:
-
-let
- arch =
- if stdenv.hostPlatform.system == "x86_64-linux" then
- "x86_64"
- else if stdenv.hostPlatform.system == "i686-linux" then
- "i386"
- else throw "Flash Player is not supported on this platform";
- lib_suffix =
- if stdenv.hostPlatform.system == "x86_64-linux" then
- "64"
- else
- "";
-in
-stdenv.mkDerivation rec {
- pname = "flashplayer";
- version = "32.0.0.465";
-
- src = fetchurl {
- url =
- if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_npapi_linux_debug.${arch}.tar.gz"
- else
- "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
- sha256 =
- if debug then
- if arch == "x86_64" then
- "04p70zc4y7k1klsxa70ngl7g5q6pf2n4018r7d5n6wg2961mjk3y"
- else
- "1avslj2ssp9fcvygcc8f578gpj3bbbpvap4ssr7ag6xn6mh15adw"
- else
- if arch == "x86_64" then
- "0dbccg7ijlr9wdjkh6chbw0q1qchycbi1a313hrrc613k3djw3x9"
- else
- "1mhbkb2d6ky1xlgx55yip1l9kh5nq35jjbbm6hf6ckai146j3dr7";
- };
-
- nativeBuildInputs = [ unzip ];
-
- sourceRoot = ".";
-
- dontStrip = true;
- dontPatchELF = true;
-
- preferLocalBuild = true;
-
- installPhase = ''
- mkdir -p $out/lib/mozilla/plugins
- cp -pv libflashplayer.so $out/lib/mozilla/plugins
-
- mkdir -p $out/bin
- cp -pv usr/bin/flash-player-properties $out/bin
-
- mkdir -p $out/lib${lib_suffix}/kde4
- cp -pv usr/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so $out/lib${lib_suffix}/kde4
-
- patchelf --set-rpath "$rpath" \
- $out/lib/mozilla/plugins/libflashplayer.so \
- $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so
-
- patchelf \
- --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- --set-rpath "$rpath" \
- $out/bin/flash-player-properties
- '';
-
- passthru = {
- mozillaPlugin = "/lib/mozilla/plugins";
- };
-
- rpath = lib.makeLibraryPath
- [ stdenv.cc.cc
- alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
- glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
- libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
- libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng
- libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib
- ];
-
- meta = {
- description = "Adobe Flash Player browser plugin";
- homepage = "http://www.adobe.com/products/flashplayer/";
- license = lib.licenses.unfree;
- maintainers = with lib.maintainers; [ taku0 ];
- platforms = [ "x86_64-linux" "i686-linux" ];
- };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
deleted file mode 100644
index ed95d02ade4..00000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, alsaLib
-, atk
-, bzip2
-, cairo
-, curl
-, expat
-, fontconfig
-, freetype
-, gdk-pixbuf
-, glib
-, glibc
-, graphite2
-, gtk2
-, harfbuzz
-, libICE
-, libSM
-, libX11
-, libXau
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXdmcp
-, libXext
-, libXfixes
-, libXi
-, libXinerama
-, libXrandr
-, libXrender
-, libXt
-, libXxf86vm
-, libdrm
-, libffi
-, libglvnd
-, libpng
-, libvdpau
-, libxcb
-, libxshmfence
-, nspr
-, nss
-, pango
-, pcre
-, pixman
-, zlib
-, unzip
-, debug ? false
-}:
-
-stdenv.mkDerivation {
- pname = "flashplayer-standalone";
- version = "32.0.0.465";
-
- src = fetchurl {
- url =
- if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz"
- else
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
- sha256 =
- if debug then
- "1ija3z5bxg0ppx9r237cxs1cdrhk6pia2kcxbrm6y30kvzrd3nqs"
- else
- "1hwnvwph7p3nfv2xf7kjw3zdpb546dsia0cmhzg81z016fi7lgw8";
- };
-
- nativeBuildInputs = [ unzip ];
-
- sourceRoot = ".";
-
- dontStrip = true;
- dontPatchELF = true;
-
- preferLocalBuild = true;
-
- installPhase = ''
- mkdir -p $out/bin
- cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin
-
- patchelf \
- --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- --set-rpath "$rpath" \
- $out/bin/flashplayer${lib.optionalString debug "debugger"}
- '';
-
- rpath = lib.makeLibraryPath
- [ stdenv.cc.cc
- alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
- glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
- libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
- libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng
- libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib
- ];
-
- meta = {
- description = "Adobe Flash Player standalone executable";
- homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html";
- license = lib.licenses.unfree;
- maintainers = with lib.maintainers; [ taku0 ];
- platforms = [ "x86_64-linux" ];
- # Application crashed with an unhandled SIGSEGV
- # Not on all systems, though. Video driver problem?
- broken = false;
- };
-}
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 810ea11b017..6b1df1acf5a 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloudflared";
- version = "2021.1.5";
+ version = "2021.2.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
- sha256 = "sha256-nknRQdlYVfqCi9SMVTak615Yn/9N99+zHITDKL5nZ00=";
+ sha256 = "sha256-kmlyj6Q+OAJ0cKMeWxajPDBm99WpRf+Gpvc+Jy79DCo=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix
index 6be32ed17a4..ffc682ca4d9 100644
--- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix
+++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
- version = "0.8.5";
+ version = "0.8.6";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
- sha256 = "0lm691w4v2sdv5i2dkszwv6g11ig2aavlbxh40kjlmc05dz7dapv";
+ sha256 = "sha256-8qY99sEEOFY2eMfuZSWv49nw1LKVHn50P1gYQN6y2f4=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix
index 293cdb67371..44ad3dfd72c 100644
--- a/pkgs/applications/networking/cluster/tanka/default.nix
+++ b/pkgs/applications/networking/cluster/tanka/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tanka";
- version = "0.12.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
- sha256 = "1f67b236njz1qdxjyf2568vkigjmpylqlra29jlgm6vhd5qky7ia";
+ sha256 = "sha256-y2HhtYKgC9Y397dZ14eQoPZxqS1fTOXVD8B4wdLIHzM=";
};
- vendorSha256 = "1pr265g11lcviqw974lf05q52qrfpwnpn9a64q6088g0nfp4ly06";
+ vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index a185c64646f..415a895e523 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.18.5";
+ version = "0.18.8";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "0msfc2cgfq7dz02n2z898iw2bx98qsny3j4pzja767vcdpnzjmr5";
+ sha256 = "sha256-ICJrY4XUrxVeZlMx69SB/ounfIwLFSguf9bhLOpYP3E=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index 9fc7a84231b..9d085b6c883 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "grisbi";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
- sha256 = "sha256-b3I87tlXhIjM/bFjhsJTNFQvZxIGKsIbsf4zZT5sHXg=";
+ sha256 = "sha256-hFLiVHyEekCP9btO75e5ni70ZcLhjbBGCBjF2gERIqs=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix
index 276581d80e5..c927d77bef4 100644
--- a/pkgs/applications/radio/flrig/default.nix
+++ b/pkgs/applications/radio/flrig/default.nix
@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
- version = "1.3.53";
+ version = "1.3.54";
pname = "flrig";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
- sha256 = "1m0fa891scpaf719002w9gpg1famx84kpzav1mw1fafmbzyvjw1i";
+ sha256 = "sha256-zw0xi4AVnm8Vi/oWkh13C9BjabOKUtZaVmLN++zKGug=";
};
buildInputs = [
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index a7fe948ecfd..34586384737 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "star";
- version = "2.7.6a";
+ version = "2.7.7a";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
- sha256 = "1zw9f4jbhz0y51namnmid42pa7pviviy94q9db8w0774nksdf8is";
+ sha256 = "sha256-0K49yjcnTzC56ZIB20OeTiMJ5EW8mRx+xEpyWEfFcts=";
};
sourceRoot = "source/source";
diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix
index 3abfd3a3139..3129bd2e208 100644
--- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix
@@ -8,13 +8,13 @@ let
in crystal.buildCrystalPackage rec {
pname = "thicket";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "taylorthurlow";
repo = pname;
rev = "v${version}";
- sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw";
+ sha256 = "sha256-A89E0CbV7VFB7W4ycFcZloP0J/d42agEuD+hs9a6a6E=";
};
format = "shards";
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index cdef71c965e..72170401d79 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
- sha256 = "03kk3vg0r88317zv8j2bj44wq2fwxi25rv1aasvayrh1i5j6zr10";
+ sha256 = "sha256-hirT0gScC2LFPvygywgPiSVDUE/Zd++62wc26HlufYU=";
};
- cargoSha256 = "0m4sv4chxzk60njixlyja44rpn04apf3bm04fgd3v7abpr169f2s";
+ cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM=";
buildInputs = [ makeWrapper libX11 libXinerama ];
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index 95e5061a985..15a3d918b95 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "lxpanel";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchurl {
url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
- sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26";
+ sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug=";
};
nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ];
diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 8013b443162..daadebf4c4d 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -3,11 +3,11 @@
stdenvNoCC.mkDerivation rec {
pname = "fasm-bin";
- version = "1.73.25";
+ version = "1.73.27";
src = fetchurl {
url = "https://flatassembler.net/fasm-${version}.tgz";
- sha256 = "0k3h61mfwslyb34kf4dnapfwl8jxlmrp4dv666wc057hkj047knn";
+ sha256 = "sha256-aAFIN3+207ZmOFKID6oDUU1zJrWZV0LTOofiRPSM8LE=";
};
installPhase = ''
diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix
index bf50401a213..75b26695e2f 100644
--- a/pkgs/development/libraries/aws-checksums/default.nix
+++ b/pkgs/development/libraries/aws-checksums/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-checksums";
- version = "0.1.10";
+ version = "0.1.11";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb";
+ sha256 = "sha256-fXu7GI2UR9QiBGP2n2pEFRjz9ZwA+BAK9zxhNnoYWt4=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index 3e4b68ec79c..4efc713bb1d 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "gensio";
- version = "2.2.3";
+ version = "2.2.4";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-jWKm64RvVkeA/Zvy8VIAXMykuqv2FEzsduN2zcPm4ME=";
+ sha256 = "sha256-tdMdIudB8zZWXF+Q0YhFo9Q4VHjLJh3rdfQsYhgo2DU=";
};
passthru = {
diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix
index ba4f84f8c80..db6c9f93fae 100644
--- a/pkgs/development/libraries/libebur128/default.nix
+++ b/pkgs/development/libraries/libebur128/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }:
stdenv.mkDerivation rec {
- version = "1.2.4";
+ version = "1.2.5";
pname = "libebur128";
src = fetchFromGitHub {
owner = "jiixyj";
repo = "libebur128";
rev = "v${version}";
- sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g";
+ sha256 = "sha256-B6MOSbLfPvadXtXHSvxZCIpAH1Bnj6sItYRp+xH5HDA=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index f38f09410ff..01c10dab60a 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,12 +1,12 @@
{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }:
stdenv.mkDerivation rec {
- version = "20201210";
+ version = "20201230";
pname = "libewf";
src = fetchurl {
url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
- sha256 = "sha256-dI1We2bsBRDcyqd6HLC7eBE99dpzSkhHtNgt0ZE4aDc=";
+ sha256 = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index 72fbcd1ab08..2f8aab830da 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -4,11 +4,11 @@
# the ngspice derivation.
stdenv.mkDerivation rec {
pname = "libngspice";
- version = "33";
+ version = "34";
src = fetchurl {
url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
- sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr";
+ sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U=";
};
nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index a6b17016719..c3852f25741 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "libosinfo";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchurl {
url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1988l5rykpzvml1l7bi2hcax0gdc811vja0f92cnr7r01nz35zs9";
+ sha256 = "sha256-tPNBgVTvP0PZQggnKUkWrqGCcCGvwG4WRPxWlRgwo1k=";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix
index 443791f2451..8bf2e2acff9 100644
--- a/pkgs/development/libraries/libuchardet/default.nix
+++ b/pkgs/development/libraries/libuchardet/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
- doCheck = true;
+ doCheck = !stdenv.isi686; # tests fail on i686
meta = with lib; {
description = "Mozilla's Universal Charset Detector C/C++ API";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 7dddd2bc67d..a4ac41d81df 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -5,8 +5,7 @@
, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
, alsaLib
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
-, flashplayerFix ? false, gdk-pixbuf
-, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
+, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf
, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
, developerBuild ? false
, docs ? false
@@ -108,10 +107,6 @@ stdenv.mkDerivation rec {
libgnomeui = libgnomeui.out;
gnome_vfs = gnome_vfs.out;
}))
- ++ lib.optional flashplayerFix (substituteAll {
- src = ./dlopen-webkit-nsplugin.diff;
- gtk = gtk2.out;
- })
++ lib.optional stdenv.isAarch64 (fetchpatch {
url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch";
sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff
deleted file mode 100644
index d2ebbf3b45a..00000000000
--- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index 19941d6..0ec15e2 100644
---- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -121,7 +121,7 @@ static void initializeGtk(QLibrary* module = 0)
- }
- }
-
-- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0"));
-+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
- if (library.load()) {
- typedef void *(*gtk_init_check_ptr)(int*, char***);
- gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index 2fe69d1..b658e4a 100644
---- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -857,7 +857,7 @@ static Display *getPluginDisplay()
- // support gdk based plugins (like flash) that use a different X connection.
- // The code below has the same effect as this one:
- // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0);
- if (!library.load())
- return 0;
-
-diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
-index 2c9b465..56b3074 100644
---- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
-+++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
-@@ -42,7 +42,7 @@ namespace WebKit {
- #if PLATFORM(QT)
- static void initializeGTK()
- {
-- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0"));
-+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
- if (library.load()) {
- typedef void *(*gtk_init_check_ptr)(int*, char***);
- gtk_init_check_ptr gtkInitCheck = reinterpret_cast(library.resolve("gtk_init_check"));
-diff --git a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index b8c8f2a..e7f4dc5 100644
---- a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -54,7 +54,7 @@ static Display *getPluginDisplay()
- // The code below has the same effect as this one:
- // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-
-- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0);
- if (!library.load())
- return 0;
-
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index ed41a4ac9bc..288a0e30f69 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -1,10 +1,9 @@
{ qtModule, stdenv, lib, fetchurl
, qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel
-, fontconfig, gtk2, libwebp, libxml2, libxslt
+, fontconfig, libwebp, libxml2, libxslt
, sqlite, systemd, glib, gst_all_1, cmake
, bison, flex, gdb, gperf, perl, pkg-config, python2, ruby
, darwin
-, flashplayerFix ? false
}:
let
@@ -58,12 +57,6 @@ qtModule {
++ optional stdenv.cc.isGNU "-Wno-class-memaccess"
# with clang this warning blows the log over Hydra's limit
++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
- ++ optionals flashplayerFix
- [
- ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''
- # this file used to exist in gdk_pixbuf?
- ''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"''
- ]
++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
doCheck = false; # fails 13 out of 13 tests (ctest)
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 2c4198d9679..5bfef9e8ba3 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "openlibm";
- version = "0.7.3";
+ version = "0.7.4";
src = fetchurl {
url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
- sha256 = "0m3khv7qidhfly634bf5w0ci5qnvndmihc4a836a0cy047pw9g6k";
+ sha256 = "sha256-61hSBNbJlWkeVUXqT/y4h8FZvwXMXuG7+Spvzd4vzK4=";
};
makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix
index 560a991c44a..4e6e49d68c4 100644
--- a/pkgs/development/libraries/tiledb/default.nix
+++ b/pkgs/development/libraries/tiledb/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "tiledb";
- version = "2.1.3";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "TileDB-Inc";
repo = "TileDB";
rev = version;
- sha256 = "1ia00bk6dc1176arf84lx08x4c7c74q7ycn7dqjnmyxkg3kmr21g";
+ sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg=";
};
# (bundled) blosc headers have a warning on some archs that it will be using
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index cd2ddf9da69..589753cd1cb 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
buildPythonPackage rec {
- version = "1.5.0";
+ version = "1.6.0";
pname = "confluent-kafka";
src = fetchPypi {
inherit pname version;
- sha256 = "9ac812006000887f76c95b8a33a9f0b65845bf072fbc54a42a1acffd34e41120";
+ sha256 = "8a9caabdb02e87cd65c7f10f689ba3f1a15f8774de455e96fa5fc56eecfee63c";
};
buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;
diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix
index 1b49ffa1539..73307c75b8b 100644
--- a/pkgs/development/python-modules/py-multihash/default.nix
+++ b/pkgs/development/python-modules/py-multihash/default.nix
@@ -1,49 +1,44 @@
{ base58
, buildPythonPackage
, fetchFromGitHub
-, isPy27
, lib
, morphys
-, pytest
-, pytestcov
-, pytestrunner
+, pytest-runner
+, pytestCheckHook
+, pythonOlder
, six
-, variants
, varint
}:
buildPythonPackage rec {
pname = "py-multihash";
- version = "1.0.0";
+ version = "2.0.1";
+ disabled = pythonOlder "3.4";
src = fetchFromGitHub {
owner = "multiformats";
repo = pname;
rev = "v${version}";
- sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z";
+ sha256 = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA=";
};
nativeBuildInputs = [
- pytestrunner
+ pytest-runner
];
propagatedBuildInputs = [
base58
morphys
six
- variants
varint
];
checkInputs = [
- pytest
- pytestcov
+ pytestCheckHook
];
pythonImportsCheck = [ "multihash" ];
- disabled = isPy27;
-
meta = with lib; {
description = "Self describing hashes - for future proofing";
homepage = "https://github.com/multiformats/py-multihash";
diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix
index 51b363c6be3..3455d78b23f 100644
--- a/pkgs/development/tools/analysis/svlint/default.nix
+++ b/pkgs/development/tools/analysis/svlint/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "svlint";
- version = "0.4.8";
+ version = "0.4.16";
src = fetchFromGitHub {
owner = "dalance";
repo = "svlint";
rev = "v${version}";
- sha256 = "1anbanvaikj8g5jcmjd165krzvjdwj1cl8f3vm1nmy997x8vxihf";
+ sha256 = "sha256-2PYHKJ141RWdUIDAKAFK6IzR4C41bHi/A8lDErSRLnU=";
};
- cargoSha256 = "18xnqsrnf2gc9zny8ayzf1bah8mq1fy5k807cz039gqz36cvnma0";
+ cargoSha256 = "sha256-x5wU0Ld4ssRoNqo9graJhjlpel+VdVdkKZMjHFqZsrE=";
meta = with lib; {
description = "SystemVerilog linter";
diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix
index 4360a3f3a30..1fb4206d5ce 100644
--- a/pkgs/development/tools/build-managers/samurai/default.nix
+++ b/pkgs/development/tools/build-managers/samurai/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "samurai";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "michaelforney";
repo = pname;
rev = version;
- sha256 = "0k0amxpi3v9v68a8vc69r4b86xs12vhzm0wxd7f11vap1pnqz2cz";
+ sha256 = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI=";
};
makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index ed9205ee251..3fda533c527 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "git-quick-stats";
- version = "2.1.5";
+ version = "2.1.6";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
- sha256 = "sha256-d5B+SSUXtOD4x+dChQsUCkiHuHcW3lOrL4QhQekY7cA=";
+ sha256 = "sha256-l3Aftu1RkcDgzdzrKIAlziDgbjYfj5xLIbysS0a5JZw=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix
index 9ad85e840ba..6b7b13437cc 100644
--- a/pkgs/development/tools/glpaper/default.nix
+++ b/pkgs/development/tools/glpaper/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation {
name = "glpaper";
- version = "unstable-2020-03-30";
+ version = "unstable-2020-10-11";
src = fetchhg {
url = "https://hg.sr.ht/~scoopta/glpaper";
- rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2";
- sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs";
+ rev = "9e7ec7cd270af330039c395345c7d23c04682267";
+ sha256 = "sha256-yBHRg6eg+PK/ixuM0MBty3RJY9qcemr3Dt+8SAitqnk=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix
index 1515dae3391..94f9b6d8ebe 100644
--- a/pkgs/development/tools/go-swagger/default.nix
+++ b/pkgs/development/tools/go-swagger/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-swagger";
- version = "0.26.0";
+ version = "0.26.1";
src = fetchFromGitHub {
owner = "go-swagger";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-mBBjZRjaD1m6sIKR1/MRAKW25bGVNihxBwQMbw/lby4=";
+ sha256 = "sha256-gA7YpzroIP26u/kmbwlcYkWVfeJ8YDEAl0H9GGQrXA8=";
};
- vendorSha256 = "sha256-Am0ypcViUcAcf96qv5qE7K3FvQuQs1XlpIqZf2upWyc=";
+ vendorSha256 = "sha256-eRcE6ai7076HqTWRJ8zKoV6/PJRgUpKvKF+0T7MgLQE=";
doCheck = false;
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 35ac0dbc6a5..68841d48d47 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cfr";
- version = "0.150";
+ version = "0.151";
src = fetchurl {
url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
- sha256 = "09lq21phnhr374wb8gj355jsqj8c4m5m818r3pbr8f8zpaamjxfj";
+ sha256 = "sha256-MW6QFbmvKVP8/0/oa/O7pwXzLnzSW9blNcaY3ool6Dc=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix
index 0c1bb8ede1b..0cfbd0680ba 100644
--- a/pkgs/development/tools/misc/semver-tool/default.nix
+++ b/pkgs/development/tools/misc/semver-tool/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "semver-tool";
- version = "2.1.0";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "fsaintjacques";
repo = pname;
rev = version;
- sha256 = "0lpwsa86qb5w6vbnsn892nb3qpxxx9ifxch8pw3ahzx2dqhdgnrr";
+ sha256 = "sha256-coy/g4nEvSN+0/aqK2r3EEIaoUcnsZhzX66H1qsK9ac=";
};
dontBuild = true; # otherwise we try to 'make' which fails.
diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix
index 9cae7b90169..c6915e294d2 100644
--- a/pkgs/development/tools/misc/svls/default.nix
+++ b/pkgs/development/tools/misc/svls/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "svls";
- version = "0.1.18";
+ version = "0.1.25";
src = fetchFromGitHub {
owner = "dalance";
repo = "svls";
rev = "v${version}";
- sha256 = "08n2sp0yj7ql5aagxw94dn8bx2jkigs9zlylf5zkg673bh54829x";
+ sha256 = "sha256-+o15rElJZXQu2Hq1/79ms9wqYimINrViSdQltSJlGN8=";
};
- cargoSha256 = "0k8x6kgxc2w7ldi456s4kg4v80b064drfa26zg5chcmcrr5zgmyv";
+ cargoSha256 = "sha256-zLDUQcnvjyr+QJLVq6ADGPee0Fd7HeDhPAkb05hYLcE=";
meta = with lib; {
description = "SystemVerilog language server";
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 8d16b2fe59c..7b644aa7147 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
- version = "0.26.0";
+ version = "0.26.1";
src = fetchFromGitHub {
owner = "crawl";
repo = "crawl";
rev = version;
- sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi";
+ sha256 = "sha256-lh0lCMZRH+c6jSHjLFDU3wjy6Oyp59ZcPaqg5PWVrkk=";
};
# Patch hard-coded paths and remove force library builds
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 9db8a95746d..356cedd3507 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -42,7 +42,7 @@ let
releaseType=alpha
version=0.17.74
- nix-prefetch-url file://$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz
+ nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz
Note the ultimate "_" is replaced with "-" in the --name arg!
'';
diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index 4208df3acd0..a8f49d59954 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -2,56 +2,56 @@
"x86_64-linux": {
"alpha": {
"experimental": {
- "name": "factorio_alpha_x64-1.1.19.tar.xz",
+ "name": "factorio_alpha_x64-1.1.21.tar.xz",
"needsAuth": true,
- "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r",
+ "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.19/alpha/linux64",
- "version": "1.1.19"
+ "url": "https://factorio.com/get-download/1.1.21/alpha/linux64",
+ "version": "1.1.21"
},
"stable": {
- "name": "factorio_alpha_x64-1.1.19.tar.xz",
+ "name": "factorio_alpha_x64-1.1.21.tar.xz",
"needsAuth": true,
- "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r",
+ "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.19/alpha/linux64",
- "version": "1.1.19"
+ "url": "https://factorio.com/get-download/1.1.21/alpha/linux64",
+ "version": "1.1.21"
}
},
"demo": {
"experimental": {
- "name": "factorio_demo_x64-1.1.19.tar.xz",
+ "name": "factorio_demo_x64-1.1.21.tar.xz",
"needsAuth": false,
- "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr",
+ "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.19/demo/linux64",
- "version": "1.1.19"
+ "url": "https://factorio.com/get-download/1.1.21/demo/linux64",
+ "version": "1.1.21"
},
"stable": {
- "name": "factorio_demo_x64-1.1.19.tar.xz",
+ "name": "factorio_demo_x64-1.1.21.tar.xz",
"needsAuth": false,
- "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr",
+ "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.19/demo/linux64",
- "version": "1.1.19"
+ "url": "https://factorio.com/get-download/1.1.21/demo/linux64",
+ "version": "1.1.21"
}
},
"headless": {
"experimental": {
- "name": "factorio_headless_x64-1.1.19.tar.xz",
+ "name": "factorio_headless_x64-1.1.21.tar.xz",
"needsAuth": false,
- "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks",
+ "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.19/headless/linux64",
- "version": "1.1.19"
+ "url": "https://factorio.com/get-download/1.1.21/headless/linux64",
+ "version": "1.1.21"
},
"stable": {
- "name": "factorio_headless_x64-1.1.19.tar.xz",
+ "name": "factorio_headless_x64-1.1.21.tar.xz",
"needsAuth": false,
- "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks",
+ "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.19/headless/linux64",
- "version": "1.1.19"
+ "url": "https://factorio.com/get-download/1.1.21/headless/linux64",
+ "version": "1.1.21"
}
}
}
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 1729e2fc285..961842e8701 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,15 +1,34 @@
-{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkg-config, makeWrapper
-, SDL2, glew, openal, libvorbis, libogg, curl, freetype, bluez, libjpeg, libpng, enet, harfbuzz
-, mcpp, wiiuse, angelscript
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, fetchsvn
+, cmake
+, pkg-config
+, makeWrapper
+, SDL2
+, glew
+, openal
+, libvorbis
+, libogg
+, curl
+, freetype
+, bluez
+, libjpeg
+, libpng
+, enet
+, harfbuzz
+, mcpp
+, wiiuse
+, angelscript
}:
-
let
dir = "stk-code";
assets = fetchsvn {
- url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
- rev = "18218";
+ url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
+ rev = "18218";
sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw";
- name = "stk-assets";
+ name = "stk-assets";
};
# List of bundled libraries in stk-code/lib to keep
@@ -36,19 +55,28 @@ let
# Not packaged to this date
"sheenbidi"
];
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
pname = "supertuxkart";
version = "1.2";
src = fetchFromGitHub {
- owner = "supertuxkart";
- repo = "stk-code";
- rev = version;
+ owner = "supertuxkart";
+ repo = "stk-code";
+ rev = version;
sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6";
- name = dir;
+ name = dir;
};
+ patches = [
+ (fetchpatch {
+ # Fix build with SDL 2.0.14
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch?id=288360dc7ce2f968a2f12099edeace3f3ed1a705";
+ sha256 = "1jgab9393qan8qbqf5bf8cgw4mynlr5a6pggqhybzsmaczgnns3n";
+ })
+ ];
+
# Deletes all bundled libs in stk-code/lib except those
# That couldn't be replaced with system packages
postPatch = ''
@@ -58,12 +86,25 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
- SDL2 glew openal libvorbis libogg freetype curl bluez libjpeg libpng enet harfbuzz
- mcpp wiiuse angelscript
+ SDL2
+ glew
+ openal
+ libvorbis
+ libogg
+ freetype
+ curl
+ bluez
+ libjpeg
+ libpng
+ enet
+ harfbuzz
+ mcpp
+ wiiuse
+ angelscript
];
cmakeFlags = [
- "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs
+ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs
"-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0
"-DCHECK_ASSETS=OFF"
"-DUSE_SYSTEM_WIIUSE=ON"
diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
index 917cf328e7e..af3740ae926 100644
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
- version = "3.12.8";
+ version = "3.12.12";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
- sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7";
+ sha256 = "sha256-C5Mhn4v0dCAVGuYxi/3YMQKGUBkdBBXYGfsM1heJkQg=";
};
dontUnpack = true;
diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix
deleted file mode 100644
index 70dab152c72..00000000000
--- a/pkgs/os-specific/linux/hal-flash/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }:
-
-stdenv.mkDerivation {
- name = "hal-flash-0.3.3";
-
- src = fetchurl {
- url = "https://github.com/cshorler/hal-flash/archive/v0.3.3.tar.gz";
- sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ autoconf automake dbus glib libtool udisks2 ];
-
- preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing";
-
- meta = with lib; {
- homepage = "https://github.com/cshorler/hal-flash";
- description = "libhal stub library to satisfy the Flash Player DRM requirements";
- longDescription =
- ''
- Stub library based loosely upon libhal.[ch] from the hal-0.5.14
- package. Provides the minimum necessary functionality to enable
- libflashplayer.so/libadobecp.so to play back DRM content.
- '';
- license = with licenses; [ afl21 gpl2 ];
- maintainers = with maintainers; [ malyn ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix
new file mode 100644
index 00000000000..c477e6f3679
--- /dev/null
+++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix
@@ -0,0 +1,66 @@
+{ stdenv
+, lib
+, pkg-config
+, meson
+, ninja
+, fetchFromGitLab
+, libgudev
+, glib
+, gobject-introspection
+, gettext
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_412
+, libxml2
+, libxslt
+, upower
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+ pname = "power-profiles-daemon";
+ version = "0.1";
+
+ outputs = [ "out" "devdoc" ];
+
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "hadess";
+ repo = "power-profiles-daemon";
+ rev = version;
+ sha256 = "012w3aryw5d43dr9jj5i6wy2a0n21jidr4ggs9ix7d4z9byr175w";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ meson
+ ninja
+ gettext
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_412
+ libxml2 # for xmllint for stripping GResources
+ libxslt # for xsltproc for building docs
+ gobject-introspection
+ ];
+
+ buildInputs = [
+ libgudev
+ systemd
+ upower
+ glib
+ ];
+
+ mesonFlags = [
+ "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+ "-Dgtk_doc=true"
+ ];
+
+ meta = with lib; {
+ homepage = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon";
+ description = "Makes user-selected power profiles handling available over D-Bus";
+ platforms = platforms.linux;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ mvnetbiz ];
+ };
+}
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 0902ce3d612..4cf3e1f7dd1 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "psmisc";
- version = "23.3";
+ version = "23.4";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1132xvrldv0dar2mf221mv5kvajq0v6yrq8k3nl0wslnh5baa0r0";
+ sha256 = "sha256-s7omgtsNooYqhr4JUTZ6WCtPaZVC1ujJGz6KxUBWIs8=";
};
nativeBuildInputs = [ autoconf automake gettext ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 95506e378f2..2f97cb4a968 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2021.2.1";
+ version = "2021.2.2";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c0dee737646..9183ff7196b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -56,7 +56,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2021.2.1";
+ hassVersion = "2021.2.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -75,7 +75,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "0a8l23n6j0x1hjcifajgbrip7b4l8xcgxn2wa1lcg27p1cghrv5m";
+ sha256 = "0y7yj3kwk2454yghslvv5s2783rch9pznhxrw4mh3plr6qzi70rp";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@@ -200,6 +200,8 @@ in with py.pkgs; buildPythonApplication rec {
"test_secrets_credstash"
# system_log/test_init.py: assert 0 == 1 where 0 = len([])
"test_error_posted_as_event"
+ # ssdp/test_init.py: RuntimeError: Event loop is closed
+ "test_scan_match_st"
];
preCheck = ''
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index afc7c5c7453..be631dd341e 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null;
assert enableExtendedAttrs -> attr != null;
stdenv.mkDerivation rec {
- name = "lighttpd-1.4.58";
+ name = "lighttpd-1.4.59";
src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
- sha256 = "sha256-Jn/v/aE6GQ69znsVFy2L4W2pgAhFfzD93s1ygy0SbQ4=";
+ sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU=";
};
postPatch = ''
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 0e1b207a755..48b5a7195b5 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
- version = "0.37.5";
+ version = "0.37.8";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "1wvq5nx3y28w8wn6wyy650gc32hgkx7inbcylrdirhagzqhcm8z6";
+ sha256 = "sha256-T3isJcnDUvN4TCd9tZA1p46pamhdPSwIKKAOr6+1F30=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 9477da8a3f8..ff6e23bc05b 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio";
- version = "2021-01-16T02-19-44Z";
+ version = "2021-02-01T22-56-52Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-eYOarXgx5+rXCw2gMzrH1vVSsIdN4WrHrAUnnCcLtN8=";
+ sha256 = "sha256-cAQErFWFqyHJpTGxbzY5JCSH/ZV0ZZOWbh1lJmK8MlY=";
};
- vendorSha256 = "sha256-6p/DBgHawsT5PjpzwjrKgZfWm5Z6v1ozMWzGpEiB2jM=";
+ vendorSha256 = "sha256-1wnnt4QuOn+1NqZcuA43naP3KtIL5VbVr6VF3+Cu41w=";
doCheck = false;
diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix
index 520aedf2c3f..1d5715176ca 100644
--- a/pkgs/servers/monitoring/grafana-agent/default.nix
+++ b/pkgs/servers/monitoring/grafana-agent/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "grafana-agent";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "agent";
- sha256 = "092ry9gq9fpkkgsdymfwzdxz982pp0ljf2gs6mp419ivvllzwhiv";
+ sha256 = "sha256-kWl6wkyN/ytnct2MseZ5FQgOL2WeGJDFPPGJxkdcDX8=";
};
vendorSha256 = null;
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 6eb9b4eb580..0bdb0680ae9 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "pushgateway";
- version = "1.3.1";
+ version = "1.4.0";
rev = "v${version}";
goPackagePath = "github.com/prometheus/pushgateway";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "pushgateway";
- sha256 = "sha256-z8xM9rq7wKH7bwzjSmGh+2pO5Y10szmIH82ztRrOCNs=";
+ sha256 = "sha256-230JgG+TtAuopkkcUda+0hl8E6WXOtTUygWoyorLiEU=";
};
buildUser = "nix@nixpkgs";
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index 6755aeb9968..e63cf485166 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -4,19 +4,19 @@ let
generic = { subPackages, pname, postInstall ? "" }:
buildGoModule rec {
inherit pname;
- version = "6.1.2";
+ version = "6.2.3";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
- sha256 = "1g4vh4ay5m3sl00j8rn4db87kfdyxcmnaf0rxnv4ah2fbj5nrh2n";
+ sha256 = "sha256-8+ibl2D8hSzFV+snJAxRNTiyYqCndUDGVCVKt2bkPlQ=";
};
inherit subPackages postInstall;
- vendorSha256 = "12qi94k8fjx0kaq2x977yhan8ynd6j6cbqx1l60gqs2xgkm71k9r";
+ vendorSha256 = "sha256-KykxKJxel4E5VB8QAkEpBBaA7hKfSnTDkJ9qlNEln80=";
doCheck = false;
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 755dc151775..2b0be2803e2 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
- version = "0.17.2";
+ version = "0.18.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
- sha256 = "1zxx6vyf0fhrz8yqnlakszwziyq20k3kprshh414qxdpqfj9jax6";
+ sha256 = "sha256-GJKTQGMmFJeUQn02GWP4KKpKdM8eT+VxDBDzST+5NXk=";
};
- vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8";
+ vendorSha256 = "sha256-s11iJFcJ1Ez6TkhCU3VD2ThU5/9otHz5rDF8z9ux79E=";
doCheck = false;
diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix
index 4fd6a398a30..8e57e253435 100644
--- a/pkgs/servers/oauth2_proxy/default.nix
+++ b/pkgs/servers/oauth2_proxy/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "oauth2-proxy";
- version = "6.1.1";
+ version = "7.0.0";
src = fetchFromGitHub {
repo = pname;
owner = "oauth2-proxy";
- sha256 = "10vvib4089yywd10kigjszsfxkzv8xzj7dy3wr5df8h80rcfa74n";
+ sha256 = "sha256-yH60mfuYRv31I0DOEtWxqGCzKOwDYsQh4yjvYO3vq3I=";
rev = "v${version}";
};
- vendorSha256 = "0z8ibmpil899xvjaw7siswy22shjhx17a6lnjpr62paqdxy1sfwc";
+ vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU=";
# Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
buildFlagsArray = ("-ldflags=-X main.VERSION=${version}");
diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index afae82b4d39..d9a3332e021 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
- version = "0.23.5";
+ version = "0.23.10";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
- sha256 = "03wxrf9iyaianlnlcx8ks04r0snpg32a3qbq36cykcq2x55qnczq";
+ sha256 = "sha256-EkExTDU7T7FYZrDtF0AF8wjn9fp8y9SLmINYGv8zvXk=";
};
dontBuild = true;
diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix
index 9240b9c51a2..ac7f2678260 100644
--- a/pkgs/servers/tarssh/default.nix
+++ b/pkgs/servers/tarssh/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "tarssh";
- version = "0.5.0";
+ version = "0.7.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "Freaky";
repo = pname;
- sha256 = "1waxfbw9lqbqv8igb291pjqg22324lzv4p7fsdfrkvxf95jd2i03";
+ sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk=";
};
- cargoSha256 = "1f3anrh2y8yg7l4nilwk0a7c7kq5yvg07cqh75igjdb5a7p9di0j";
+ cargoSha256 = "sha256-7X9klYVZ2yE8BPuLhzWkuT7VFpmdOZGSD0D1x3kBNEs=";
meta = with lib; {
description = "A simple SSH tarpit inspired by endlessh";
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix
index 98cbf2c80f0..d3e2c6534aa 100644
--- a/pkgs/shells/zsh/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ postPatch = ''
+ # make zshrc aware of where zsh-prezto is installed
+ sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/share/zsh-prezto/|g" runcoms/zshrc
+ '';
+
installPhase = ''
mkdir -p $out/share/zsh-prezto
cp -R ./ $out/share/zsh-prezto
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 160ca5d4e06..e170aae7370 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -66,7 +66,7 @@ let
# {pkgs, ...}:
# {
# allowUnfree = false;
- # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name);
+ # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "vscode" x.name);
# }
allowUnfreePredicate = config.allowUnfreePredicate or (x: false);
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index bb763962ceb..b92344bf9c4 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
pname = "nx-libs";
- version = "3.5.99.25";
+ version = "3.5.99.26";
src = fetchFromGitHub {
owner = "ArcticaProject";
repo = "nx-libs";
rev = version;
- sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc";
+ sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ=";
};
nativeBuildInputs = [ autoconf automake libtool pkg-config which
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 1c263a1969d..ba6f9d074b2 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -18,13 +18,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
- version = "4.10";
+ version = "4.11";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "0s8lbvh2vsqphvspyjyxp5s589gf2wrjpka8v496lf6fv1nsi5s8";
+ sha256 = "1pcgxpmiiskq770sn25861dj0z8l24nzc1jbzyql7cxn0w5bnw1x";
};
postPatch = ''
diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix
index 8ed8b0b812b..3ed29af25fd 100644
--- a/pkgs/tools/admin/ssmsh/default.nix
+++ b/pkgs/tools/admin/ssmsh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssmsh";
- version = "1.4.4";
+ version = "1.4.5";
src = fetchFromGitHub {
owner = "bwhaley";
repo = pname;
rev = "v${version}";
- sha256 = "0mgx4q21f6rxih79l0hwgzwafxviz5a33dpvc5k0z172sfw0dmj1";
+ sha256 = "sha256-WZ2glv/f4LwTK/G8QdaVRIAHvgGLPLPL8xjAg/kUokQ=";
};
- vendorSha256 = "147f02bl3sf073dy2ximbavdcbphdn7djgisla1cyyy4ng6dhf7f";
+ vendorSha256 = "sha256-17fmdsfOrOaySPsXofLzz0+vmiemg9MbnWhRoZ67EuQ=";
doCheck = true;
diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix
index 309bf4803fb..2545a051080 100644
--- a/pkgs/tools/admin/stripe-cli/default.nix
+++ b/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "stripe-cli";
- version = "1.5.5";
+ version = "1.5.8";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
- sha256 = "0r0szzw3xl9cn5vcqgn6sc4wbk2j17r1rhg14qgix835lzp9wpdv";
+ sha256 = "sha256-TE6+X2UEvHyUiPB61JA9JHCJTDOvHhyt5A44cgd2Meo=";
};
- vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r";
+ vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU=";
subPackages = [
"cmd/stripe"
diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix
index a3056a80aa1..ddd37387fae 100644
--- a/pkgs/tools/filesystems/rar2fs/default.nix
+++ b/pkgs/tools/filesystems/rar2fs/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rar2fs";
- version = "1.29.2";
+ version = "1.29.4";
src = fetchFromGitHub {
owner = "hasse69";
repo = pname;
rev = "v${version}";
- sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y";
+ sha256 = "sha256-O14KuzngzsGazvwz3FCPe0SplO8I6CPJjpCLBPcZq6k=";
};
postPatch = ''
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 07d4d1dd303..92956aa53e3 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
- version = "2.9.4";
+ version = "2.9.5";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
- sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr";
+ sha256 = "sha256-KV/Ti6mPW+FASjug6q8Qfgra8L/TIyl/Y6JwANzQreE=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index a671090460e..e79774da917 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -6,12 +6,12 @@
mkDerivation rec {
pname = "calamares";
- version = "3.2.35.1";
+ version = "3.2.36";
# release including submodule
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "s2wnwcdrcJLG5NhugSkntBCYfPuv3T/9+PclbmK0BJ4=";
+ sha256 = "sha256-pgA0mRglIBObNNUQIozNy6EvJQSmHRF+kN4EjqL4tt4=";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 48d8b7c8930..dc1a49a40bf 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "1.8.10";
+ version = "1.8.11";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-S1bnzuOZGQLdVJUH+A29KxF84dj2OeLJ4XajfTDdjUY=";
+ sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA=";
};
- vendorSha256 = "sha256-X1h0EcUf8MWt929huNjt0WnhFqhVZu07JGi7c5hdXoY=";
+ vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY=";
doCheck = false;
diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix
index 4808fe3ef56..462fc51b289 100644
--- a/pkgs/tools/misc/code-minimap/default.nix
+++ b/pkgs/tools/misc/code-minimap/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "code-minimap";
- version = "0.4.3";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "wfxr";
repo = pname;
rev = "v${version}";
- sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc";
+ sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8=";
};
- cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww";
+ cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s=";
meta = with lib; {
description = "A high performance code minimap render";
diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix
index 6297e613122..783f93daab4 100644
--- a/pkgs/tools/misc/mysqltuner/default.nix
+++ b/pkgs/tools/misc/mysqltuner/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mysqltuner";
- version = "1.7.17";
+ version = "1.7.21";
src = fetchFromGitHub {
owner = "major";
repo = "MySQLTuner-perl";
rev = version;
- sha256 = "0wjdqraa6r6kd6rsgrn177dq6xsnnr1sgnbs9whknjbs4fn3wwl5";
+ sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0=";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix
index e7a5d38a916..cb3e8bd057a 100644
--- a/pkgs/tools/misc/osinfo-db-tools/default.nix
+++ b/pkgs/tools/misc/osinfo-db-tools/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db-tools";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9";
+ sha256 = "sha256-JV8ch4us7HDDAg/1qcsPa9hhygAJ8kYI31729i1SQ8A=";
};
nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ];
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 0355c65ac6c..eb267e6007a 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2021.0";
+ version = "1.2021.1";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "sha256-QERrsTB8GO+B8DZkl1Ruru9Bw+uL9ojQbJ321sbqIws=";
+ sha256 = "sha256-FOM+hao1lx6EJMccbhLzvVVmCR3F/igHTGN1vhhdmdQ=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 9d667d0ee1d..98abf7e843e 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio-client";
- version = "2021-01-16T02-45-34Z";
+ version = "2021-01-30T00-50-42Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
- sha256 = "sha256-1JUCoeLFMDvzT5KdQw+ZdYWPgdWKIL3kJ/LCIsqc6xE=";
+ sha256 = "sha256-6t9x2kViSUyZMbe9OFdoCFN4y/swelMVOm80YvOizwM=";
};
vendorSha256 = "sha256-3wWUIFpNXom2MuUEDgAAEHlWRXhUzId+shZW/i5Rw4A=";
diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix
index 65ba8d17bcb..7b9a3c42d60 100644
--- a/pkgs/tools/networking/termshark/default.nix
+++ b/pkgs/tools/networking/termshark/default.nix
@@ -2,19 +2,19 @@
buildGoModule rec {
pname = "termshark";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "gcla";
repo = "termshark";
rev = "v${version}";
- sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b";
+ sha256 = "sha256-vS6j8Mcri3SI/6HqtFX/EzVl8S0lx8fWU+0ddjzJz8g=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ wireshark-cli ];
- vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7";
+ vendorSha256 = "sha256-md9HHiYOsBimCBjD1FyjTqnskCZksQiEggWd5UW0RPM=";
doCheck = false;
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index 1497d09734f..d70d7af30b0 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Qx989u2893Jv4/ZUdSqZk+q/FUjo0GDoVzeS63AO2HA=";
+ sha256 = "sha256-OKKAYZz2ytiuc/U4fOZepBDvupzQdWC0Wk3wDi+Ih6w=";
};
- cargoSha256 = "sha256-s0RIEZw8FOdKqMXgDPNXmqp7V6flzE8eF1J/rSK+qKs=";
+ cargoSha256 = "sha256-jEplQ/r/XPvLIQrQAiR1Fde5yfE98UuqDazPcEgvo+w=";
meta = with lib; {
description = "Mirror installed software on multiple machines";
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 9ec5c3c13b3..4009d111307 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
- version = "1.12.1";
+ version = "1.13.0";
pname = "librepo";
outputs = [ "out" "dev" "py" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "rpm-software-management";
repo = "librepo";
rev = version;
- sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z";
+ sha256 = "sha256-gK1pkcZAJVXx0cYGs8PA4iPSMOwgJZI9Hqrrs1ZITDo=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index eb9fc8e7b95..bad5f3f476e 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "clamav";
- version = "0.103.0";
+ version = "0.103.1";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
- sha256 = "0ih5x1rscg2m64y0z20njj7435q8k7ss575cfw7aipdzfx979a9j";
+ sha256 = "sha256-cwjEe4myaK87nzYUBSiSekn/PmM6nJwKrCcS2BBW4lc=";
};
# don't install sample config files into the absolute sysconfdir folder
diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index 08a83f8c9b2..1222ade4ad7 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "doppler";
- version = "3.21.0";
+ version = "3.22.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
- sha256 = "sha256-ll4PabDy5xnyi+cZdjvSySizRCxthRY7uHLzdYP6U5M=";
+ sha256 = "sha256-Vx+f2IgCOdRxCVppkJNzVDBnsWjt4X96PyCJl9MmfWI=";
};
vendorSha256 = "sha256-rQrlnIYYnRc+cqyiyJoh1YqxD61doyjte7ehrX4RDTI=";
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 617224a6af3..76aea2bbd51 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -14,13 +14,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "rng-tools";
- version = "6.9";
+ version = "6.11";
src = fetchFromGitHub {
owner = "nhorman";
repo = "rng-tools";
rev = "v${version}";
- sha256 = "065jf26s8zkicb95zc9ilksjdq9gqrh5vcx3mhi6mypbnamn6w98";
+ sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M=";
};
postPatch = ''
diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index bdf2a4bcd30..6fd66b40e15 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "logcheck";
- version = "1.3.20";
+ version = "1.3.22";
_name = "logcheck_${version}";
src = fetchurl {
url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
- sha256 = "1rmkvxhcwr9gb6z4dlgr6rrx5l70hshlxdggs6qx0w1ljcmx1dlz";
+ sha256 = "sha256-e7XeRNlFsexlVskK2OnLTmNV/ES2xWU+/+AElexV6E4=";
};
prePatch = ''
diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix
index 92878c5386b..0d3b6f4d6b8 100644
--- a/pkgs/tools/system/tuptime/default.nix
+++ b/pkgs/tools/system/tuptime/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tuptime";
- version = "5.0.1";
+ version = "5.0.2";
src = fetchFromGitHub {
owner = "rfrail3";
repo = "tuptime";
rev = version;
- sha256 = "0nk3yyjavgmc435vj3f0siw4y5nwipsbcsvsf5m7mgvq0xi8f3ls";
+ sha256 = "sha256-2Q1czKvwdVq+2+64k4SOghw05CUlT5HdZpvKMRbGdDY=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index 5b03f6e89a6..97b06b9a0c7 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ansifilter";
- version = "2.17";
+ version = "2.18";
src = fetchurl {
url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
- sha256 = "0by4rhy30l7jgxvq6mwf8p43s1472q96l3g7n2skq2lnkjrvx1ar";
+ sha256 = "sha256-Zs8BfTakPV9q4gYJzjtYZHSU7mwOQfxoLFmL/859fTk=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index 03ce2eb5ee8..73370eb011e 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages
+{ lib, stdenv, fetchFromGitHub, ruby, dune_2, ocamlPackages
, ipaexfont, junicode, lmodern, lmmath
}:
let
@@ -35,12 +35,12 @@ let
in
stdenv.mkDerivation rec {
pname = "satysfi";
- version = "0.0.5";
+ version = "0.0.6";
src = fetchFromGitHub {
owner = "gfngfn";
repo = "SATySFi";
rev = "v${version}";
- sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n";
+ sha256 = "1wdmcz2b7v37msmsvjvbyj7x5a80qfws8a7w72q0g5959pw5fdxj";
fetchSubmodules = true;
};
@@ -70,7 +70,8 @@ in
meta = with lib; {
homepage = "https://github.com/gfngfn/SATySFi";
description = "A statically-typed, functional typesetting system";
- license = licenses.lgpl3;
+ changelog = "https://github.com/gfngfn/SATySFi/blob/v${version}/CHANGELOG.md";
+ license = licenses.lgpl3Only;
maintainers = [ maintainers.mt-caret maintainers.marsam ];
platforms = platforms.all;
};
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 27c2b48e66b..6452b0e49a1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -178,6 +178,9 @@ mapAliases ({
firestr = throw "firestr has been removed."; # added 2019-12-08
fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
flameGraph = flamegraph; # added 2018-04-25
+ flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
+ flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
+ flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25
flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
@@ -261,6 +264,7 @@ mapAliases ({
gupnp_igd = gupnp-igd; # added 2018-02-25
gupnptools = gupnp-tools; # added 2015-12-19
gutenberg = zola; # added 2018-11-17
+ hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
heimdalFull = heimdal; # added 2018-05-01
hepmc = hepmc2; # added 2019-08-05
hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5b76618dd3..5968d6a1154 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5017,8 +5017,6 @@ in
haste-client = callPackage ../tools/misc/haste-client { };
- hal-flash = callPackage ../os-specific/linux/hal-flash { };
-
hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
half = callPackage ../development/libraries/half { };
@@ -7181,6 +7179,8 @@ in
povray = callPackage ../tools/graphics/povray { };
+ power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { };
+
ppl = callPackage ../development/libraries/ppl { };
pplatex = callPackage ../tools/typesetting/tex/pplatex { };
@@ -22248,14 +22248,6 @@ in
flameshot = libsForQt5.callPackage ../tools/misc/flameshot { };
- flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {});
-
- flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix (config.flashplayer or {});
-
- flashplayer-standalone-debugger = flashplayer-standalone.override {
- debug = true;
- };
-
fluxbox = callPackage ../applications/window-managers/fluxbox { };
fme = callPackage ../applications/misc/fme {