3
0
Fork 0
forked from mirrors/nixpkgs

Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
	pkgs/top-level/aliases.nix
This commit is contained in:
Jonathan Ringer 2022-02-10 09:21:09 -08:00
commit 12fd8a77e1
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0
83 changed files with 542 additions and 495 deletions

View file

@ -276,7 +276,7 @@ rec {
/* Like `mapAttrsRecursive', but it takes an additional predicate
function that tells it whether to recursive into an attribute
function that tells it whether to recurse into an attribute
set. If it returns false, `mapAttrsRecursiveCond' does not
recurse, but does apply the map function. If it returns true, it
does recurse, and does not apply the map function.

View file

@ -802,6 +802,13 @@
loaded in the initrd.
</para>
</listitem>
<listitem>
<para>
<literal>nixos-generate-config</literal> now puts the dhcp
configuration in <literal>hardware-configuration.nix</literal>
instead of <literal>configuration.nix</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>fetchFromSourcehut</literal> now allows fetching

View file

@ -274,6 +274,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.
- `fetchFromSourcehut` now allows fetching repositories recursively
using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
is set to `true`.

View file

@ -279,7 +279,7 @@ if (`lsblk -o TYPE` =~ "lvm") {
push @initrdKernelModules, "dm-snapshot";
}
my $virt = `systemd-detect-virt`;
my $virt = `@detectvirt@`;
chomp $virt;
@ -398,7 +398,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
# Maybe this is a bind-mount of a filesystem we saw earlier?
if (defined $fsByDev{$fields[2]}) {
# Make sure this isn't a btrfs subvolume.
my $msg = `btrfs subvol show $rootDir$mountPoint`;
my $msg = `@btrfs@ subvol show $rootDir$mountPoint`;
if ($? != 0 || $msg =~ /ERROR:/s) {
my $path = $fields[3]; $path = "" if $path eq "/";
my $base = $fsByDev{$fields[2]};
@ -436,7 +436,7 @@ EOF
# Is this a btrfs filesystem?
if ($fsType eq "btrfs") {
my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
my ($status, @info) = runCommand("@btrfs@ subvol show $rootDir$mountPoint");
if ($status != 0 || join("", @info) =~ /ERROR:/) {
die "Failed to retrieve subvolume info for $mountPoint\n";
}
@ -558,6 +558,8 @@ if (!$noFilesystems) {
$fsAndSwap .= "swapDevices =" . multiLineList(" ", @swapDevices) . ";\n";
}
my $networkingDhcpConfig = generateNetworkingDhcpConfig();
my $hwConfig = <<EOF;
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
@ -572,6 +574,7 @@ my $hwConfig = <<EOF;
boot.kernelModules = [$kernelModules ];
boot.extraModulePackages = [$modulePackages ];
$fsAndSwap
$networkingDhcpConfig
${\join "", (map { " $_\n" } (uniq @attrs))}}
EOF
@ -580,13 +583,13 @@ sub generateNetworkingDhcpConfig {
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour.
networking.useDHCP = false;
networking.useDHCP = lib.mkDefault false;
EOF
foreach my $path (glob "/sys/class/net/*") {
my $dev = basename($path);
if ($dev ne "lo") {
$config .= " networking.interfaces.$dev.useDHCP = true;\n";
$config .= " networking.interfaces.$dev.useDHCP = lib.mkDefault true;\n";
}
}

View file

@ -33,8 +33,9 @@ let
nixos-generate-config = makeProg {
name = "nixos-generate-config";
src = ./nixos-generate-config.pl;
path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ];
perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";
detectvirt = "${pkgs.systemd}/bin/systemd-detect-virt";
btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
xserverEnabled = config.services.xserver.enable;
};
@ -133,12 +134,13 @@ in
$bootLoaderConfig
# networking.hostName = "nixos"; # Define your hostname.
# Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
# Set your time zone.
# time.timeZone = "Europe/Amsterdam";
$networkingDhcpConfig
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password\@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@ -148,6 +150,7 @@ in
# console = {
# font = "Lat2-Terminus16";
# keyMap = "us";
# useXkbConfig = true; # use xkbOptions in tty.
# };
$xserverConfig
@ -155,7 +158,10 @@ in
$desktopConfiguration
# Configure keymap in X11
# services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e";
# services.xserver.xkbOptions = {
# "eurosign:e";
# "caps:escape" # map caps to escape.
# };
# Enable CUPS to print documents.
# services.printing.enable = true;

View file

@ -3,12 +3,10 @@
with lib;
let
cfg = config.services.haveged;
in
{
###### interface
@ -17,14 +15,11 @@ in
services.haveged = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable to haveged entropy daemon, which refills
/dev/random when low.
'';
};
enable = mkEnableOption ''
haveged entropy daemon, which refills /dev/random when low.
NOTE: does nothing on kernels newer than 5.6.
'';
# source for the note https://github.com/jirka-h/haveged/issues/57
refill_threshold = mkOption {
type = types.int;
@ -39,29 +34,44 @@ in
};
###### implementation
config = mkIf cfg.enable {
systemd.services.haveged =
{ description = "Entropy Harvesting Daemon";
unitConfig.Documentation = "man:haveged(8)";
wantedBy = [ "multi-user.target" ];
# https://github.com/jirka-h/haveged/blob/a4b69d65a8dfc5a9f52ff8505c7f58dcf8b9234f/contrib/Fedora/haveged.service
systemd.services.haveged = {
description = "Entropy Daemon based on the HAVEGE algorithm";
unitConfig = {
Documentation = "man:haveged(8)";
DefaultDependencies = false;
ConditionKernelVersion = "<5.6";
};
wantedBy = [ "sysinit.target" ];
after = [ "systemd-tmpfiles-setup-dev.service" ];
before = [ "sysinit.target" "shutdown.target" "systemd-journald.service" ];
path = [ pkgs.haveged ];
serviceConfig = {
ExecStart = "${pkgs.haveged}/bin/haveged -F -w ${toString cfg.refill_threshold} -v 1";
SuccessExitStatus = 143;
PrivateTmp = true;
PrivateDevices = true;
PrivateNetwork = true;
ProtectSystem = "full";
ProtectHome = true;
};
serviceConfig = {
ExecStart = "${pkgs.haveged}/bin/haveged -w ${toString cfg.refill_threshold} --Foreground -v 1";
Restart = "always";
SuccessExitStatus = "137 143";
SecureBits = "noroot-locked";
CapabilityBoundingSet = [ "CAP_SYS_ADMIN" "CAP_SYS_CHROOT" ];
# We can *not* set PrivateTmp=true as it can cause an ordering cycle.
PrivateTmp = false;
PrivateDevices = true;
ProtectSystem = "full";
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
RestrictNamespaces = true;
RestrictRealtime = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "newuname" "~@mount" ];
SystemCallErrorNumber = "EPERM";
};
};
};
}

View file

@ -135,6 +135,7 @@ in
services.bamf.enable = true;
services.colord.enable = mkDefault true;
services.fwupd.enable = mkDefault true;
services.packagekit.enable = mkDefault true;
services.touchegg.enable = mkDefault true;
services.touchegg.package = pkgs.pantheon.touchegg;
services.tumbler.enable = mkDefault true;
@ -272,7 +273,7 @@ in
})
(mkIf serviceCfg.apps.enable {
environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [
environment.systemPackages = with pkgs.pantheon; pkgs.gnome.removePackagesByName ([
elementary-calculator
elementary-calendar
elementary-camera
@ -286,7 +287,11 @@ in
elementary-terminal
elementary-videos
epiphany
] config.environment.pantheon.excludePackages);
] ++ lib.optionals config.services.flatpak.enable [
# Only install appcenter if flatpak is enabled before
# https://github.com/NixOS/nixpkgs/issues/15932 is resolved.
appcenter
]) config.environment.pantheon.excludePackages;
# needed by screenshot
fonts.fonts = [

View file

@ -105,10 +105,10 @@ switchboard-with-plugs.override {
</term>
<listitem>
<para>
AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>.
AppCenter has been available since 20.03. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. However, due to missing appstream metadata, the Packagekit backend does not function currently. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/15932">issue</link>.
</para>
<para>
To use AppCenter on NixOS, add <literal>pantheon.appcenter</literal> to <xref linkend="opt-environment.systemPackages" />, <link linkend="module-services-flatpak">enable Flatpak support</link> and optionally add the <literal>appcenter</literal> Flatpak remote:
If you are using Pantheon, AppCenter should be installed by default if you have <link linkend="module-services-flatpak">Flatpak support</link> enabled. If you also wish to add the <literal>appcenter</literal> Flatpak remote:
</para>
<screen>
<prompt>$ </prompt>flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo

View file

@ -14,13 +14,13 @@ let
]);
in stdenv.mkDerivation rec {
pname = "wike";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "hugolabe";
repo = "Wike";
rev = version;
sha256 = "sha256-Cv4gmAUqViHJEAgueLOUX+cI775QopfRA6vmHgQvCUY=";
sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI=";
};
nativeBuildInputs = [

View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
version = "1.10.3";
version = "1.10.4";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
sha256 = "sha256-4Xjm4P4uK0aZxUT0WzcSDdY6rEeh5YFwsMfVtFB14No=";
sha256 = "sha256-tj/RDGPu1hB67eTdq7NrbRd+OwBhIAm1lBgoft5m4v4=";
fetchSubmodules = true;
};

View file

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "22.2.1";
version = "22.2.2";
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 = "26dfd41430e9efa5cc93c2d67156387a564efd0843c2020284658100b298d54c";
sha256 = "sha256-b2yoy1WhnPTE2fNeHVvkwKLzjeaSBhHiQgSZ9VHwkGY=";
};
nativeBuildInputs = [ qmake qttools ];

View file

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.22.1";
version = "1.23.0";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-x1bnDksmEjKuzjwPBENP9xpQbzo8HAW+0i2l2Ra/48Y=";
sha256 = "sha256-F6eWC1GhPJRyra7U80tBxfokY1PIJmsuF3H9536tPxA=";
};
vendorSha256 = null;

View file

@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
version = "0.043";
version = "0.044";
in
fetchzip {
name = "JuliaMono-ttf-${version}";
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
sha256 = "sha256-oxQRrFhTf37OrJSbDlmzh/7xOuKrtxO7v2+j7QcsAmE=";
sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg=";
postFetch = ''
mkdir -p $out/share/fonts/truetype

View file

@ -1,240 +0,0 @@
From b5d7cb20713eff3b3729e5c5fdd2f15680a29385 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 31 Oct 2021 23:12:46 +0800
Subject: [PATCH] build: add packagekit_backend option
---
.github/workflows/main.yml | 7 +++++++
meson_options.txt | 1 +
src/Application.vala | 4 ++++
src/Core/BackendAggregator.vala | 2 ++
src/Core/Package.vala | 21 +++++++++++++--------
src/Core/UpdateManager.vala | 6 ++++++
src/Views/Homepage.vala | 4 ++++
src/meson.build | 10 ++++++++--
8 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index daf13654..5dc5a2fb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,6 +42,13 @@ jobs:
meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build
ninja -C build install
+ - name: Build (NixOS)
+ env:
+ DESTDIR: out
+ run: |
+ meson configure -Dcurated=false -Dpayments=false -Dpackagekit_backend=false build
+ ninja -C build install
+
lint:
runs-on: ubuntu-latest
diff --git a/meson_options.txt b/meson_options.txt
index 0ae93d07..37a6cd8a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,3 +4,4 @@ option('name', type : 'string', value : 'AppCenter', description : 'The name of
option('payments', type : 'boolean', value : true, description : 'Enable payment features and display paid apps')
option('sharing', type : 'boolean', value : true, description : 'Display sharing features, i.e. copyable URLs to appcenter.elementary.io')
option('hide_upstream_distro_apps', type : 'boolean', value : true, description : 'Used for hiding Ubuntu repo apps on elementary OS')
+option('packagekit_backend', type : 'boolean', value : true, description : 'Enable PackageKit backend')
diff --git a/src/Application.vala b/src/Application.vala
index 65fae5aa..7c075076 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -167,9 +167,11 @@ public class AppCenter.App : Gtk.Application {
var client = AppCenterCore.Client.get_default ();
+#if PACKAGEKIT_BACKEND
if (fake_update_packages != null) {
AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages;
}
+#endif
if (silent) {
NetworkMonitor.get_default ().network_changed.connect ((available) => {
@@ -183,6 +185,7 @@ public class AppCenter.App : Gtk.Application {
return;
}
+#if PACKAGEKIT_BACKEND
if (local_path != null) {
var file = File.new_for_commandline_arg (local_path);
@@ -192,6 +195,7 @@ public class AppCenter.App : Gtk.Application {
warning ("Failed to load local AppStream XML file: %s", e.message);
}
}
+#endif
if (main_window == null) {
main_window = new MainWindow (this);
diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala
index 539dba98..feb1eaa9 100644
--- a/src/Core/BackendAggregator.vala
+++ b/src/Core/BackendAggregator.vala
@@ -26,8 +26,10 @@ public class AppCenterCore.BackendAggregator : Backend, Object {
construct {
backends = new Gee.ArrayList<unowned Backend> ();
+#if PACKAGEKIT_BACKEND
backends.add (PackageKitBackend.get_default ());
backends.add (UbuntuDriversBackend.get_default ());
+#endif
backends.add (FlatpakBackend.get_default ());
unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default ();
diff --git a/src/Core/Package.vala b/src/Core/Package.vala
index d6f12f15..8dbd7a22 100644
--- a/src/Core/Package.vala
+++ b/src/Core/Package.vala
@@ -328,7 +328,14 @@ public class AppCenterCore.Package : Object {
public string origin_description {
owned get {
unowned string origin = component.get_origin ();
- if (backend is PackageKitBackend) {
+ if (backend is FlatpakBackend) {
+ var fp_package = this as FlatpakPackage;
+ if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) {
+ return _("%s (system-wide)").printf (origin);
+ }
+ return origin;
+#if PACKAGEKIT_BACKEND
+ } else if (backend is PackageKitBackend) {
if (origin == APPCENTER_PACKAGE_ORIGIN) {
return _("AppCenter");
} else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
@@ -336,15 +343,9 @@ public class AppCenterCore.Package : Object {
} else if (origin.has_prefix ("ubuntu-")) {
return _("Ubuntu (non-curated)");
}
- } else if (backend is FlatpakBackend) {
- var fp_package = this as FlatpakPackage;
- if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) {
- return _("%s (system-wide)").printf (origin);
- }
-
- return origin;
} else if (backend is UbuntuDriversBackend) {
return _("Ubuntu Drivers");
+#endif
}
return _("Unknown Origin (non-curated)");
@@ -434,11 +435,15 @@ public class AppCenterCore.Package : Object {
_author_title = null;
backend_details = null;
+#if PACKAGEKIT_BACKEND
// The version on a PackageKit package comes from the package not AppStream, so only reset the version
// on other backends
if (!(backend is PackageKitBackend)) {
_latest_version = null;
}
+#else
+ _latest_version = null;
+#endif
this.component = component;
}
diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala
index 9deceaf5..c92c0d37 100644
--- a/src/Core/UpdateManager.vala
+++ b/src/Core/UpdateManager.vala
@@ -52,6 +52,7 @@ public class AppCenterCore.UpdateManager : Object {
installed_package.update_state ();
}
+#if PACKAGEKIT_BACKEND
Pk.Results pk_updates;
unowned PackageKitBackend client = PackageKitBackend.get_default ();
try {
@@ -60,10 +61,12 @@ public class AppCenterCore.UpdateManager : Object {
warning ("Unable to get updates from PackageKit backend: %s", e.message);
return 0;
}
+#endif
uint os_count = 0;
string os_desc = "";
+#if PACKAGEKIT_BACKEND
var package_array = pk_updates.get_package_array ();
debug ("PackageKit backend reports %d updates", package_array.length);
@@ -87,6 +90,7 @@ public class AppCenterCore.UpdateManager : Object {
);
}
});
+#endif
os_updates.component.set_pkgnames ({});
os_updates.change_information.clear_update_info ();
@@ -159,6 +163,7 @@ public class AppCenterCore.UpdateManager : Object {
count += 1;
}
+#if PACKAGEKIT_BACKEND
pk_updates.get_details_array ().foreach ((pk_detail) => {
var pk_package = new Pk.Package ();
try {
@@ -181,6 +186,7 @@ public class AppCenterCore.UpdateManager : Object {
critical (e.message);
}
});
+#endif
os_updates.update_state ();
return count;
diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala
index 3673903f..2e128e77 100644
--- a/src/Views/Homepage.vala
+++ b/src/Views/Homepage.vala
@@ -107,9 +107,13 @@ public class AppCenter.Homepage : AbstractView {
column_spacing = 24,
orientation = Gtk.Orientation.VERTICAL
};
+#if PACKAGEKIT_BACKEND
grid.add (banner_revealer);
grid.add (recently_updated_revealer);
grid.add (categories_label);
+#else
+ category_flow.margin_top = 12;
+#endif
grid.add (category_flow);
scrolled_window = new Gtk.ScrolledWindow (null, null) {
diff --git a/src/meson.build b/src/meson.build
index 7b319fc6..d1d77931 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,10 +12,8 @@ appcenter_files = files(
'Core/FlatpakBackend.vala',
'Core/Job.vala',
'Core/Package.vala',
- 'Core/PackageKitBackend.vala',
'Core/ScreenshotCache.vala',
'Core/Task.vala',
- 'Core/UbuntuDriversBackend.vala',
'Core/UpdateManager.vala',
'Dialogs/InstallFailDialog.vala',
'Dialogs/NonCuratedWarningDialog.vala',
@@ -76,6 +74,14 @@ if get_option('hide_upstream_distro_apps')
args += '--define=HIDE_UPSTREAM_DISTRO_APPS'
endif
+if get_option('packagekit_backend')
+ args += '--define=PACKAGEKIT_BACKEND'
+ appcenter_files += files(
+ 'Core/PackageKitBackend.vala',
+ 'Core/UbuntuDriversBackend.vala',
+ )
+endif
+
executable(
meson.project_name(),
appcenter_files,

View file

@ -38,13 +38,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0=";
};
patches = [
# Introduces a packagekit_backend meson flag.
# Makes appcenter actually work by using only the flatpak backend.
# https://github.com/elementary/appcenter/pull/1739
./add-packagekit-backend-option.patch
];
nativeBuildInputs = [
appstream-glib
dbus # for pkg-config
@ -77,8 +70,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dpayments=false"
"-Dcurated=false"
# This option is introduced in add-packagekit-backend-option.patch
"-Dpackagekit_backend=false"
];
postPatch = ''

View file

@ -47,8 +47,7 @@ stdenv.mkDerivation rec {
'';
preInstall = ''
# Install our override for plank dockitems as Appcenter is not ready to be preinstalled.
# See: https://github.com/NixOS/nixpkgs/issues/70214.
# Install our override for plank dockitems as the desktop file path is different.
schema_dir=$out/share/glib-2.0/schemas
install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override

View file

@ -0,0 +1,2 @@
[PlankDockItemPreferences]
Launcher=file:///run/current-system/sw/share/applications/io.elementary.appcenter.desktop

View file

@ -1,2 +1,2 @@
[net.launchpad.plank.dock.settings]
dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem']
dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']

View file

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "0.7.3";
version = "0.7.4";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-zbxFMc02hbsU2ERlUzqMBHwHYfORB7TkMINrKC52PPU=";
sha256 = "sha256-GphF32CFxZYaoTG1k9pP+cRNs/PIKtwevTcIyjG7CpQ=";
};
executable = "bb";

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.3.1058";
version = "1.10.3.1075";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "guIQjiWyulITZZSjt/kCtU5qo4FG/2IK2rwBI6Ttfe0=";
sha256 = "5uJtr6uz6mrkoFfzUmUb6vy5H4s1Lag3CNCsGwsQZ9Q=";
};
nativeBuildInputs = [

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioaseko";
version = "0.0.1";
version = "0.0.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "milanmeu";
repo = pname;
rev = "v${version}";
hash = "sha256-dfU2J4aDKNR+GoEmdq/NhX4Mrmm9tmCkse1tb+V5EFQ=";
hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "10.8.1";
version = "10.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "1hi312gvkrmcxhrc8s3zxwbh87hakd42k5hk7c3xqilc4in3d5dv";
sha256 = "sha256-zvilMBx9H2VDmu13IiAiCqXEGkbpAJpGnt4Ea7FlGVI=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,51 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pythonOlder
, xmltodict
}:
buildPythonPackage rec {
pname = "aiosteamist";
version = "0.3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = version;
hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
xmltodict
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=aiosteamist" ""
'';
pythonImportsCheck = [
"aiosteamist"
];
# Modules doesn't have test suite
doCheck = false;
meta = with lib; {
description = "Module to control Steamist steam systems";
homepage = "https://github.com/bdraco/aiosteamist";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "cloudsplaining";
version = "0.4.10";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "salesforce";
repo = pname;
rev = version;
hash = "sha256-zTsqrHu8eQsQ4ZFocvHdVsgCjWE6JVrlyaztFNir2fk=";
hash = "sha256-HdZHRK/Q544z9ySbjNIjqiXzel0UTsnb9tuXawbkwZg=";
};
propagatedBuildInputs = [

View file

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "connexion";
version = "2.10.0";
version = "2.11.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "zalando";
repo = pname;
rev = version;
sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8=";
sha256 = "sha256-m/r09VNp/AMssOJH9RKMhPcObGHl9uIAoS1PwrjpKaE=";
};
propagatedBuildInputs = [

View file

@ -3,31 +3,42 @@
, fetchPypi
, makefun
, setuptools-scm
, pythonOlder
}:
buildPythonPackage rec {
pname = "decopatch";
version = "1.4.8";
version = "1.4.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0i6i811s2j1z0cl6y177dwsbfxib8dvb5c2jpgklvc2xy4ahhsy6";
hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8=";
};
nativeBuildInputs = [ setuptools-scm ];
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [ makefun ];
propagatedBuildInputs = [
makefun
];
postPatch = ''
substituteInPlace setup.py --replace "'pytest-runner', " ""
substituteInPlace setup.cfg \
--replace "pytest-runner" ""
'';
pythonImportsCheck = [
"decopatch"
];
# Tests would introduce multiple cirucular dependencies
# Affected: makefun, pytest-cases
doCheck = false;
pythonImportsCheck = [ "decopatch" ];
meta = with lib; {
description = "Python helper for decorators";
homepage = "https://github.com/smarie/python-decopatch";

View file

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "discovery30303";
version = "0.2.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
# Commit points to 0.2.1, https://github.com/bdraco/discovery30303/issues/1
rev = "0d0b0fdca1a98662dd2e6174d25853703bd6bf07";
hash = "sha256-WSVMhiJxASxAkxs6RGuAVvEFS8TPxDKE9M99Rp8HKGM=";
};
nativeBuildInputs = [
poetry-core
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=discovery30303" ""
'';
pythonImportsCheck = [
"discovery30303"
];
meta = with lib; {
description = "Module to discover devices that respond on port 30303";
homepage = "https://github.com/bdraco/discovery30303";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, attrs
, flake8
, pytestCheckHook
, hypothesis
, hypothesmith
}:
buildPythonPackage rec {
pname = "flake8-bugbear";
version = "22.1.11";
src = fetchFromGitHub {
owner = "PyCQA";
repo = pname;
rev = version;
sha256 = "sha256-sTg69Hgvi77wtLWEH4JtcIAMFk7exr5CBXmyS0nE5Vc=";
};
propagatedBuildInputs = [
attrs
flake8
];
checkInputs = [
flake8
pytestCheckHook
hypothesis
hypothesmith
];
meta = with lib; {
homepage = "https://github.com/PyCQA/flake8-bugbear";
changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log";
description = ''
A plugin for flake8 finding likely bugs and design problems in your
program.
'';
license = licenses.mit;
maintainers = with maintainers; [ newam ];
};
}

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "gipc";
version = "1.3.0";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "a25ccfd2f8c94b24d2113fa50a0de5c7a44499ca9f2ab7c91c3bec0ed96ddeb1";
sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo=";
};
propagatedBuildInputs = [ gevent ];

View file

@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "glean_parser";
version = "4.4.0";
version = "5.0.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "3ae1435b183936a49368806421df27ab944f1802e86a02b38b8e08e53ff0aac5";
sha256 = "sha256-MJ827VXy8e2CRyq4sY4d0B7etxBgRk4/hZybYOOLh9Q=";
};
postPatch = ''

View file

@ -12,17 +12,17 @@
buildPythonPackage rec {
pname = "glean-sdk";
version = "43.0.2";
version = "44.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-9LLE7cUJhJ+0/rFtVkSdiXUohrXW0JFy3XcYMAAivfw=";
sha256 = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "sha256:1qi7zn2278jpry466w3xj1wpyy5f82bffi55i6nva591i3r1z4am";
sha256 = "sha256-lWFv8eiA3QHp5bhcg4qon/dvKUbFbtH1Q2oXGkk0Me0=";
};
nativeBuildInputs = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
version = "1.6.0";
version = "1.7.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = version;
sha256 = "sha256-qgowVCsSNa+Gt+fWnR1eMfkbtpZD7DS4ALZYz6KZZTM=";
sha256 = "sha256-SDxYPncC/VVTbI4Ka/mgcVfU1KUNRXVvQl78LCoD/RQ=";
};
propagatedBuildInputs = [
@ -44,17 +44,17 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace tests/event_media_test.py \
--replace "/bin/echo" "${coreutils}/bin/echo"
'';
pythonImportsCheck = [
"google_nest_sdm"
];
disabledTests = [
"test_clip_preview_transcode"
"test_event_manager_event_expiration_with_transcode"
];
meta = with lib; {
description = "Python module for Google Nest Device Access using the Smart Device Management API";
description = "Module for Google Nest Device Access using the Smart Device Management API";
homepage = "https://github.com/allenporter/python-google-nest-sdm";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];

View file

@ -3,29 +3,35 @@
, cryptography
, fetchPypi
, httpx
, ntlm-auth
, pyspnego
, pythonOlder
}:
buildPythonPackage rec {
pname = "httpx-ntlm";
version = "0.0.10";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "httpx_ntlm";
inherit version;
sha256 = "1rar6smz56y8k5qbgrpabpr639nwvf6whdi093hyakf0m3h9cpfz";
sha256 = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ=";
};
propagatedBuildInputs = [
cryptography
httpx
ntlm-auth
pyspnego
];
# https://github.com/ulodciv/httpx-ntlm/issues/5
doCheck = false;
pythonImportsCheck = [ "httpx_ntlm" ];
pythonImportsCheck = [
"httpx_ntlm"
];
meta = with lib; {
description = "NTLM authentication support for HTTPX";

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.4.8";
version = "2.4.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MrlFTUNisT5VG8IUIk/qejkM7tV6qrU4ASBzAUCLWpQ=";
sha256 = "sha256-4pFkysb0gxgb1oYirTnvQgjEStJkzUn0Ktw33ZP7zA4=";
};
checkInputs = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "intellifire4py";
version = "0.7.3";
version = "0.9.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jeeftor";
repo = pname;
rev = version;
hash = "sha256-vOARk7TZrpsJLt8Ofur1NxknejmmxmH4Z+30mev4++o=";
hash = "sha256-cNWsKwXVlnZgPjkll1IaEhDHfHNvWCBY6U3B34IdHd0=";
};
propagatedBuildInputs = [

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libusb1";
version = "2.0.1";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46";
sha256 = "5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538";
};
postPatch = ''

View file

@ -1,4 +1,7 @@
{ fetchPypi, buildPythonPackage, lib, isPy3k
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, click
, joblib
, regex
@ -6,13 +9,16 @@
}:
buildPythonPackage rec {
version = "3.6.7";
pname = "nltk";
version = "3.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "51bf1aef5304740a708be7c8e683f7798f03dc5c7a7e7feb758be9e95f4585e3";
hash = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI=";
};
propagatedBuildInputs = [
@ -30,10 +36,14 @@ buildPythonPackage rec {
# best.
doCheck = false;
meta = {
pythonImportsCheck = [
"nltk"
];
meta = with lib; {
description = "Natural Language Processing ToolKit";
homepage = "http://nltk.org/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ lheckemann ];
license = licenses.asl20;
maintainers = with maintainers; [ lheckemann ];
};
}

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "ovoenergy";
version = "1.1.12";
version = "1.2.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "timmo001";
repo = pname;
rev = "v${version}";
sha256 = "1430k699gblxwspsbgxnha8afk6npqharhz2jyjw5gir9pi6g9cz";
sha256 = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI=";
};
propagatedBuildInputs = [

View file

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "pygraphviz";
version = "1.8";
version = "1.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
hash = "sha256-6y4losZHBE57ZrWhWb5k2q7yS1Sfz1NcJBNp1ubgnEU=";
hash = "sha256-+hj3xs6ig0Gk5GbtDPBWgrCmgoiv6N18lCZ4L3wa4Bw=";
extension = "zip";
};

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pynamodb";
version = "5.2.0";
version = "5.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "6c9bec5946949d07c76230187cdb9126e8247c94499bbc8e79ded11d17060a60";
sha256 = "sha256-x6nFV7UjZLwJJX7dADeO68dSWLvaoP4FD8ziNWFJ+Qo=";
};
propagatedBuildInputs = [ python-dateutil botocore ];

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pywemo";
version = "0.7.0";
version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-NwhKrk5cQT7kk4VCr0BMQz0yTP/vuBA6MjTRuk2LM5Y=";
hash = "sha256-bGoqhrjoRKUGPBNfmr2XP+1HL5mdRi6XoCi0BdvY9x8=";
};
nativeBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "sendgrid";
version = "6.9.5";
version = "6.9.6";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = pname;
repo = "sendgrid-python";
rev = version;
sha256 = "1r8xh0c6wivrajj6gl1hv25vsb9i79n19nd4x53207i5vz9d55g5";
sha256 = "sha256-6MkAtkbKVoa8UatG92RzbCdAM+WsQN2WnOIh4pRoUVk=";
};
propagatedBuildInputs = [

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "srpenergy";
version = "1.3.5";
version = "1.3.6";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "lamoreauxlab";
repo = "srpenergy-api-client-python";
rev = version;
sha256 = "sha256-s90+gzjcG27pUcMGpzf2rf+mR8/fmpvwBXGfvv3rNGI=";
hash = "sha256-aZnqGtfklWgigac2gdkQv29Qy5HC34zGGY2iWr2cOMo=";
};
propagatedBuildInputs = [

View file

@ -2,30 +2,39 @@
, buildPythonPackage
, fetchFromGitHub
, requests
, pythonOlder
}:
buildPythonPackage rec {
pname = "tmb";
version = "0.1.1";
version = "0.1.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "alemuro";
repo = pname;
rev = version;
sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE=";
hash = "sha256-/syHSu9LKLDe3awrgSIHh0hV+raWqKd53f43WagHn9c=";
};
VERSION = version;
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [
requests
];
pythonImportsCheck = [
"tmb"
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "tmb" ];
meta = with lib; {
homepage = "https://github.com/alemuro/tmb";
description = "Python library that interacts with TMB API";
homepage = "https://github.com/alemuro/tmb";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.9.43";
version = "3.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "f7d4adf2df0fe19ea49c5f3268c33ffe28b3be818d280bb4c113d7463c58ddf9";
sha256 = "sha256-mPsV25oD8FlPSDOGHOX+nLCN/I6RS83l3efUCgavmHY=";
};
propagatedBuildInputs = [ numpy ];

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.27.8";
version = "2.27.9";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wvTkdU0HygqI/YqJu8bIqfkPtEH5ybVy/VxITwSBdIY=";
sha256 = "sha256-c2iXRTTSl5OUku/f2rIykwRAsR4iA/bfHwxA4yQqh+o=";
};
propagatedBuildInputs = [

View file

@ -1,27 +1,51 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
, fetchFromGitHub
, pythonOlder
, jsonpatch
, jsonschema
, jsonpointer
, six
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "warlock";
version = "1.3.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bcwaldon";
repo = pname;
rev = version;
hash = "sha256-59V4KOwjs/vhA3F3E0j3p5L4JnKPgcExN+mgSWs0Cn0=";
};
propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ];
propagatedBuildInputs = [
jsonpatch
jsonschema
six
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "jsonschema>=0.7,<4" "jsonschema"
sed -i "/--cov/d" pytest.ini
'';
pythonImportsCheck = [
"warlock"
];
meta = with lib; {
homepage = "https://github.com/bcwaldon/warlock";
description = "Python object model built on JSON schema and JSON patch";
homepage = "https://github.com/bcwaldon/warlock";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}

View file

@ -22,13 +22,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.812";
version = "2.0.820";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-dCGcg0v83/KJGCvq2jQSemaHJb5wvluN6U73dRer6gY=";
hash = "sha256-qvYg4tXq9RTYj+pbxg0fZRkTGP8/pk22K9wqMNxVHTo=";
};
nativeBuildInputs = with py.pkgs; [

View file

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RoXk/wzizlND+WuFy5ZFfryKC9vS31b6SgZH7dPt3Ds=";
sha256 = "sha256-pJyITEIngSWTDGfCcm8Z6YD6Pkbum0Vk71hqWk+CnUc=";
};
goPackagePath = "github.com/aquasecurity/tfsec";

View file

@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.23.1";
version = "1.24.1";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "sha256-vAuUA51E1pufn3YvNe4yfqJHXo14iUEA5MzP3/ah+8I=";
sha256 = "sha256-Dl1ZTYzwZ3tl5k9uPnnKHObmTP6Xsw0P1LdPqCfd/d0=";
};
outputs = [ "out" "man" ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "reviewdog";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-PneUN59ddYvhVIXqZeDCh0tWADkRTU9Dj0HNf0V8s3g=";
sha256 = "sha256-IBAJePrqliriOkZRWLAU7hllpGr4DVs8rzD2yyOXZzM=";
};
vendorSha256 = "sha256-NI5pzKfUTjXqDukeQ1wFN/D0TBeXfDPGL69oEL7reCE=";
vendorSha256 = "sha256-6TBurIWct6k4X+0lZ9FYgTc+DQgTpEIS7HUr0V7n++I=";
doCheck = false;

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0TXk+6hS6TJHwhowYzL8ABw3iyfVwPttJWKQ9RfzMSI=";
sha256 = "sha256-L/io0kMYkFVSmOiH6sM/CoibE1rPRwDM0fFddw6kM+4=";
};
buildInputs = [ zlib openssl ];

View file

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

View file

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "symfony-cli";
version = "5.3.0";
version = "5.3.3";
vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
sha256 = "sha256-bZPoHVYso2BEEZO4FXubxOtGCIJyX77Ll0qut5sJjUA=";
sha256 = "sha256-qLgcv6vjPiNJZuZzW0mSKxySz0GdNALtyZ6E3fL3B6Y=";
};
# Tests requires network access

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vultr-cli";
version = "2.12.0";
version = "2.12.1";
src = fetchFromGitHub {
owner = "vultr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mT99flZAAhLSynD/8+fa74Mc3KK8pVs+OOFDYNSBzEE=";
sha256 = "sha256-jcZiCZn6AbrjEhMkJQloLhZmfnxqlZxu5TXqH+dDN0s=";
};
vendorSha256 = null;

View file

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

View file

@ -116,6 +116,11 @@ buildPythonApplication rec {
url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch";
sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2";
})
(fetchpatch {
name = "anki-2.1.15-unescape.patch";
url = "https://795309.bugs.gentoo.org/attachment.cgi?id=715200";
sha256 = "14rz864kdaba4fd1marwkyz9n1jiqnbjy4al8bvwlhpvp0rm1qk6";
})
];
# Anki does not use setup.py

View file

@ -72,13 +72,15 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
icu
curl
openssl
] ++ lib.optionals stdenv.isLinux [
lttng-ust-2-10
musl
];
nativeBuildInputs = [
autoPatchelfHook
python3.pkgs.wrapPython
] ++ lib.optionals stdenv.isLinux [
autoPatchelfHook
];
pythonPath = with python3.pkgs; [
@ -101,6 +103,8 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process
declare kept_aside="${{
"x86_64-linux" = "attach_linux_amd64.so";
"aarch64-darwin" = "attach_x86_64.dylib";
"x86_64-darwin" = "attach_x86_64.dylib";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}"
mv "$kept_aside" "$kept_aside.hidden"
rm *.so *.dylib *.dll *.exe *.pdb
@ -118,7 +122,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
meta = with lib; {
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.jraygauthier ];
platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
maintainers = with maintainers; [ jraygauthier jfchevrette ];
};
}

View file

@ -761,7 +761,7 @@
"sendgrid" = ps: with ps; [ sendgrid ];
"sense" = ps: with ps; [ sense-energy ];
"sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
"senseme" = ps: with ps; [ ]; # missing inputs: aiosenseme
"senseme" = ps: with ps; [ aiosenseme ];
"sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo
"sensor" = ps: with ps; [ sqlalchemy ];
"sentry" = ps: with ps; [ sentry-sdk ];
@ -835,7 +835,7 @@
"statistics" = ps: with ps; [ sqlalchemy ];
"statsd" = ps: with ps; [ statsd ];
"steam_online" = ps: with ps; [ ]; # missing inputs: steamodd
"steamist" = ps: with ps; [ aiohttp-cors ifaddr ]; # missing inputs: aiosteamist discovery30303
"steamist" = ps: with ps; [ aiohttp-cors aiosteamist discovery30303 ifaddr ];
"stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron
"stookalert" = ps: with ps; [ ]; # missing inputs: stookalert
"stream" = ps: with ps; [ pyturbojpeg aiohttp-cors av ];
@ -1460,6 +1460,7 @@
"season"
"select"
"sense"
"senseme"
"sensor"
"sentry"
"seventeentrack"
@ -1507,6 +1508,7 @@
"startca"
"statistics"
"statsd"
"steamist"
"stream"
"stt"
"subaru"

View file

@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "klipper";
version = "unstable-2022-01-09";
version = "unstable-2022-02-07";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "6e6ad7b5201d3452aa605f4ae852c51239c2c7d8";
sha256 = "sha256-cflcGweEjB0xj2LhYJzyvqFSQen2vhYXlL7lz/HoGaM=";
rev = "6d7c03365ad13c4661675aaccd0a3dc5be544493";
sha256 = "sha256-xFSZkOFETGcJXA6CUCReoyNZXhDAfgKkWoeDRqueBVw=";
};
sourceRoot = "source/klippy";

View file

@ -129,6 +129,10 @@ stdenv.mkDerivation rec {
sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config
# https://github.com/sysown/proxysql/issues/3679
# TODO: remove when upgrading past 2.3.2
sed -i -e 's@^\(\s\+cd curl/curl \&\& ./configure .*\) \(--with-ssl=.*\)$@\1 --without-zstd \2@' Makefile
popd
patchShebangs .
'';

View file

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "btrbk";
version = "0.31.3";
version = "0.32.0";
src = fetchurl {
url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2";
sha256 = "HmvNtIgFfeaiFuSRobWlcJqusPSYtqAqx+79+CeNVDQ=";
};
nativeBuildInputs = [ asciidoctor makeWrapper ];

View file

@ -0,0 +1,26 @@
{ lib, rustPlatform, fetchFromGitea, testVersion, garage }:
rustPlatform.buildRustPackage rec {
pname = "garage";
version = "0.6.0";
src = fetchFromGitea {
domain = "git.deuxfleurs.fr";
owner = "Deuxfleurs";
repo = "garage";
rev = "v${version}";
sha256 = "sha256-NNjqDOkMMRyXce+Z7RQpuffCuVhA1U3qH30rSv939ks=";
};
cargoSha256 = "sha256-eKJxRcC43D8qVLORer34tlmsWhELTbcJbZLyf0MB618=";
passthru = {
tests.version = testVersion { package = garage; };
};
meta = {
description = "S3-compatible object store for small self-hosted geo-distributed deployments";
homepage = "https://garagehq.deuxfleurs.fr";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ nickcao _0x4A6F ];
};
}

View file

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

View file

@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec {
pname = "svgbob";
version = "0.6.2";
version = "0.6.3";
src = fetchCrate {
inherit version;
crateName = "svgbob_cli";
sha256 = "sha256-9JASoUN/VzZS8ihepTQL2SXZitxKBMSJEv+13vzQd3w=";
sha256 = "sha256-yYRBV0s19J0M02wenGayy7Ebx6wDhiLiGmb+os29u9I=";
};
cargoSha256 = "sha256-pkdiow+9gsQ9rrSHwukd17r5CfsaJgYj6KA4wYKbtA0=";
cargoSha256 = "sha256-R4W+Oe7Ks2D9qE1IpV6/AMMMwZnCfJ5DzxFAMpV2rFE=";
meta = with lib; {
description = "Convert your ascii diagram scribbles into happy little SVG";

View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "ddcutil";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "rockowitz";
repo = "ddcutil";
rev = "v${version}";
sha256 = "sha256-mIYxGoITaFlHgqAfB6ZZFR3spGD0BElJZJJqFGM4r/I=";
sha256 = "0hbd2ybpqmm96icg387vr57dqkdbc20vyimqjq5yx0sdlp4ikzi7";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View file

@ -1,8 +1,9 @@
{ lib
, python3
, buildPythonPackage
, fetchPypi
}:
with python3.pkgs; buildPythonPackage rec {
buildPythonPackage rec {
pname = "esphome-dashboard";
version = "20220116.0";

View file

@ -1,5 +1,4 @@
{ lib
, pkgs
, python3
, fetchFromGitHub
, fetchpatch
@ -11,7 +10,7 @@
let
python = python3.override {
packageOverrides = self: super: {
esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
esphome-dashboard = self.callPackage ./dashboard.nix {};
};
};
in

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, bison, flex, libffi }:
{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }:
stdenv.mkDerivation rec {
pname = "txr";
version = "231";
version = "273";
src = fetchurl {
url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2";
sha256 = "0mcglb84zfmrai2bcdg9j0ck8jp8h7ii2rf4m38yjggy0dvii2lc";
sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg=";
};
nativeBuildInputs = [ bison flex ];
@ -17,8 +17,16 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "tests";
# Remove failing test-- mentions 'usr/bin' so probably related :)
preCheck = "rm -rf tests/017";
postPatch = ''
# Fixup references to /usr/bin in tests
substituteInPlace tests/017/realpath.tl --replace /usr/bin /bin
substituteInPlace tests/017/realpath.expected --replace /usr/bin /bin
substituteInPlace tests/018/process.tl --replace /usr/bin/env ${lib.getBin coreutils}/bin/env
'';
# Remove failing tests -- 018/chmod tries setting sticky bit
preCheck = "rm -rf tests/018/chmod*";
postInstall = ''
d=$out/share/vim-plugins/txr

View file

@ -29,7 +29,7 @@
let
pname = "vector";
version = "0.19.1";
version = "0.19.2";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -38,10 +38,10 @@ rustPlatform.buildRustPackage {
owner = "timberio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ty+tsT3nkdYN7/avG1imIwWKAmtPA3NPjhrtoADciQs=";
sha256 = "sha256-fTi9Xu/abQAiVCokfieJUgAtPaqUKw6LJQFqMBoW5yc=";
};
cargoSha256 = "sha256-dYIAbjBBnEsCGt5ceV+jG0hsu8dcAH4V+wnfm6Chw8Q=";
cargoSha256 = "sha256-1bxlO9vuNuPLTLhXwcR6mgOpZwFgdXvGVps5b5ioKJc=";
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

View file

@ -10,17 +10,18 @@
, coreutils
, iptables
, makeWrapper
, protoc-gen-go-grpc
}:
buildGoModule rec {
pname = "opensnitch";
version = "1.4.3";
version = "1.5.0";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "opensnitch";
rev = "v${version}";
sha256 = "1c2v2x8hfqk524sa42vry74lda4lg6ii40ljk2qx9j2f69446sva";
sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I=";
};
patches = [
@ -31,17 +32,15 @@ buildGoModule rec {
url = "https://github.com/evilsocket/opensnitch/commit/8a3f63f36aa92658217bbbf46d39e6d20b2c0791.patch";
sha256 = "sha256-WkwjKTQZppR0nqvRO4xiQoKZ307NvuUwoRx+boIpuTg=";
})
# Upstream has inconsistent vendoring
./go-mod.patch
];
modRoot = "daemon";
buildInputs = [ libnetfilter_queue libnfnetlink ];
nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper ];
nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper protoc-gen-go-grpc ];
vendorSha256 = "sha256-sTfRfsvyiFk1bcga009W6jD6RllrySRAU6B/8mF6+ow=";
vendorSha256 = "sha256-81BKMLuEXA/NeIjO7icBm48ROq6KxAxHtvP0nV5yM5A=";
preBuild = ''
make -C ../proto ../daemon/ui/protocol/ui.pb.go

View file

@ -1,24 +0,0 @@
diff --git a/daemon/go.mod b/daemon/go.mod
index ec21c04..a859bfb 100644
--- a/daemon/go.mod
+++ b/daemon/go.mod
@@ -5,17 +5,12 @@ go 1.14
require (
github.com/evilsocket/ftrace v1.2.0
github.com/fsnotify/fsnotify v1.4.7
- github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
- github.com/golang/protobuf v1.5.0
github.com/google/gopacket v1.1.14
github.com/google/nftables v0.0.0-20210514154851-a285acebcad3
github.com/iovisor/gobpf v0.2.0
github.com/vishvananda/netlink v1.1.0
- github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
- golang.org/x/net v0.0.0-20190311183353-d8887717615a
- golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
- golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 // indirect
- golang.org/x/text v0.3.0 // indirect
+ golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
+ golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c
google.golang.org/grpc v1.27.0
google.golang.org/protobuf v1.26.0
)

View file

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "opensnitch-ui";
version = "1.4.3";
version = "1.5.0";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "opensnitch";
rev = "v${version}";
sha256 = "sha256-amtDSDJOyNSxmJICEqN5lKhGyfF5C6I0EWViB1EXW7A=";
sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I=";
};
nativeBuildInputs = [
@ -26,6 +26,8 @@ python3Packages.buildPythonApplication rec {
unidecode
unicode-slugify
pyinotify
notify2
# pyasn # dpendency missing but not mandatory
];
preBuild = ''
@ -48,6 +50,9 @@ python3Packages.buildPythonApplication rec {
dontWrapQtApps = true;
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
# All tests are sandbox-incompatible and disabled for now
doCheck = false;
meta = with lib; {
description = "An application firewall";
homepage = "https://github.com/evilsocket/opensnitch/wiki";

View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
version = "1.3.1";
version = "1.3.3";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = version;
hash = "sha256-BWdXSHIicMa3PgGoF4GGAOh2LAJWt+7svMLFGhWIkn0=";
hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4=";
};
propagatedBuildInputs = with python3.pkgs; [

View file

@ -10,14 +10,15 @@
python3.pkgs.buildPythonApplication rec {
pname = "chipsec";
version = "1.6.1";
version = "1.8.1";
disabled = !stdenv.isLinux;
src = fetchFromGitHub {
owner = "chipsec";
repo = "chipsec";
rev = version;
sha256 = "01sp24z63r3nqxx57zc4873b8i5dqipy7yrxzrwjns531vznhiy2";
hash = "sha256-bK8wlwhP0pi8rOs8ysbSZ+0aZOaX4mckfH/p4OLGnes=";
};
patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ];
@ -29,9 +30,9 @@ python3.pkgs.buildPythonApplication rec {
nasm
];
checkInputs = [
python3.pkgs.distro
python3.pkgs.pytestCheckHook
checkInputs = with python3.pkgs; [
distro
pytestCheckHook
];
preBuild = lib.optionalString withDriver ''
@ -45,10 +46,15 @@ python3.pkgs.buildPythonApplication rec {
$out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko
'';
setupPyBuildFlags = [ "--build-lib=$CHIPSEC_BUILD_LIB" ]
++ lib.optional (!withDriver) "--skip-driver";
setupPyBuildFlags = [
"--build-lib=$CHIPSEC_BUILD_LIB"
] ++ lib.optional (!withDriver) [
"--skip-driver"
];
pythonImportsCheck = [ "chipsec" ];
pythonImportsCheck = [
"chipsec"
];
meta = with lib; {
description = "Platform Security Assessment Framework";

View file

@ -1,15 +1,29 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "haveged";
version = "1.9.2";
version = "1.9.15";
src = fetchurl {
url = "http://www.issihosts.com/haveged/haveged-${version}.tar.gz";
sha256 = "0w5ypz6451msckivjriwyw8djydlwffam7x23xh626s2vzdrlzgp";
src = fetchFromGitHub {
owner = "jirka-h";
repo = "haveged";
rev = "v${version}";
sha256 = "sha256-bU+/lRx0RAqHheNQ9CWT/V0oZnZd0W9EHhhX3RRIZ/0=";
};
meta = {
strictDeps = true;
postPatch = ''
patchShebangs ent # test shebang
'';
installFlags = [
"sbindir=$(out)/bin" # no reason for us to have a $out/sbin, its just a symlink to $out/bin
];
doCheck = true;
meta = with lib; {
description = "A simple entropy daemon";
longDescription = ''
The haveged project is an attempt to provide an easy-to-use, unpredictable
@ -19,9 +33,9 @@ stdenv.mkDerivation rec {
of haveged is directed towards improving overall reliability and adaptability while minimizing
the barriers to using haveged for other tasks.
'';
homepage = "http://www.issihosts.com/haveged/";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.domenkozar ];
platforms = lib.platforms.unix;
homepage = "https://github.com/jirka-h/haveged";
license = licenses.gpl3;
maintainers = with maintainers; [ domenkozar ];
platforms = platforms.unix;
};
}

View file

@ -6,20 +6,20 @@
buildGoModule rec {
pname = "kubescape";
version = "2.0.144";
version = "2.0.146";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
hash = "sha256-X/r39lvNSLZ4SG/x5Woj7c0fEOp8USyeTWYihaY0faU=";
hash = "sha256-OSpT6S0jCw/svWl4q9CyZUwUB/cFAyiyWt+oXKVPSJ0=";
};
nativeBuildInputs = [
installShellFiles
];
vendorSha256 = "sha256-gB1/WkGC3sgMqmA4F9/dGU0R0hIDwwTVBNNsY6Yj8KU=";
vendorSha256 = "sha256-p2bLZfwsSevaiAqciCfEvpdOx3WlVdWBHVXtLBMjLGA=";
ldflags = [
"-s"

View file

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "step-ca";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
sha256 = "sha256-f9sp5sAWysOOoIdCiCJxTWRhyt0wfpO5p4pxW6jj0xc=";
sha256 = "sha256-oebmJ+xrJTV5gXH3U1lWCSQMHiVnUTa0ZTp39sVB7KM=";
};
vendorSha256 = "sha256-iDfPCRU91cuZsKqNOjkLGYmWf8i5FO4NmDsfD5Xqip0=";
vendorSha256 = "sha256-IJXJS+Z93Hw1I1CAeRv4mq8as9DKebqNFa0IMgZ+Kic=";
ldflags = [ "-buildid=" ];

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
version = "5.13.0";
version = "5.13.1";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yOYwPr/Yz/PGpCZtv/dWVFgll6VM7wQEtU/jEVpMjlE=";
sha256 = "sha256-bUzL9QkSgzJePBnGSYQvsKC975ss5b3kBdIgwgGzEtk=";
};
vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc=";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "swayr";
version = "0.12.1";
version = "0.13.0";
src = fetchFromSourcehut {
owner = "~tsdh";
repo = "swayr";
rev = "v${version}";
sha256 = "sha256-xcpgebGyYJep4vSdBb0OXhX66DGA7w3B5KYOHj8BKKM=";
sha256 = "sha256-V4ETsraJo9X10fPMGSuiokPiSlZGYHncOdfheGom1go=";
};
cargoSha256 = "sha256-CYavcHLIQKEh1SoELevAa6g0Q2nksWwcS7/syK4oYq0=";
cargoSha256 = "sha256-3ErzkS8u+4Ve26jpDbsYr4BVDm/XEgydYdZ2ErtVuVA=";
patches = [
./icon-paths.patch

View file

@ -425,8 +425,8 @@ mapAliases ({
google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
go-pup = pup; # Added 2017-12-19
gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
gpgstats = throw "gpgstats has been removed: upstream is gone"; # added 2022-02-06
graalvm11 = graalvm11-ce;
graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19
graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19

View file

@ -5592,6 +5592,8 @@ with pkgs;
gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
garage = callPackage ../tools/filesystems/garage { };
garmin-plugin = callPackage ../applications/misc/garmin-plugin {};
garmintools = callPackage ../development/libraries/garmintools {};

View file

@ -408,6 +408,8 @@ in {
aiosqlite = callPackage ../development/python-modules/aiosqlite { };
aiosteamist = callPackage ../development/python-modules/aiosteamist { };
aiostream = callPackage ../development/python-modules/aiostream { };
aioswitcher = callPackage ../development/python-modules/aioswitcher { };
@ -2172,6 +2174,8 @@ in {
discordpy = callPackage ../development/python-modules/discordpy { };
discovery30303 = callPackage ../development/python-modules/discovery30303 { };
diskcache = callPackage ../development/python-modules/diskcache { };
dissononce = callPackage ../development/python-modules/dissononce { };
@ -2859,6 +2863,8 @@ in {
flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { };
flake8-bugbear = callPackage ../development/python-modules/flake8-bugbear { };
flake8 = callPackage ../development/python-modules/flake8 { };
flake8-length = callPackage ../development/python-modules/flake8-length { };