From fb771b072a9049237fd8f9df198c6d3b0bfffa69 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 22:31:35 -0600 Subject: [PATCH 1/7] appimage: plumb support for extra attributes to be specified --- pkgs/build-support/appimage/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6db626464fb..82f67d8450f 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -33,7 +33,7 @@ rec { ''; }; - wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // { + wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; @@ -46,17 +46,17 @@ rec { cd $APPDIR exec ./AppRun "$@" ''; - }); + } // (builtins.removeAttrs args [ "name" "src" "extraPkgs" ])); - wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { + wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { inherit name extraPkgs; src = extractType1 { inherit name src; }; - }; + }); - wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { + wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { inherit name extraPkgs; src = extractType2 { inherit name src; }; - }; + }); defaultFhsEnvArgs = { name = "appimage-env"; From 25fb5d553cb4e97a26ef4fb0e9ab7a6b1e1df453 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 23:27:58 -0600 Subject: [PATCH 2/7] minetime: init at 1.4.10, using appimageTools --- pkgs/applications/office/minetime/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/office/minetime/default.nix diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix new file mode 100644 index 00000000000..4d566d0513f --- /dev/null +++ b/pkgs/applications/office/minetime/default.nix @@ -0,0 +1,29 @@ +{ appimageTools, fetchurl, lib }: + +let + pname = "MineTime"; + version = "1.4.10"; +in +appimageTools.wrapType2 rec { + name = "${pname}-${version}"; + src = fetchurl { + url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}-x86_64.AppImage"; + sha256 = "11w1v9vlg51masxgigraqp5547dl02jrrwhzz5gcckv4l9y8rlyw"; + }; + + extraPkgs = p: p.atomEnv.packages; + + # Ideally inherit this, but it needs to be set or the app fails to launch. + profile = '' + export LC_ALL=C.UTF8 + ''; + + meta = with lib; { + description = "Modern, intuitive and smart calendar application"; + homepage = https://minetime.ai; + license = licenses.unfree; + # Should be cross-platform, but for now we just grab the appimage + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13bc8ebfaf0..864eadc9481 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4399,6 +4399,8 @@ in mimetic = callPackage ../development/libraries/mimetic { }; + minetime = callPackage ../applications/office/minetime { }; + minio-client = callPackage ../tools/networking/minio-client { buildGoPackage = buildGo110Package; }; From 843d5b05efd0c7633141a11321101b110931a443 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 18:08:38 -0600 Subject: [PATCH 3/7] appimageTools: use functionArgs as suggested, use dynamicLinker attr --- pkgs/build-support/appimage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 82f67d8450f..c17274295c9 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -23,7 +23,7 @@ rec { buildCommand = '' install $src ./appimage patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ ./appimage @@ -46,7 +46,7 @@ rec { cd $APPDIR exec ./AppRun "$@" ''; - } // (builtins.removeAttrs args [ "name" "src" "extraPkgs" ])); + } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { inherit name extraPkgs; From 1c06590fa926f114ada7aa0be227613fac866088 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 18:19:50 -0600 Subject: [PATCH 4/7] appimageTools: small simplification --- pkgs/build-support/appimage/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index c17274295c9..f0c0faa8cda 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -49,12 +49,10 @@ rec { } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { - inherit name extraPkgs; src = extractType1 { inherit name src; }; }); wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { - inherit name extraPkgs; src = extractType2 { inherit name src; }; }); From a7065d315d574f62d2f5c161bd7d344afc5147b4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 12:12:13 -0500 Subject: [PATCH 5/7] minetime: 1.4.10 -> 1.4.11 https://github.com/marcoancona/MineTime/releases/tag/v1.4.11 --- pkgs/applications/office/minetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix index 4d566d0513f..a0f582ece47 100644 --- a/pkgs/applications/office/minetime/default.nix +++ b/pkgs/applications/office/minetime/default.nix @@ -2,13 +2,13 @@ let pname = "MineTime"; - version = "1.4.10"; + version = "1.4.11"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}-x86_64.AppImage"; - sha256 = "11w1v9vlg51masxgigraqp5547dl02jrrwhzz5gcckv4l9y8rlyw"; + sha256 = "1kdwsfr28bmnqfz4q80d7n3fqxlk70r01kx9hjz89v11slkp3pf7"; }; extraPkgs = p: p.atomEnv.packages; From 9db228d5065b6f660b4279f0a0903134097c0adc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 19 Mar 2019 10:10:31 -0500 Subject: [PATCH 6/7] minetime: 1.4.11 -> 1.4.12 --- pkgs/applications/office/minetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix index a0f582ece47..5a977bc4532 100644 --- a/pkgs/applications/office/minetime/default.nix +++ b/pkgs/applications/office/minetime/default.nix @@ -2,13 +2,13 @@ let pname = "MineTime"; - version = "1.4.11"; + version = "1.4.12"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}-x86_64.AppImage"; - sha256 = "1kdwsfr28bmnqfz4q80d7n3fqxlk70r01kx9hjz89v11slkp3pf7"; + sha256 = "1gpscil003ja35c9dax33prf5wabcwsbvrbzclpwsw5b9i2sgbpw"; }; extraPkgs = p: p.atomEnv.packages; From fc6c5fdfed9653c2c1be13d3e3896049291dac60 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 23 Apr 2019 20:43:04 -0500 Subject: [PATCH 7/7] minetime: 1.4.12 -> 1.5.1, better entrypoint name, drop unused 32bit https://github.com/marcoancona/MineTime/releases/tag/v1.5.1 https://github.com/marcoancona/MineTime/releases/tag/v1.5.0 --- pkgs/applications/office/minetime/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix index 5a977bc4532..85e8bc131ce 100644 --- a/pkgs/applications/office/minetime/default.nix +++ b/pkgs/applications/office/minetime/default.nix @@ -1,23 +1,25 @@ -{ appimageTools, fetchurl, lib }: +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: let - pname = "MineTime"; - version = "1.4.12"; + pname = "minetime"; + version = "1.5.1"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}-x86_64.AppImage"; - sha256 = "1gpscil003ja35c9dax33prf5wabcwsbvrbzclpwsw5b9i2sgbpw"; + sha256 = "0099cq4p7j01bzs7q79y9xi7g6ji17v9g7cykfjggwsgqfmvd0hz"; }; - extraPkgs = p: p.atomEnv.packages; - - # Ideally inherit this, but it needs to be set or the app fails to launch. profile = '' - export LC_ALL=C.UTF8 + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + meta = with lib; { description = "Modern, intuitive and smart calendar application"; homepage = https://minetime.ai;