JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-01-30 18:01:14 +00:00 committed by GitHub
commit 24bc16243e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 260 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
View File

@ -42,11 +42,11 @@ in {
serviceOpts = {
serviceConfig = {
AmbientCapabilities = [
"CAP_RAW_SYSIO"
"CAP_SYS_RAWIO"
"CAP_SYS_ADMIN"
];
CapabilityBoundingSet = [
"CAP_RAW_SYSIO"
"CAP_SYS_RAWIO"
"CAP_SYS_ADMIN"
];
DevicePolicy = "closed";

16
nixos/modules/services/networking/nftables.nix
View File

@ -25,9 +25,10 @@ in
for more information.
There are other programs that use iptables internally too, such as
libvirt.
libvirt. For information on how the two firewalls interact, see [2].
[1]: https://github.com/NixOS/nixpkgs/issues/24318#issuecomment-289216273
[2]: https://wiki.nftables.org/wiki-nftables/index.php/Troubleshooting#Question_4._How_do_nftables_and_iptables_interact_when_used_on_the_same_system.3F
'';
};
networking.nftables.ruleset = mkOption {
@ -118,20 +119,11 @@ in
flush ruleset
include "${cfg.rulesetFile}"
'';
checkScript = pkgs.writeScript "nftables-check" ''
#! ${pkgs.runtimeShell} -e
if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then
echo "Unload ip_tables before using nftables!" 1>&2
exit 1
else
${rulesScript}
fi
'';
in {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = checkScript;
ExecReload = checkScript;
ExecStart = rulesScript;
ExecReload = rulesScript;
ExecStop = "${pkgs.nftables}/bin/nft flush ruleset";
};
};

2
nixos/modules/system/boot/systemd.nix
View File

@ -25,9 +25,11 @@ let
"nss-lookup.target"
"nss-user-lookup.target"
"time-sync.target"
] ++ (optionals cfg.package.withCryptsetup [
"cryptsetup.target"
"cryptsetup-pre.target"
"remote-cryptsetup.target"
]) ++ [
"sigpwr.target"
"timers.target"
"paths.target"

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, ApplicationServices
, potrace, ApplicationServices
, Foundation
, testVersion, imagemagick
}:
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config libtool ];
buildInputs =
[ zlib fontconfig freetype ghostscript
[ zlib fontconfig freetype ghostscript potrace
liblqr1 libpng libraw libtiff libxml2 libheif djvulibre
]
# libjxl is broken on aarch64 (see meta.broken in libjxl) for now,

20
pkgs/applications/misc/qMasterPassword/default.nix
View File

@ -1,18 +1,18 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }:
{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, qttools, libX11, libXtst, openssl, libscrypt }:
mkDerivation rec {
name = "qMasterPassword";
version = "1.2.2";
pname = "qMasterPassword-unstable";
version = "2022-01-28";
src = fetchFromGitHub {
owner = "bkueng";
repo = name;
rev = "v${version}";
sha256 = "0l0jarvfdc69rcjl2wa0ixq8gp3fmjsy9n84m38sxf3n9j2bh13c";
repo = "qMasterPassword";
rev = "7ade33952531731c266c2597f4212c93aca68c59";
sha256 = "sha256-MdV6AkRh072++sKoeuwvhgqLEfUkTF34xt6OH9n59Q0=";
};
buildInputs = [ qtbase libX11 libXtst openssl libscrypt ];
nativeBuildInputs = [ qmake ];
nativeBuildInputs = [ qmake qttools ];
# Upstream install is mostly defunct. It hardcodes target.path and doesn't
# install anything but the binary.
@ -22,12 +22,16 @@ mkDerivation rec {
ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword
'' else ''
mkdir -p $out/bin
mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps}
mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps,qMasterPassword/translations}
mv qMasterPassword $out/bin
mv data/qMasterPassword.desktop $out/share/applications
mv LICENSE README.md $out/share/doc/qMasterPassword
mv data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png
mv data/icons/* $out/share/icons/qmasterpassword
lrelease ./data/translations/translation_de.ts
lrelease ./data/translations/translation_pl.ts
mv ./data/translations/translation_de.qm $out/share/qMasterPassword/translations/translation_de.qm
mv ./data/translations/translation_pl.qm $out/share/qMasterPassword/translations/translation_pl.qm
'';
meta = with lib; {

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "22.1.10.1";
version = "22.1.11";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
sha256 = "sha256-uXDkLDDIRGSxXCczG9TQxtcLFjjOjKtyl/LRMax7JX4=";
sha256 = "7fa21ca9b8b0df6f1bda7a7dc21d53642eccf8de6a31a9a29a251e0a17c00c83";
};
nativeBuildInputs = [ qmake qttools ];

4
pkgs/applications/office/super-productivity/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "super-productivity";
version = "7.10.0";
version = "7.10.1";
src = fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
sha256 = "sha256-Aa0orJpsin7XntUVpW6VLcbGiTSeyySDCGNFOERtgvg=";
sha256 = "sha256-jhCsC5G8epyclp2+DYpot1UMjo5mkMa0UO0bQZ1T0Ug=";
name = "${pname}-${version}.AppImage";
};

2
pkgs/desktops/pantheon/apps/appcenter/default.nix
View File

@ -5,7 +5,6 @@
, appstream-glib
, dbus
, desktop-file-utils
, elementary-gtk-theme
, elementary-icon-theme
, fetchFromGitHub
, flatpak
@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
buildInputs = [
appstream
elementary-gtk-theme
elementary-icon-theme
flatpak
glib

1
pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson

29
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
View File

@ -2,28 +2,26 @@
, stdenv
, fetchFromGitHub
, nix-update-script
, pkg-config
, appstream-glib
, desktop-file-utils
, meson
, ninja
, pkg-config
, python3
, vala
, desktop-file-utils
, gtk3
, wrapGAppsHook
, clutter
, elementary-icon-theme
, evolution-data-server
, folks
, geoclue2
, geocode-glib
, granite
, gtk3
, libchamplain
, libgee
, libhandy
, geoclue2
, libchamplain
, clutter
, folks
, geocode-glib
, python3
, libnotify
, libical
, libgdata
, evolution-data-server
, appstream-glib
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -61,7 +59,6 @@ stdenv.mkDerivation rec {
libgee
libhandy
libical
libnotify
];
postPatch = ''

42
pkgs/desktops/pantheon/apps/elementary-camera/default.nix
View File

@ -3,25 +3,24 @@
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
, ninja
, vala
, appstream
, desktop-file-utils
, python3
, gettext
, libxml2
, gtk3
, meson
, ninja
, pkg-config
, python3
, vala
, wrapGAppsHook
, elementary-icon-theme
, glib
, granite
, gst_all_1
, gtk3
, libcanberra
, libgee
, libhandy
, gst_all_1
, libcanberra
, clutter-gtk
, clutter-gst
, elementary-icon-theme
, appstream
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -58,19 +57,22 @@ stdenv.mkDerivation rec {
];
buildInputs = [
clutter-gst
clutter-gtk
elementary-icon-theme
glib
granite
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gstreamer
gtk3
libcanberra
libgee
libhandy
];
] ++ (with gst_all_1; [
gst-plugins-bad
gst-plugins-base
# gtkSupport needed for gtksink
# https://github.com/elementary/camera/issues/181
(gst-plugins-good.override { gtkSupport = true; })
gst-plugins-ugly
gstreamer
]);
postPatch = ''
chmod +x meson/post_install.py

29
pkgs/desktops/pantheon/apps/elementary-code/default.nix
View File

@ -3,29 +3,28 @@
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, appstream
, desktop-file-utils
, meson
, ninja
, vala
, pkg-config
, polkit
, python3
, desktop-file-utils
, gtk3
, granite
, libgee
, libhandy
, elementary-icon-theme
, appstream
, libpeas
, vala
, wrapGAppsHook
, editorconfig-core-c
, elementary-icon-theme
, granite
, gtk3
, gtksourceview4
, gtkspell3
, libgee
, libgit2-glib
, libhandy
, libpeas
, libsoup
, vte
, webkitgtk
, ctags
, libgit2-glib
, wrapGAppsHook
, polkit
}:
stdenv.mkDerivation rec {
@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
ctags
editorconfig-core-c
elementary-icon-theme
granite
@ -74,7 +72,6 @@ stdenv.mkDerivation rec {
libpeas
libsoup
vte
webkitgtk
];
# ctags needed in path by outline plugin

2
pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
View File

@ -14,7 +14,6 @@
, libgee
, libhandy
, elementary-icon-theme
, elementary-gtk-theme
, gettext
, wrapGAppsHook
, appstream
@ -55,7 +54,6 @@ stdenv.mkDerivation rec {
elementary-icon-theme
granite
gtk3
elementary-gtk-theme
libgee
libhandy
glib

2
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -20,7 +20,6 @@
, elementary-dock
, bamf
, sqlite
, libdbusmenu-gtk3
, zeitgeist
, glib-networking
, elementary-icon-theme
@ -64,7 +63,6 @@ stdenv.mkDerivation rec {
gtk3
libcanberra
libcloudproviders
libdbusmenu-gtk3
libgee
libgit2-glib
libhandy

61
pkgs/desktops/pantheon/apps/elementary-music/default.nix
View File

@ -3,31 +3,25 @@
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, desktop-file-utils
, meson
, ninja
, vala
, desktop-file-utils
, gtk3
, granite
, pkg-config
, python3
, libgee
, clutter-gtk
, json-glib
, vala
, wrapGAppsHook
, elementary-icon-theme
, glib
, granite
, gst_all_1
, gtk3
, libgda
, libgee
, libgpod
, libhandy
, libnotify
, libpeas
, libsoup
, zeitgeist
, gst_all_1
, taglib
, libdbusmenu
, libsignon-glib
, libaccounts-glib
, elementary-icon-theme
, wrapGAppsHook
, zeitgeist
}:
stdenv.mkDerivation rec {
@ -66,34 +60,25 @@ stdenv.mkDerivation rec {
wrapGAppsHook
];
buildInputs = with gst_all_1; [
clutter-gtk
buildInputs = [
elementary-icon-theme
glib
granite
gtk3
libgda
libgee
libgpod
libhandy
libpeas
taglib
zeitgeist
] ++ (with gst_all_1; [
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
gtk3
json-glib
libaccounts-glib
libdbusmenu
libgda
libgee
libgpod
libhandy
libnotify
libpeas
libsignon-glib
libsoup
taglib
zeitgeist
];
mesonFlags = [
"-Dplugins=audioplayer,cdrom,ipod"
];
]);
postPatch = ''
chmod +x meson/post_install.py

19
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
View File

@ -8,7 +8,6 @@
, vala
, desktop-file-utils
, gtk3
, libaccounts-glib
, libexif
, libgee
, libhandy
@ -24,7 +23,6 @@
, libsoup
, sqlite
, python3
, scour
, webkitgtk
, libwebp
, appstream
@ -54,19 +52,13 @@ stdenv.mkDerivation rec {
wrapGAppsHook
];
buildInputs = with gst_all_1; [
buildInputs = [
elementary-icon-theme
geocode-glib
gexiv2
granite
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
gtk3
json-glib
libaccounts-glib
libexif
libgee
libgphoto2
@ -76,10 +68,15 @@ stdenv.mkDerivation rec {
librest
libsoup
libwebp
scour
sqlite
webkitgtk
];
] ++ (with gst_all_1; [
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
]);
mesonFlags = [
"-Dplugins=false"

2
pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
View File

@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Screenshot tool designed for elementary OS";
homepage = "https://github.com/elementary/screenshot";
license = licenses.lgpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
mainProgram = "io.elementary.screenshot";

2
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
View File

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
smart copy/paste, and little to no configuration.
'';
homepage = "https://github.com/elementary/terminal";
license = licenses.lgpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
mainProgram = "io.elementary.terminal";

2
pkgs/desktops/pantheon/apps/sideload/default.nix
View File

@ -2,7 +2,6 @@
, stdenv
, desktop-file-utils
, nix-update-script
, elementary-gtk-theme
, elementary-icon-theme
, fetchFromGitHub
, flatpak
@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-gtk-theme
elementary-icon-theme
flatpak
glib

82
pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch Normal file
View File

@ -0,0 +1,82 @@
From cc47fa33893e6840463ef8d59f9f4de4b7563726 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 4 Dec 2021 22:00:38 +0800
Subject: [PATCH] Add meson option for overlaying logo on wallpaper
---
meson.build | 8 ++++++++
meson_options.txt | 1 +
src/Views/OperatingSystemView.vala | 8 ++++++++
3 files changed, 17 insertions(+)
create mode 100644 meson_options.txt
diff --git a/meson.build b/meson.build
index 2125de6e..cbe3cadd 100644
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,14 @@ add_project_arguments(
vapi_dir = join_paths(meson.current_source_dir(), 'vapi')
add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
+vala_flags = []
+
+if get_option('wallpaper')
+ vala_flags += ['--define', 'WALLPAPER']
+endif
+
+add_project_arguments(vala_flags, language: 'vala')
+
subdir('data')
subdir('src')
subdir('po')
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 00000000..8cef0bb3
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1 @@
+option('wallpaper', type : 'boolean', value : true, description : 'Overlay logo on default wallpaper')
diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala
index fdb92e7e..6110d1aa 100644
--- a/src/Views/OperatingSystemView.vala
+++ b/src/Views/OperatingSystemView.vala
@@ -39,6 +39,7 @@ public class About.OperatingSystemView : Gtk.Grid {
logo_icon_name = "distributor-logo";
}
+#if WALLPAPER
var logo = new Hdy.Avatar (128, "", false) {
// In case the wallpaper can't be loaded, we don't want an icon or text
icon_name = "invalid-icon-name",
@@ -53,6 +54,7 @@ public class About.OperatingSystemView : Gtk.Grid {
}
});
logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+#endif
var icon = new Gtk.Image () {
icon_name = logo_icon_name + "-symbolic",
@@ -64,9 +66,11 @@ public class About.OperatingSystemView : Gtk.Grid {
icon_style_context.add_class ("logo");
icon_style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+#if WALLPAPER
var logo_overlay = new Gtk.Overlay ();
logo_overlay.add (logo);
logo_overlay.add_overlay (icon);
+#endif
// Intentionally not using GLib.OsInfoKey.PRETTY_NAME here because we
// want more granular control over text formatting
@@ -145,7 +149,11 @@ public class About.OperatingSystemView : Gtk.Grid {
valign = Gtk.Align.CENTER,
vexpand = true
};
+#if WALLPAPER
software_grid.attach (logo_overlay, 0, 0, 1, 4);
+#else
+ software_grid.attach (icon, 0, 0, 1, 4);
+#endif
software_grid.attach (title, 1, 0, 3);
software_grid.attach (kernel_version_label, 1, 2, 3);

16
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
View File

@ -2,7 +2,6 @@
, stdenv
, fetchFromGitHub
, nix-update-script
, substituteAll
, meson
, ninja
, pkg-config
@ -15,7 +14,6 @@
, switchboard
, fwupd
, appstream
, nixos-artwork
}:
stdenv.mkDerivation rec {
@ -30,11 +28,10 @@ stdenv.mkDerivation rec {
};
patches = [
# Use NixOS's default wallpaper
(substituteAll {
src = ./fix-background-path.patch;
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
# Introduces a wallpaper meson flag.
# The wallpapaper path does not exist on NixOS, let's just remove the wallpaper.
# https://github.com/elementary/switchboard-plug-about/pull/236
./add-wallpaper-option.patch
];
nativeBuildInputs = [
@ -55,6 +52,11 @@ stdenv.mkDerivation rec {
switchboard
];
mesonFlags = [
# This option is introduced in add-wallpaper-option.patch
"-Dwallpaper=false"
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";

13
pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala
index fdb92e7e..4161538e 100644
--- a/src/Views/OperatingSystemView.vala
+++ b/src/Views/OperatingSystemView.vala
@@ -47,7 +47,7 @@ public class About.OperatingSystemView : Gtk.Grid {
};
logo.set_image_load_func ((size) => {
try {
- return new Gdk.Pixbuf.from_file_at_scale ("/usr/share/backgrounds/elementaryos-default", -1, size, true);
+ return new Gdk.Pixbuf.from_file_at_scale ("@default_wallpaper@", -1, size, true);
} catch (Error e) {
critical (e.message);
}

2
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GTK theme designed to be smooth, attractive, fast, and usable";
homepage = "https://github.com/elementary/stylesheet";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};

2
pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon.
'';
homepage = "https://github.com/elementary/icons";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};

1
pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
View File

@ -2,7 +2,6 @@
, runCommand
, mutter
, elementary-default-settings
, nixos-artwork
, glib
, gala
, epiphany

2
pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
View File

@ -14,7 +14,6 @@
, granite
, libgee
, elementary-icon-theme
, elementary-gtk-theme
, elementary-settings-daemon
, gettext
, libhandy
@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-gtk-theme
elementary-icon-theme
elementary-settings-daemon # settings schema
glib

9
pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix
View File

@ -1,13 +1,14 @@
{ lib
, stdenv
, fetchFromGitHub
, unstableGitUpdater
, substituteAll
, file-roller
}:
stdenv.mkDerivation rec {
pname = "file-roller-contract";
version = "unstable-2021-02-23";
version = "unstable-2021-02-22";
src = fetchFromGitHub {
owner = "elementary";
@ -36,6 +37,12 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru = {
updateScript = unstableGitUpdater {
url = "https://github.com/elementary/file-roller-contract.git";
};
};
meta = with lib; {
description = "Contractor extension for File Roller";
homepage = "https://github.com/elementary/file-roller-contract";

9
pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix
View File

@ -1,13 +1,14 @@
{ lib
, stdenv
, fetchFromGitHub
, unstableGitUpdater
, substituteAll
, gnome-bluetooth
}:
stdenv.mkDerivation rec {
pname = "gnome-bluetooth-contract";
version = "unstable-2021-02-23";
version = "unstable-2021-02-22";
src = fetchFromGitHub {
owner = "elementary";
@ -36,6 +37,12 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru = {
updateScript = unstableGitUpdater {
url = "https://github.com/elementary/gnome-bluetooth-contract.git";
};
};
meta = with lib; {
description = "Contractor extension for GNOME Bluetooth";
homepage = "https://github.com/elementary/gnome-bluetooth-contract";

9
pkgs/desktops/pantheon/granite/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, python3
, meson
, ninja
@ -18,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "granite";
version = "6.2.0";
version = "6.2.0"; # nixpkgs-update: no auto update
outputs = [ "out" "dev" ];
@ -52,12 +51,6 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "An extension to GTK used by elementary OS";
longDescription = ''

7
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix vendored
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, unstableGitUpdater
, substituteAll
, meson
, ninja
@ -45,6 +46,12 @@ stdenv.mkDerivation rec {
pantheon.wingpanel
];
passthru = {
updateScript = unstableGitUpdater {
url = "https://github.com/Lafydev/wingpanel-indicator-ayatana.git";
};
};
meta = with lib; {
description = "Ayatana Compatibility Indicator for Wingpanel";
homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana";

4
pkgs/development/libraries/libf2c/default.nix
View File

@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# Makefile is missing depepdencies on generated headers:
# main.c:4:10: fatal error: signal1.h: No such file or directory
enableParallelBuilding = false;
meta = {
description = "F2c converts Fortran 77 source code to C";
homepage = "http://www.netlib.org/f2c/";

4
pkgs/development/tools/butane/default.nix
View File

@ -4,13 +4,13 @@ with lib;
buildGoModule rec {
pname = "butane";
version = "0.13.1";
version = "0.14.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "butane";
rev = "v${version}";
sha256 = "sha256-wrz9+McHW2NNMsB3uOZIceykYBlSgl2WErAT8bMlkXo=";
sha256 = "sha256-rS1/LQ5R3WY9ot1pgtN+6t/ZChr9SxPzrsNio7WWNqQ=";
};
vendorSha256 = null;

8
pkgs/os-specific/linux/systemd/default.nix
View File

@ -594,17 +594,21 @@ stdenv.mkDerivation {
rm -rf $out/share/doc
'';
passthru = {
# The interface version prevents NixOS from switching to an
# incompatible systemd at runtime. (Switching across reboots is
# fine, of course.) It should be increased whenever systemd changes
# in a backwards-incompatible way. If the interface version of two
# systemd builds is the same, then we can switch between them at
# runtime; otherwise we can't and we need to reboot.
passthru.interfaceVersion = 2;
interfaceVersion = 2;
passthru.tests = {
inherit withCryptsetup;
tests = {
inherit (nixosTests) switchTest;
};
};
meta = with lib; {
homepage = "https://www.freedesktop.org/wiki/Software/systemd/";

4
pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fcitx-libpinyin";
version = "0.5.3";
version = "0.5.4";
src = fetchurl {
url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz";
sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6";
sha256 = "1wvsc21imbgq3chlxfw4aycmkb2vi1bkjj9frvhga2m5b5pq82k5";
};
nativeBuildInputs = [ cmake pkg-config ];

5
pkgs/tools/package-management/nix/common.nix
View File

@ -9,6 +9,7 @@ assert (sha256 == null) -> (src != null);
let
atLeast24 = lib.versionAtLeast version "2.4pre";
atLeast25 = lib.versionAtLeast version "2.5pre";
atLeast27 = lib.versionAtLeast version "2.7pre";
in
{ stdenv
, autoconf-archive
@ -44,7 +45,7 @@ in
, util-linuxMinimal
, xz
, enableDocumentation ? atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform
, enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform
, enableStatic ? stdenv.hostPlatform.isStatic
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp
@ -100,6 +101,8 @@ stdenv.mkDerivation {
lowdown
] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
libcpuid
] ++ lib.optional (atLeast27) [
nlohmann_json
] ++ lib.optionals withLibseccomp [
libseccomp
] ++ lib.optionals withAWS [

6
pkgs/tools/package-management/nix/default.nix
View File

@ -67,12 +67,12 @@ in lib.makeExtensible (self: {
unstable = lib.lowPrio (common rec {
version = "2.7";
suffix = "pre20220124_${lib.substring 0 7 src.rev}";
suffix = "pre20220127_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "0a70b37b5694c769fb855c1afe7642407d1db64f";
sha256 = "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg=";
rev = "558c4ee3e370c9f9a6ea293df54ed6914a999f1c";
sha256 = "sha256-hMzKQflpgf3P7OdYKSnD1VMBSnF48XSRjaNX3bUJct4=";
};
});
})

51
pkgs/tools/security/rnp/cmake_nogit.patch
View File

@ -1,51 +0,0 @@
diff --git i/cmake/version.cmake w/cmake/version.cmake
index 0ed123b5..4348e7e1 100644
--- i/cmake/version.cmake
+++ w/cmake/version.cmake
@@ -90,41 +90,12 @@ function(determine_version source_dir var_prefix)
else()
message(STATUS "Found no version.txt.")
endif()
- # for GIT_EXECUTABLE
- find_package(Git REQUIRED)
- # get a description of the version, something like:
- # v1.9.1-0-g38ffe82 (a tagged release)
- # v1.9.1-0-g38ffe82-dirty (a tagged release with local modifications)
- # v1.9.0-3-g5b92266 (post-release snapshot)
- # v1.9.0-3-g5b92266-dirty (post-release snapshot with local modifications)
- _git(version describe --abbrev=${GIT_REV_LEN} --match "v[0-9]*" --long --dirty)
- if (NOT _git_ec EQUAL 0)
- # no annotated tags, fake one
- message(STATUS "Found no annotated tags.")
- _git(revision rev-parse --short=${GIT_REV_LEN} --verify HEAD)
- if (_git_ec EQUAL 0)
- set(version "v${base_version}-0-g${revision}")
- # check if dirty (this won't detect untracked files, but should be ok)
- _git(changes diff-index --quiet HEAD --)
- if (NOT _git_ec EQUAL 0)
- string(APPEND version "-dirty")
- endif()
- # append the commit timestamp of the most recent commit (only
- # in non-release branches -- typically master)
- _git(commit_timestamp show -s --format=%ct)
- if (_git_ec EQUAL 0)
- string(APPEND version "+${commit_timestamp}")
- endif()
- elseif(has_version_txt)
- # Nothing to get from git - so use version.txt completely
- set(version "${version_file}")
- else()
- # Sad case - no git, no version.txt
- set(version "v${base_version}")
- endif()
+ if(has_version_txt)
+ # Nothing to get from git - so use version.txt completely
+ set(version "${version_file}")
else()
- set(has_release_tag YES)
- message(STATUS "Found annotated tag ${version}")
+ # Sad case - no git, no version.txt
+ set(version "v${base_version}")
endif()
extract_version_info("${version}" "${local_prefix}")
if ("${has_version_txt}" AND NOT ${base_version} STREQUAL ${local_prefix}_VERSION)

6
pkgs/tools/security/rnp/default.nix
View File

@ -15,17 +15,15 @@
stdenv.mkDerivation rec {
pname = "rnp";
version = "0.15.2";
version = "0.16.0";
src = fetchFromGitHub {
owner = "rnpgp";
repo = "rnp";
rev = "v${version}";
sha256 = "1jph69nsz245fbv04nalh1qmhniyh88sacsf3nxv1vxm190314i9";
sha256 = "u0etVslTBF9fBqnpVBofYsm0uC/eR6gO3lhwzqua5Qw=";
};
patches = [ ./cmake_nogit.patch ];
buildInputs = [ zlib bzip2 json_c botan2 ];
cmakeFlags = [

4
pkgs/tools/text/chroma/default.nix
View File

@ -6,7 +6,7 @@ in
buildGoModule rec {
pname = "chroma";
version = "0.9.4";
version = "0.10.0";
# To update:
# nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@ -17,7 +17,7 @@ buildGoModule rec {
inherit (srcInfo) sha256;
};
vendorSha256 = "1l5ryhwifhff41r4z1d2lifpvjcc4yi1vzrzlvkx3iy9dmxqcssl";
vendorSha256 = "09b718vjd6npg850fr7z6srs2sc5vsr7byzlz5yb5qx0vm3ajxpf";
modRoot = "./cmd/chroma";

8
pkgs/tools/text/chroma/src.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/alecthomas/chroma.git",
"rev": "6520148857c2ae3106ff371e527abea815b23915",
"date": "2021-10-17T08:46:20+11:00",
"path": "/nix/store/0s8a46d1nyjl3yhsgni2jz5vdv95cka8-chroma",
"sha256": "1iy6mymdjxbl5wbll1mivv7gqdyqhl6xpfqps99z307m7y38r1ni",
"rev": "36bdd4b98823bd1d7be96767cde3dd575e60b406",
"date": "2022-01-12T21:49:38+11:00",
"path": "/nix/store/951ya4wlxp217a2j3qdni29zwqfq0z7v-chroma",
"sha256": "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,