Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-01-15 06:01:01 +00:00 committed by GitHub
commit a6317e795d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 427 additions and 208 deletions

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
version = "1.49";
version = "1.50";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
sha256 = "sha256-DpEzilMERfbop7YYqNCcxSe1qfcz4n7Uqj/i5t5a6nQ=";
sha256 = "sha256-OURD8k8DIa1DddDng55HrzgAN95srW4wm7RD7DbiJLQ=";
};
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

View File

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.22.3";
version = "0.23.0";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-28qgTWCQrFCREGNfj8bePocEpB+0AZfrKNO4akn7/5I=";
sha256 = "sha256-53DyT8tunk0s1VGrlj6qQLOKNPN4Haqdyd8ozPi5z8w=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

View File

@ -0,0 +1,14 @@
{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }:
stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/Applications
cp -r "${desktopName}.app" $out/Applications
'';
}

View File

@ -1,35 +1,89 @@
{ branch ? "stable", pkgs }:
{ branch ? "stable", pkgs, lib, stdenv }:
let
inherit (pkgs) callPackage fetchurl;
in {
stable = callPackage ./base.nix rec {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
version = "0.0.16";
src = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk=";
versions = if stdenv.isLinux then {
stable = "0.0.16";
ptb = "0.0.27";
canary = "0.0.132";
} else {
stable = "0.0.264";
ptb = "0.0.58";
canary = "0.0.280";
};
version = versions.${branch};
srcs = {
x86_64-linux = {
stable = fetchurl {
url =
"https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk=";
};
ptb = fetchurl {
url =
"https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb";
};
canary = fetchurl {
url =
"https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "1jjbd9qllgcdpnfxg5alxpwl050vzg13rh17n638wha0vv4mjhyv";
};
};
x86_64-darwin = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p";
};
ptb = fetchurl {
url =
"https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0=";
};
canary = fetchurl {
url =
"https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
sha256 = "0ccchsywry68vv81pqzzxmh1r19lnvxr429iwvgfr9y82lyjvz06";
};
};
# Only PTB bundles a MachO Universal binary with ARM support.
aarch64-darwin = {
ptb = fetchurl {
url =
"https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0=";
};
};
};
ptb = callPackage ./base.nix rec {
pname = "discord-ptb";
binaryName = "DiscordPTB";
desktopName = "Discord PTB";
version = "0.0.27";
src = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb";
src = srcs.${stdenv.hostPlatform.system}.${branch};
meta = with lib; {
description = "All-in-one cross-platform voice and text chat for gamers";
homepage = "https://discordapp.com/";
downloadPage = "https://discordapp.com/download";
license = licenses.unfree;
maintainers = with maintainers; [ ldesgoui MP2E devins2518 ];
platforms = [ "x86_64-linux" "x86_64-darwin" ]
++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ];
};
package = if stdenv.isLinux then ./linux.nix else ./darwin.nix;
packages = {
stable = callPackage package rec {
inherit src version meta;
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
};
ptb = callPackage package rec {
inherit src version meta;
pname = "discord-ptb";
binaryName = "DiscordPTB";
desktopName = "Discord PTB";
};
canary = callPackage package rec {
inherit src version meta;
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
};
};
canary = callPackage ./base.nix rec {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.132";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "1jjbd9qllgcdpnfxg5alxpwl050vzg13rh17n638wha0vv4mjhyv";
};
};
}.${branch}
in packages.${branch}

View File

@ -1,17 +1,14 @@
{ pname, version, src, binaryName, desktopName
, autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook
, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
, writeScript, common-updater-scripts
}:
{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook
, makeDesktopItem, lib, stdenv, wrapGAppsHook, alsa-lib, at-spi2-atk
, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript
, common-updater-scripts }:
let
inherit binaryName;
in stdenv.mkDerivation rec {
inherit pname version src;
stdenv.mkDerivation rec {
inherit pname version src meta;
nativeBuildInputs = [
alsa-lib
@ -33,13 +30,45 @@ in stdenv.mkDerivation rec {
dontWrapGApps = true;
libPath = lib.makeLibraryPath [
libcxx systemd libpulseaudio libdrm mesa
stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango libXScrnSaver
libappindicator-gtk3 libdbusmenu
];
libcxx
systemd
libpulseaudio
libdrm
mesa
stdenv.cc.cc
alsa-lib
atk
at-spi2-atk
at-spi2-core
cairo
cups
dbus
expat
fontconfig
freetype
gdk-pixbuf
glib
gtk3
libnotify
libX11
libXcomposite
libuuid
libXcursor
libXdamage
libXext
libXfixes
libXi
libXrandr
libXrender
libXtst
nspr
nss
libxcb
pango
libXScrnSaver
libappindicator-gtk3
libdbusmenu
];
installPhase = ''
mkdir -p $out/{bin,opt/${binaryName},share/pixmaps}
@ -56,7 +85,9 @@ in stdenv.mkDerivation rec {
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
# Without || true the install would fail on case-insensitive filesystems
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${
lib.strings.toLower binaryName
} || true
ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png
ln -s "${desktopItem}/share/applications" $out/share/
@ -76,18 +107,11 @@ in stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnugrep common-updater-scripts
set -eou pipefail;
url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
url=$(curl -sI "https://discordapp.com/api/download/${
builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname
}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
version=''${url##https://dl*.discordapp.net/apps/linux/}
version=''${version%%/*.tar.gz}
update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix
'';
meta = with lib; {
description = "All-in-one cross-platform voice and text chat for gamers";
homepage = "https://discordapp.com/";
downloadPage = "https://discordapp.com/download";
license = licenses.unfree;
maintainers = with maintainers; [ ldesgoui MP2E ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -1,65 +1,59 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, fetchpatch
, cmake
, gdk-pixbuf
, gtk3
, vala
, gettext
, meson
, ninja
, pantheon
, pkg-config
, python3
, vala
, wrapGAppsHook
, glib
, gtk3
, json-glib
, libgudev
, libevdev
, libgee
, libgudev
, libsoup
, wrapGAppsHook
, pantheon
}:
stdenv.mkDerivation rec {
pname = "spice-up";
version = "1.8.2";
version = "1.9.1";
src = fetchFromGitHub {
owner = "Philip-Scott";
repo = "Spice-up";
rev = version;
sha256 = "1pix911l4ddn50026a5sbpqfzba6fmw40m1yzbknmkgd2ny28f0m";
sha256 = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc=";
};
USER = "pbuilder";
nativeBuildInputs = [
cmake
gettext
meson
ninja
pkg-config
python3
vala
wrapGAppsHook
];
buildInputs = [
pantheon.elementary-icon-theme
pantheon.granite
gdk-pixbuf
glib
gtk3
json-glib
libevdev
libgee
libgudev
libsoup
pantheon.elementary-icon-theme
pantheon.granite
];
patches = [
# Fix build with Vala 0.46
# https://github.com/Philip-Scott/Spice-up/pull/288
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/Philip-Scott/Spice-up/pull/288.patch";
sha256 = "0kyfd8v2sk4cvcq1j8ysp64snfjhnpr3iz7l04lx7if7h372xj39";
})
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
@ -74,6 +68,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
# The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+
license = licenses.gpl3Plus;
mainProgram = "com.github.philip-scott.spice-up";
mainProgram = "com.github.philip_scott.spice-up";
};
}

View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, mkDerivation
, fetchurl
, cmake
@ -65,5 +66,6 @@ in mkDerivation rec {
homepage = "https://www.gplates.org";
license = licenses.gpl2Only;
platforms = platforms.all;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gplates.x86_64-darwin
};
}

View File

@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only;
maintainers = [ maintainers.bgamari ];
platforms = platforms.all;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/graphia.x86_64-darwin
};
}

View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "st";
version = "0.8.4";
version = "0.8.5";
src = fetchurl {
url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz";
hash = "sha256-1C087OtNamXjLpClM249RG22EsP72evBeAvGyaAzRqY=";
hash = "sha256-6mgyID7QL/dBgry4raqexFTI+YnnkjLLhZZl4vVEqzc=";
};
inherit patches;
@ -49,19 +49,17 @@ stdenv.mkDerivation rec {
libXft
] ++ extraLibs;
installPhase = ''
runHook preInstall
TERMINFO=$out/share/terminfo make install PREFIX=$out
runHook postInstall
preInstall = ''
export TERMINFO=$out/share/terminfo
'';
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://st.suckless.org/";
description = "Simple Terminal for X from Suckless.org Community";
license = licenses.mit;
maintainers = with maintainers; [ andsild ];
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.unix;
};
}

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "glitter";
version = "1.5.11";
version = "1.5.12";
src = fetchFromGitHub {
owner = "milo123459";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WAQ4DwPKkATLa52GE5LZRVY0YH4nRStjPuQg7kdXRjw=";
sha256 = "sha256-XQ3HLmT3sWjoHTxnOU9FSHbnCwitFH0tOOpT7WwTEPE=";
};
cargoSha256 = "sha256-UK3gUAs+FalqboK7MuhE9kOc/Smu/EAN0BYbgg4PWns=";
cargoSha256 = "sha256-V54Itj7/zUO1bp0y30TjV1mSo/oNJOxEofpSqrYz6xk=";
# tests require it to be in a git repository
preCheck = ''

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "luna-icons";
version = "1.8";
version = "1.9";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "1c317ac43ff70sxn1syx20qhs4nkccv6hbf69fmi3acswqsll1z4";
sha256 = "1l6jxbgq2qnw4qx0khkdxcq75v17cv2ccfnm28sslpzcc1r8amqd";
};
nativeBuildInputs = [

View File

@ -280,89 +280,128 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-autoar = callPackage ./misc/gnome-autoar { };
gnome-packagekit = callPackage ./misc/gnome-packagekit { };
} // lib.optionalAttrs (config.allowAliases or true) {
#### Legacy aliases
}) // lib.optionalAttrs (config.allowAliases or true) {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
bijiben = gnome-notes; # added 2018-09-26
evolution_data_server = evolution-data-server; # added 2018-02-25
geocode_glib = pkgs.geocode-glib; # added 2018-02-25
glib_networking = pkgs.glib-networking; # added 2018-02-25
gnome_common = gnome-common; # added 2018-02-25
gnome_control_center = gnome-control-center; # added 2018-02-25
gnome_desktop = gnome-desktop; # added 2018-02-25
gnome_keyring = gnome-keyring; # added 2018-02-25
gnome_online_accounts = gnome-online-accounts; # added 2018-02-25
gnome_session = gnome-session; # added 2018-02-25
gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25
gnome_shell = gnome-shell; # added 2018-02-25
gnome_terminal = gnome-terminal; # added 2018-02-25
gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
gnome-tweak-tool = gnome-tweaks; # added 2018-03-21
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
libgames-support = libgnome-games-support; # added 2018-03-14
libgnome_keyring = libgnome-keyring; # added 2018-02-25
inherit (pkgs) rarian; # added 2018-04-25
networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
yelp_xsl = yelp-xsl; # added 2018-02-25
yelp_tools = yelp-tools; # added 2018-02-25
bijiben = throw "The gnome.bijiben alias was removed on 2022-01-13. Please use gnome.gnome-notes directly."; # added 2018-09-26
evolution_data_server = throw "The gnome.evolution_data_server alias was removed on 2022-01-13. Please use gnome.evolution-data-server directly."; # added 2018-02-25
geocode_glib = throw "The gnome.geocode_glib alias was removed on 2022-01-13. Please use pkgs.geocode-glib directly."; # added 2018-02-25
glib_networking = throw "The gnome.glib_networking alias was removed on 2022-01-13. Please use pkgs.glib-networking directly."; # added 2018-02-25
gnome_common = throw "The gnome.gnome_common alias was removed on 2022-01-13. Please use gnome.gnome-common directly."; # added 2018-02-25
gnome_control_center = throw "The gnome.gnome_control_center alias was removed on 2022-01-13. Please use gnome.gnome-control-center directly."; # added 2018-02-25
gnome_desktop = throw "The gnome.gnome_desktop alias was removed on 2022-01-13. Please use gnome.gnome-desktop directly."; # added 2018-02-25
gnome_keyring = throw "The gnome.gnome_keyring alias was removed on 2022-01-13. Please use gnome.gnome-keyring directly."; # added 2018-02-25
gnome_online_accounts = throw "The gnome.gnome_online_accounts alias was removed on 2022-01-13. Please use gnome.gnome-online-accounts directly."; # added 2018-02-25
gnome_session = throw "The gnome.gnome_session alias was removed on 2022-01-13. Please use gnome.gnome-session directly."; # added 2018-02-25
gnome_settings_daemon = throw "The gnome.gnome_settings_daemon alias was removed on 2022-01-13. Please use gnome.gnome-settings-daemon directly."; # added 2018-02-25
gnome_shell = throw "The gnome.gnome_shell alias was removed on 2022-01-13. Please use gnome.gnome-shell directly."; # added 2018-02-25
gnome_terminal = throw "The gnome.gnome_terminal alias was removed on 2022-01-13. Please use gnome.gnome-terminal directly."; # added 2018-02-25
gnome-themes-standard = throw "The gnome.gnome-themes-standard alias was removed on 2022-01-13. Please use gnome.gnome-themes-extra directly."; # added 2018-03-14
gnome_themes_standard = throw "The gnome.gnome_themes_standard alias was removed on 2022-01-13. Please use gnome.gnome-themes-standard directly."; # added 2018-02-25
gnome-tweak-tool = throw "The gnome.gnome-tweak-tool alias was removed on 2022-01-13. Please use gnome.gnome-tweaks directly."; # added 2018-03-21
gsettings_desktop_schemas = throw "The gnome.gsettings_desktop_schemas alias was removed on 2022-01-13. Please use gnome.gsettings-desktop-schemas directly."; # added 2018-02-25
libgames-support = throw "The gnome.libgames-support alias was removed on 2022-01-13. Please use gnome.libgnome-games-support directly."; # added 2018-03-14
libgnome_keyring = throw "The gnome.libgnome_keyring alias was removed on 2022-01-13. Please use gnome.libgnome-keyring directly."; # added 2018-02-25
rarian = throw "The gnome.rarian alias was removed on 2022-01-13. Please use pkgs.rarian directly."; # added 2018-04-25
networkmanager_fortisslvpn = throw "The gnome.networkmanager_fortisslvpn alias was removed on 2022-01-13. Please use gnome.networkmanager-fortisslvpn directly."; # added 2018-02-25
networkmanager_iodine = throw "The gnome.networkmanager_iodine alias was removed on 2022-01-13. Please use gnome.networkmanager-iodine directly."; # added 2018-02-25
networkmanager_l2tp = throw "The gnome.networkmanager_l2tp alias was removed on 2022-01-13. Please use gnome.networkmanager-l2tp directly."; # added 2018-02-25
networkmanager_openconnect = throw "The gnome.networkmanager_openconnect alias was removed on 2022-01-13. Please use gnome.networkmanager-openconnect directly."; # added 2018-02-25
networkmanager_openvpn = throw "The gnome.networkmanager_openvpn alias was removed on 2022-01-13. Please use gnome.networkmanager-openvpn directly."; # added 2018-02-25
networkmanager_vpnc = throw "The gnome.networkmanager_vpnc alias was removed on 2022-01-13. Please use gnome.networkmanager-vpnc directly."; # added 2018-02-25
yelp_xsl = throw "The gnome.yelp_xsl alias was removed on 2022-01-13. Please use gnome.yelp-xsl directly."; # added 2018-02-25
yelp_tools = throw "The gnome.yelp_tools alias was removed on 2022-01-13. Please use gnome.yelp-tools directly."; # added 2018-02-25
# added 2019-02-08
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk-pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl;
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
inherit (pkgs) gnome-video-effects; # added 2019-08-19
inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
inherit (pkgs) glib-networking; # added 2019-09-02
inherit (pkgs) nemiver; # added 2019-09-09
atk = throw "The gnome.atk alias was removed on 2022-01-13. Please use pkgs.atk directly."; # added 2019-02-08
glib = throw "The gnome.glib alias was removed on 2022-01-13. Please use pkgs.glib directly."; # added 2019-02-08
gobject-introspection = throw "The gnome.gobject-introspection alias was removed on 2022-01-13. Please use pkgs.gobject-introspection directly."; # added 2019-02-08
gspell = throw "The gnome.gspell alias was removed on 2022-01-13. Please use pkgs.gspell directly."; # added 2019-02-08
webkitgtk = throw "The gnome.webkitgtk alias was removed on 2022-01-13. Please use pkgs.webkitgtk directly."; # added 2019-02-08
gtk3 = throw "The gnome.gtk3 alias was removed on 2022-01-13. Please use pkgs.gtk3 directly."; # added 2019-02-08
gtkmm3 = throw "The gnome.gtkmm3 alias was removed on 2022-01-13. Please use pkgs.gtkmm3 directly."; # added 2019-02-08
libgtop = throw "The gnome.libgtop alias was removed on 2022-01-13. Please use pkgs.libgtop directly."; # added 2019-02-08
libgudev = throw "The gnome.libgudev alias was removed on 2022-01-13. Please use pkgs.libgudev directly."; # added 2019-02-08
libhttpseverywhere = throw "The gnome.libhttpseverywhere alias was removed on 2022-01-13. Please use pkgs.libhttpseverywhere directly."; # added 2019-02-08
librsvg = throw "The gnome.librsvg alias was removed on 2022-01-13. Please use pkgs.librsvg directly."; # added 2019-02-08
libsecret = throw "The gnome.libsecret alias was removed on 2022-01-13. Please use pkgs.libsecret directly."; # added 2019-02-08
gdk-pixbuf = throw "The gnome.gdk-pixbuf alias was removed on 2022-01-13. Please use pkgs.gdk-pixbuf directly."; # added 2019-02-08
gtksourceview = throw "The gnome.gtksourceview alias was removed on 2022-01-13. Please use pkgs.gtksourceview directly."; # added 2019-02-08
gtksourceviewmm = throw "The gnome.gtksourceviewmm alias was removed on 2022-01-13. Please use pkgs.gtksourceviewmm directly."; # added 2019-02-08
gtksourceview4 = throw "The gnome.gtksourceview4 alias was removed on 2022-01-13. Please use pkgs.gtksourceview4 directly."; # added 2019-02-08
easytag = throw "The gnome.easytag alias was removed on 2022-01-13. Please use pkgs.easytag directly."; # added 2019-02-08
meld = throw "The gnome.meld alias was removed on 2022-01-13. Please use pkgs.meld directly."; # added 2019-02-08
orca = throw "The gnome.orca alias was removed on 2022-01-13. Please use pkgs.orca directly."; # added 2019-02-08
rhythmbox = throw "The gnome.rhythmbox alias was removed on 2022-01-13. Please use pkgs.rhythmbox directly."; # added 2019-02-08
shotwell = throw "The gnome.shotwell alias was removed on 2022-01-13. Please use pkgs.shotwell directly."; # added 2019-02-08
gnome-usage = throw "The gnome.gnome-usage alias was removed on 2022-01-13. Please use pkgs.gnome-usage directly."; # added 2019-02-08
clutter = throw "The gnome.clutter alias was removed on 2022-01-13. Please use pkgs.clutter directly."; # added 2019-02-08
clutter-gst = throw "The gnome.clutter-gst alias was removed on 2022-01-13. Please use pkgs.clutter-gst directly."; # added 2019-02-08
clutter-gtk = throw "The gnome.clutter-gtk alias was removed on 2022-01-13. Please use pkgs.clutter-gtk directly."; # added 2019-02-08
cogl = throw "The gnome.cogl alias was removed on 2022-01-13. Please use pkgs.cogl directly."; # added 2019-02-08
gtk-vnc = throw "The gnome.gtk-vnc alias was removed on 2022-01-13. Please use pkgs.gtk-vnc directly."; # added 2019-02-08
libdazzle = throw "The gnome.libdazzle alias was removed on 2022-01-13. Please use pkgs.libdazzle directly."; # added 2019-02-08
libgda = throw "The gnome.libgda alias was removed on 2022-01-13. Please use pkgs.libgda directly."; # added 2019-02-08
libgit2-glib = throw "The gnome.libgit2-glib alias was removed on 2022-01-13. Please use pkgs.libgit2-glib directly."; # added 2019-02-08
libgxps = throw "The gnome.libgxps alias was removed on 2022-01-13. Please use pkgs.libgxps directly."; # added 2019-02-08
libgdata = throw "The gnome.libgdata alias was removed on 2022-01-13. Please use pkgs.libgdata directly."; # added 2019-02-08
libgepub = throw "The gnome.libgepub alias was removed on 2022-01-13. Please use pkgs.libgepub directly."; # added 2019-02-08
libpeas = throw "The gnome.libpeas alias was removed on 2022-01-13. Please use pkgs.libpeas directly."; # added 2019-02-08
libgee = throw "The gnome.libgee alias was removed on 2022-01-13. Please use pkgs.libgee directly."; # added 2019-02-08
geocode-glib = throw "The gnome.geocode-glib alias was removed on 2022-01-13. Please use pkgs.geocode-glib directly."; # added 2019-02-08
libgweather = throw "The gnome.libgweather alias was removed on 2022-01-13. Please use pkgs.libgweather directly."; # added 2019-02-08
librest = throw "The gnome.librest alias was removed on 2022-01-13. Please use pkgs.librest directly."; # added 2019-02-08
libzapojit = throw "The gnome.libzapojit alias was removed on 2022-01-13. Please use pkgs.libzapojit directly."; # added 2019-02-08
libmediaart = throw "The gnome.libmediaart alias was removed on 2022-01-13. Please use pkgs.libmediaart directly."; # added 2019-02-08
gfbgraph = throw "The gnome.gfbgraph alias was removed on 2022-01-13. Please use pkgs.gfbgraph directly."; # added 2019-02-08
gexiv2 = throw "The gnome.gexiv2 alias was removed on 2022-01-13. Please use pkgs.gexiv2 directly."; # added 2019-02-08
folks = throw "The gnome.folks alias was removed on 2022-01-13. Please use pkgs.folks directly."; # added 2019-02-08
totem-pl-parser = throw "The gnome.totem-pl-parser alias was removed on 2022-01-13. Please use pkgs.totem-pl-parser directly."; # added 2019-02-08
gcr = throw "The gnome.gcr alias was removed on 2022-01-13. Please use pkgs.gcr directly."; # added 2019-02-08
gsound = throw "The gnome.gsound alias was removed on 2022-01-13. Please use pkgs.gsound directly."; # added 2019-02-08
libgnomekbd = throw "The gnome.libgnomekbd alias was removed on 2022-01-13. Please use pkgs.libgnomekbd directly."; # added 2019-02-08
vte = throw "The gnome.vte alias was removed on 2022-01-13. Please use pkgs.vte directly."; # added 2019-02-08
vte_290 = throw "The gnome.vte_290 alias was removed on 2022-01-13. Please use pkgs.vte_290 directly."; # added 2019-02-08
gnome-menus = throw "The gnome.gnome-menus alias was removed on 2022-01-13. Please use pkgs.gnome-menus directly."; # added 2019-02-08
gdl = throw "The gnome.gdl alias was removed on 2022-01-13. Please use pkgs.gdl directly."; # added 2019-02-08
defaultIconTheme = adwaita-icon-theme;
gtk = gtk3;
gtkmm = gtkmm3;
rest = librest;
pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01
gsettings-desktop-schemas = throw "The gnome.gsettings-desktop-schemas alias was removed on 2022-01-13. Please use pkgs.gsettings-desktop-schemas directly."; # added 2019-04-16
gnome-video-effects = throw "The gnome.gnome-video-effects alias was removed on 2022-01-13. Please use pkgs.gnome-video-effects directly."; # added 2019-08-19
gnome-online-accounts = throw "The gnome.gnome-online-accounts alias was removed on 2022-01-13. Please use pkgs.gnome-online-accounts directly."; # added 2019-08-23
grilo = throw "The gnome.grilo alias was removed on 2022-01-13. Please use pkgs.grilo directly."; # added 2019-08-23
grilo-plugins = throw "The gnome.grilo-plugins alias was removed on 2022-01-13. Please use pkgs.grilo-plugins directly."; # added 2019-08-23
tracker = throw "The gnome.tracker alias was removed on 2022-01-13. Please use pkgs.tracker directly."; # added 2019-08-23
tracker-miners = throw "The gnome.tracker-miners alias was removed on 2022-01-13. Please use pkgs.tracker-miners directly."; # added 2019-08-23
gnome-photos = throw "The gnome.gnome-photos alias was removed on 2022-01-13. Please use pkgs.gnome-photos directly."; # added 2019-08-23
glib-networking = throw "The gnome.glib-networking alias was removed on 2022-01-13. Please use pkgs.glib-networking directly."; # added 2019-09-02
nemiver = throw "The gnome.nemiver alias was removed on 2022-01-13. Please use pkgs.nemiver directly."; # added 2019-09-09
# added 2019-08-25
corePackages = throw "gnome.corePackages is removed since 2019-08-25: please use `services.gnome.core-shell.enable`";
optionalPackages = throw "gnome.optionalPackages is removed since 2019-08-25: please use `services.gnome.core-utilities.enable`";
gamesPackages = throw "gnome.gamesPackages is removed since 2019-08-25: please use `services.gnome.games.enable`";
defaultIconTheme = throw "The gnome.defaultIconTheme alias was removed on 2022-01-13. Please use gnome.adwaita-icon-theme directly."; # added 2019-02-08
gtk = throw "The gnome.gtk alias was removed on 2022-01-13. Please use pkgs.gtk3 directly."; # added 2019-02-08
gtkmm = throw "The gnome.gtkmm alias was removed on 2022-01-13. Please use pkgs.gtkmm3 directly."; # added 2019-02-08
rest = throw "The gnome.rest alias was removed on 2022-01-13. Please use pkgs.librest directly."; # added 2019-02-08
nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream";
pidgin-im-gnome-shell-extension = throw "The gnome.pidgin-im-gnome-shell-extension alias was removed on 2022-01-13. Please use pkgs.gnomeExtensions.pidgin-im-integration directly."; # added 2019-08-01
inherit (pkgs) vala; # added 2019-10-10
vala = throw "The gnome.vala alias was removed on 2022-01-13. Please use pkgs.vala directly."; # added 2019-10-10
inherit (pkgs) gnome-user-docs; # added 2019-11-20
gnome-user-docs = throw "The gnome.gnome-user-docs alias was removed on 2022-01-13. Please use pkgs.gnome-user-docs directly."; # added 2019-11-20
inherit (pkgs) gjs; # added 2019-01-05
gjs = throw "The gnome.gjs alias was removed on 2022-01-13. Please use pkgs.gjs directly."; # added 2019-01-05
inherit (pkgs) yelp-tools; # added 2019-11-20
yelp-tools = throw "The gnome.yelp-tools alias was removed on 2022-01-13. Please use pkgs.yelp-tools directly."; # added 2019-11-20
inherit (pkgs) dconf; # added 2019-11-30
dconf = throw "The gnome.dconf alias was removed on 2022-01-13. Please use pkgs.dconf directly."; # added 2019-11-30
inherit (pkgs) networkmanagerapplet; # added 2019-12-12
networkmanagerapplet = throw "The gnome.networkmanagerapplet alias was removed on 2022-01-13. Please use pkgs.networkmanagerapplet directly."; # added 2019-12-12
inherit (pkgs) glade; # added 2020-05-15
glade = throw "The gnome.glade alias was removed on 2022-01-13. Please use pkgs.glade directly."; # added 2020-05-15
vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13
gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19
maintainers = lib.teams.gnome.members;
maintainers = throw "The gnome.maintainers alias was removed on 2022-01-13. Please use lib.teams.gnome.members directly."; # added 2020-04-01
mutter328 = throw "Removed as Pantheon is upgraded to mutter338.";
mutter334 = throw "Removed as Pantheon is upgraded to mutter338.";
gnome-getting-started-docs = throw "Removed in favour of gnome-tour.";
# Added 2021-05-07
gnome3 = self // { recurseForDerivations = false; };
})
}

View File

@ -69,5 +69,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.14.8";
version = "0.14.11";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-RyxlU6Wf+rHSZ/xuhiCbF+KYhMxHEEh3XvLCdwAVTYw=";
sha256 = "sha256-hS+LJfYB+nH5z/UA6RKdqA8qc1jT9Gskt6LufHCiqv8=";
};
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";

View File

@ -4,13 +4,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sumneko-lua-language-server";
version = "2.5.6";
version = "2.6.0";
src = fetchFromGitHub {
owner = "sumneko";
repo = "lua-language-server";
rev = version;
sha256 = "sha256-dSj3wNbQghiGfqe7dNDbWnbXYLSiG+0mYv2yFmGsAc8=";
sha256 = "sha256-8Vfk6B85anlUf09cc08hOGujbcVCMqgEJ1PTxX6llrk=";
fetchSubmodules = true;
};

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wrangler";
version = "1.19.6";
version = "1.19.7";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eFrILGq6rlm/u8RAxGHRaFgOT88I8T4inAKCoJpqPYA=";
sha256 = "sha256-1Bb4vpmWtSW2E2gr6V+tDsc4P5FJfCLLpzQX2WiVzUg=";
};
cargoSha256 = "sha256-8JgtaSROcS9DwcnK7Yky8Ol8AJPI7guU08iaz9yPC8g=";
cargoSha256 = "sha256-iAlRdUMR+64ngRT4icY6sTFFeRt4aShV/hj8PXJ0kEk=";
nativeBuildInputs = [ pkg-config ];

View File

@ -0,0 +1,79 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, alsa-lib, openssl
, withTTS ? false, llvmPackages, speechd }:
rustPlatform.buildRustPackage rec {
pname = "blightmud";
version = "3.5.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-DaICzwBew90YstV42wiY0IbvR1W4Hm8dzo3xY2qlMGQ=";
};
cargoSha256 = "sha256-BamMTPh+GN9GG4puxyTauPhjCC8heCu1wsgFaw98s9U=";
buildFeatures = lib.optional withTTS "tts";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib openssl ] ++ lib.optional withTTS [ speechd ];
# Building the speech-dispatcher-sys crate for TTS support requires setting
# LIBCLANG_PATH.
LIBCLANG_PATH = lib.optionalString withTTS "${llvmPackages.libclang.lib}/lib";
preBuild = lib.optionalString withTTS ''
# When building w/ TTS the speech-dispatcher-sys crate's build.rs uses
# rust-bindgen with libspeechd. This bypasses the normal nixpkgs CC wrapper
# so we have to adapt the BINDGEN_EXTRA_CLANG_ARGS env var to compensate. See
# this blog post[0] for more information.
#
# [0]: https://hoverbear.org/blog/rust-bindgen-in-nix/
export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \
$(< ${stdenv.cc}/nix-support/cc-cflags) \
-isystem ${llvmPackages.libclang.lib}/lib/clang/${
lib.getVersion llvmPackages.clang
}/include \
-idirafter ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${
lib.getVersion stdenv.cc.cc
}/include \
-idirafter ${speechd}/include"
'';
checkFlags = let
# Most of Blightmud's unit tests pass without trouble in the isolated
# Nixpkgs build env. The following tests need to be skipped.
skipList = [
"test_connect"
"test_gmcp_negotiation"
"test_ttype_negotiation"
"test_reconnect"
"test_mud"
"test_server"
"test_lua_script"
"timer_test"
"validate_assertion_fail"
];
skipFlag = test: "--skip " + test;
in builtins.concatStringsSep " " (builtins.map skipFlag skipList);
meta = with lib; {
description = "A terminal MUD client written in Rust";
longDescription = ''
Blightmud is a terminal client for connecting to Multi User Dungeon (MUD)
games. It is written in Rust and supports TLS, GMCP, MSDP, MCCP2, tab
completion, text searching and a split view for scrolling. Blightmud can
be customized with Lua scripting for aliases, triggers, timers, customized
status bars, and more. Blightmud supports several accessibility features
including an optional built-in text-to-speech engine and a screen reader
friendly mode.
'';
homepage = "https://github.com/Blightmud/Blightmud";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ cpu ];
platforms = platforms.linux;
};
}

View File

@ -1,44 +1,28 @@
{ lib, fetchFromGitHub, fetchpatch, python3 }:
let
python = python3.override {
packageOverrides = self: super: {
mautrix_0_13 = self.mautrix.overridePythonAttrs (oldAttrs: rec {
version = "0.13.3";
src = oldAttrs.src.override {
inherit (oldAttrs) pname;
inherit version;
sha256 = "1e4a292469f3e200c182aaa5bf693a5c3834b2a0cfb3d29e4c9a1559db7740e3";
};
});
};
};
in
python.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "heisenbridge";
version = "1.8.2";
version = "1.10.0";
src = fetchFromGitHub {
owner = "hifi";
repo = pname;
rev = "v${version}";
sha256 = "173prcd56rwlxjxlw67arnm12k1l317xi5s6m7jhmp8zbbrj5vwr";
sha256 = "sha256-rQBmg1CBourj/dDJ7P108gGMRdXWp6nwvHIBiQbJLQ0=";
};
postPatch = ''
echo "${version}" > heisenbridge/version.txt
'';
propagatedBuildInputs = with python.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
aiohttp
irc
mautrix_0_13
mautrix
python-socks
pyyaml
];
checkInputs = with python.pkgs; [
checkInputs = with python3.pkgs; [
pytestCheckHook
];

View File

@ -1,29 +1,54 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, rustPlatform
, vulkan-loader
, pkg-config
, udev
, v4l-utils
, llvmPackages
}:
rustPlatform.buildRustPackage rec {
pname = "wluma";
version = "2.0.1";
version = "3.0.0";
src = fetchFromGitHub {
owner = "maximbaz";
repo = "wluma";
rev = version;
sha256 = "sha256-fqBEJS+SQoPNNEw6jyoiZjq/chY73bQ+cM21F8RdNPE=";
sha256 = "sha256-H5ohAawHTvZoFq4t5dUgP4Tr5qNyXEP4SG738Bo8mxc=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeWrapper
pkg-config
];
buildInputs = [
udev
v4l-utils.lib
];
LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
# Works around the issue with rust-bindgen and the Nix gcc wrapper:
# https://hoverbear.org/blog/rust-bindgen-in-nix/
preBuild = ''
export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \
$(< ${stdenv.cc}/nix-support/cc-cflags) \
-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include \
-idirafter ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include \
-idirafter ${v4l-utils.dev}/include"
'';
postInstall = ''
wrapProgram $out/bin/wluma \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}"
'';
cargoSha256 = "sha256-dZBA6VeJRHmqpazRwjLP1kYcYYN5LCFWkIaXqp4/RkQ=";
cargoSha256 = "sha256-xLmDDy6qKXo0mLW3R4hQfZssg6lpo0G018TonF1uS14=";
meta = with lib; {
description = "Automatic brightness adjustment based on screen contents and ALS";

View File

@ -30879,6 +30879,10 @@ with pkgs;
lua = lua5_1;
};
blightmud = callPackage ../games/blightmud { };
blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
n2048 = callPackage ../games/n2048 { };
naev = callPackage ../games/naev { };
@ -34043,17 +34047,17 @@ with pkgs;
discord = import ../applications/networking/instant-messengers/discord {
branch = "stable";
inherit pkgs;
inherit pkgs lib stdenv;
};
discord-ptb = import ../applications/networking/instant-messengers/discord {
branch = "ptb";
inherit pkgs;
inherit pkgs lib stdenv;
};
discord-canary = import ../applications/networking/instant-messengers/discord {
branch = "canary";
inherit pkgs;
inherit pkgs lib stdenv;
};
golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {};