From f74adda6532125cffe319f551b6f85edf4fa9096 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 24 Aug 2021 21:15:51 +0100 Subject: [PATCH 1/4] haproxy: 2.3.10 -> 2.3.13 (cherry picked from commit b919ded180a5c72b26a523197c5d9444b25db4f7) --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index bb79ad956a6..32fa2af818b 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.10"; + version = "2.3.13"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-mUbgz8g/KQcrNDHjckYiHPnUqdKKFYwHVxTTRSZvTzU="; + sha256 = "0mz2vga8wwhqa8n4psphbqfd5q33n4m8ar7ac9chhn0i397s8lf6"; }; buildInputs = [ openssl zlib ] From 6a01d735d9b98192e261e41757de09ee9c80e13e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 25 Aug 2021 21:39:25 +0100 Subject: [PATCH 2/4] icinga2: 2.12.4 -> 2.12.6 --- pkgs/servers/monitoring/icinga2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 44c512196c6..0adddb29e75 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.12.4"; + version = "2.12.6"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-SJBOZzLbmW4525G3w6BVS53kOd2bJ5rEbwwb4Lo5q8I="; + sha256 = "1xgcwdqv6qzay5qhy25jr858kgszsy84ym8v9py53rnblj1rlcpn"; }; patches = [ From 2fcab17583451191bcf2a82bf4f3aced6bca9b05 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Mon, 23 Aug 2021 12:23:59 -0700 Subject: [PATCH 3/4] unixODBC: Add additional URL (cherry picked from commit 811af99f75f55097207020678d4dd0ec479040ca) --- pkgs/development/libraries/unixODBC/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index ef70f4b2c37..2ab717782e5 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -5,7 +5,10 @@ stdenv.mkDerivation rec { version = "2.3.9"; src = fetchurl { - url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"; + urls = [ + "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" + "http://www.unixodbc.org/${pname}-${version}.tar.gz" + ]; sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc="; }; From dacd1104f698847e5ac3f3b0300f1820ab49c248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 26 Aug 2021 00:19:25 +0200 Subject: [PATCH 4/4] flexoptix-app: 5.9.0 -> 5.11.0 and fixes This update is required because the autoupdater prevents the app from running without being updated (which is not possible because it is a store path). So this updates the app and patches out the updater (essentially it never thinks it needs to update, even though it prints on the command line that it should). Also fix the desktop item. (cherry picked from commit 9aa05d18b77b20ecea5046fac4987a5130d9dfef) --- pkgs/tools/misc/flexoptix-app/default.nix | 29 ++++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 40f30bd7ad9..507fbb7dcc7 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,12 +1,12 @@ -{ lib, appimageTools, fetchurl }: let +{ lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.9.0"; + version = "5.11.0"; name = "${pname}-${version}"; src = fetchurl { name = "${name}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj"; + sha256 = "sha256:1hzdb2fbkwpsf0d3ws4z32blk6549jwhf1lrlqmcxhzqfvkr4gin"; }; udevRules = fetchurl { @@ -14,12 +14,20 @@ sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr"; }; - appimageContents = appimageTools.extractType2 { - inherit name src; - }; + appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: { + buildCommand = '' + ${oA.buildCommand} -in appimageTools.wrapType2 { - inherit name src; + # Get rid of the autoupdater + ${nodePackages.asar}/bin/asar extract $out/resources/app.asar app + sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js + ${nodePackages.asar}/bin/asar pack app $out/resources/app.asar + ''; + }); + +in appimageTools.wrapAppImage { + inherit name; + src = appimageContents; multiPkgs = null; # no 32bit needed extraPkgs = { pkgs, ... }@args: [ @@ -27,11 +35,14 @@ in appimageTools.wrapType2 { ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; extraInstallCommands = '' + # Add desktop convencience stuff mv $out/bin/{${name},${pname}} install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps substituteInPlace $out/share/applications/flexoptix-app.desktop \ - --replace 'Exec=AppRun' "Exec=$out/bin/${pname}" + --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --" + + # Add udev rules mkdir -p $out/lib/udev/rules.d ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules '';