Merge branch 'master' into staging-next
This commit is contained in:
Jan Tojnar
@@ -753,6 +753,7 @@ with lib.maintainers;
|
||||
members = [
|
||||
SuperSandro2000
|
||||
anthonyroussel
|
||||
vinetos
|
||||
];
|
||||
scope = "Maintain the ecosystem around OpenStack";
|
||||
shortName = "OpenStack";
|
||||
|
||||
@@ -119,6 +119,8 @@
|
||||
|
||||
- `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
|
||||
|
||||
- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
|
||||
|
||||
- `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust.
|
||||
The module was updated to accommodate for breaking changes.
|
||||
Breaking changes to the module API were minimised as much as possible,
|
||||
@@ -173,6 +175,8 @@
|
||||
|
||||
- All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).
|
||||
|
||||
- All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`).
|
||||
|
||||
- `services.cgit` now runs as the cgit user by default instead of root.
|
||||
This change requires granting access to the repositories to this user or
|
||||
setting the appropriate one through `services.cgit.some-instance.user`.
|
||||
|
||||
@@ -83,7 +83,7 @@ in
|
||||
configPackages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = [ ];
|
||||
example = lib.literalExpression "[ pkgs.gnome.gnome-session ]";
|
||||
example = lib.literalExpression "[ pkgs.gnome-session ]";
|
||||
description = ''
|
||||
List of packages that provide XDG desktop portal configuration, usually in
|
||||
the form of `share/xdg-desktop-portal/$desktop-portals.conf`.
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
sleep-inactive-battery-type='nothing'
|
||||
'';
|
||||
|
||||
extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ];
|
||||
extraGSettingsOverridePackages = [ pkgs.gnome-settings-daemon ];
|
||||
|
||||
enable = true;
|
||||
};
|
||||
|
||||
@@ -64,7 +64,7 @@ let
|
||||
} // lib.optionalAttrs (cfg.tlsCertFile != null) { tlsCertFile = cfg.tlsCertFile; }
|
||||
// lib.optionalAttrs (cfg.tlsKeyFile != null) { tlsPrivateKeyFile = cfg.tlsKeyFile; }
|
||||
// lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; }
|
||||
// lib.optionalAttrs (cfg.clusterDns != "") { clusterDNS = [ cfg.clusterDns ] ; }
|
||||
// lib.optionalAttrs (cfg.clusterDns != []) { clusterDNS = cfg.clusterDns; }
|
||||
// lib.optionalAttrs (cfg.featureGates != {}) { featureGates = cfg.featureGates; }
|
||||
));
|
||||
|
||||
@@ -112,8 +112,8 @@ in
|
||||
|
||||
clusterDns = mkOption {
|
||||
description = "Use alternative DNS.";
|
||||
default = "10.1.0.1";
|
||||
type = str;
|
||||
default = [ "10.1.0.1" ];
|
||||
type = listOf str;
|
||||
};
|
||||
|
||||
clusterDomain = mkOption {
|
||||
|
||||
@@ -32,15 +32,15 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.gnome.gnome-settings-daemon
|
||||
pkgs.gnome-settings-daemon
|
||||
];
|
||||
|
||||
services.udev.packages = [
|
||||
pkgs.gnome.gnome-settings-daemon
|
||||
pkgs.gnome-settings-daemon
|
||||
];
|
||||
|
||||
systemd.packages = [
|
||||
pkgs.gnome.gnome-settings-daemon
|
||||
pkgs.gnome-settings-daemon
|
||||
];
|
||||
|
||||
systemd.user.targets."gnome-session-x11-services".wants = [
|
||||
|
||||
@@ -167,7 +167,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set.
|
||||
|
||||
extraGSettingsOverridePackages = [
|
||||
pkgs.gsettings-desktop-schemas # for org.gnome.desktop
|
||||
pkgs.gnome.gnome-shell # for org.gnome.shell
|
||||
pkgs.gnome-shell # for org.gnome.shell
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ in
|
||||
favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ]
|
||||
'''
|
||||
'';
|
||||
description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally.";
|
||||
description = "List of desktop files to put as favorite apps into pkgs.gnome-shell. These need to be installed somehow globally.";
|
||||
};
|
||||
|
||||
extraGSettingsOverrides = mkOption {
|
||||
@@ -123,7 +123,7 @@ in
|
||||
description = "List of packages for which gsettings are overridden.";
|
||||
};
|
||||
|
||||
debug = mkEnableOption "gnome-session debug messages";
|
||||
debug = mkEnableOption "pkgs.gnome-session debug messages";
|
||||
|
||||
flashback = {
|
||||
enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity";
|
||||
@@ -162,11 +162,11 @@ in
|
||||
};
|
||||
|
||||
panelModulePackages = mkOption {
|
||||
default = [ pkgs.gnome.gnome-applets ];
|
||||
defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]";
|
||||
default = [ pkgs.gnome-applets ];
|
||||
defaultText = literalExpression "[ pkgs.gnome-applets ]";
|
||||
type = types.listOf types.package;
|
||||
description = ''
|
||||
Packages containing modules that should be made available to `gnome-panel` (usually for applets).
|
||||
Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets).
|
||||
|
||||
If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`.
|
||||
'';
|
||||
@@ -196,7 +196,7 @@ in
|
||||
services.gnome.core-shell.enable = true;
|
||||
services.gnome.core-utilities.enable = mkDefault true;
|
||||
|
||||
services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ];
|
||||
services.displayManager.sessionPackages = [ pkgs.gnome-session.sessions ];
|
||||
|
||||
environment.extraInit = ''
|
||||
${lib.concatMapStrings (p: ''
|
||||
@@ -228,7 +228,7 @@ in
|
||||
assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique.");
|
||||
map
|
||||
(wm:
|
||||
pkgs.gnome.gnome-flashback.mkSessionForWm {
|
||||
pkgs.gnome-flashback.mkSessionForWm {
|
||||
inherit (wm) wmName wmLabel wmCommand;
|
||||
}
|
||||
) flashbackWms;
|
||||
@@ -237,20 +237,20 @@ in
|
||||
enableGnomeKeyring = true;
|
||||
};
|
||||
|
||||
systemd.packages = with pkgs.gnome; [
|
||||
gnome-flashback
|
||||
] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms;
|
||||
systemd.packages = [
|
||||
pkgs.gnome-flashback
|
||||
] ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;
|
||||
|
||||
environment.systemPackages = with pkgs.gnome; [
|
||||
gnome-flashback
|
||||
(gnome-panel-with-modules.override {
|
||||
environment.systemPackages = [
|
||||
pkgs.gnome-flashback
|
||||
(pkgs.gnome-panel-with-modules.override {
|
||||
panelModulePackages = cfg.flashback.panelModulePackages;
|
||||
})
|
||||
]
|
||||
# For /share/applications/${wmName}.desktop
|
||||
++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)
|
||||
# For /share/gnome-session/sessions/gnome-flashback-${wmName}.session
|
||||
++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);
|
||||
++ (map (wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)
|
||||
# For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
|
||||
++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);
|
||||
})
|
||||
|
||||
(lib.mkIf serviceCfg.core-os-services.enable {
|
||||
@@ -287,7 +287,7 @@ in
|
||||
buildPortalsInGnome = false;
|
||||
})
|
||||
];
|
||||
xdg.portal.configPackages = mkDefault [ pkgs.gnome.gnome-session ];
|
||||
xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ];
|
||||
|
||||
networking.networkmanager.enable = mkDefault true;
|
||||
|
||||
@@ -309,7 +309,7 @@ in
|
||||
services.xserver.desktopManager.gnome.sessionPath =
|
||||
let
|
||||
mandatoryPackages = [
|
||||
pkgs.gnome.gnome-shell
|
||||
pkgs.gnome-shell
|
||||
];
|
||||
optionalPackages = [
|
||||
pkgs.gnome-shell-extensions
|
||||
@@ -329,15 +329,15 @@ in
|
||||
services.gvfs.enable = true;
|
||||
services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true));
|
||||
|
||||
systemd.packages = with pkgs.gnome; [
|
||||
gnome-session
|
||||
gnome-shell
|
||||
systemd.packages = [
|
||||
pkgs.gnome-session
|
||||
pkgs.gnome-shell
|
||||
];
|
||||
|
||||
services.udev.packages = with pkgs.gnome; [
|
||||
services.udev.packages = [
|
||||
# Force enable KMS modifiers for devices that require them.
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
|
||||
mutter
|
||||
# https://gitlab.gnome.org/GNOME/pkgs.mutter/-/merge_requests/1443
|
||||
pkgs.mutter
|
||||
];
|
||||
|
||||
services.avahi.enable = mkDefault true;
|
||||
@@ -368,16 +368,16 @@ in
|
||||
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
|
||||
environment.systemPackages =
|
||||
let
|
||||
mandatoryPackages = with pkgs.gnome; [
|
||||
gnome-shell
|
||||
mandatoryPackages = [
|
||||
pkgs.gnome-shell
|
||||
];
|
||||
optionalPackages = with pkgs.gnome; [
|
||||
optionalPackages = [
|
||||
pkgs.adwaita-icon-theme
|
||||
nixos-background-info
|
||||
pkgs.gnome-backgrounds
|
||||
gnome-bluetooth
|
||||
pkgs.gnome-bluetooth
|
||||
pkgs.gnome-color-manager
|
||||
gnome-control-center
|
||||
pkgs.gnome-control-center
|
||||
pkgs.gnome-shell-extensions
|
||||
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
|
||||
pkgs.gnome-user-docs
|
||||
|
||||
@@ -177,7 +177,7 @@ in
|
||||
pkgs.pantheon.mutter
|
||||
];
|
||||
systemd.packages = with pkgs; [
|
||||
gnome.gnome-session
|
||||
gnome-session
|
||||
pantheon.gala
|
||||
pantheon.gnome-settings-daemon
|
||||
pantheon.elementary-session-settings
|
||||
|
||||
@@ -153,7 +153,7 @@ in
|
||||
XDG_DATA_DIRS = lib.makeSearchPath "share" [
|
||||
gdm # for gnome-login.session
|
||||
config.services.displayManager.sessionData.desktops
|
||||
pkgs.gnome.gnome-control-center # for accessibility icon
|
||||
pkgs.gnome-control-center # for accessibility icon
|
||||
pkgs.adwaita-icon-theme
|
||||
pkgs.hicolor-icon-theme # empty icon theme as a base
|
||||
];
|
||||
@@ -181,7 +181,11 @@ in
|
||||
];
|
||||
|
||||
# Otherwise GDM will not be able to start correctly and display Wayland sessions
|
||||
systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ];
|
||||
systemd.packages = with pkgs.gnome; [
|
||||
gdm
|
||||
pkgs.gnome-session
|
||||
pkgs.gnome-shell
|
||||
];
|
||||
environment.systemPackages = [ pkgs.adwaita-icon-theme ];
|
||||
|
||||
# We dont use the upstream gdm service
|
||||
@@ -232,7 +236,7 @@ in
|
||||
EnvironmentFile = "-/etc/locale.conf";
|
||||
};
|
||||
|
||||
systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ];
|
||||
systemd.services.display-manager.path = [ pkgs.gnome-session ];
|
||||
|
||||
# Allow choosing an user account
|
||||
services.accounts-daemon.enable = true;
|
||||
|
||||
@@ -45,7 +45,7 @@ import ./make-test-python.nix (
|
||||
# Eval API is now internal so Shell needs to run in unsafe mode.
|
||||
# TODO: improve test driver so that it supports openqa-like manipulation
|
||||
# that would allow us to drop this mess.
|
||||
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode"
|
||||
"${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||
# Eval API is now internal so Shell needs to run in unsafe mode.
|
||||
# TODO: improve test driver so that it supports openqa-like manipulation
|
||||
# that would allow us to drop this mess.
|
||||
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode"
|
||||
"${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||
# Eval API is now internal so Shell needs to run in unsafe mode.
|
||||
# TODO: improve test driver so that it supports openqa-like manipulation
|
||||
# that would allow us to drop this mess.
|
||||
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode"
|
||||
"${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -109,8 +109,8 @@ import ../make-test-python.nix (
|
||||
environment.systemPackages = [
|
||||
(pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir"
|
||||
{ libraries = with pkgs.python3Packages; [
|
||||
matrix-nio
|
||||
] ++ matrix-nio.optional-dependencies.e2e;
|
||||
(matrix-nio.override { withOlm = true; })
|
||||
];
|
||||
} ''
|
||||
import asyncio
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
# Booting off the encrypted disk requires having a Nix store available for the init script
|
||||
mountHostNixStore = true;
|
||||
useEFIBoot = true;
|
||||
qemu.options = [ "-device canokey,file=/tmp/canokey-file" ];
|
||||
qemu.options = [ "-device pci-ohci,id=usb-bus" "-device canokey,bus=usb-bus.0,file=/tmp/canokey-file" ];
|
||||
};
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, wrapGAppsHook3
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
@@ -37,14 +38,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tidal-hifi";
|
||||
version = "5.15.0";
|
||||
version = "5.16.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
|
||||
sha256 = "sha256-0OXNynf56On+emLO0ZfNIcoT3GEhSXdoQhfxapLYYic=";
|
||||
sha256 = "sha256-gDinm7kILm4SKlWmaJ1grwRuketGs/aWlJfNEF+AIRo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
||||
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
|
||||
--replace "CXX_STANDARD 14" "CXX_STANDARD 17"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out"
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DMSK_PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
ln -s $out/lib/molsketch/* $out/lib/.
|
||||
|
||||
@@ -88,12 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace src/meshlab/src/external/ssynth.cmake \
|
||||
--replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
|
||||
--replace-warn "MD5 ''${SSYNTH_MD5}" ""
|
||||
export cmakeFlags="cmakeFlags
|
||||
-DCMAKE_INSTALL_PREFIX=$out/${python3Packages.python.sitePackages}/pymeshlab
|
||||
"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab"
|
||||
"-DVCGDIR=${vcg.src}"
|
||||
];
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p2pool";
|
||||
version = "4.0";
|
||||
version = "4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ=";
|
||||
hash = "sha256-eMg8DXFtVfYhl6vpg/KRUZUgMU/XsCS29Af1CSIbUsY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
, wrapGAppsHook3
|
||||
, libinput
|
||||
, gobject-introspection
|
||||
, gnome
|
||||
, mutter
|
||||
, gnome-desktop
|
||||
, glib
|
||||
, gtk3
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk3
|
||||
gnome-desktop
|
||||
# For keybindings settings schemas
|
||||
gnome.mutter
|
||||
mutter
|
||||
json-glib
|
||||
wayland
|
||||
finalAttrs.wlroots
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchFromGitLab
|
||||
, autoconf, automake, gettext, intltool
|
||||
, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection
|
||||
, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection, wayland-scanner
|
||||
, gtk3, python, pygobject3, pyxdg
|
||||
|
||||
, withQuartz ? stdenv.isDarwin, ApplicationServices
|
||||
@@ -26,6 +26,8 @@ let
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
@@ -37,7 +39,7 @@ let
|
||||
wrapPython
|
||||
gobject-introspection
|
||||
python
|
||||
];
|
||||
] ++ lib.optionals (pname == "gammastep") [ wayland-scanner ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-randr=${if withRandr then "yes" else "no"}"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script
|
||||
, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
|
||||
, glib-networking, gtkspell3, hunspell, desktop-file-utils
|
||||
, gobject-introspection, wrapGAppsHook3, gnome }:
|
||||
, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "eolie";
|
||||
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
gst-plugins-base
|
||||
gst-plugins-ugly
|
||||
gstreamer
|
||||
gnome.gnome-settings-daemon
|
||||
gnome-settings-daemon
|
||||
gtk3
|
||||
gtkspell3
|
||||
hunspell
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zarf";
|
||||
version = "0.37.0";
|
||||
version = "0.38.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defenseunicorns";
|
||||
repo = "zarf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GgvpBYFPH1corqNCA6NQCg6Rkbdez9mFwv5HlmOCKvE=";
|
||||
hash = "sha256-tnxLktz8tc8ceWirThPR5eqlk5W3jnliiKka6feeX38=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gLnUvNxuxrMu6i+b0jgindgcbGOA+tk4N5N4owGV7B8=";
|
||||
vendorHash = "sha256-y4A3A6zTgZaFjy6B31BAIpyRDp+pYdc/dkFpZq2NQ2c=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -4,13 +4,13 @@ let
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.66";
|
||||
ptb = "0.0.101";
|
||||
canary = "0.0.475";
|
||||
development = "0.0.24";
|
||||
canary = "0.0.479";
|
||||
development = "0.0.25";
|
||||
} else {
|
||||
stable = "0.0.316";
|
||||
ptb = "0.0.130";
|
||||
canary = "0.0.583";
|
||||
development = "0.0.46";
|
||||
stable = "0.0.317";
|
||||
ptb = "0.0.131";
|
||||
canary = "0.0.587";
|
||||
development = "0.0.47";
|
||||
};
|
||||
version = versions.${branch};
|
||||
srcs = rec {
|
||||
@@ -25,29 +25,29 @@ let
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-suVIDCZhI6DwUVizBmTm104Clr6pH/olAIbOMNzFNss=";
|
||||
hash = "sha256-mirioiRpwQB07sL1avGYk2+Cnmdw7PW808AAA6p2Y0U=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
hash = "sha256-rSlGL2BwtUxLJltSD2Ms94qmZ4kuX5i9jFqyYC30jyQ=";
|
||||
hash = "sha256-9dwZ89YOs2iNOeoVrGfNHwr4mvfXmPk1SrJYoteYakY=";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
|
||||
hash = "sha256-ZJ2ybvKGGCm8CZhwGxmLXZWNUD1eAyg17zD/sBwViB4=";
|
||||
hash = "sha256-SX6a2qPSFURL00dMLrHSI4+964Xc76ada4PUMlG1V9U=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
hash = "sha256-mLfeMx5dQNpoLUyoOSCj8XtNxWjsBpVWdFv1obtHJak=";
|
||||
hash = "sha256-/wuYPjGh/RJZSDeo8r78YEbCYj+qZWTaIDIfKuSH+r0=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
hash = "sha256-eIjkXOW07sR26iBttT0mGDxNnpLFKlVJtzSAtFcicBg=";
|
||||
hash = "sha256-6m6wmGzVOEY2oVAHsSMsAtgQK5zqC0D7U3s28pcH0ss=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
|
||||
hash = "sha256-nMihtf/xLIxwqAVrF1BSRewdS2WThx0LZ5HZUI+OzM0=";
|
||||
hash = "sha256-mgVCuTE2zYFRUW6Ukw7mUmPnOR4g/QUFYlWI3bux0es=";
|
||||
};
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
|
||||
@@ -65,12 +65,12 @@
|
||||
let
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/88a232d5/Feishu-linux_x64-7.18.11.deb";
|
||||
sha256 = "sha256-EneDVW8eQ6J+M49hn9xLtvlqiDOx4Rs8VMLt1cqSbak=";
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/bfdb886c/Feishu-linux_x64-7.22.9.deb";
|
||||
sha256 = "sha256-4lLCQeW6ZRzmzrHPQ91RxKEqJCxqqa4iGuJ8snZqvkQ=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f29ac73d/Feishu-linux_arm64-7.18.11.deb";
|
||||
sha256 = "sha256-ghAWPQgVEBSom7zBHUKb56O3EZR4rOnQlz9BRSJBNp4=";
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/c3f495d6/Feishu-linux_arm64-7.22.9.deb";
|
||||
sha256 = "sha256-cT9n1p220ya1T21fWy4b7b7dIx3hqw7lConGaSZ2+UA=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -131,7 +131,7 @@ let
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
version = "7.18.11";
|
||||
version = "7.22.9";
|
||||
pname = "feishu";
|
||||
|
||||
src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -41,7 +41,7 @@ buildPythonApplication rec {
|
||||
propagatedBuildInputs = [
|
||||
cacert
|
||||
setuptools
|
||||
matrix-nio
|
||||
(matrix-nio.override { withOlm = true; })
|
||||
python-magic
|
||||
markdown
|
||||
pillow
|
||||
@@ -51,7 +51,7 @@ buildPythonApplication rec {
|
||||
pyxdg
|
||||
python-olm
|
||||
emoji
|
||||
] ++ matrix-nio.optional-dependencies.e2e;
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple but convenient CLI-based Matrix client app for sending and receiving";
|
||||
|
||||
@@ -39,11 +39,10 @@ python3Packages.buildPythonApplication rec {
|
||||
janus
|
||||
keyring
|
||||
logbook
|
||||
matrix-nio
|
||||
(matrix-nio.override { withOlm = true; })
|
||||
peewee
|
||||
prompt-toolkit
|
||||
]
|
||||
++ matrix-nio.optional-dependencies.e2e
|
||||
++ lib.optionals enableDbusUi optional-dependencies.ui;
|
||||
|
||||
optional-dependencies.ui = with python3Packages; [
|
||||
|
||||
@@ -56,10 +56,10 @@ in buildPythonPackage {
|
||||
attrs
|
||||
logbook
|
||||
pygments
|
||||
matrix-nio
|
||||
(matrix-nio.override { withOlm = true; })
|
||||
aiohttp
|
||||
requests
|
||||
] ++ matrix-nio.optional-dependencies.e2e;
|
||||
];
|
||||
|
||||
passthru.scripts = [ "matrix.py" ];
|
||||
|
||||
|
||||
@@ -18,48 +18,45 @@ python3Packages.buildPythonPackage rec {
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
aiohttp
|
||||
aiohttp-middlewares
|
||||
aioredis
|
||||
aiosqlite
|
||||
appdirs
|
||||
arrow
|
||||
babel
|
||||
bitstring
|
||||
bleach
|
||||
# botbuilder-core, connector for teams
|
||||
certifi
|
||||
click
|
||||
# dialogflow, connector for Dialogflow
|
||||
dnspython
|
||||
emoji
|
||||
get-video-properties
|
||||
ibm-watson
|
||||
matrix-nio
|
||||
mattermostdriver
|
||||
motor
|
||||
multidict
|
||||
nbconvert
|
||||
nbformat
|
||||
opsdroid-get-image-size
|
||||
parse
|
||||
puremagic
|
||||
pycron
|
||||
python-olm
|
||||
pyyaml
|
||||
regex
|
||||
rich
|
||||
slack-sdk
|
||||
tailer
|
||||
voluptuous
|
||||
watchgod
|
||||
webexteamssdk
|
||||
wrapt
|
||||
]
|
||||
++ matrix-nio.optional-dependencies.e2e;
|
||||
dependencies = with python3Packages; [
|
||||
aiohttp
|
||||
aiohttp-middlewares
|
||||
aioredis
|
||||
aiosqlite
|
||||
appdirs
|
||||
arrow
|
||||
babel
|
||||
bitstring
|
||||
bleach
|
||||
# botbuilder-core, connector for teams
|
||||
certifi
|
||||
click
|
||||
# dialogflow, connector for Dialogflow
|
||||
dnspython
|
||||
emoji
|
||||
get-video-properties
|
||||
ibm-watson
|
||||
(matrix-nio.override { withOlm = true; })
|
||||
mattermostdriver
|
||||
motor
|
||||
multidict
|
||||
nbconvert
|
||||
nbformat
|
||||
opsdroid-get-image-size
|
||||
parse
|
||||
puremagic
|
||||
pycron
|
||||
python-olm
|
||||
pyyaml
|
||||
regex
|
||||
rich
|
||||
slack-sdk
|
||||
tailer
|
||||
voluptuous
|
||||
watchgod
|
||||
webexteamssdk
|
||||
wrapt
|
||||
];
|
||||
|
||||
passthru.python = python3Packages.python;
|
||||
|
||||
|
||||
@@ -18,11 +18,9 @@ stdenv.mkDerivation rec {
|
||||
"-DYARP_COMPILE_UNMAINTAINED:BOOL=ON"
|
||||
"-DCREATE_YARPC:BOOL=ON"
|
||||
"-DCREATE_YARPCXX:BOOL=ON"
|
||||
"-DCMAKE_INSTALL_LIBDIR=${placeholder "out"}/lib"
|
||||
];
|
||||
|
||||
# since we cant expand $out in cmakeFlags
|
||||
preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_LIBDIR=$out/lib"'';
|
||||
|
||||
postInstall = "mv ./$out/lib/*.so $out/lib/";
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -17,8 +17,11 @@
|
||||
, evince
|
||||
, glib
|
||||
, gtk4
|
||||
, gnome
|
||||
, gnome-bluetooth
|
||||
, gnome-control-center
|
||||
, gnome-desktop
|
||||
, gnome-session
|
||||
, gnome-shell
|
||||
, gcr
|
||||
, pam
|
||||
, systemd
|
||||
@@ -71,10 +74,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
networkmanager
|
||||
polkit
|
||||
gmobile
|
||||
gnome.gnome-bluetooth
|
||||
gnome.gnome-control-center
|
||||
gnome-bluetooth
|
||||
gnome-control-center
|
||||
gnome-desktop
|
||||
gnome.gnome-session
|
||||
gnome-session
|
||||
gtk4
|
||||
pam
|
||||
systemd
|
||||
@@ -109,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Depends on GSettings schemas in gnome-shell
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}"
|
||||
--set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session"
|
||||
--prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}"
|
||||
--set GNOME_SESSION "${gnome-session}/bin/gnome-session"
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib
|
||||
, desktopSupport ? "gnomeflashback", xorg
|
||||
, gtk2
|
||||
, gtk3, gnome, mate
|
||||
, gtk3, gnome-panel, mate
|
||||
, libxfce4util, xfce4-panel
|
||||
}:
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ glib dbus-glib xorg.xcbutilwm ]
|
||||
++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ]
|
||||
++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ]
|
||||
++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
|
||||
++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
|
||||
;
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.65";
|
||||
version = "0.2.66";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-b2CJMjQr6Eez1xijGpXNkKeYeO87o1a13rB9bA2ShV0=";
|
||||
hash = "sha256-84ssbd0qF0p2x+cFYwYNW4P79KSZqhvF4Zd6wlRhgLo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AqzhDEan0tdjfbP/nmpfa2e842zR6RyymllNR02zjlM=";
|
||||
vendorHash = "sha256-fzGnswfzvKhzs7iYnsiQb1c+TTk9+113uj7ryOAvUJk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
gobject-introspection,
|
||||
gjs,
|
||||
glib-networking,
|
||||
gnome,
|
||||
gnome-bluetooth,
|
||||
gtk-layer-shell,
|
||||
libpulseaudio,
|
||||
libsoup_3,
|
||||
@@ -50,7 +50,7 @@ buildNpmPackage rec {
|
||||
buildInputs = [
|
||||
gjs
|
||||
glib-networking
|
||||
gnome.gnome-bluetooth
|
||||
gnome-bluetooth
|
||||
gtk-layer-shell
|
||||
libpulseaudio
|
||||
libsoup_3
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atac";
|
||||
version = "0.16.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julien-cpsn";
|
||||
repo = "ATAC";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PTslXzgZCzmy45zI2omv4Ef5h4gJdfWcK5ko7ulHnXo=";
|
||||
hash = "sha256-FSZGpV+dREwjst84TT1aBm/H+VqkjI8XDPo3usJ7UeI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZQyj2+gsZnayWD29dYZDh1zYTstaQluzzF7pXf0yoY4=";
|
||||
cargoHash = "sha256-sNgtqvFiwHSYMDf0379i8Yl9NrkCRVLo/ogjbHFgKBY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
cmake,
|
||||
dbus,
|
||||
glib,
|
||||
gnome,
|
||||
gnome-settings-daemon,
|
||||
gsettings-desktop-schemas,
|
||||
gtest,
|
||||
intltool,
|
||||
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# TODO these bloat the closure size alot, just so the indicator doesn't have the potential to crash.
|
||||
# is there a better way to give it access to DE-specific schemas as needed?
|
||||
# https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413
|
||||
gnome.gnome-settings-daemon
|
||||
gnome-settings-daemon
|
||||
mate.mate-settings-daemon
|
||||
];
|
||||
|
||||
|
||||
@@ -21,9 +21,11 @@
|
||||
glib-networking,
|
||||
glibc,
|
||||
gnome,
|
||||
gnome-bluetooth_1_0,
|
||||
gnome-color-manager,
|
||||
gnome-desktop,
|
||||
gnome-remote-desktop,
|
||||
gnome-settings-daemon,
|
||||
gnome-user-share,
|
||||
gsettings-desktop-schemas,
|
||||
gsound,
|
||||
@@ -46,6 +48,7 @@
|
||||
libxslt,
|
||||
meson,
|
||||
modemmanager,
|
||||
mutter,
|
||||
networkmanager,
|
||||
networkmanagerapplet,
|
||||
ninja,
|
||||
@@ -116,11 +119,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gnome-desktop
|
||||
adwaita-icon-theme
|
||||
cheese
|
||||
gnome.gnome-bluetooth_1_0
|
||||
gnome-bluetooth_1_0
|
||||
gnome-remote-desktop
|
||||
gnome.gnome-settings-daemon
|
||||
gnome-settings-daemon
|
||||
gnome-user-share
|
||||
gnome.mutter
|
||||
mutter
|
||||
gsettings-desktop-schemas
|
||||
gsound
|
||||
gtk3
|
||||
@@ -174,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
|
||||
--prefix XDG_DATA_DIRS : "${librsvg}/share"
|
||||
# WM keyboard shortcuts
|
||||
--prefix XDG_DATA_DIRS : "${gnome.mutter}/share"
|
||||
--prefix XDG_DATA_DIRS : "${mutter}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
budgie-screensaver,
|
||||
docbook-xsl-nons,
|
||||
glib,
|
||||
gnome,
|
||||
gnome-desktop,
|
||||
gnome-settings-daemon,
|
||||
graphene,
|
||||
gst_all_1,
|
||||
gtk-doc,
|
||||
@@ -26,6 +26,7 @@
|
||||
magpie,
|
||||
mesa,
|
||||
meson,
|
||||
mutter,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
@@ -79,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
budgie-screensaver
|
||||
glib
|
||||
gnome-desktop
|
||||
gnome.gnome-settings-daemon
|
||||
gnome.mutter
|
||||
gnome-settings-daemon
|
||||
mutter
|
||||
zenity
|
||||
graphene
|
||||
gst_all_1.gstreamer
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
budgie-desktop-view,
|
||||
glib,
|
||||
gsettings-desktop-schemas,
|
||||
gnome,
|
||||
mutter,
|
||||
nixos-artwork,
|
||||
nixos-background-light ? nixos-artwork.wallpapers.nineish,
|
||||
nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray,
|
||||
@@ -59,7 +59,7 @@ let
|
||||
budgie-desktop
|
||||
budgie-desktop-view
|
||||
gsettings-desktop-schemas
|
||||
gnome.mutter
|
||||
mutter
|
||||
] ++ extraGSettingsOverridePackages;
|
||||
|
||||
in
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gnome,
|
||||
adwaita-icon-theme,
|
||||
glib,
|
||||
gtk3,
|
||||
gsettings-desktop-schemas,
|
||||
gnome-desktop,
|
||||
gnome-settings-daemon,
|
||||
dbus,
|
||||
json-glib,
|
||||
libICE,
|
||||
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
json-glib
|
||||
xorg.xtrans
|
||||
adwaita-icon-theme
|
||||
gnome.gnome-settings-daemon
|
||||
gnome-settings-daemon
|
||||
gsettings-desktop-schemas
|
||||
systemd
|
||||
libepoxy
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapProgram "$out/libexec/budgie-session-binary" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
--suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
|
||||
--suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
|
||||
'';
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
, just
|
||||
, xcursorgen
|
||||
, hyprcursor
|
||||
, xcur2png
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -14,7 +15,7 @@ let
|
||||
};
|
||||
variantName = { palette, color }: palette + color;
|
||||
variants = lib.mapCartesianProduct variantName dimensions;
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "catppuccin-cursors";
|
||||
@@ -24,10 +25,10 @@ stdenvNoCC.mkDerivation {
|
||||
owner = "catppuccin";
|
||||
repo = "cursors";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LJyBnXDUGBLOD4qPI7l0YC0CcqYTtgoMJc1H2yLqk9g=";
|
||||
hash = "sha256-CuzD6O/RImFKLWzJoiUv7nlIdoXNvwwl+k5mTeVIY10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ just inkscape xcursorgen hyprcursor ];
|
||||
nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ];
|
||||
|
||||
outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage
|
||||
|
||||
|
||||
+3
-3
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.122.4";
|
||||
version = "0.124.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YpdzwGThmc9r4I+Rx8nxTZToi+J3UbqwZD+F2hYEG8M=";
|
||||
hash = "sha256-S57ApSuO3Mo/GpoaXx0dKOU3CfdQXmPM8AWi8fZ9MfY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WAYjYIHsBkQiTUmMDRXnx3Q1UAFVfXmZDFxzw7Kh0ds=";
|
||||
vendorHash = "sha256-BbBwia47E6EtoEzO2c2fhjg6WHGHTnzl5VyVYxIMu6E=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "0.30.0";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "csvtk";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shenwei356";
|
||||
repo = "csvtk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xq56dErO0vjG9bZ5aISIFWX4IOHaQksE9W1is2HiFuQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wJedDF7QIg8oWc/QX+rZDyq/nkAW+PMb8EYb0RGJxQM=";
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform, efficient and practical CSV/TSV toolkit in Golang";
|
||||
changelog = "https://github.com/shenwei356/csvtk/releases/tag/v${version}";
|
||||
homepage = "https://github.com/shenwei356/csvtk";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
|
||||
mainProgram = "csvtk";
|
||||
};
|
||||
}
|
||||
@@ -5,10 +5,10 @@
|
||||
|
||||
let
|
||||
pname = "fflogs";
|
||||
version = "8.12.19";
|
||||
version = "8.13.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
|
||||
hash = "sha256-/TGmUHMNowQFIw09OGw1ybiYE7ADPLbsZpAMPw3G5NE=";
|
||||
hash = "sha256-NSLJo+6o30bF2+1c1mHdHGC5GoZUjzC0JYJ5x/tY4uQ=";
|
||||
};
|
||||
extracted = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
+19
-18
@@ -1,26 +1,27 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, wrapGAppsHook3
|
||||
, meson
|
||||
, vala
|
||||
, pkg-config
|
||||
, ninja
|
||||
, itstool
|
||||
, clutter-gtk
|
||||
, libgee
|
||||
, libgnome-games-support
|
||||
, gnome
|
||||
, gtk3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
wrapGAppsHook3,
|
||||
meson,
|
||||
vala,
|
||||
pkg-config,
|
||||
ninja,
|
||||
itstool,
|
||||
clutter-gtk,
|
||||
libgee,
|
||||
libgnome-games-support,
|
||||
gnome,
|
||||
gtk3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-twenty-forty-eight";
|
||||
version = "3.38.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2";
|
||||
};
|
||||
|
||||
@@ -63,4 +64,4 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+27
-26
@@ -1,32 +1,34 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, gettext
|
||||
, itstool
|
||||
, libxml2
|
||||
, pkg-config
|
||||
, gnome-panel
|
||||
, gtk3
|
||||
, glib
|
||||
, libwnck
|
||||
, libgtop
|
||||
, libnotify
|
||||
, upower
|
||||
, wirelesstools
|
||||
, linuxPackages
|
||||
, adwaita-icon-theme
|
||||
, libgweather
|
||||
, gucharmap
|
||||
, tracker
|
||||
, polkit
|
||||
, gnome
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
gettext,
|
||||
itstool,
|
||||
libxml2,
|
||||
pkg-config,
|
||||
gnome-panel,
|
||||
gtk3,
|
||||
glib,
|
||||
libwnck,
|
||||
libgtop,
|
||||
libnotify,
|
||||
upower,
|
||||
wirelesstools,
|
||||
linuxPackages,
|
||||
adwaita-icon-theme,
|
||||
libgweather,
|
||||
gucharmap,
|
||||
tracker,
|
||||
polkit,
|
||||
gnome,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-applets";
|
||||
version = "3.52.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw=";
|
||||
};
|
||||
|
||||
@@ -64,8 +66,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
packageName = "gnome-applets";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
@@ -78,4 +79,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+36
-30
@@ -1,38 +1,44 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gnome
|
||||
, adwaita-icon-theme
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gettext
|
||||
, glib
|
||||
, udev
|
||||
, itstool
|
||||
, libxml2
|
||||
, wrapGAppsHook3
|
||||
, libnotify
|
||||
, libcanberra-gtk3
|
||||
, gobject-introspection
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, python3
|
||||
, gsettings-desktop-schemas
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
gnome,
|
||||
adwaita-icon-theme,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
gettext,
|
||||
glib,
|
||||
udev,
|
||||
itstool,
|
||||
libxml2,
|
||||
wrapGAppsHook3,
|
||||
libnotify,
|
||||
libcanberra-gtk3,
|
||||
gobject-introspection,
|
||||
gtk-doc,
|
||||
docbook-xsl-nons,
|
||||
docbook_xml_dtd_43,
|
||||
python3,
|
||||
gsettings-desktop-schemas,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-bluetooth";
|
||||
version = "3.34.5";
|
||||
|
||||
# TODO: split out "lib"
|
||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"devdoc"
|
||||
"man"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.majorMinor finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "bJSeUsi+zCBU2qzWBJAfZs5c9wml+pHEu3ysyTm1Pqk=";
|
||||
};
|
||||
|
||||
@@ -82,8 +88,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.gnome-bluetooth_1_0";
|
||||
packageName = "gnome-bluetooth";
|
||||
attrPath = "gnome-bluetooth_1_0";
|
||||
freeze = true;
|
||||
};
|
||||
};
|
||||
@@ -96,4 +102,4 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+3
-4
@@ -26,7 +26,7 @@
|
||||
gsettings-desktop-schemas,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-bluetooth";
|
||||
version = "46.1";
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major version}/gnome-bluetooth-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw=";
|
||||
};
|
||||
|
||||
@@ -74,7 +74,6 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-bluetooth";
|
||||
attrPath = "gnome.gnome-bluetooth";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -86,4 +85,4 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+84
-83
@@ -1,74 +1,75 @@
|
||||
{ fetchurl
|
||||
, lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, accountsservice
|
||||
, adwaita-icon-theme
|
||||
, colord
|
||||
, colord-gtk4
|
||||
, cups
|
||||
, dbus
|
||||
, docbook-xsl-nons
|
||||
, fontconfig
|
||||
, gdk-pixbuf
|
||||
, gettext
|
||||
, glib
|
||||
, glib-networking
|
||||
, gcr_4
|
||||
, glibc
|
||||
, gnome-bluetooth
|
||||
, gnome-color-manager
|
||||
, gnome-desktop
|
||||
, gnome-online-accounts
|
||||
, gnome-settings-daemon
|
||||
, gnome-tecla
|
||||
, gnome
|
||||
, gsettings-desktop-schemas
|
||||
, gsound
|
||||
, gst_all_1
|
||||
, gtk4
|
||||
, ibus
|
||||
, json-glib
|
||||
, libgtop
|
||||
, libgudev
|
||||
, libadwaita
|
||||
, libkrb5
|
||||
, libjxl
|
||||
, libpulseaudio
|
||||
, libpwquality
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, libsecret
|
||||
, libsoup_3
|
||||
, libwacom
|
||||
, libXi
|
||||
, libxml2
|
||||
, libxslt
|
||||
, meson
|
||||
, modemmanager
|
||||
, mutter
|
||||
, networkmanager
|
||||
, networkmanagerapplet
|
||||
, libnma-gtk4
|
||||
, ninja
|
||||
, pkg-config
|
||||
, polkit
|
||||
, python3
|
||||
, samba
|
||||
, setxkbmap
|
||||
, shadow
|
||||
, shared-mime-info
|
||||
, sound-theme-freedesktop
|
||||
, tracker
|
||||
, tracker-miners
|
||||
, tzdata
|
||||
, udisks2
|
||||
, upower
|
||||
, libepoxy
|
||||
, gnome-user-share
|
||||
, gnome-remote-desktop
|
||||
, wrapGAppsHook4
|
||||
, xorgserver
|
||||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
substituteAll,
|
||||
accountsservice,
|
||||
adwaita-icon-theme,
|
||||
colord,
|
||||
colord-gtk4,
|
||||
cups,
|
||||
dbus,
|
||||
docbook-xsl-nons,
|
||||
fontconfig,
|
||||
gdk-pixbuf,
|
||||
gettext,
|
||||
glib,
|
||||
glib-networking,
|
||||
gcr_4,
|
||||
glibc,
|
||||
gnome-bluetooth,
|
||||
gnome-color-manager,
|
||||
gnome-desktop,
|
||||
gnome-online-accounts,
|
||||
gnome-settings-daemon,
|
||||
gnome-tecla,
|
||||
gnome,
|
||||
gsettings-desktop-schemas,
|
||||
gsound,
|
||||
gst_all_1,
|
||||
gtk4,
|
||||
ibus,
|
||||
json-glib,
|
||||
libgtop,
|
||||
libgudev,
|
||||
libadwaita,
|
||||
libkrb5,
|
||||
libjxl,
|
||||
libpulseaudio,
|
||||
libpwquality,
|
||||
librsvg,
|
||||
webp-pixbuf-loader,
|
||||
libsecret,
|
||||
libsoup_3,
|
||||
libwacom,
|
||||
libXi,
|
||||
libxml2,
|
||||
libxslt,
|
||||
meson,
|
||||
modemmanager,
|
||||
mutter,
|
||||
networkmanager,
|
||||
networkmanagerapplet,
|
||||
libnma-gtk4,
|
||||
ninja,
|
||||
pkg-config,
|
||||
polkit,
|
||||
python3,
|
||||
samba,
|
||||
setxkbmap,
|
||||
shadow,
|
||||
shared-mime-info,
|
||||
sound-theme-freedesktop,
|
||||
tracker,
|
||||
tracker-miners,
|
||||
tzdata,
|
||||
udisks2,
|
||||
upower,
|
||||
libepoxy,
|
||||
gnome-user-share,
|
||||
gnome-remote-desktop,
|
||||
wrapGAppsHook4,
|
||||
xorgserver,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -147,11 +148,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tracker-miners # for search locations dialog
|
||||
udisks2
|
||||
upower
|
||||
] ++ (with gst_all_1; [
|
||||
# For animations in Mouse panel.
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
@@ -177,13 +177,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postInstall = ''
|
||||
# Pull in WebP and JXL support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
}}"
|
||||
export GDK_PIXBUF_MODULE_FILE="${
|
||||
gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
}
|
||||
}"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
@@ -205,7 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-control-center";
|
||||
attrPath = "gnome.gnome-control-center";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
, libnotify
|
||||
, itstool
|
||||
, gnome
|
||||
, gnome-settings-daemon
|
||||
, adwaita-icon-theme
|
||||
, libxml2
|
||||
, gsettings-desktop-schemas
|
||||
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
udisks2
|
||||
adwaita-icon-theme
|
||||
systemd
|
||||
gnome.gnome-settings-daemon
|
||||
gnome-settings-daemon
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,222 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
autoreconfHook,
|
||||
fetchurl,
|
||||
gettext,
|
||||
glib,
|
||||
gnome-bluetooth,
|
||||
gnome-desktop,
|
||||
gnome-panel,
|
||||
gnome-session,
|
||||
gnome,
|
||||
gsettings-desktop-schemas,
|
||||
gtk3,
|
||||
ibus,
|
||||
libcanberra-gtk3,
|
||||
libpulseaudio,
|
||||
libxkbfile,
|
||||
libxml2,
|
||||
pkg-config,
|
||||
polkit,
|
||||
gdm,
|
||||
systemd,
|
||||
upower,
|
||||
pam,
|
||||
wrapGAppsHook3,
|
||||
writeTextFile,
|
||||
xkeyboard_config,
|
||||
xorg,
|
||||
nixosTests,
|
||||
runCommand,
|
||||
buildEnv,
|
||||
}:
|
||||
|
||||
let
|
||||
# From data/sessions/Makefile.am
|
||||
requiredComponentsCommon = enableGnomePanel: [ ] ++ lib.optional enableGnomePanel "gnome-panel";
|
||||
requiredComponentsGsd = [
|
||||
"org.gnome.SettingsDaemon.A11ySettings"
|
||||
"org.gnome.SettingsDaemon.Color"
|
||||
"org.gnome.SettingsDaemon.Datetime"
|
||||
"org.gnome.SettingsDaemon.Housekeeping"
|
||||
"org.gnome.SettingsDaemon.Keyboard"
|
||||
"org.gnome.SettingsDaemon.MediaKeys"
|
||||
"org.gnome.SettingsDaemon.Power"
|
||||
"org.gnome.SettingsDaemon.PrintNotifications"
|
||||
"org.gnome.SettingsDaemon.Rfkill"
|
||||
"org.gnome.SettingsDaemon.ScreensaverProxy"
|
||||
"org.gnome.SettingsDaemon.Sharing"
|
||||
"org.gnome.SettingsDaemon.Smartcard"
|
||||
"org.gnome.SettingsDaemon.Sound"
|
||||
"org.gnome.SettingsDaemon.UsbProtection"
|
||||
"org.gnome.SettingsDaemon.Wacom"
|
||||
"org.gnome.SettingsDaemon.XSettings"
|
||||
];
|
||||
requiredComponents =
|
||||
wmName: enableGnomePanel:
|
||||
"RequiredComponents=${
|
||||
lib.concatStringsSep ";" (
|
||||
[ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd
|
||||
)
|
||||
};";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-flashback";
|
||||
version = "3.52.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo=";
|
||||
};
|
||||
|
||||
# make .desktop Execs absolute
|
||||
postPatch = ''
|
||||
patch -p0 <<END_PATCH
|
||||
+++ data/applications/gnome-flashback.desktop.in
|
||||
@@ -4 +4 @@
|
||||
-Exec=gnome-flashback
|
||||
+Exec=$out/bin/gnome-flashback
|
||||
END_PATCH
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Check that our expected RequiredComponents match the stock session files, but then don't install them.
|
||||
# They can be installed using mkSessionForWm.
|
||||
grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
|
||||
|
||||
rm -r $out/share/gnome-session
|
||||
rm -r $out/share/xsessions
|
||||
rm $out/libexec/gnome-flashback-metacity
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gettext
|
||||
libxml2
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gnome-bluetooth
|
||||
gnome-desktop
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
ibus
|
||||
libcanberra-gtk3
|
||||
libpulseaudio
|
||||
libxkbfile
|
||||
xorg.libXxf86vm
|
||||
polkit
|
||||
gdm
|
||||
gnome-panel
|
||||
systemd
|
||||
upower
|
||||
pam
|
||||
xkeyboard_config
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts";
|
||||
PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-flashback";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
|
||||
mkWmApplication =
|
||||
{
|
||||
wmName,
|
||||
wmLabel,
|
||||
wmCommand,
|
||||
}:
|
||||
writeTextFile {
|
||||
name = "gnome-flashback-${wmName}-wm";
|
||||
destination = "/share/applications/${wmName}.desktop";
|
||||
text = ''
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Encoding=UTF-8
|
||||
Name=${wmLabel}
|
||||
Exec=${wmCommand}
|
||||
NoDisplay=true
|
||||
X-GNOME-WMName=${wmLabel}
|
||||
X-GNOME-Autostart-Phase=WindowManager
|
||||
X-GNOME-Provides=windowmanager
|
||||
X-GNOME-Autostart-Notify=false
|
||||
'';
|
||||
};
|
||||
|
||||
mkGnomeSession =
|
||||
{
|
||||
wmName,
|
||||
wmLabel,
|
||||
enableGnomePanel,
|
||||
}:
|
||||
writeTextFile {
|
||||
name = "gnome-flashback-${wmName}-gnome-session";
|
||||
destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
|
||||
text = ''
|
||||
[GNOME Session]
|
||||
Name=GNOME Flashback (${wmLabel})
|
||||
${requiredComponents wmName enableGnomePanel}
|
||||
'';
|
||||
};
|
||||
|
||||
mkSessionForWm =
|
||||
{
|
||||
wmName,
|
||||
wmLabel,
|
||||
wmCommand,
|
||||
}:
|
||||
writeTextFile {
|
||||
name = "gnome-flashback-${wmName}-xsession";
|
||||
destination = "/share/xsessions/gnome-flashback-${wmName}.desktop";
|
||||
text = ''
|
||||
[Desktop Entry]
|
||||
Name=GNOME Flashback (${wmLabel})
|
||||
Comment=This session logs you into GNOME Flashback with ${wmLabel}
|
||||
Exec=${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName}
|
||||
TryExec=${wmCommand}
|
||||
Type=Application
|
||||
DesktopNames=GNOME-Flashback;GNOME;
|
||||
'';
|
||||
}
|
||||
// {
|
||||
providedSessions = [ "gnome-flashback-${wmName}" ];
|
||||
};
|
||||
|
||||
mkSystemdTargetForWm =
|
||||
{
|
||||
wmName,
|
||||
wmLabel,
|
||||
wmCommand,
|
||||
enableGnomePanel,
|
||||
}:
|
||||
runCommand "gnome-flashback-${wmName}.target" { } ''
|
||||
mkdir -p $out/lib/systemd/user
|
||||
cp -r "${finalAttrs.gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
|
||||
"$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
|
||||
'';
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests) gnome-flashback;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNOME 2.x-like session for GNOME 3";
|
||||
mainProgram = "gnome-flashback";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-flashback";
|
||||
license = licenses.gpl2;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
+32
-28
@@ -1,35 +1,40 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, dconf
|
||||
, evolution-data-server
|
||||
, gdm
|
||||
, geocode-glib_2
|
||||
, gettext
|
||||
, glib
|
||||
, gnome-desktop
|
||||
, gnome-menus
|
||||
, gnome
|
||||
, gtk3
|
||||
, itstool
|
||||
, libgweather
|
||||
, libwnck
|
||||
, libxml2
|
||||
, pkg-config
|
||||
, polkit
|
||||
, systemd
|
||||
, wrapGAppsHook3
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
dconf,
|
||||
evolution-data-server,
|
||||
gdm,
|
||||
geocode-glib_2,
|
||||
gettext,
|
||||
glib,
|
||||
gnome-desktop,
|
||||
gnome-menus,
|
||||
gnome,
|
||||
gtk3,
|
||||
itstool,
|
||||
libgweather,
|
||||
libwnck,
|
||||
libxml2,
|
||||
pkg-config,
|
||||
polkit,
|
||||
systemd,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-panel";
|
||||
version = "3.52.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"man"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-nim6iHPN5A1AwpNKRk+PQ7ousbUisZFEfKon3XhTxdQ=";
|
||||
};
|
||||
|
||||
@@ -91,8 +96,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
packageName = "gnome-panel";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
@@ -105,4 +109,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+21
-13
@@ -1,17 +1,22 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildEnv
|
||||
, gnome-panel
|
||||
, gnome-flashback
|
||||
, xorg
|
||||
, glib
|
||||
, wrapGAppsHook3
|
||||
, panelModulePackages ? [ ]
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildEnv,
|
||||
gnome,
|
||||
gnome-panel,
|
||||
gnome-flashback,
|
||||
xorg,
|
||||
glib,
|
||||
wrapGAppsHook3,
|
||||
panelModulePackages ? [ ],
|
||||
}:
|
||||
|
||||
let
|
||||
# We always want to find the built-in panel applets.
|
||||
selectedPanelModulePackages = [ gnome-panel gnome-flashback ] ++ panelModulePackages;
|
||||
selectedPanelModulePackages = [
|
||||
gnome-panel
|
||||
gnome-flashback
|
||||
] ++ panelModulePackages;
|
||||
|
||||
panelModulesEnv = buildEnv {
|
||||
name = "gnome-panel-modules-env";
|
||||
@@ -28,8 +33,9 @@ stdenv.mkDerivation {
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = selectedPanelModulePackages ++
|
||||
lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]);
|
||||
buildInputs =
|
||||
selectedPanelModulePackages
|
||||
++ lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]);
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
@@ -62,5 +68,7 @@ stdenv.mkDerivation {
|
||||
)
|
||||
'';
|
||||
|
||||
meta = gnome-panel.meta // { outputsToInstall = [ "out" ]; };
|
||||
meta = gnome-panel.meta // {
|
||||
outputsToInstall = [ "out" ];
|
||||
};
|
||||
}
|
||||
+10
-9
@@ -1,12 +1,13 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, glib
|
||||
, systemd
|
||||
, wrapGAppsHook3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
glib,
|
||||
systemd,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
+41
-36
@@ -1,42 +1,48 @@
|
||||
{ fetchurl
|
||||
, lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, adwaita-icon-theme
|
||||
, glib
|
||||
, gtk3
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-desktop
|
||||
, dbus
|
||||
, json-glib
|
||||
, libICE
|
||||
, xmlto
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_412
|
||||
, python3
|
||||
, libxslt
|
||||
, gettext
|
||||
, makeWrapper
|
||||
, systemd
|
||||
, xorg
|
||||
, libepoxy
|
||||
, bash
|
||||
, gnome-session-ctl
|
||||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
substituteAll,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gnome,
|
||||
adwaita-icon-theme,
|
||||
glib,
|
||||
gtk3,
|
||||
gsettings-desktop-schemas,
|
||||
gnome-desktop,
|
||||
gnome-settings-daemon,
|
||||
gnome-shell,
|
||||
dbus,
|
||||
json-glib,
|
||||
libICE,
|
||||
xmlto,
|
||||
docbook_xsl,
|
||||
docbook_xml_dtd_412,
|
||||
python3,
|
||||
libxslt,
|
||||
gettext,
|
||||
makeWrapper,
|
||||
systemd,
|
||||
xorg,
|
||||
libepoxy,
|
||||
bash,
|
||||
gnome-session-ctl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-session";
|
||||
# Also bump ./ctl.nix when bumping major version.
|
||||
version = "46.0";
|
||||
|
||||
outputs = [ "out" "sessions" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"sessions"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ=";
|
||||
};
|
||||
|
||||
@@ -71,7 +77,7 @@ stdenv.mkDerivation rec {
|
||||
json-glib
|
||||
xorg.xtrans
|
||||
adwaita-icon-theme
|
||||
gnome.gnome-settings-daemon
|
||||
gnome-settings-daemon
|
||||
gsettings-desktop-schemas
|
||||
systemd
|
||||
libepoxy
|
||||
@@ -109,8 +115,8 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram "$out/libexec/gnome-session-binary" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
--suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \
|
||||
--suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
|
||||
--suffix XDG_DATA_DIRS : "${gnome-shell}/share" \
|
||||
--suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
|
||||
'';
|
||||
|
||||
separateDebugInfo = true;
|
||||
@@ -118,7 +124,6 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-session";
|
||||
attrPath = "gnome.gnome-session";
|
||||
};
|
||||
providedSessions = [
|
||||
"gnome"
|
||||
@@ -133,4 +138,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+45
-44
@@ -1,52 +1,53 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, perl
|
||||
, gettext
|
||||
, gtk3
|
||||
, glib
|
||||
, libnotify
|
||||
, libgnomekbd
|
||||
, lcms2
|
||||
, libpulseaudio
|
||||
, alsa-lib
|
||||
, libcanberra-gtk3
|
||||
, upower
|
||||
, colord
|
||||
, libgweather
|
||||
, polkit
|
||||
, gsettings-desktop-schemas
|
||||
, geoclue2
|
||||
, systemd
|
||||
, libgudev
|
||||
, libwacom
|
||||
, libxslt
|
||||
, libxml2
|
||||
, modemmanager
|
||||
, networkmanager
|
||||
, gnome-desktop
|
||||
, geocode-glib_2
|
||||
, docbook_xsl
|
||||
, wrapGAppsHook3
|
||||
, python3
|
||||
, tzdata
|
||||
, nss
|
||||
, gcr_4
|
||||
, gnome-session-ctl
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchpatch,
|
||||
substituteAll,
|
||||
fetchurl,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gnome,
|
||||
perl,
|
||||
gettext,
|
||||
gtk3,
|
||||
glib,
|
||||
libnotify,
|
||||
libgnomekbd,
|
||||
lcms2,
|
||||
libpulseaudio,
|
||||
alsa-lib,
|
||||
libcanberra-gtk3,
|
||||
upower,
|
||||
colord,
|
||||
libgweather,
|
||||
polkit,
|
||||
gsettings-desktop-schemas,
|
||||
geoclue2,
|
||||
systemd,
|
||||
libgudev,
|
||||
libwacom,
|
||||
libxslt,
|
||||
libxml2,
|
||||
modemmanager,
|
||||
networkmanager,
|
||||
gnome-desktop,
|
||||
geocode-glib_2,
|
||||
docbook_xsl,
|
||||
wrapGAppsHook3,
|
||||
python3,
|
||||
tzdata,
|
||||
nss,
|
||||
gcr_4,
|
||||
gnome-session-ctl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "43.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A=";
|
||||
};
|
||||
|
||||
@@ -125,4 +126,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.pantheon.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+43
-44
@@ -1,49 +1,50 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, substituteAll
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, perl
|
||||
, gettext
|
||||
, gtk3
|
||||
, glib
|
||||
, libnotify
|
||||
, libgnomekbd
|
||||
, libpulseaudio
|
||||
, alsa-lib
|
||||
, libcanberra-gtk3
|
||||
, upower
|
||||
, colord
|
||||
, libgweather
|
||||
, polkit
|
||||
, gsettings-desktop-schemas
|
||||
, geoclue2
|
||||
, systemd
|
||||
, libgudev
|
||||
, libwacom
|
||||
, libxslt
|
||||
, libxml2
|
||||
, modemmanager
|
||||
, networkmanager
|
||||
, gnome-desktop
|
||||
, geocode-glib_2
|
||||
, docbook_xsl
|
||||
, wrapGAppsHook3
|
||||
, python3
|
||||
, tzdata
|
||||
, gcr_4
|
||||
, gnome-session-ctl
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
substituteAll,
|
||||
fetchurl,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gnome,
|
||||
perl,
|
||||
gettext,
|
||||
gtk3,
|
||||
glib,
|
||||
libnotify,
|
||||
libgnomekbd,
|
||||
libpulseaudio,
|
||||
alsa-lib,
|
||||
libcanberra-gtk3,
|
||||
upower,
|
||||
colord,
|
||||
libgweather,
|
||||
polkit,
|
||||
gsettings-desktop-schemas,
|
||||
geoclue2,
|
||||
systemd,
|
||||
libgudev,
|
||||
libwacom,
|
||||
libxslt,
|
||||
libxml2,
|
||||
modemmanager,
|
||||
networkmanager,
|
||||
gnome-desktop,
|
||||
geocode-glib_2,
|
||||
docbook_xsl,
|
||||
wrapGAppsHook3,
|
||||
python3,
|
||||
tzdata,
|
||||
gcr_4,
|
||||
gnome-session-ctl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c=";
|
||||
};
|
||||
|
||||
@@ -103,7 +104,6 @@ stdenv.mkDerivation rec {
|
||||
# we're using plain
|
||||
env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
|
||||
|
||||
|
||||
postPatch = ''
|
||||
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
|
||||
chmod +x $f
|
||||
@@ -113,8 +113,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
packageName = "gnome-settings-daemon";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -123,4 +122,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+78
-72
@@ -1,66 +1,68 @@
|
||||
{ fetchurl
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, lib, stdenv
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, json-glib
|
||||
, gettext
|
||||
, libsecret
|
||||
, python3
|
||||
, polkit
|
||||
, networkmanager
|
||||
, gi-docgen
|
||||
, at-spi2-core
|
||||
, unzip
|
||||
, shared-mime-info
|
||||
, libgweather
|
||||
, libjxl
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, geoclue2
|
||||
, perl
|
||||
, desktop-file-utils
|
||||
, libpulseaudio
|
||||
, libical
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook4
|
||||
, libxslt
|
||||
, gcr_4
|
||||
, accountsservice
|
||||
, gdk-pixbuf
|
||||
, gdm
|
||||
, upower
|
||||
, ibus
|
||||
, libnma-gtk4
|
||||
, gnome-desktop
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-keyring
|
||||
, glib
|
||||
, gjs
|
||||
, mutter
|
||||
, evolution-data-server-gtk4
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, sassc
|
||||
, systemd
|
||||
, pipewire
|
||||
, gst_all_1
|
||||
, adwaita-icon-theme
|
||||
, gnome-bluetooth
|
||||
, gnome-clocks
|
||||
, gnome-settings-daemon
|
||||
, gnome-autoar
|
||||
, gnome-tecla
|
||||
, asciidoc
|
||||
, bash-completion
|
||||
, mesa
|
||||
, libGL
|
||||
, libXi
|
||||
, libX11
|
||||
, libxml2
|
||||
{
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
substituteAll,
|
||||
lib,
|
||||
stdenv,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gnome,
|
||||
json-glib,
|
||||
gettext,
|
||||
libsecret,
|
||||
python3,
|
||||
polkit,
|
||||
networkmanager,
|
||||
gi-docgen,
|
||||
at-spi2-core,
|
||||
unzip,
|
||||
shared-mime-info,
|
||||
libgweather,
|
||||
libjxl,
|
||||
librsvg,
|
||||
webp-pixbuf-loader,
|
||||
geoclue2,
|
||||
perl,
|
||||
desktop-file-utils,
|
||||
libpulseaudio,
|
||||
libical,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook4,
|
||||
libxslt,
|
||||
gcr_4,
|
||||
accountsservice,
|
||||
gdk-pixbuf,
|
||||
gdm,
|
||||
upower,
|
||||
ibus,
|
||||
libnma-gtk4,
|
||||
gnome-desktop,
|
||||
gsettings-desktop-schemas,
|
||||
gnome-keyring,
|
||||
glib,
|
||||
gjs,
|
||||
mutter,
|
||||
evolution-data-server-gtk4,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
sassc,
|
||||
systemd,
|
||||
pipewire,
|
||||
gst_all_1,
|
||||
adwaita-icon-theme,
|
||||
gnome-bluetooth,
|
||||
gnome-clocks,
|
||||
gnome-settings-daemon,
|
||||
gnome-autoar,
|
||||
gnome-tecla,
|
||||
asciidoc,
|
||||
bash-completion,
|
||||
mesa,
|
||||
libGL,
|
||||
libXi,
|
||||
libX11,
|
||||
libxml2,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -70,7 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell";
|
||||
version = "46.4";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
||||
@@ -191,13 +196,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postInstall = ''
|
||||
# Pull in WebP and JXL support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
}}"
|
||||
export GDK_PIXBUF_MODULE_FILE="${
|
||||
gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
}
|
||||
}"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
@@ -224,7 +231,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mozillaPlugin = "/lib/mozilla/plugins";
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-shell";
|
||||
attrPath = "gnome.gnome-shell";
|
||||
};
|
||||
};
|
||||
|
||||
+25
-24
@@ -1,32 +1,33 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, meson
|
||||
, fetchurl
|
||||
, python3
|
||||
, pkg-config
|
||||
, gtk4
|
||||
, glib
|
||||
, gtksourceview5
|
||||
, gsettings-desktop-schemas
|
||||
, wrapGAppsHook4
|
||||
, ninja
|
||||
, gnome
|
||||
, cairo
|
||||
, enchant
|
||||
, icu
|
||||
, itstool
|
||||
, libadwaita
|
||||
, editorconfig-core-c
|
||||
, libxml2
|
||||
, desktop-file-utils
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
meson,
|
||||
fetchurl,
|
||||
python3,
|
||||
pkg-config,
|
||||
gtk4,
|
||||
glib,
|
||||
gtksourceview5,
|
||||
gsettings-desktop-schemas,
|
||||
wrapGAppsHook4,
|
||||
ninja,
|
||||
gnome,
|
||||
cairo,
|
||||
enchant,
|
||||
icu,
|
||||
itstool,
|
||||
libadwaita,
|
||||
editorconfig-core-c,
|
||||
libxml2,
|
||||
desktop-file-utils,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-text-editor";
|
||||
version = "46.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-AFtIEEqQm+Zq4HRI0rxXBsfRE3gQV6JP9tpVvfMkxz0=";
|
||||
};
|
||||
|
||||
@@ -67,4 +68,4 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
+25
-24
@@ -1,31 +1,32 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gtk4
|
||||
, glib
|
||||
, gdk-pixbuf
|
||||
, desktop-file-utils
|
||||
, appstream-glib
|
||||
, wrapGAppsHook4
|
||||
, python3
|
||||
, gnome
|
||||
, libadwaita
|
||||
, librsvg
|
||||
, rustc
|
||||
, cargo
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
gettext,
|
||||
meson,
|
||||
ninja,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
gtk4,
|
||||
glib,
|
||||
gdk-pixbuf,
|
||||
desktop-file-utils,
|
||||
appstream-glib,
|
||||
wrapGAppsHook4,
|
||||
python3,
|
||||
gnome,
|
||||
libadwaita,
|
||||
librsvg,
|
||||
rustc,
|
||||
cargo,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-tour";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-8yZSqp1+8GQ3YM5jkyCCz9NkHnczt2xCm3jQl4O3xGo=";
|
||||
};
|
||||
|
||||
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
packageName = "gnome-tour";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -72,4 +73,4 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -8,6 +8,8 @@
|
||||
, glib
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, gnome-settings-daemon
|
||||
, gnome-shell
|
||||
, gnome-shell-extensions
|
||||
, gobject-introspection
|
||||
, gsettings-desktop-schemas
|
||||
@@ -17,6 +19,7 @@
|
||||
, libgudev
|
||||
, libnotify
|
||||
, libxml2
|
||||
, mutter
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, wrapGAppsHook4
|
||||
@@ -48,11 +51,11 @@ python3Packages.buildPythonApplication rec {
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gnome-desktop
|
||||
gnome.gnome-settings-daemon
|
||||
gnome.gnome-shell
|
||||
gnome-settings-daemon
|
||||
gnome-shell
|
||||
# Makes it possible to select user themes through the `user-theme` extension
|
||||
gnome-shell-extensions
|
||||
gnome.mutter
|
||||
mutter
|
||||
gsettings-desktop-schemas
|
||||
gtk4
|
||||
libadwaita
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "handheld-daemon";
|
||||
version = "3.3.8";
|
||||
version = "3.3.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hhd-dev";
|
||||
repo = "hhd";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-15vG+e509CEagZ+G9FcfRmsdD8Jex8xUfdvEKlY+FaI=";
|
||||
hash = "sha256-vjJY9YrULRHEgVIgzwLS5gKfQnbHFKXigU+rlm+BiJQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -24,6 +24,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/keycastr/keycastr";
|
||||
description = "Open-source keystroke visualizer";
|
||||
|
||||
Executable
+20
@@ -0,0 +1,20 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq gnused
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "$0")" || exit 1
|
||||
|
||||
# Grab latest release version
|
||||
LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/keycastr/keycastr/releases/latest" | jq -r '.tag_name' | sed 's/^v//')"
|
||||
CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)"
|
||||
|
||||
if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then
|
||||
echo "keycastr is up-to-date"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/keycastr/keycastr/releases/download/v${LATEST_VER}/KeyCastr.app.zip")")"
|
||||
|
||||
sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix
|
||||
sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix
|
||||
+24
-18
@@ -1,31 +1,37 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, docbook_xml_dtd_43
|
||||
, docbook_xsl
|
||||
, gettext
|
||||
, gmp
|
||||
, gtk-doc
|
||||
, libxslt
|
||||
, mpfr
|
||||
, pcre2
|
||||
, pkg-config
|
||||
, python3
|
||||
{
|
||||
lib,
|
||||
autoreconfHook,
|
||||
docbook_xml_dtd_43,
|
||||
docbook_xsl,
|
||||
fetchFromGitHub,
|
||||
gettext,
|
||||
gmp,
|
||||
gtk-doc,
|
||||
libxslt,
|
||||
mpfr,
|
||||
pcre2,
|
||||
pkg-config,
|
||||
python3,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libbytesize";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storaged-project";
|
||||
repo = "libbytesize";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U=";
|
||||
hash = "sha256-scOnucn7xp6KKEtkpwfyrdzcntJF2l0h0fsQotcceLc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"devdoc"
|
||||
"man"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
@@ -49,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://github.com/storaged-project/libbytesize";
|
||||
description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes";
|
||||
mainProgram = "bscalc";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
mainProgram = "bscalc";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
@@ -1,16 +1,26 @@
|
||||
{ lib, stdenv, fetchurl, unzip, makeWrapper, jre_headless }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
makeWrapper,
|
||||
jre_headless,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maestro";
|
||||
version = "1.36.0";
|
||||
version = "1.37.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
||||
sha256 = "18zffmqz32dfb66yy48z3dl258rlfc8m2r4021hbrbixvk7k3qb7";
|
||||
sha256 = "sha256-bWZuD2+v6molwW1ef2a3djBnVfYscBjILLGXeeSUmoU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchpatch,
|
||||
stdenv,
|
||||
pkg-config,
|
||||
gnome,
|
||||
gnome-settings-daemon,
|
||||
gettext,
|
||||
gobject-introspection,
|
||||
cairo,
|
||||
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cairo
|
||||
glib
|
||||
gnome-desktop
|
||||
gnome.gnome-settings-daemon
|
||||
gnome-settings-daemon
|
||||
gobject-introspection
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
gnome,
|
||||
gnome-shell,
|
||||
sassc,
|
||||
gnome-themes-extra,
|
||||
gtk-engine-murrine,
|
||||
@@ -82,7 +82,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome.gnome-shell
|
||||
gnome-shell
|
||||
sassc
|
||||
];
|
||||
buildInputs = [ gnome-themes-extra ];
|
||||
|
||||
@@ -3,6 +3,12 @@
|
||||
, lib
|
||||
, nixosTests
|
||||
, olm
|
||||
# This option enables the use of an experimental pure-Go implementation of the
|
||||
# Olm protocol instead of libolm for end-to-end encryption. Using goolm is not
|
||||
# recommended by the mautrix developers, but they are interested in people
|
||||
# trying it out in non-production-critical environments and reporting any
|
||||
# issues they run into.
|
||||
, withGoolm ? false
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -18,7 +24,8 @@ buildGoModule rec {
|
||||
hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
buildInputs = lib.optional (!withGoolm) olm;
|
||||
tags = lib.optional withGoolm "goolm";
|
||||
|
||||
vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio=";
|
||||
|
||||
|
||||
+58
-52
@@ -1,60 +1,66 @@
|
||||
{ fetchurl
|
||||
, runCommand
|
||||
, lib
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, cairo
|
||||
, colord
|
||||
, lcms2
|
||||
, pango
|
||||
, json-glib
|
||||
, libstartup_notification
|
||||
, libcanberra
|
||||
, ninja
|
||||
, xvfb-run
|
||||
, xkeyboard_config
|
||||
, libxcvt
|
||||
, libxkbfile
|
||||
, libXdamage
|
||||
, libxkbcommon
|
||||
, libXtst
|
||||
, libinput
|
||||
, libdrm
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
, gtk3
|
||||
, gnome-desktop
|
||||
, pipewire
|
||||
, libgudev
|
||||
, libwacom
|
||||
, xwayland
|
||||
, mesa
|
||||
, meson
|
||||
, gnome-settings-daemon
|
||||
, xorgserver
|
||||
, python3
|
||||
, wayland-scanner
|
||||
, wrapGAppsHook3
|
||||
, gi-docgen
|
||||
, sysprof
|
||||
, libsysprof-capture
|
||||
, desktop-file-utils
|
||||
, libcap_ng
|
||||
, egl-wayland
|
||||
, graphene
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
{
|
||||
fetchurl,
|
||||
runCommand,
|
||||
lib,
|
||||
fetchpatch,
|
||||
stdenv,
|
||||
pkg-config,
|
||||
gnome,
|
||||
gettext,
|
||||
gobject-introspection,
|
||||
cairo,
|
||||
colord,
|
||||
lcms2,
|
||||
pango,
|
||||
json-glib,
|
||||
libstartup_notification,
|
||||
libcanberra,
|
||||
ninja,
|
||||
xvfb-run,
|
||||
xkeyboard_config,
|
||||
libxcvt,
|
||||
libxkbfile,
|
||||
libXdamage,
|
||||
libxkbcommon,
|
||||
libXtst,
|
||||
libinput,
|
||||
libdrm,
|
||||
gsettings-desktop-schemas,
|
||||
glib,
|
||||
gtk3,
|
||||
gnome-desktop,
|
||||
pipewire,
|
||||
libgudev,
|
||||
libwacom,
|
||||
xwayland,
|
||||
mesa,
|
||||
meson,
|
||||
gnome-settings-daemon,
|
||||
xorgserver,
|
||||
python3,
|
||||
wayland-scanner,
|
||||
wrapGAppsHook3,
|
||||
gi-docgen,
|
||||
sysprof,
|
||||
libsysprof-capture,
|
||||
desktop-file-utils,
|
||||
libcap_ng,
|
||||
egl-wayland,
|
||||
graphene,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "43.8";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"man"
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
@@ -175,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-11";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" {} ''
|
||||
libdirExists = runCommand "mutter-libdir-exists" { } ''
|
||||
if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then
|
||||
echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one."
|
||||
exit 1
|
||||
@@ -1,75 +1,81 @@
|
||||
{ fetchurl
|
||||
, runCommand
|
||||
, lib
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, cairo
|
||||
, colord
|
||||
, lcms2
|
||||
, pango
|
||||
, libstartup_notification
|
||||
, libcanberra
|
||||
, ninja
|
||||
, xvfb-run
|
||||
, libxcvt
|
||||
, libICE
|
||||
, libX11
|
||||
, libXcomposite
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXi
|
||||
, libXtst
|
||||
, libxkbfile
|
||||
, xkeyboard_config
|
||||
, libxkbcommon
|
||||
, libXrender
|
||||
, libxcb
|
||||
, libXrandr
|
||||
, libXinerama
|
||||
, libXau
|
||||
, libinput
|
||||
, libdrm
|
||||
, libei
|
||||
, libdisplay-info
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
, atk
|
||||
, gtk4
|
||||
, fribidi
|
||||
, harfbuzz
|
||||
, gnome-desktop
|
||||
, pipewire
|
||||
, libgudev
|
||||
, libwacom
|
||||
, libSM
|
||||
, xwayland
|
||||
, mesa
|
||||
, meson
|
||||
, gnome-settings-daemon
|
||||
, xorgserver
|
||||
, python3
|
||||
, wayland-scanner
|
||||
, wrapGAppsHook4
|
||||
, gi-docgen
|
||||
, sysprof
|
||||
, libsysprof-capture
|
||||
, desktop-file-utils
|
||||
, egl-wayland
|
||||
, graphene
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
{
|
||||
fetchurl,
|
||||
runCommand,
|
||||
lib,
|
||||
stdenv,
|
||||
pkg-config,
|
||||
gnome,
|
||||
gettext,
|
||||
gobject-introspection,
|
||||
cairo,
|
||||
colord,
|
||||
lcms2,
|
||||
pango,
|
||||
libstartup_notification,
|
||||
libcanberra,
|
||||
ninja,
|
||||
xvfb-run,
|
||||
libxcvt,
|
||||
libICE,
|
||||
libX11,
|
||||
libXcomposite,
|
||||
libXcursor,
|
||||
libXdamage,
|
||||
libXext,
|
||||
libXfixes,
|
||||
libXi,
|
||||
libXtst,
|
||||
libxkbfile,
|
||||
xkeyboard_config,
|
||||
libxkbcommon,
|
||||
libXrender,
|
||||
libxcb,
|
||||
libXrandr,
|
||||
libXinerama,
|
||||
libXau,
|
||||
libinput,
|
||||
libdrm,
|
||||
libei,
|
||||
libdisplay-info,
|
||||
gsettings-desktop-schemas,
|
||||
glib,
|
||||
atk,
|
||||
gtk4,
|
||||
fribidi,
|
||||
harfbuzz,
|
||||
gnome-desktop,
|
||||
pipewire,
|
||||
libgudev,
|
||||
libwacom,
|
||||
libSM,
|
||||
xwayland,
|
||||
mesa,
|
||||
meson,
|
||||
gnome-settings-daemon,
|
||||
xorgserver,
|
||||
python3,
|
||||
wayland-scanner,
|
||||
wrapGAppsHook4,
|
||||
gi-docgen,
|
||||
sysprof,
|
||||
libsysprof-capture,
|
||||
desktop-file-utils,
|
||||
egl-wayland,
|
||||
graphene,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "46.4";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"man"
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
@@ -139,7 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xwayland
|
||||
wayland
|
||||
wayland-protocols
|
||||
] ++ [
|
||||
# X11 client
|
||||
gtk4
|
||||
libICE
|
||||
@@ -184,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-14";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" {} ''
|
||||
libdirExists = runCommand "mutter-libdir-exists" { } ''
|
||||
if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then
|
||||
echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one."
|
||||
exit 1
|
||||
@@ -195,7 +200,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "mutter";
|
||||
attrPath = "gnome.mutter";
|
||||
};
|
||||
};
|
||||
|
||||
+2
-2
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfst";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-3ph782JHIcXVujIa+VdRiY5PS7Qcijbi1k8GJ2Vti0I=";
|
||||
hash = "sha256-B3cUFZ1c8+OKgLbGZW08zCyLi2xQu0G7ZcX+wQeWv1M=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
+2
-2
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opengrm-ngram";
|
||||
version = "1.3.14";
|
||||
version = "1.3.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz";
|
||||
sha256 = "sha256-ivMPDy6CPM17hWCToLOVzUgcWZiEt2pjYeizeBLYnYc=";
|
||||
hash = "sha256-pcwP0VVW8H+0Y2Fsmh4WaH4whPPJlE3WyBI4VJfsES4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2024-08-26";
|
||||
version = "0-unstable-2024-08-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "96d774a9ebae3fe61623029389d763e0c73aa362";
|
||||
hash = "sha256-re4uiXt4No4OEeNm6hc52lkQ8lqkAoF1xy2BjIIi3A8=";
|
||||
rev = "fb29e8ba74aa9712b5b06c20e935a7f4cd208b8c";
|
||||
hash = "sha256-zv+51x8vxsh3vXRPb1k6hCShYk7GQz6n0MAp7KFQbAw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rospo";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ferama";
|
||||
repo = "rospo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cUah73wr0fKK9Lw3228r5SITDn5rNlpgQW5rHtbo6jU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KbR8T7KwueQ9fc4AOX26GOTQFXuV9LgfSxgwCzQt4eE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/ferama/rospo/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd rospo \
|
||||
--bash <($out/bin/rospo completion bash) \
|
||||
--fish <($out/bin/rospo completion fish) \
|
||||
--zsh <($out/bin/rospo completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple, reliable, persistent ssh tunnels with embedded ssh server";
|
||||
homepage = "https://github.com/ferama/rospo";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
mainProgram = "rospo";
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "scalingo";
|
||||
version = "1.32.0";
|
||||
version = "1.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-kursqM0/HxTnEvrVxEd4YUiIG4I974JKZqkQTqP00ko=";
|
||||
hash = "sha256-7hb1RU33wGeSESxY16pYJfQ2O3QOT92Em6jlh8oP/Zc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
pnpm_9,
|
||||
electron,
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -20,6 +22,15 @@ let
|
||||
};
|
||||
|
||||
platformId = platformIds.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}");
|
||||
|
||||
desktopEntry = makeDesktopItem {
|
||||
name = "siyuan";
|
||||
desktopName = "SiYuan";
|
||||
comment = "Refactor your thinking";
|
||||
icon = "siyuan";
|
||||
exec = "siyuan %U";
|
||||
categories = [ "Utility" ];
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "siyuan";
|
||||
@@ -68,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nodejs
|
||||
pnpm.configHook
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
@@ -117,12 +129,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--chdir $out/share/siyuan/resources \
|
||||
--add-flags $out/share/siyuan/resources/app \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \
|
||||
--inherit-argv0
|
||||
|
||||
install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopEntry ];
|
||||
|
||||
meta = {
|
||||
description = "Privacy-first personal knowledge management system that supports complete offline usage, as well as end-to-end encrypted data sync";
|
||||
homepage = "https://b3log.org/siyuan/";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
gnome,
|
||||
gnome-shell,
|
||||
sassc,
|
||||
gnome-themes-extra,
|
||||
gtk-engine-murrine,
|
||||
@@ -83,7 +83,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome.gnome-shell
|
||||
gnome-shell
|
||||
sassc
|
||||
];
|
||||
buildInputs = [ gnome-themes-extra ];
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tproxy";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevwan";
|
||||
repo = "tproxy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LX3ciC3cMYuQPm6ekEkJPrSdTXH+WZ4flXyrsvJZgn8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7s2gnd9UR/R7H5pcA8NcoenaabSVpMh3qzzkOr5RWnU=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "CLI tool to proxy and analyze TCP connections";
|
||||
homepage = "https://github.com/kevwan/tproxy";
|
||||
changelog = "https://github.com/kevwan/tproxy/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ DCsunset ];
|
||||
mainProgram = "tproxy";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "u-config";
|
||||
version = "0.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "u-config";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-r1zcXKLqw/gK+9k3SX7OCBaZhvV2ya5VC9O3h+WdkyY=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"CROSS=${stdenv.cc.targetPrefix}"
|
||||
"CC=${lib.getExe stdenv.cc}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildFlags = [ "pkg-config" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 pkg-config -t $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Smaller, simpler, portable pkg-config clone";
|
||||
homepage = "https://github.com/skeeto/u-config";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
+3
-3
@@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1jhhZosrU2zTlgMhM7vJ2kLpO+BITPdUo0t3rcbDYjg=";
|
||||
sha256 = "sha256-rXWBTPM3dCGON1DvpCOsA4C4mAuVDqV9YbrvP5yDCa0=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-J0fYfSbxL4R1ac6ezM03e1+J8n7+CRSujVU6XDCyPU4=";
|
||||
vendorHash = "sha256-HpPJXYBrk5qfV01VOqXGpn4waEONJa61mqLbEsuwrEs=";
|
||||
|
||||
excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xdg-desktop-portal-shana";
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "xdg-desktop-portal-shana";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bUskzFDd4qjH4Isp6vAJHe5qzgCLudQbkh+JNNTSMu8=";
|
||||
sha256 = "sha256-bBKoAegT3wk2UD2fqSLaix2MuKtVAcHA6vcB9VAzLJw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
cargoHash = "sha256-FzEdQePDnSCuMDqbz0ZUywDzNfbiOwottSrE+eWL9to=";
|
||||
cargoHash = "sha256-vufD/eYulblUKQVHsyvjl2AlRoRAGp2oeYol9kTt3lQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Filechooser portal backend for any desktop environment";
|
||||
|
||||
@@ -121,8 +121,8 @@ rustPlatform.buildRustPackage rec {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [
|
||||
"${src}/assets/fonts/zed-mono"
|
||||
"${src}/assets/fonts/zed-sans"
|
||||
"${src}/assets/fonts/plex-mono"
|
||||
"${src}/assets/fonts/plex-sans"
|
||||
];
|
||||
};
|
||||
# Setting this environment variable allows to disable auto-updates
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome-shell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adapta-gtk-theme";
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
inkscape
|
||||
libxml2
|
||||
glib.dev
|
||||
gnome.gnome-shell
|
||||
gnome-shell
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, glib
|
||||
, gnome
|
||||
, gnome-shell
|
||||
, gnome-themes-extra
|
||||
, gtk-engine-murrine
|
||||
, inkscape
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
# "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
|
||||
# "-Dvariants=light,darker,dark,lighter"
|
||||
"-Dcinnamon_version=${cinnamon-common.version}"
|
||||
"-Dgnome_shell_version=${gnome.gnome-shell.version}"
|
||||
"-Dgnome_shell_version=${gnome-shell.version}"
|
||||
# You will need to patch gdm to make use of this.
|
||||
"-Dgnome_shell_gresource=true"
|
||||
];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv
|
||||
, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
, gnome
|
||||
, gnome-shell
|
||||
, gnome-themes-extra
|
||||
, gtk-engine-murrine
|
||||
, gtk3
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-gnome-shell=${gnome.gnome-shell.version}"
|
||||
"--with-gnome-shell=${gnome-shell.version}"
|
||||
"--disable-unity"
|
||||
];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, gnome, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
|
||||
{ lib, stdenv, fetchFromGitHub, gnome-shell, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "equilux-theme";
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs install.sh
|
||||
sed -i install.sh \
|
||||
-e "s|if .*which gnome-shell.*;|if true;|" \
|
||||
-e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|"
|
||||
-e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome-shell.version}|"
|
||||
mkdir -p $out/share/themes
|
||||
./install.sh --dest $out/share/themes
|
||||
rm $out/share/themes/*/COPYING
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }:
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome-shell, gdk-pixbuf, librsvg, gtk-engine-murrine }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lounge-gtk-theme";
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
mesonFlags = [
|
||||
"-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}"
|
||||
"-D gnome_version=${lib.versions.majorMinor gnome-shell.version}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, sassc
|
||||
, gnome
|
||||
, gnome-shell
|
||||
, gnome-themes-extra
|
||||
, gtk-engine-murrine
|
||||
, gdk-pixbuf
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}"
|
||||
"-Dgnome_shell_version=${lib.versions.majorMinor gnome-shell.version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user