From bbf95adcbe7b3d5266bff5ace4723e72575d24bb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 14 Oct 2021 10:40:11 -0300 Subject: [PATCH 1/2] Grammar fixup --- pkgs/top-level/aliases.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e9edb67edbe..8daf56b39555 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -540,8 +540,8 @@ mapAliases ({ minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 - mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 - mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 From 48d57557ea2523c9ab355a7d2199b01a5c7646ee Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 14 Oct 2021 10:45:06 -0300 Subject: [PATCH 2/2] minetime: removal --- pkgs/applications/office/minetime/default.nix | 50 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/applications/office/minetime/default.nix diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix deleted file mode 100644 index 1971a7829447..000000000000 --- a/pkgs/applications/office/minetime/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ appimageTools, fetchurl, lib, runCommand, stdenv, gsettings-desktop-schemas, gtk3, zlib }: - -let - name = "${pname}-${version}"; - pname = "minetime"; - version = "1.8.10"; - appimage = fetchurl { - url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage"; - sha256 = "1a80lgk6v9kv9xb2y3i08gk25jm0pqyl57kfr5p1rbc33prhmcgw"; - }; - extracted = appimageTools.extractType2 { - inherit name; - src = appimage; - }; - patched = runCommand "minetime-patchelf" {} '' - cp -av ${extracted} $out - - x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService - chmod +w $x - - patchelf \ - --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ - $x - ''; -in -appimageTools.wrapAppImage rec { - inherit name; - src = patched; - - profile = '' - 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 = ps: - appimageTools.defaultFhsEnvArgs.multiPkgs ps - ++ (with ps; [ at-spi2-core at-spi2-atk libsecret libnotify ]); - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; - - 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/aliases.nix b/pkgs/top-level/aliases.nix index 8daf56b39555..8e946d75ddb5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -539,6 +539,7 @@ mapAliases ({ mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 + minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80ea6f313f16..676b6be5f90c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7404,8 +7404,6 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { }; minio-certgen = callPackage ../tools/security/minio-certgen { };