Merge branch 'master' into staging-next
This commit is contained in:
Vladimír Čunát
commit
725f48a252
|
|
@ -7702,6 +7702,12 @@
|
|||
githubId = 10654650;
|
||||
name = "Guillaume Koenig";
|
||||
};
|
||||
guitargeek = {
|
||||
email = "jonas.rembser@cern.ch";
|
||||
github = "guitargeek";
|
||||
githubId = 6578603;
|
||||
name = "Jonas Rembser";
|
||||
};
|
||||
guserav = {
|
||||
github = "guserav";
|
||||
githubId = 28863828;
|
||||
|
|
@ -15271,6 +15277,12 @@
|
|||
githubId = 1788628;
|
||||
name = "pandaman";
|
||||
};
|
||||
pandapip1 = {
|
||||
email = "gavinnjohn@gmail.com";
|
||||
github = "Pandapip1";
|
||||
githubId = 45835846;
|
||||
name = "Gavin John";
|
||||
};
|
||||
panicgh = {
|
||||
email = "nbenes.gh@xandea.de";
|
||||
github = "panicgh";
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ with lib;
|
|||
gst_all_1 = super.gst_all_1 // {
|
||||
gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; };
|
||||
gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableWayland = false; enableX11 = false; };
|
||||
gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableX11 = false; };
|
||||
gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableWayland = false; enableX11 = false; gtkSupport = false; qt5Support = false; qt6Support = false; };
|
||||
};
|
||||
imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
|
||||
imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
|
||||
|
|
|
|||
|
|
@ -97,50 +97,50 @@ in
|
|||
|
||||
logs = {
|
||||
main = mkOption {
|
||||
type = types.enum [ "error" "notice" "info" "debug"];
|
||||
type = types.enum [ "none" "error" "notice" "info" "debug"];
|
||||
default = "info";
|
||||
description = ''
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice].
|
||||
'';
|
||||
};
|
||||
|
||||
network = mkOption {
|
||||
type = types.enum [ "error" "notice" "info" "debug"];
|
||||
type = types.enum [ "none" "error" "notice" "info" "debug"];
|
||||
default = "info";
|
||||
description = ''
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice].
|
||||
'';
|
||||
};
|
||||
|
||||
bus = mkOption {
|
||||
type = types.enum [ "error" "notice" "info" "debug"];
|
||||
type = types.enum [ "none" "error" "notice" "info" "debug"];
|
||||
default = "info";
|
||||
description = ''
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice].
|
||||
'';
|
||||
};
|
||||
|
||||
update = mkOption {
|
||||
type = types.enum [ "error" "notice" "info" "debug"];
|
||||
type = types.enum [ "none" "error" "notice" "info" "debug"];
|
||||
default = "info";
|
||||
description = ''
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice].
|
||||
'';
|
||||
};
|
||||
|
||||
other = mkOption {
|
||||
type = types.enum [ "error" "notice" "info" "debug"];
|
||||
type = types.enum [ "none" "error" "notice" "info" "debug"];
|
||||
default = "info";
|
||||
description = ''
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice].
|
||||
'';
|
||||
};
|
||||
|
||||
all = mkOption {
|
||||
type = types.enum [ "error" "notice" "info" "debug"];
|
||||
type = types.enum [ "none" "error" "notice" "info" "debug"];
|
||||
default = "info";
|
||||
description = ''
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
|
||||
Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice].
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ in
|
|||
and users are replaced by dummy users), so tests are complemented by a
|
||||
logrotate-checkconf service that is enabled by default.
|
||||
This extra check can be disabled by disabling it at the systemd level with the
|
||||
{option}`services.systemd.services.logrotate-checkconf.enable` option.
|
||||
{option}`systemd.services.logrotate-checkconf.enable` option.
|
||||
|
||||
Conversely there are still things that might make this check fail incorrectly
|
||||
(e.g. a file path where we don't have access to intermediate directories):
|
||||
|
|
|
|||
|
|
@ -534,14 +534,11 @@ in {
|
|||
hyperkittyApiKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64)
|
||||
secretKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64)
|
||||
|
||||
mailmanWebCfgTmp=$(mktemp)
|
||||
jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \
|
||||
install -m 0440 -o root -g mailman \
|
||||
<(jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \
|
||||
--arg archiver_key "$hyperkittyApiKey" \
|
||||
--arg secret_key "$secretKey" \
|
||||
>"$mailmanWebCfgTmp"
|
||||
chown root:mailman "$mailmanWebCfgTmp"
|
||||
chmod 440 "$mailmanWebCfgTmp"
|
||||
mv -n "$mailmanWebCfgTmp" "$mailmanWebCfg"
|
||||
--arg secret_key "$secretKey") \
|
||||
"$mailmanWebCfg"
|
||||
fi
|
||||
|
||||
hyperkittyApiKey="$(jq -r .MAILMAN_ARCHIVER_KEY "$mailmanWebCfg")"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# NixOS tests for gnome-desktop-testing-runner using software
|
||||
# See https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests
|
||||
# See https://github.com/NixOS/nixpkgs/issues/34987
|
||||
|
||||
{ system ? builtins.currentSystem,
|
||||
config ? {},
|
||||
|
|
|
|||
|
|
@ -119,11 +119,11 @@ in
|
|||
with subtest("Libreswan is ready"):
|
||||
alice.wait_for_unit("ipsec")
|
||||
bob.wait_for_unit("ipsec")
|
||||
alice.succeed("ipsec verify 1>&2")
|
||||
alice.succeed("ipsec checkconfig")
|
||||
|
||||
with subtest("Alice and Bob can start the tunnel"):
|
||||
alice.execute("ipsec auto --start tunnel >&2 &")
|
||||
bob.succeed("ipsec auto --start tunnel")
|
||||
alice.execute("ipsec start tunnel >&2 &")
|
||||
bob.succeed("ipsec start tunnel")
|
||||
# apparently this is needed to "wake" the tunnel
|
||||
bob.execute("ping -c1 alice")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
let inherit (import ./ssh-keys.nix pkgs)
|
||||
snakeOilPrivateKey snakeOilPublicKey;
|
||||
snakeOilPrivateKey snakeOilPublicKey snakeOilEd25519PrivateKey snakeOilEd25519PublicKey;
|
||||
in {
|
||||
name = "openssh";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
|
|
@ -108,6 +108,31 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
server-no-openssl =
|
||||
{ ... }:
|
||||
{
|
||||
programs.ssh.package = pkgs.opensshPackages.openssh.override {
|
||||
linkOpenssl = false;
|
||||
};
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
hostKeys = [
|
||||
{ type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
|
||||
];
|
||||
settings = {
|
||||
# Must not specify the OpenSSL provided algorithms.
|
||||
Ciphers = [ "chacha20-poly1305@openssh.com" ];
|
||||
KexAlgorithms = [
|
||||
"curve25519-sha256"
|
||||
"curve25519-sha256@libssh.org"
|
||||
];
|
||||
};
|
||||
};
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
snakeOilEd25519PublicKey
|
||||
];
|
||||
};
|
||||
|
||||
server-no-pam =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
|
|
@ -139,6 +164,7 @@ in {
|
|||
server_allowed_users.wait_for_unit("sshd", timeout=30)
|
||||
server_localhost_only.wait_for_unit("sshd", timeout=30)
|
||||
server_match_rule.wait_for_unit("sshd", timeout=30)
|
||||
server_no_openssl.wait_for_unit("sshd", timeout=30)
|
||||
server_no_pam.wait_for_unit("sshd", timeout=30)
|
||||
|
||||
server_lazy.wait_for_unit("sshd.socket", timeout=30)
|
||||
|
|
@ -230,6 +256,16 @@ in {
|
|||
timeout=30
|
||||
)
|
||||
|
||||
with subtest("no-openssl"):
|
||||
client.succeed(
|
||||
"cat ${snakeOilEd25519PrivateKey} > privkey.snakeoil"
|
||||
)
|
||||
client.succeed("chmod 600 privkey.snakeoil")
|
||||
client.succeed(
|
||||
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-no-openssl true",
|
||||
timeout=30
|
||||
)
|
||||
|
||||
with subtest("no-pam"):
|
||||
client.succeed(
|
||||
"cat ${snakeOilPrivateKey} > privkey.snakeoil"
|
||||
|
|
|
|||
|
|
@ -12,4 +12,16 @@ pkgs:
|
|||
"yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
|
||||
"9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"
|
||||
];
|
||||
|
||||
snakeOilEd25519PrivateKey = pkgs.writeText "privkey.snakeoil" ''
|
||||
-----BEGIN OPENSSH PRIVATE KEY-----
|
||||
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
|
||||
QyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+QAAAJC89yCivPcg
|
||||
ogAAAAtzc2gtZWQyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+Q
|
||||
AAAEDJmKp3lX6Pz0unTc0QZwrHb8Eyr9fJUopE9d2/+q+eCxgFMhajUng+Rjj/sCFXI9Pz
|
||||
G8BQjru2n7JgUVF1Kbv5AAAACnRvbUBvemRlc2sBAgM=
|
||||
-----END OPENSSH PRIVATE KEY-----
|
||||
'';
|
||||
|
||||
snakeOilEd25519PublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "View and edit tags for various audio files";
|
||||
mainProgram = "easytag";
|
||||
homepage = "https://wiki.gnome.org/Apps/EasyTAG";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/easytag";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Listen to your favorite podcasts";
|
||||
mainProgram = "gnome-podcasts";
|
||||
homepage = "https://wiki.gnome.org/Apps/Podcasts";
|
||||
homepage = "https://apps.gnome.org/Podcasts/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";
|
||||
description = "A modern music player for GNOME";
|
||||
homepage = "https://wiki.gnome.org/Apps/Lollypop";
|
||||
homepage = "https://gitlab.gnome.org/World/lollypop";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Rhythmbox";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/rhythmbox";
|
||||
description = "A music playing application for GNOME";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sonic-pi";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sonic-pi-net";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s9B3OBwiUdCJyxbeQXeidv38pzmvC442Byl+llabqp0=";
|
||||
hash = "sha256-JMextQY0jLShWmqRQoVAbqIzDhA1mOzI7vfsG7+jjX0=";
|
||||
};
|
||||
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A Gnome CD Ripper";
|
||||
mainProgram = "sound-juicer";
|
||||
homepage = "https://wiki.gnome.org/Apps/SoundJuicer";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/sound-juicer";
|
||||
maintainers = [ maintainers.bdimcheff ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
of backing up the Right Way (encrypted, off-site, and regular) \
|
||||
and uses duplicity as the backend.
|
||||
'';
|
||||
homepage = "https://wiki.gnome.org/Apps/DejaDup";
|
||||
homepage = "https://apps.gnome.org/DejaDup/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -16,9 +16,8 @@
|
|||
let
|
||||
inherit (melpaStablePackages) tree-sitter-langs;
|
||||
|
||||
libSuffix = if stdenv.isDarwin then "dylib" else "so";
|
||||
langName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname);
|
||||
soName = g: langName g + "." + libSuffix;
|
||||
soName = g: langName g + stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
grammarDir = runCommand "emacs-tree-sitter-grammars" {
|
||||
# Fake same version number as upstream language bundle to prevent triggering runtime downloads
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
|
|||
currently recommend running gnome-builder inside a nix-shell with
|
||||
appropriate dependencies loaded.
|
||||
'';
|
||||
homepage = "https://wiki.gnome.org/Apps/Builder";
|
||||
homepage = "https://apps.gnome.org/Builder/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -3446,6 +3446,8 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
reditorsupport.r = callPackage ./reditorsupport.r { };
|
||||
|
||||
reloadedextensions.reloaded-cpp = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "reloaded-cpp";
|
||||
|
|
@ -4571,6 +4573,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
vue.volar = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "volar";
|
||||
publisher = "Vue";
|
||||
version = "2.0.16";
|
||||
hash = "sha256-RTBbF7qahYP4L7SZ/5aCM/e5crZAyyPRcgL48FVL1jk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md";
|
||||
description = "The official Vue VSCode extension";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Vue.volar";
|
||||
homepage = "https://github.com/vuejs/language-tools";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
vspacecode.whichkey = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "whichkey";
|
||||
|
|
@ -4583,6 +4601,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
vue.vscode-typescript-vue-plugin = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-typescript-vue-plugin";
|
||||
publisher = "Vue";
|
||||
version = "1.8.27";
|
||||
hash = "sha256-ym1+WPKBcn4h9lqSFVehfiDoGUEviOSEVXVLhHcYvfc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Vue.vscode-typescript-vue-plugin/changelog";
|
||||
description = "Vue VSCode extension for TypeScript";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin";
|
||||
homepage = "https://github.com/vuejs/language-tools";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
waderyan.gitblame = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "gitblame";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
jq,
|
||||
moreutils,
|
||||
python311Packages,
|
||||
R,
|
||||
rPackages,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "r";
|
||||
publisher = "reditorsupport";
|
||||
version = "2.8.2";
|
||||
hash = "sha256-FPL/JjW452KRchcQ0iHXRJarZXvS3B8PvZhXjf3rMhQ=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
buildInputs = [
|
||||
python311Packages.radian
|
||||
R
|
||||
rPackages.languageserver
|
||||
];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."r.rpath.mac".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rpath.linux".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r/changelog";
|
||||
description = "A Visual Studio Code extension for the R programming language";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=REditorSupport.r";
|
||||
homepage = "https://github.com/REditorSupport/vscode-R";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.pandapip1 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Access, organize and share your photos";
|
||||
mainProgram = "gnome-photos";
|
||||
homepage = "https://wiki.gnome.org/Apps/Photos";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-photos";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Gthumb";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gthumb";
|
||||
description = "Image browser and viewer for GNOME";
|
||||
mainProgram = "gthumb";
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/OCRFeeder";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/ocrfeeder";
|
||||
description = "Complete Optical Character Recognition and Document Analysis and Recognition program";
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@
|
|||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shotwell";
|
||||
version = "0.32.6";
|
||||
|
|
@ -97,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meta = with lib; {
|
||||
description = "Popular photo organizer for the GNOME desktop";
|
||||
mainProgram = "shotwell";
|
||||
homepage = "https://wiki.gnome.org/Apps/Shotwell";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/shotwell";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [];
|
||||
maintainers = with maintainers; [ bobby285271 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Small GTK application to allow to keep a diary of your life";
|
||||
mainProgram = "almanah";
|
||||
homepage = "https://wiki.gnome.org/Apps/Almanah_Diary";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/almanah";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Tool for writing an ISO file to multiple USB devices at once";
|
||||
mainProgram = "gnome-multi-writer";
|
||||
homepage = "https://wiki.gnome.org/Apps/MultiWriter";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-multi-writer";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Recipe management application for GNOME";
|
||||
mainProgram = "gnome-recipes";
|
||||
homepage = "https://wiki.gnome.org/Apps/Recipes";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/recipes";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.29.4.1";
|
||||
version = "3.29.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "qcad-${version}-src";
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U=";
|
||||
hash = "sha256-NKWuvhVGtlhWOfV0MWyViTgk0luA8mvnwQS0TZj7Ulc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -272,8 +272,8 @@ let
|
|||
# Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
|
||||
# allowing us to use our rustc and our clang.
|
||||
./patches/chromium-121-rust.patch
|
||||
] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "125") [
|
||||
# M124 shipped with broken --ozone-platform-hint flag handling, which we rely on
|
||||
] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "124.0.6367.118") [
|
||||
# M124 < 124.0.6367.118 shipped with broken --ozone-platform-hint flag handling, which we rely on
|
||||
# for our NIXOS_OZONE_WL (wayland) environment variable.
|
||||
# See <https://issues.chromium.org/issues/329678163>.
|
||||
# This is the commit for the fix that landed in M125, which applies clean on M124.
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
version = "2024-03-14";
|
||||
};
|
||||
};
|
||||
hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA=";
|
||||
hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY=";
|
||||
version = "124.0.6367.91";
|
||||
hash = "sha256-+r/48dxipSAo74v1deMuKalW+Hj85hCun63ZcgLYDLk=";
|
||||
hash_deb_amd64 = "sha256-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY=";
|
||||
version = "124.0.6367.118";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "A new GNOME web browser";
|
||||
mainProgram = "eolie";
|
||||
homepage = "https://wiki.gnome.org/Apps/Eolie";
|
||||
homepage = "https://gitlab.gnome.org/World/eolie";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ samdroid-apps ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2023.09.06";
|
||||
version = "2024.04.17";
|
||||
dropboxd = "${dropbox}/bin/dropbox";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2";
|
||||
hash = "sha256-kZMwj8Fn8Hf58C57wE025TlmiSs5TaKMGEzvb2QjgSw=";
|
||||
hash = "sha256-pqCYzxaqR0f0CBaseT1Z436K47cIDQswYR1sK4Zj8sE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
|
|||
PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Evolution";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/evolution";
|
||||
description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
|
||||
mainProgram = "evolution";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -76,13 +76,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.11.5";
|
||||
version = "2.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
hash = "sha256-WyYBIiIQNDHydJqU3jWNItJU2/sYnRpGHCXE9Xhom5M=";
|
||||
hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Gnote";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnote";
|
||||
description = "A note taking application";
|
||||
mainProgram = "gnote";
|
||||
maintainers = with maintainers; [ jfvillablanca ];
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ python3Packages.buildPythonApplication rec {
|
|||
"Getting Things GNOME" (GTG) is a personal tasks and ToDo list organizer inspired by the "Getting Things Done" (GTD) methodology.
|
||||
GTG is intended to help you track everything you need to do and need to know, from small tasks to large projects.
|
||||
'';
|
||||
homepage = "https://wiki.gnome.org/Apps/GTG";
|
||||
homepage = "https://github.com/getting-things-gnome/gtg";
|
||||
downloadPage = "https://github.com/getting-things-gnome/gtg/releases";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ oyren ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
cairo clutter-gtk ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/action/show/Apps/Pinpoint";
|
||||
homepage = "https://gitlab.gnome.org/Archive/pinpoint";
|
||||
description = "A tool for making hackers do excellent presentations";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.6";
|
||||
version = "4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
hash = "sha256-vyw8SjI8EM9giYpAsCNppgSydPEBNz2sbFahEKmKe6w=";
|
||||
hash = "sha256-5hiVTU1w3Rk/BdxYwDB0Y+EZFnSAaEWtx19IB1ak1yY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Project management tool for the GNOME desktop";
|
||||
mainProgram = "planner";
|
||||
homepage = "https://wiki.gnome.org/Apps/Planner";
|
||||
homepage = "https://gitlab.gnome.org/World/planner";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ amiloradovsky ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "last";
|
||||
version = "1542";
|
||||
version = "1543";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mcfrith";
|
||||
repo = "last";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZzvyyecYiBscogfN9/FnDbHg/lqb8y14n9C2KLIqhFA=";
|
||||
hash = "sha256-APHPv7Q64JITfHsvjCThZ6hvGHerk6wjOm32KdTv4k8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkwave";
|
||||
version = "3.3.118";
|
||||
version = "3.3.119";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
|
||||
sha256 = "sha256-D0MwwCiiqz0vTUzur222kl2wEMS2/VLRECLQ5d6gSGo=";
|
||||
sha256 = "sha256-6rPgnnZBEVwHhIv7MPfdDDu+K4y+RQF+leB327pqwDg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
|
||||
|
|
|
|||
|
|
@ -53,12 +53,11 @@
|
|||
, Cocoa
|
||||
, CoreSymbolication
|
||||
, OpenGL
|
||||
, noSplash ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "root";
|
||||
version = "6.30.04";
|
||||
version = "6.30.06";
|
||||
|
||||
passthru = {
|
||||
tests = import ./tests { inherit callPackage; };
|
||||
|
|
@ -66,7 +65,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
hash = "sha256-K0GAtpjznMZdkQhNgzqIRRWzJbxfZzyOOavoGLAl2Mw=";
|
||||
hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
|
||||
|
|
@ -143,8 +142,6 @@ stdenv.mkDerivation rec {
|
|||
-e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")'
|
||||
|
||||
patchShebangs build/unix/
|
||||
'' + lib.optionalString noSplash ''
|
||||
substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# Eliminate impure reference to /System/Library/PrivateFrameworks
|
||||
substituteInPlace core/macosx/CMakeLists.txt \
|
||||
|
|
@ -163,10 +160,6 @@ stdenv.mkDerivation rec {
|
|||
"-Dbuiltin_gtest=OFF"
|
||||
"-Dbuiltin_nlohmannjson=OFF"
|
||||
"-Dbuiltin_openui5=ON"
|
||||
"-Dalien=OFF"
|
||||
"-Dbonjour=OFF"
|
||||
"-Dcastor=OFF"
|
||||
"-Dchirp=OFF"
|
||||
"-Dclad=OFF"
|
||||
"-Ddavix=ON"
|
||||
"-Ddcache=OFF"
|
||||
|
|
@ -176,21 +169,13 @@ stdenv.mkDerivation rec {
|
|||
"-Dfortran=OFF"
|
||||
"-Dgnuinstall=ON"
|
||||
"-Dimt=ON"
|
||||
"-Dgfal=OFF"
|
||||
"-Dgviz=OFF"
|
||||
"-Dhdfs=OFF"
|
||||
"-Dhttp=ON"
|
||||
"-Dkrb5=OFF"
|
||||
"-Dldap=OFF"
|
||||
"-Dmonalisa=OFF"
|
||||
"-Dmysql=OFF"
|
||||
"-Dodbc=OFF"
|
||||
"-Dopengl=ON"
|
||||
"-Doracle=OFF"
|
||||
"-Dpgsql=OFF"
|
||||
"-Dpythia6=OFF"
|
||||
"-Dpythia8=OFF"
|
||||
"-Drfio=OFF"
|
||||
"-Droot7=ON"
|
||||
"-Dsqlite=OFF"
|
||||
"-Dssl=ON"
|
||||
|
|
@ -204,16 +189,12 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include"
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
|
||||
"-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE"
|
||||
|
||||
# fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found
|
||||
# fatal error: could not build module '_Builtin_intrinsics'
|
||||
"-Druntime_cxxmodules=OFF"
|
||||
];
|
||||
|
||||
# suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ];
|
||||
|
||||
postInstall = ''
|
||||
for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do
|
||||
wrapProgram "$out/bin/$prog" \
|
||||
|
|
@ -273,7 +254,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://root.cern.ch/";
|
||||
description = "A data analysis framework";
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.veprbl ];
|
||||
maintainers = [ maintainers.guitargeek maintainers.veprbl ];
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,15 +6,16 @@
|
|||
, fetchzip
|
||||
, cmake
|
||||
, lz4
|
||||
, gfortran
|
||||
, bzip2
|
||||
, m4
|
||||
, hdf5
|
||||
, gsl
|
||||
, unzip
|
||||
, makeWrapper
|
||||
, zlib
|
||||
, meson
|
||||
, git
|
||||
, ninja
|
||||
, pandoc
|
||||
, eigen
|
||||
, pkg-config
|
||||
, wrapGAppsHook3
|
||||
|
|
@ -40,7 +41,7 @@ let
|
|||
pname = "libccp4";
|
||||
version = "8.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://ftp.ccp4.ac.uk/opensource/${pname}-${version}.tar.gz";
|
||||
url = "https://ftp.ccp4.ac.uk/opensource/libccp4-${version}.tar.gz";
|
||||
hash = "sha256-y4E66GYSoIZjKd6rfO6W6sVz2BvlskA0HUD5rVMi/y0=";
|
||||
};
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
|
@ -87,7 +88,7 @@ let
|
|||
};
|
||||
mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "mosflm";
|
||||
|
||||
inherit version src;
|
||||
|
|
@ -111,7 +112,7 @@ let
|
|||
pname = "xgandalf";
|
||||
version = "c6c5003ff1086e8c0fb5313660b4f02f3a3aab7b";
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
|
||||
url = "https://gitlab.desy.de/thomas.white/xgandalf/-/archive/${version}/xgandalf-${version}.tar.gz";
|
||||
hash = "sha256-/uZlBwAINSoYqgLQFTMz8rS1Rpadu79JkO6Bu/+Nx9E=";
|
||||
};
|
||||
|
||||
|
|
@ -121,10 +122,10 @@ let
|
|||
|
||||
pinkIndexer = stdenv.mkDerivation rec {
|
||||
pname = "pinkindexer";
|
||||
version = "5d4e016941eb2a9e50a10df96ded7ff1e2464503";
|
||||
version = "15caa21191e27e989b750b29566e4379bc5cd21a";
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-VnJOJJ247dNoBlos4Fu3GQBlAnTk9el+yZDRiicJtu0=";
|
||||
hash = "sha256-v/SCJiHAV05Lc905y/dE8uBXlW+lLX9wau4XORYdbQg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
|
@ -169,13 +170,27 @@ let
|
|||
"-DENABLE_BZIP2_PLUGIN=yes"
|
||||
];
|
||||
};
|
||||
|
||||
millepede-ii = stdenv.mkDerivation rec {
|
||||
pname = "millepede-ii";
|
||||
version = "04-13-06";
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.desy.de/claus.kleinwort/millepede-ii/-/archive/V${version}/millepede-ii-V${version}.tar.gz";
|
||||
hash = "sha256-aFoo8AGBsUEN2u3AmnSpTqJ6JeNV6j9vkAFTZ34I+sI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crystfel";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-nCO9ndDKS54bVN9IhFBiCVNzqk7BsCljXFrOmlx+sP4=";
|
||||
url = "https://www.desy.de/~twhite/crystfel/crystfel-${version}.tar.gz";
|
||||
sha256 = "sha256-ogNHWYfbxRmB5TdK8K0JpcCnYOOyXapQGSPh8mfp+Tc=";
|
||||
};
|
||||
nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ]
|
||||
++ lib.optionals withGui [ wrapGAppsHook3 ];
|
||||
|
|
@ -192,6 +207,7 @@ stdenv.mkDerivation rec {
|
|||
mosflm
|
||||
pinkIndexer
|
||||
xgandalf
|
||||
pandoc
|
||||
] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
argp-standalone
|
||||
|
|
@ -201,12 +217,12 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ];
|
||||
|
||||
patches = [
|
||||
# on darwin at least, we need to link to a separate argp library;
|
||||
# this patch adds a test for this and the necessary linker options
|
||||
./link-to-argp-standalone-if-needed.patch
|
||||
./disable-fmemopen-on-aarch64-darwin.patch
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.desy.de/thomas.white/crystfel/-/commit/3c54d59e1c13aaae716845fed2585770c3ca9d14.diff";
|
||||
hash = "sha256-oaJNBQQn0c+z4p1pnW4osRJA2KdKiz4hWu7uzoKY7wc=";
|
||||
})
|
||||
# hotfix for an issue that occurs (at least) on NixOS:
|
||||
# if the temporary path is too long, we get a segfault
|
||||
./gui-path-issue.patch
|
||||
];
|
||||
|
||||
# CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but
|
||||
|
|
@ -218,7 +234,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = lib.optionalString withBitshuffle ''
|
||||
for file in $out/bin/*; do
|
||||
wrapProgram $file --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins
|
||||
wrapProgram $file \
|
||||
--set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins \
|
||||
--prefix PATH ":" ${lib.makeBinPath [ millepede-ii ]}
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
diff --git a/src/gui_index.c b/src/gui_index.c
|
||||
index 2cc8e8db..13be77d5 100644
|
||||
--- a/src/gui_index.c
|
||||
+++ b/src/gui_index.c
|
||||
@@ -540,6 +540,7 @@ static void delete_gui_tempdir(char *tmpdir)
|
||||
{
|
||||
char *path;
|
||||
int i;
|
||||
+ size_t pathlen;
|
||||
|
||||
/* List of files which it's safe to delete */
|
||||
char *files[] = {"gmon.out", "mosflm.lp", "SUMMARY", "XDS.INP",
|
||||
@@ -552,11 +553,12 @@ static void delete_gui_tempdir(char *tmpdir)
|
||||
|
||||
if ( tmpdir == NULL ) return;
|
||||
|
||||
- path = calloc(strlen(tmpdir)+64, 1);
|
||||
+ pathlen = strlen(tmpdir)+64;
|
||||
+ path = calloc(pathlen, 1);
|
||||
if ( path == NULL ) return;
|
||||
|
||||
for ( i=0; i<n_files; i++ ) {
|
||||
- snprintf(path, 127, "%s/%s", tmpdir, files[i]);
|
||||
+ snprintf(path, pathlen, "%s/%s", tmpdir, files[i]);
|
||||
unlink(path);
|
||||
}
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index 59bbcfb7..dd75d4e2 100644
|
||||
index 4717bb2a..38d8693f 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -80,6 +80,12 @@ if cc.has_function('clock_gettime', prefix: '#include <time.h>')
|
||||
@@ -70,6 +70,12 @@ if cc.has_function('clock_gettime', prefix: '#include <time.h>')
|
||||
conf_data.set10('HAVE_CLOCK_GETTIME', true)
|
||||
endif
|
||||
|
||||
|
|
@ -12,15 +12,15 @@ index 59bbcfb7..dd75d4e2 100644
|
|||
+ argpdep = dependency('', required : false)
|
||||
+endif
|
||||
+
|
||||
# ************************ libcrystfel (subdir) ************************
|
||||
|
||||
subdir('libcrystfel')
|
||||
@@ -180,7 +186,7 @@ endif
|
||||
if cc.has_function('sched_setaffinity',
|
||||
prefix: '#include <sched.h>',
|
||||
args: '-D_GNU_SOURCE')
|
||||
@@ -186,7 +192,7 @@ endif
|
||||
|
||||
indexamajig = executable('indexamajig', indexamajig_sources,
|
||||
dependencies: [mdep, libcrystfeldep, gsldep,
|
||||
- pthreaddep, zmqdep, asapodep],
|
||||
+ pthreaddep, zmqdep, asapodep, argpdep],
|
||||
- pthreaddep, zmqdep, asapodep, asapoproddep],
|
||||
+ pthreaddep, zmqdep, asapodep, asapoproddep, argpdep],
|
||||
install: true,
|
||||
install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
|
||||
install_rpath: crystfel_rpath)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gerrit";
|
||||
version = "3.9.2";
|
||||
version = "3.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
|
||||
hash = "sha256-KsuuwFKdpXHDVAZZ2JiX781mgqDQyyEILo4lmNn+8YE=";
|
||||
hash = "sha256-pjrWXfae1momJRTfdIPalsLynAGwqp1VtX9M9uqzJwM=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, fetchFromGitHub, nodePackages, stdenvNoCC }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, nodePackages
|
||||
, stdenvNoCC
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mpv-cheatsheet";
|
||||
version = "0.30.0.2";
|
||||
|
|
@ -9,6 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MWK0CYto3zgn3fivmL43tvgZn6XrjPxKLp0lgTFdplM=";
|
||||
};
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodePackages.browserify
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
buildLua,
|
||||
fetchFromGitHub,
|
||||
ffmpeg,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
buildLua {
|
||||
|
|
@ -15,6 +16,7 @@ buildLua {
|
|||
rev = "d09c11227704c8d5bdaa2c799ef64dce881c63a7";
|
||||
hash = "sha256-MKoM0f74/XoctiHQVOB3LzFWtJXpsREfQh5icaebCJo=";
|
||||
};
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace slicing.lua \
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "conmon-rs";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+htd9RJGSFzzyEQSBJGIzurQDQgpJ+sJHLPe3aPH0cg=";
|
||||
hash = "sha256-+RKjJtI01Y56+cFDdOSAL4BodI7R/rM3B3ht3p6+xzs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ capnproto protobuf ];
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-CcWji/qMd7eX0O3cR9/FLID17WpSfz4kEAhDgKb3jds=";
|
||||
cargoHash = "sha256-4VOse+y0EO9IORyeAO/j1t6ssQARJp7lK21TUJVuH78=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OCI container runtime monitor written in Rust";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.1.10";
|
||||
version = "2.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WUXyx5OWIJDamzHUahN+0/rcn2pxQgCgYAE/d0mxk2A=";
|
||||
hash = "sha256-QQgpvvk7S6ARzBct/4AQP66End30EXcUPqv8a4Udoas=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
|
||||
|
||||
# manpage requires building the vendored go-md2man
|
||||
makeFlags = [ "bin/conmon" ];
|
||||
makeFlags = [ "bin/conmon" "VERSION=${version}" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.26.1";
|
||||
version = "2.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R/AFjJM4rcu2JbdfTNhxIIVhaP7LzFrDAU93hbuXSXs=";
|
||||
hash = "sha256-YM/9ijwxDAjFZk/ku33b/pMYri5V1h0wPd2YS7qJgCw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
rm -rf e2e/
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-SzySXS0s0p1EXcO5RQyATBG9gtoJ4wPxZKGU62fAOHw=";
|
||||
vendorHash = "sha256-ztqWSoDsN8qdm6Jq8Wo7r16zuXENQDp2JvwSN+6Jbxw=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ stdenv
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, wrapGAppsHook3
|
||||
, quickemu
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "quickgui";
|
||||
version = "1.2.8";
|
||||
|
||||
|
|
@ -18,31 +20,48 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wrapGAppsHook3
|
||||
quickemu
|
||||
gnome.zenity
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
unpackCmd = "dpkg-deb -x $curSrc source";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
substituteInPlace $out/share/applications/quickgui.desktop \
|
||||
--replace "/usr" $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]}
|
||||
)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/share/applications/quickgui.desktop \
|
||||
--replace "/usr" $out
|
||||
|
||||
# quickgui PR 88
|
||||
echo "Categories=System;" >> $out/share/applications/quickgui.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Flutter frontend for quickemu";
|
||||
homepage = "https://github.com/quickemu-project/quickgui";
|
||||
changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}";
|
||||
maintainers = [ lib.maintainers.heyimnova ];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ heyimnova ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||
mainProgram = "quickgui";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apt";
|
||||
version = "2.7.14";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-egF4PwW32Q82rqeHHMBnV0ma6K3pM0l6rrbFCCdOc1g=";
|
||||
hash = "sha256-gKp0RmsTLlDtjQFZ8Q5kpEi2psZHI9YsQrg6UZnKA6c=";
|
||||
};
|
||||
|
||||
# cycle detection; lib can't be split
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firefoxpwa";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filips123";
|
||||
repo = "PWAsForFirefox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZD/bTziVmHtQVKejzj+fUXVazCm2PaulS2NZjTribSk=";
|
||||
hash = "sha256-T2X+41ScE8FDZGJdgAjZCp1MQX51UACuNsWFk+6cR3A=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/native";
|
||||
|
|
@ -119,7 +119,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
passthru.tests.firefoxpwa = nixosTests.firefoxpwa;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "A tool to install, manage and use Progressive Web Apps (PWAs) in Mozilla Firefox (native component)";
|
||||
longDescription = ''
|
||||
Progressive Web Apps (PWAs) are web apps that use web APIs and features along
|
||||
|
|
@ -149,9 +149,9 @@ rustPlatform.buildRustPackage rec {
|
|||
'';
|
||||
homepage = "https://pwasforfirefox.filips.si/";
|
||||
changelog = "https://github.com/filips123/PWAsForFirefox/releases/tag/v${version}";
|
||||
license = licenses.mpl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.mpl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
adamcstephens
|
||||
camillemndn
|
||||
pasqui23
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gema";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceforge.net/projects/gema/files/gema/gema-${finalAttrs.version}/gema-${finalAttrs.version}-source.tar.gz";
|
||||
hash = "sha256-c7qxgZYk/QaqocjRXVlgJxUWCgf3T1JBY7v9Fg9YfIU=";
|
||||
};
|
||||
|
||||
makeFlags = [ "--directory=src" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 src/gema -t $out/bin
|
||||
installManPage doc/gema.1
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "General purpose text processing utility based on the concept of pattern matching.";
|
||||
longDescription = "Reads an input file and copies it to an output file transforming the data as specified by the patterns defined by the user.";
|
||||
homepage = "https://gema.sourceforge.net/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "gema";
|
||||
maintainers = with lib.maintainers; [ quag ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ghciwatch";
|
||||
version = "0.5.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MercuryTechnologies";
|
||||
repo = "ghciwatch";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6afUHLPrSWhgN5LA346tAZ1+gROr+i/ZyCNVnyCd5Tc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-og7S3W+DCBlFIvKLZghLT+msBLnS1o7Rea7v2VPsDYA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
];
|
||||
|
||||
# integration tests are not run but the macros need this variable to be set
|
||||
GHC_VERSIONS = "";
|
||||
checkFlags = "--test \"unit\"";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ghci-based file watching recompiler for Haskell development";
|
||||
homepage = "https://github.com/MercuryTechnologies/ghciwatch";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mangoiv _9999years ];
|
||||
mainProgram = "ghciwatch";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
}
|
||||
|
|
@ -9,11 +9,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "jetbrains-toolbox";
|
||||
version = "2.2.3.20090";
|
||||
version = "2.3.1.31116";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
|
||||
sha256 = "sha256-SqxQF5pG61CySsDzdZ1P2C9cCe/B145D0S+T4NByif8=";
|
||||
sha256 = "sha256-mrTeUp9DBSO1S6Nxx077lqtY847CiCBCCi/vboZ8ADs=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcpuid";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anrieff";
|
||||
repo = "libcpuid";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Zs5GKvSasdfLqo8oErDQNAuXRG27Bm9vNwyooqbol0Q=";
|
||||
sha256 = "sha256-Bq16UH4IUR7dU57bGHKq8P6JsjaB4arOJ4zFeNyxXSg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
autoreconfHook,
|
||||
help2man,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libiff";
|
||||
version = "0-unstable-2024-03-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "svanderburg";
|
||||
repo = "libiff";
|
||||
rev = "b5f542a83c824f26e0816770c9a17c22bd388606";
|
||||
sha256 = "sha256-Arh3Ihd5TWg5tdemodrxz2EDxh/hwz9b2/AvrTONFy8=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
help2man
|
||||
];
|
||||
meta = with lib; {
|
||||
description = "Parser for the Interchange File Format (IFF)";
|
||||
longDescription = ''
|
||||
libiff is a portable, extensible parser library implemented in
|
||||
ANSI C, for EA-IFF 85: Electronic Arts' Interchange File Format
|
||||
(IFF).
|
||||
'';
|
||||
homepage = "https://github.com/svanderburg/libiff";
|
||||
maintainers = with maintainers; [ _414owen ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
libiff,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
help2man,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libilbm";
|
||||
version = "0-unstable-2024-03-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "svanderburg";
|
||||
repo = "libilbm";
|
||||
rev = "586f5822275ef5780509a851cb90c7407b2633d9";
|
||||
sha256 = "sha256-EcsrspL/N40yFE15UFWGienpJHhoq1zd8zZe6x4nK6o=";
|
||||
};
|
||||
buildInputs = [ libiff ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
help2man
|
||||
];
|
||||
meta = with lib; {
|
||||
description = "Parser for the ILBM: IFF Interleaved BitMap format";
|
||||
longDescription = ''
|
||||
libilbm is a portable parser library built on top of libiff,
|
||||
for ILBM: IFF Interleaved BitMap format, which is used by programs
|
||||
such as Deluxe Paint and Graphicraft to read and write images.
|
||||
'';
|
||||
homepage = "https://github.com/svanderburg/libilbm";
|
||||
maintainers = with maintainers; [ _414owen ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -78,12 +78,21 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-V+QDymEzXpw78Ezd2DInRLE0F6mXpLRhCK8iI8prq8I=";
|
||||
hash = "sha256-KrIeZEq6RAz3N47wgtQjlfNzoGcTh3DqOhYBOxJPGzs=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./ggml-metal.m \
|
||||
--replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
|
||||
--replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
|
||||
|
||||
substituteInPlace ./scripts/build-info.cmake \
|
||||
--replace-fail 'set(BUILD_NUMBER 0)' 'set(BUILD_NUMBER ${finalAttrs.version})' \
|
||||
--replace-fail 'set(BUILD_COMMIT "unknown")' "set(BUILD_COMMIT \"$(cat COMMIT)\")"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config git ]
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ ps.buildPythonApplication rec {
|
|||
postPatch = ''
|
||||
# disable coverage testing
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "addopts = [" "addopts_ = ["
|
||||
--replace-fail "addopts = [" "addopts_ = ["
|
||||
'';
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
|
@ -57,7 +57,7 @@ ps.buildPythonApplication rec {
|
|||
ps.babel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
ps.pyside6
|
||||
ps.jeepney
|
||||
];
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgmoneta";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmoneta";
|
||||
repo = "pgmoneta";
|
||||
rev = version;
|
||||
hash = "sha256-sFH8sYTQ10bR+TDNbyIJiAIcp24CA9E5zrRjyV9mGBU=";
|
||||
hash = "sha256-+2pS3KG5wwP7bnaV+x8WxvDvQuXqmiMbuLScMNLqBtI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "surrealdb";
|
||||
version = "1.3.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "surrealdb";
|
||||
repo = "surrealdb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dnfgU7nTX3vvqN9Mox6USRfpFdEI/dAOKIVZ2Jd4t9o=";
|
||||
hash = "sha256-LC/T+TkHdZ0uWaVQpR2Q9l0fShPL871rOfxxsXyJnvw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-B+x+xEcwHqoYMolAuMQzSiO/QA1FiBGO3eis9kgN1S4=";
|
||||
cargoHash = "sha256-1/l++iXiPCIwAVE8VQCSS++/9i3Kh1RNq3WnUjRy2fU=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
|
@ -38,6 +38,8 @@ rustPlatform.buildRustPackage rec {
|
|||
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
|
||||
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
|
||||
|
||||
RUSTFLAGS = "--cfg surrealdb_unstable";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "whistle";
|
||||
version = "2.9.68";
|
||||
version = "2.9.70";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avwo";
|
||||
repo = "whistle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8UWYh2pm0UX6tb/7DT5ZaHvmHdxk6hwE7fFHKY6pGOs=";
|
||||
hash = "sha256-KtZZa/t/WqMSjEAET8wutIhu7sp55/CtaBnNDThkEUI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/WnrhtVr972Na8rpZ7dzH3998WDPsS5X6jCPkCj3hyc=";
|
||||
npmDepsHash = "sha256-0XDfi23BktYDH58sDjaBtt6x2ZZDFqtBBL9agnHwgeo=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -371,6 +371,51 @@ dependencies = [
|
|||
"workspace",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "assistant2"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assets",
|
||||
"assistant_tooling",
|
||||
"client",
|
||||
"editor",
|
||||
"env_logger",
|
||||
"feature_flags",
|
||||
"futures 0.3.28",
|
||||
"gpui",
|
||||
"language",
|
||||
"languages",
|
||||
"log",
|
||||
"nanoid",
|
||||
"node_runtime",
|
||||
"open_ai",
|
||||
"project",
|
||||
"rand 0.8.5",
|
||||
"release_channel",
|
||||
"rich_text",
|
||||
"schemars",
|
||||
"semantic_index",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"settings",
|
||||
"theme",
|
||||
"ui",
|
||||
"util",
|
||||
"workspace",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "assistant_tooling"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"gpui",
|
||||
"schemars",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-broadcast"
|
||||
version = "0.7.0"
|
||||
|
|
@ -2047,6 +2092,7 @@ dependencies = [
|
|||
"core-services",
|
||||
"ipc-channel",
|
||||
"plist",
|
||||
"release_channel",
|
||||
"serde",
|
||||
"util",
|
||||
]
|
||||
|
|
@ -2253,6 +2299,7 @@ dependencies = [
|
|||
"prost",
|
||||
"rand 0.8.5",
|
||||
"release_channel",
|
||||
"remote_projects",
|
||||
"reqwest",
|
||||
"rpc",
|
||||
"rustc-demangle",
|
||||
|
|
@ -2298,7 +2345,6 @@ dependencies = [
|
|||
"editor",
|
||||
"emojis",
|
||||
"extensions_ui",
|
||||
"feature_flags",
|
||||
"futures 0.3.28",
|
||||
"fuzzy",
|
||||
"gpui",
|
||||
|
|
@ -3798,6 +3844,17 @@ dependencies = [
|
|||
"util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "filedescriptor"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"thiserror",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "filetime"
|
||||
version = "0.2.22"
|
||||
|
|
@ -4002,15 +4059,12 @@ dependencies = [
|
|||
"gpui",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"log",
|
||||
"notify",
|
||||
"parking_lot",
|
||||
"rope",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"smol",
|
||||
"sum_tree",
|
||||
"tempfile",
|
||||
"text",
|
||||
"time",
|
||||
|
|
@ -4318,7 +4372,10 @@ dependencies = [
|
|||
"git2",
|
||||
"lazy_static",
|
||||
"log",
|
||||
"parking_lot",
|
||||
"pretty_assertions",
|
||||
"regex",
|
||||
"rope",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"smol",
|
||||
|
|
@ -4327,6 +4384,8 @@ dependencies = [
|
|||
"time",
|
||||
"unindent",
|
||||
"url",
|
||||
"util",
|
||||
"windows 0.53.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4479,6 +4538,7 @@ dependencies = [
|
|||
"derive_more",
|
||||
"env_logger",
|
||||
"etagere",
|
||||
"filedescriptor",
|
||||
"flume",
|
||||
"font-kit",
|
||||
"foreign-types 0.5.0",
|
||||
|
|
@ -5395,6 +5455,7 @@ dependencies = [
|
|||
"globset",
|
||||
"gpui",
|
||||
"indoc",
|
||||
"itertools 0.11.0",
|
||||
"lazy_static",
|
||||
"log",
|
||||
"lsp",
|
||||
|
|
@ -6049,14 +6110,18 @@ dependencies = [
|
|||
"anyhow",
|
||||
"clock",
|
||||
"collections",
|
||||
"ctor",
|
||||
"env_logger",
|
||||
"futures 0.3.28",
|
||||
"git",
|
||||
"gpui",
|
||||
"itertools 0.11.0",
|
||||
"language",
|
||||
"log",
|
||||
"parking_lot",
|
||||
"rand 0.8.5",
|
||||
"settings",
|
||||
"smallvec",
|
||||
"sum_tree",
|
||||
"text",
|
||||
"theme",
|
||||
|
|
@ -7374,6 +7439,7 @@ dependencies = [
|
|||
"db",
|
||||
"editor",
|
||||
"file_icons",
|
||||
"git",
|
||||
"gpui",
|
||||
"language",
|
||||
"menu",
|
||||
|
|
@ -7708,7 +7774,9 @@ dependencies = [
|
|||
name = "recent_projects"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"editor",
|
||||
"feature_flags",
|
||||
"fuzzy",
|
||||
"gpui",
|
||||
"language",
|
||||
|
|
@ -7716,10 +7784,15 @@ dependencies = [
|
|||
"ordered-float 2.10.0",
|
||||
"picker",
|
||||
"project",
|
||||
"remote_projects",
|
||||
"rpc",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"settings",
|
||||
"smol",
|
||||
"theme",
|
||||
"ui",
|
||||
"ui_text_field",
|
||||
"util",
|
||||
"workspace",
|
||||
]
|
||||
|
|
@ -7846,6 +7919,18 @@ dependencies = [
|
|||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "remote_projects"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"client",
|
||||
"gpui",
|
||||
"rpc",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rend"
|
||||
version = "0.4.0"
|
||||
|
|
@ -9411,6 +9496,7 @@ dependencies = [
|
|||
"log",
|
||||
"menu",
|
||||
"picker",
|
||||
"project",
|
||||
"rust-embed",
|
||||
"settings",
|
||||
"simplelog",
|
||||
|
|
@ -9744,7 +9830,6 @@ dependencies = [
|
|||
"serde_json",
|
||||
"settings",
|
||||
"task",
|
||||
"terminal",
|
||||
"tree-sitter-rust",
|
||||
"tree-sitter-typescript",
|
||||
"ui",
|
||||
|
|
@ -9842,6 +9927,7 @@ dependencies = [
|
|||
"shellexpand",
|
||||
"smol",
|
||||
"task",
|
||||
"tasks_ui",
|
||||
"terminal",
|
||||
"theme",
|
||||
"ui",
|
||||
|
|
@ -10986,8 +11072,8 @@ name = "vcs_menu"
|
|||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"fs",
|
||||
"fuzzy",
|
||||
"git",
|
||||
"gpui",
|
||||
"picker",
|
||||
"ui",
|
||||
|
|
@ -12282,6 +12368,7 @@ dependencies = [
|
|||
"parking_lot",
|
||||
"postage",
|
||||
"project",
|
||||
"remote_projects",
|
||||
"schemars",
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
@ -12520,12 +12607,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zed"
|
||||
version = "0.132.4"
|
||||
version = "0.133.5"
|
||||
dependencies = [
|
||||
"activity_indicator",
|
||||
"anyhow",
|
||||
"assets",
|
||||
"assistant",
|
||||
"assistant2",
|
||||
"audio",
|
||||
"auto_update",
|
||||
"backtrace",
|
||||
|
|
@ -12580,6 +12668,7 @@ dependencies = [
|
|||
"quick_action_bar",
|
||||
"recent_projects",
|
||||
"release_channel",
|
||||
"remote_projects",
|
||||
"rope",
|
||||
"search",
|
||||
"serde",
|
||||
|
|
@ -12640,6 +12729,13 @@ dependencies = [
|
|||
"zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zed_deno"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zed_elm"
|
||||
version = "0.0.1"
|
||||
|
|
@ -12697,6 +12793,13 @@ dependencies = [
|
|||
"zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zed_glsl"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zed_haskell"
|
||||
version = "0.1.0"
|
||||
|
|
@ -12755,7 +12858,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zed_terraform"
|
||||
version = "0.0.2"
|
||||
version = "0.0.3"
|
||||
dependencies = [
|
||||
"zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed";
|
||||
version = "0.132.4";
|
||||
version = "0.133.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4jnPqfLmxp3YpUAIpc/CZ5pv040uDggjeNzJJ2v021E=";
|
||||
hash = "sha256-52vWOlaxVcjlKLrBW+anh6i7kfBCD5cTHWcjLFiY9BA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2023-10-30";
|
||||
version = "2024-05-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "+sWYUCFp5J+fhPHxicwtsHCQkFTpKwjj9H3GAXqNaYo=";
|
||||
sha256 = "trQwRZ/JKIS8TcRIg0eL5GmB/yymDwqqNued0ddRuqU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariant
|
|||
lib.checkListOfEnum "${pname}: color variants" [ "Light" "Dark" ] colorVariants
|
||||
lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants
|
||||
lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants
|
||||
lib.checkListOfEnum "${pname}: Activities icon variants" [ "standard" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" ] (single iconVariant)
|
||||
lib.checkListOfEnum "${pname}: Activities icon variants" [ "standard" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant)
|
||||
lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" ] (single nautilusStyle)
|
||||
lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize)
|
||||
lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity)
|
||||
|
|
@ -40,13 +40,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whitesur-gtk-theme";
|
||||
version = "2024-02-26";
|
||||
version = "2024-05-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9HYsORTd5n0jUYmwiObPZ90mOGhR2j+tzs6Y1NNnrn4=";
|
||||
sha256 = "sha256-NgmFQtgVJvVXJjZUXt/BIx1hdzjHfVmmwXUCDZZD7+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -103,11 +103,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "MacOS BigSur like Gtk+ theme based on Elegant Design";
|
||||
homepage = "https://github.com/vinceliuice/WhiteSur-gtk-theme";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Accerciser";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/accerciser";
|
||||
description = "Interactive Python accessibility explorer";
|
||||
mainProgram = "accerciser";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Cheese";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/cheese";
|
||||
description = "Take photos and videos with your webcam, with fun graphical effects";
|
||||
mainProgram = "cheese";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/FileRoller";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/file-roller";
|
||||
description = "Archive manager for the GNOME desktop environment";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Ghex";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/ghex";
|
||||
description = "Hex editor for GNOME desktop environment";
|
||||
mainProgram = "ghex";
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Simple GNOME 3 application to access remote or virtual systems";
|
||||
mainProgram = "gnome-boxes";
|
||||
homepage = "https://wiki.gnome.org/Apps/Boxes";
|
||||
homepage = "https://apps.gnome.org/Boxes/";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Calendar";
|
||||
homepage = "https://apps.gnome.org/Calendar/";
|
||||
description = "Simple and beautiful calendar application for GNOME";
|
||||
mainProgram = "gnome-calendar";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Characters";
|
||||
homepage = "https://apps.gnome.org/Characters/";
|
||||
description = "Simple utility application to find and insert unusual characters";
|
||||
mainProgram = "gnome-characters";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Clocks";
|
||||
homepage = "https://apps.gnome.org/Clocks/";
|
||||
description = "Clock application designed for GNOME 3";
|
||||
mainProgram = "gnome-clocks";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Logs";
|
||||
homepage = "https://apps.gnome.org/Logs/";
|
||||
description = "A log viewer for the systemd journal";
|
||||
mainProgram = "gnome-logs";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Maps";
|
||||
homepage = "https://apps.gnome.org/Maps/";
|
||||
description = "A map application for GNOME 3";
|
||||
mainProgram = "gnome-maps";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Music";
|
||||
homepage = "https://apps.gnome.org/Music/";
|
||||
description = "Music player and management application for the GNOME desktop environment";
|
||||
mainProgram = "gnome-music";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Note editor designed to remain simple to use";
|
||||
mainProgram = "bijiben";
|
||||
homepage = "https://wiki.gnome.org/Apps/Notes";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-notes";
|
||||
license = licenses.gpl3;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A simple and modern sound recorder";
|
||||
mainProgram = "gnome-sound-recorder";
|
||||
homepage = "https://wiki.gnome.org/Apps/SoundRecorder";
|
||||
homepage = "https://gitlab.gnome.org/World/vocalis";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Weather";
|
||||
homepage = "https://apps.gnome.org/Weather/";
|
||||
description = "Access current weather conditions and forecasts";
|
||||
mainProgram = "gnome-weather";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Polari";
|
||||
homepage = "https://apps.gnome.org/Polari/";
|
||||
description = "IRC chat client designed to integrate with the GNOME desktop";
|
||||
mainProgram = "polari";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Seahorse";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/seahorse";
|
||||
description = "Application for managing encryption keys and passwords in the GnomeKeyring";
|
||||
mainProgram = "seahorse";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
# Pull fix pending upstream inclusion for -fno-common toolchain support:
|
||||
# https://gitlab.gnome.org/GNOME/vinagre/-/merge_requests/8
|
||||
# https://gitlab.gnome.org/Archive/vinagre/-/merge_requests/8
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff";
|
||||
url = "https://gitlab.gnome.org/Archive/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff";
|
||||
sha256 = "0zn8cd93hjdz6rw2d7gfl1ghzkc9h0x40k9l0jx3n5qfwdq4sir8";
|
||||
})
|
||||
];
|
||||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Remote desktop viewer for GNOME";
|
||||
mainProgram = "vinagre";
|
||||
homepage = "https://wiki.gnome.org/Apps/Vinagre";
|
||||
homepage = "https://gitlab.gnome.org/Archive/vinagre";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Graphical application to analyse disk usage in any GNOME environment";
|
||||
mainProgram = "baobab";
|
||||
homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer";
|
||||
homepage = "https://apps.gnome.org/Baobab/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "GSettings editor for GNOME";
|
||||
mainProgram = "dconf-editor";
|
||||
homepage = "https://wiki.gnome.org/Apps/DconfEditor";
|
||||
homepage = "https://apps.gnome.org/DconfEditor/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "GNOME image viewer";
|
||||
homepage = "https://wiki.gnome.org/Apps/EyeOfGnome";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/eog";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Epiphany";
|
||||
homepage = "https://apps.gnome.org/Epiphany/";
|
||||
description = "WebKit based web browser for GNOME";
|
||||
mainProgram = "epiphany";
|
||||
maintainers = teams.gnome.members ++ teams.pantheon.members;
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Evince";
|
||||
homepage = "https://apps.gnome.org/Evince/";
|
||||
description = "GNOME's document viewer";
|
||||
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Unified backend for programs that work with contacts, tasks, and calendar information";
|
||||
homepage = "https://wiki.gnome.org/Apps/Evolution";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Calculator";
|
||||
homepage = "https://apps.gnome.org/Calculator/";
|
||||
description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Contacts";
|
||||
homepage = "https://apps.gnome.org/Contacts/";
|
||||
description = "GNOME’s integrated address book";
|
||||
mainProgram = "gnome-contacts";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
|
|||
# Fix test dependencies with meson 0.57, can be removed on next bump
|
||||
# We need to explicitly depend on the generated files.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch";
|
||||
url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch";
|
||||
sha256 = "tKesWeOK3OqOxrXm4dZvCZHHdTD7AQbYDjtYDCsLd3A=";
|
||||
})
|
||||
# Fix build with meson 0.61, can be removed on next bump
|
||||
# data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch";
|
||||
url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch";
|
||||
sha256 = "cIRM6ACqsnEo2JWYvr6EBye5o0BudugZMShCe1U5hz8=";
|
||||
})
|
||||
];
|
||||
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Dictionary";
|
||||
homepage = "https://gitlab.gnome.org/Archive/gnome-dictionary";
|
||||
description = "Dictionary is the GNOME application to look up definitions";
|
||||
mainProgram = "gnome-dictionary";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Disks";
|
||||
homepage = "https://apps.gnome.org/DiskUtility/";
|
||||
description = "A udisks graphical front-end";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Software store that lets you install and update applications and system extensions";
|
||||
mainProgram = "gnome-software";
|
||||
homepage = "https://wiki.gnome.org/Apps/Software";
|
||||
homepage = "https://apps.gnome.org/Software/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/SystemMonitor";
|
||||
homepage = "https://apps.gnome.org/SystemMonitor/";
|
||||
description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
|
||||
mainProgram = "gnome-system-monitor";
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "The GNOME Terminal Emulator";
|
||||
mainProgram = "gnome-terminal";
|
||||
homepage = "https://wiki.gnome.org/Apps/Terminal";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-terminal";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue