git.iko.soy/typeable/nixpkgs
on master help sign in
Merge staging-next into staging
commit739cf04cb74bc5c7982f8a7c65978eaaa513b068 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateThu 17 Mar 2022, 18:02 (5 years ago) parent838f4217025814
32 files changed+111−169
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+4−4 nixos/doc/manual/release-notes/rl-2205.section.md+1−1 nixos/modules/system/boot/modprobe.nix−20 nixos/modules/system/boot/stage-1.nix−3 pkgs/applications/misc/moonlight-qt/default.nix+1 pkgs/applications/networking/cluster/kn/default.nix+2−2 pkgs/applications/networking/cluster/velero/default.nix+2−2 pkgs/desktops/arcan/arcan/clone-sources.nix+1−1 pkgs/desktops/arcan/durden/default.nix+7−3 pkgs/desktops/arcan/pipeworld/default.nix+7−3 pkgs/desktops/arcan/prio/default.nix+5−1 pkgs/desktops/arcan/xarcan/default.nix+4−12 pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix+10−1 pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml−1 pkgs/development/haskell-modules/configuration-nix.nix+1 pkgs/development/haskell-modules/hackage-packages.nix−2 pkgs/development/libraries/audio/lv2/default.nix+31−5 pkgs/development/python-modules/gaphas/default.nix+2−2 pkgs/development/python-modules/protonvpn-nm-lib/default.nix+2−2 pkgs/development/python-modules/pywlroots/default.nix+2−2 pkgs/development/python-modules/stups-pierone/default.nix+2−2 pkgs/development/python-modules/thinc/default.nix+2−2 pkgs/development/python-modules/timetagger/default.nix+2−2 pkgs/development/python-modules/trimesh/default.nix+2−2 pkgs/development/python-modules/txtorcon/default.nix+2−2 pkgs/development/python-modules/types-dateutil/default.nix+2−2 pkgs/development/python-modules/types-freezegun/default.nix+2−2 pkgs/development/python-modules/types-paramiko/default.nix+2−2 pkgs/tools/backup/bupstash/default.nix+3−3 pkgs/tools/wayland/swayr/default.nix+3−3 pkgs/tools/wayland/ydotool/default.nix+7−22 pkgs/tools/wayland/ydotool/fixup-cmakelists.patch−58
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+4−4
@@ -1330,10 +1330,10 @@
13301330 </listitem>
13311331 <listitem>
13321332 <para>
1333− A new option
1334− <literal>boot.initrd.extraModprobeConfig</literal> has been
1335− added which can be used to configure kernel modules that are
1336− loaded in the initrd.
1333+ The options <literal>boot.extraModprobeConfig</literal> and
1334+ <literal>boot.blacklistedKernelModules</literal> now also take
1335+ effect in the initrd by copying the file
1336+ <literal>/etc/modprobe.d/nixos.conf</literal> into the initrd.
13371337 </para>
13381338 </listitem>
13391339 <listitem>
nixos/doc/manual/release-notes/rl-2205.section.md+1−1
@@ -495,7 +495,7 @@ In addition to numerous new and upgraded packages, this release has the followin
495495
496496- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
497497
498−- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
498+- The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd.
499499
500500- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.
501501
nixos/modules/system/boot/modprobe.nix−20
@@ -34,23 +34,6 @@ with lib;
3434 type = types.lines;
3535 };
3636
37− boot.initrd.extraModprobeConfig = mkOption {
38− default = "";
39− example =
40− ''
41− options zfs zfs_arc_max=1073741824
42− '';
43− description = ''
44− Does exactly the same thing as
45− <option>boot.extraModprobeConfig</option>, except
46− that the generated <filename>modprobe.conf</filename>
47− file is also included in the initrd.
48− This is useful for setting module options for kernel
49− modules that are loaded during early boot in the initrd.
50− '';
51− type = types.lines;
52− };
53−
5437 };
5538
5639
@@ -67,9 +50,6 @@ with lib;
6750 '')}
6851 ${config.boot.extraModprobeConfig}
6952 '';
70− environment.etc."modprobe.d/nixos-initrd.conf".text = ''
71− ${config.boot.initrd.extraModprobeConfig}
72− '';
7353 environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
7454
7555 environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf";
nixos/modules/system/boot/stage-1.nix−3
@@ -358,9 +358,6 @@ let
358358 { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
359359 symlink = "/etc/mdadm.conf";
360360 }
361− { object = config.environment.etc."modprobe.d/nixos-initrd.conf".source;
362− symlink = "/etc/modprobe.d/nixos-initrd.conf";
363− }
364361 { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
365362 src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
366363 preferLocalBuild = true;
pkgs/applications/misc/moonlight-qt/default.nix+1
@@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
5757 license = licenses.gpl3Plus;
5858 maintainers = with maintainers; [ luc65r ];
5959 platforms = platforms.all;
60+ mainProgram = "moonlight";
6061 };
6162}
pkgs/applications/networking/cluster/kn/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "kn";
5− version = "1.3.0";
5+ version = "1.3.1";
66
77 src = fetchFromGitHub {
88 owner = "knative";
99 repo = "client";
1010 rev = "knative-v${version}";
11− sha256 = "sha256-PxiYxDHcA95MinNpEcXul2cYrV/VB6gThhYCZANqAGY=";
11+ sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo=";
1212 };
1313
1414 vendorSha256 = null;
pkgs/applications/networking/cluster/velero/default.nix+2−2
@@ -2,14 +2,14 @@
22
33buildGoModule rec {
44 pname = "velero";
5− version = "1.8.0";
5+ version = "1.8.1";
66
77
88 src = fetchFromGitHub {
99 owner = "vmware-tanzu";
1010 repo = "velero";
1111 rev = "v${version}";
12− sha256 = "sha256-tQGAzQFrpCUAEzdd5vr4j2oIb6TKeN9DQm96TdP0n40=";
12+ sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58=";
1313 };
1414
1515 ldflags = [
pkgs/desktops/arcan/arcan/clone-sources.nix+1−1
@@ -11,7 +11,7 @@
1111 rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57";
1212 sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg=";
1313 };
14− libuvc-src = fetchgit {
14+ libuvc-src = fetchFromGitHub {
1515 owner = "libuvc";
1616 repo = "libuvc";
1717 rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837";
pkgs/desktops/arcan/durden/default.nix+7−3
@@ -5,15 +5,19 @@
55
66stdenv.mkDerivation rec {
77 pname = "durden";
8− version = "0.6.1+date=2021-10-17";
8+ version = "0.6.1+date=2022-03-11";
99
1010 src = fetchFromGitHub {
1111 owner = "letoram";
1212 repo = pname;
13− rev = "5fb8b0f9bc2952ed9cf7dc20a1c5c0cc44c02ff1";
14− hash = "sha256-+EIsrCkMe9MrUQOCh0R+rsDg/Rqs3iQWO0GZCgZQ+No=";
13+ rev = "fec2a1051500df28becce188d932645743091efa";
14+ hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA=";
1515 };
1616
17+ dontConfigure = true;
18+
19+ dontBuild = true;
20+
1721 installPhase = ''
1822 runHook preInstall
1923
pkgs/desktops/arcan/pipeworld/default.nix+7−3
@@ -5,15 +5,19 @@
55
66stdenv.mkDerivation rec {
77 pname = "pipeworld";
8− version = "0.pre+date=2021-11-26";
8+ version = "0.pre+date=2021-12-03";
99
1010 src = fetchFromGitHub {
1111 owner = "letoram";
1212 repo = pname;
13− rev = "9f816db154ca5c54af952ad11c2186ccac5bdd2d";
14− hash = "sha256-uwnrRsMP0RLEGr2mEVQ6kEtV/c6t5qSCHY0ynywPzkw=";
13+ rev = "c653414670cafb0c73a57492aa3d9510460b16a9";
14+ hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk=";
1515 };
1616
17+ dontConfigure = true;
18+
19+ dontBuild = true;
20+
1721 installPhase = ''
1822 runHook preInstall
1923
pkgs/desktops/arcan/prio/default.nix+5−1
@@ -5,7 +5,7 @@
55
66stdenv.mkDerivation rec {
77 pname = "prio";
8− version = "0.pre+unstable=2018-09-13";
8+ version = "0.pre+date=2018-09-13";
99
1010 src = fetchFromGitHub {
1111 owner = "letoram";
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
1414 hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM=";
1515 };
1616
17+ dontConfigure = true;
18+
19+ dontBuild = true;
20+
1721 installPhase = ''
1822 runHook preInstall
1923
pkgs/desktops/arcan/xarcan/default.nix+4−12
@@ -38,23 +38,15 @@
3838
3939stdenv.mkDerivation rec {
4040 pname = "xarcan";
41− version = "0.6.0+unstable=2021-06-14";
41+ version = "0.6.0+date=2021-08-26";
4242
4343 src = fetchFromGitHub {
4444 owner = "letoram";
4545 repo = pname;
46− rev = "98d28a5f2c6860bb191fbc1c9e577c18e4c9a9b7";
47− hash = "sha256-UTIVDKnYD/q0K6G7NJUKh1tHcqnsuiJ/cQxWuPMJ2G4=";
46+ rev = "e40f0176e495ffdad6e7405c58378df6532eb70d";
47+ hash = "sha256-T+1oL7P5MTDkeSfW6OXc1OgfZ8E6e/4YRonf1eXcfIA=";
4848 };
4949
50− patches = [
51− # fix build with meson 0.60
52− (fetchpatch {
53− url = "https://github.com/letoram/xarcan/commit/b67e514dbb59bffc23b75d47ca7f24e96c4aeb05.patch";
54− sha256 = "sha256-tSQmNy1Id6nDIN+03dc1+rEEF8fMq0yJBiscNM60xic=";
55− })
56− ];
57−
5850 nativeBuildInputs = [
5951 meson
6052 ninja
@@ -122,6 +114,6 @@ stdenv.mkDerivation rec {
122114 '';
123115 license = licenses.mit;
124116 maintainers = with maintainers; [ AndersonTorres ];
125− platforms = platforms.all;
117+ platforms = platforms.unix;
126118 };
127119}
pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix+10−1
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ stdenv
2+, lib
23, fetchpatch
34, substituteAll
45, fetchurl
@@ -70,6 +71,14 @@ stdenv.mkDerivation rec {
7071 })
7172
7273 # Fix build with new meson
74+ # plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments.
75+ # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283
76+ (fetchpatch {
77+ url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch";
78+ sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ=";
79+ })
80+ # meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
81+ # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249
7382 (fetchpatch {
7483 url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff";
7584 sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY=";
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml−1
@@ -3703,7 +3703,6 @@ broken-packages:
37033703 - persistent-discover
37043704 - persistent-documentation
37053705 - persistent-equivalence
3706− - persistent-migration
37073706 - persistent-mongoDB
37083707 - persistent-mysql-haskell
37093708 - persistent-odbc
pkgs/development/haskell-modules/configuration-nix.nix+1
@@ -163,6 +163,7 @@ self: super: builtins.intersectAttrs super {
163163 network-transport-tcp = dontCheck super.network-transport-tcp;
164164 network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
165165 oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com
166+ persistent-migration = dontCheck super.persistent-migration; # spec requires pg_ctl binary
166167 pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
167168 pixiv = dontCheck super.pixiv;
168169 raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw
pkgs/development/haskell-modules/hackage-packages.nix−2
@@ -211081,8 +211081,6 @@ self: {
211081211081 ];
211082211082 description = "Manual migrations for the persistent library";
211083211083 license = lib.licenses.bsd3;
211084− hydraPlatforms = lib.platforms.none;
211085− broken = true;
211086211084 }) {};
211087211085
211088211086 "persistent-mongoDB" = callPackage
pkgs/development/libraries/audio/lv2/default.nix+31−5
@@ -1,24 +1,50 @@
1−{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }:
1+{ stdenv
2+, lib
3+, fetchurl
4+, libsndfile
5+, pkg-config
6+, python3
7+, wafHook
8+, pipewire
9+}:
210
311stdenv.mkDerivation rec {
412 pname = "lv2";
513 version = "1.18.2";
614
15+ outputs = [ "out" "dev" ];
16+
717 src = fetchurl {
818 url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2";
919 sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4=";
1020 };
1121
12− nativeBuildInputs = [ pkg-config wafHook ];
13− buildInputs = [ gtk2 libsndfile python3 ];
22+ nativeBuildInputs = [
23+ pkg-config
24+ wafHook
25+ ];
26+
27+ buildInputs = [
28+ libsndfile
29+ python3
30+ ];
1431
15− wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
32+ wafConfigureFlags = [
33+ "--includedir=${placeholder "dev"}/include"
34+ "--bindir=${placeholder "dev"}/bin"
35+ ] ++ lib.optionals stdenv.isDarwin [
36+ "--lv2dir=${placeholder "out"}/lib/lv2"
37+ ];
38+
39+ passthru.tests = {
40+ inherit pipewire;
41+ };
1642
1743 meta = with lib; {
1844 homepage = "https://lv2plug.in";
1945 description = "A plugin standard for audio systems";
2046 license = licenses.mit;
21− maintainers = [ maintainers.goibhniu ];
47+ maintainers = with maintainers; [ goibhniu ];
2248 platforms = platforms.unix;
2349 };
2450}
pkgs/development/python-modules/gaphas/default.nix+2−2
@@ -12,14 +12,14 @@
1212
1313buildPythonPackage rec {
1414 pname = "gaphas";
15− version = "3.5.0";
15+ version = "3.5.1";
1616 disabled = pythonOlder "3.7";
1717
1818 format = "pyproject";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "526f1943dd54efe91fbf45db38049103611fbac5939c42ad172ba9d2dce71fe1";
22+ sha256 = "sha256-71oYuLhqJ7bst0W7v9tQSoaisjONZSa9zEWzYWtGl2E=";
2323 };
2424
2525 nativeBuildInputs = [
pkgs/development/python-modules/protonvpn-nm-lib/default.nix+2−2
@@ -13,14 +13,14 @@
1313
1414buildPythonPackage rec {
1515 pname = "protonvpn-nm-lib";
16− version = "3.7.0";
16+ version = "3.8.0";
1717 disabled = pythonOlder "3.7";
1818
1919 src = fetchFromGitHub {
2020 owner = "ProtonVPN";
2121 repo = pname;
2222 rev = version;
23− sha256 = "sha256-RZ10p/Lg9GQj0CohW2v+THch5EaD236rEHETGjNStdY=";
23+ sha256 = "sha256-fAaP9c66LcbZgezadGPUt400YRnrnFoBvpzlc1zxuc4=";
2424 };
2525
2626 propagatedBuildInputs = [
pkgs/development/python-modules/pywlroots/default.nix+2−2
@@ -18,11 +18,11 @@
1818
1919buildPythonPackage rec {
2020 pname = "pywlroots";
21− version = "0.15.10";
21+ version = "0.15.11";
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "VWfcDhMAuUkYObRiaXRfcB7dI75SM7zVwWWvnlrxV0k=";
25+ sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8=";
2626 };
2727
2828 nativeBuildInputs = [ pkg-config ];
pkgs/development/python-modules/stups-pierone/default.nix+2−2
@@ -12,7 +12,7 @@
1212
1313buildPythonPackage rec {
1414 pname = "stups-pierone";
15− version = "1.1.50";
15+ version = "1.1.51";
1616 format = "setuptools";
1717
1818 disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121 owner = "zalando-stups";
2222 repo = "pierone-cli";
2323 rev = version;
24− hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw=";
24+ hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE=";
2525 };
2626
2727 propagatedBuildInputs = [
pkgs/development/python-modules/thinc/default.nix+2−2
@@ -30,14 +30,14 @@
3030
3131buildPythonPackage rec {
3232 pname = "thinc";
33− version = "8.0.14";
33+ version = "8.0.15";
3434 format = "setuptools";
3535
3636 disabled = pythonOlder "3.6";
3737
3838 src = fetchPypi {
3939 inherit pname version;
40− sha256 = "sha256-3MC8ao6BTiDyaCXj/X+DNCTpMYcTWVJFSl0X+sCc5J0=";
40+ sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs=";
4141 };
4242
4343 postPatch = ''
pkgs/development/python-modules/timetagger/default.nix+2−2
@@ -9,13 +9,13 @@
99
1010python3Packages.buildPythonPackage rec {
1111 pname = "timetagger";
12− version = "22.2.3";
12+ version = "22.3.1";
1313
1414 src = fetchFromGitHub {
1515 owner = "almarklein";
1616 repo = pname;
1717 rev = "v${version}";
18− sha256 = "sha256-tQel+IVqP+MngAvFgr7Yh+XCSIPWpzCBXHOj9b0Os98=";
18+ sha256 = "sha256-pHogDjqXuoQp5afSnPvMPaKoBtPE6u3kMi87SzY5yoU=";
1919 };
2020
2121 propagatedBuildInputs = with python3Packages; [
pkgs/development/python-modules/trimesh/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "trimesh";
9− version = "3.10.2";
9+ version = "3.10.3";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "sha256-PcR84la6ZJjtpjg4WGVUkyZJqVT8Ge7vjk90X6gStAo=";
13+ sha256 = "sha256-K2zBEGzagQ6lOWIPkop1YYqB2/KZIj2beUJUu2Garno=";
1414 };
1515
1616 propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/txtorcon/default.nix+2−2
@@ -4,7 +4,7 @@
44
55buildPythonPackage rec {
66 pname = "txtorcon";
7− version = "21.1.0";
7+ version = "22.0.0";
88
99 checkInputs = [ pytest mock lsof GeoIP ];
1010 propagatedBuildInputs = [
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6";
18+ sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM=";
1919 };
2020
2121 # Based on what txtorcon tox.ini will automatically test, allow back as far
pkgs/development/python-modules/types-dateutil/default.nix+2−2
@@ -5,12 +5,12 @@
55
66buildPythonPackage rec {
77 pname = "types-python-dateutil";
8− version = "2.8.9";
8+ version = "2.8.10";
99 format = "setuptools";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "sha256-kPlaa21Pq6NZKH8XosrlEczJ1KvImwGWm9rBGFgVwF0=";
13+ sha256 = "sha256-a886rnJC5Xk7r9eyvPtOJV63srMUSs0N8OGC3OWMytM=";
1414 };
1515
1616 pythonImportsCheck = [ "dateutil-stubs" ];
pkgs/development/python-modules/types-freezegun/default.nix+2−2
@@ -5,12 +5,12 @@
55
66buildPythonPackage rec {
77 pname = "types-freezegun";
8− version = "1.1.6";
8+ version = "1.1.7";
99 format = "setuptools";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8=";
13+ hash = "sha256-6dEyfpjGyqj2XeABje0nQ0fo40GY1ZqppcJK2SZdXl4=";
1414 };
1515
1616 # Module doesn't have tests
pkgs/development/python-modules/types-paramiko/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "types-paramiko";
9− version = "2.8.16";
9+ version = "2.8.17";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "sha256-HWkCWoa5509G2OHyPFijb5RVORAvE1tQEgL7myxP0SI=";
13+ sha256 = "sha256-1toFPkau9cYpvE6lvatWZwhlNerg/P2N6EBpQ7g00uY=";
1414 };
1515
1616 pythonImportsCheck = [
pkgs/tools/backup/bupstash/default.nix+3−3
@@ -1,16 +1,16 @@
11{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
22rustPlatform.buildRustPackage rec {
33 pname = "bupstash";
4− version = "0.10.3";
4+ version = "0.11.0";
55
66 src = fetchFromGitHub {
77 owner = "andrewchambers";
88 repo = pname;
99 rev = "v${version}";
10− sha256 = "sha256-YN5pIXJRTQXqFGuXvyoSlYJEjAZ4wIYEKjEeF8qIJCI=";
10+ sha256 = "sha256-9yWQQ8uzDkN3Pi2OiEn+oEazc3nH53dF2GswBCu8d3c=";
1111 };
1212
13− cargoSha256 = "sha256-Erpg+Sktx+L2X9k6g1ngOyM8MNoucGcScOSPMB7vld8=";
13+ cargoSha256 = "sha256-JAclSUFuQk768cgDEvG1rxux2xBGHl1d/NAoxw161YU=";
1414
1515 nativeBuildInputs = [ ronn pkg-config installShellFiles ];
1616 buildInputs = [ libsodium ];
pkgs/tools/wayland/swayr/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "swayr";
5− version = "0.13.0";
5+ version = "0.15.0";
66
77 src = fetchFromSourcehut {
88 owner = "~tsdh";
99 repo = "swayr";
1010 rev = "v${version}";
11− sha256 = "sha256-V4ETsraJo9X10fPMGSuiokPiSlZGYHncOdfheGom1go=";
11+ sha256 = "sha256-GLOJjGr29v4oVNCWgjPWluIiSeLoIYeOw2HwmSfxA8Y=";
1212 };
1313
14− cargoSha256 = "sha256-3ErzkS8u+4Ve26jpDbsYr4BVDm/XEgydYdZ2ErtVuVA=";
14+ cargoSha256 = "sha256-gg/IHrgfDZT+3FNM/se5X1YMcHX127jMNI/WDEpMzy4=";
1515
1616 patches = [
1717 ./icon-paths.patch
pkgs/tools/wayland/ydotool/default.nix+7−22
@@ -1,41 +1,26 @@
1−{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus, iodash, cxxopts}:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, scdoc }:
22
33stdenv.mkDerivation rec {
44 pname = "ydotool";
5− version = "unstable-2021-01-20";
5+ version = "1.0.1";
66
77 src = fetchFromGitHub {
88 owner = "ReimuNotMoe";
99 repo = "ydotool";
10− rev = "b1d041f52f7bac364d6539b1251d29c3b77c0f37";
11− sha256 = "1gzdbx6fv0dbcyia3yyzhv93az2gf90aszb9kcj5cnxywfpv9w9g";
10+ rev = "v${version}";
11+ sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA=";
1212 };
1313
14− # upstream decided to use a cpp package manager called cpm.
15− # we need to disable that because it wants networking, furthermore,
16− # it does some system folder creating which also needs to be disabled.
17− # Both changes are to respect the sandbox.
18− patches = [ ./fixup-cmakelists.patch ];
19−
20−
21− # cxxopts is a header only library.
22− # See pull request: https://github.com/ReimuNotMoe/ydotool/pull/105
23− postPatch = ''
24− substituteInPlace CMakeLists.txt --replace \
25− "PUBLIC cxxopts" \
26− "PUBLIC"
27− '';
28−
2914 nativeBuildInputs = [ cmake pkg-config ];
3015 buildInputs = [
31− boost libevdevplus libuinputplus iodash cxxopts
16+ scdoc
3217 ];
3318
3419 meta = with lib; {
3520 inherit (src.meta) homepage;
3621 description = "Generic Linux command-line automation tool";
37− license = licenses.mit;
38− maintainers = with maintainers; [ willibutz ];
22+ license = licenses.agpl3Plus;
23+ maintainers = with maintainers; [ willibutz kraem ];
3924 platforms = with platforms; linux;
4025 };
4126}
pkgs/tools/wayland/ydotool/fixup-cmakelists.patchdeleted−58
@@ -1,58 +0,0 @@
1−From bb8bc44d22060cd1215712117cf30eae09f4f6ba Mon Sep 17 00:00:00 2001
2−From: Jappie Klooster <jappieklooster@hotmail.com>
3−Date: Fri, 2 Apr 2021 14:04:14 -0400
4−Subject: [PATCH] Fixup cmaklists
5−
6−We remove cpm, which is a package manager for c++,
7−which requires networking, so it's better just deleted.
8−
9−Furthermore we delete the adddirectory statements.
10−These want to modify directories outside of the sandbox.
11−---
12− CMakeLists.txt | 26 --------------------------
13− 1 file changed, 26 deletions(-)
14−
15−diff --git a/CMakeLists.txt b/CMakeLists.txt
16−index b5e8789..b797538 100644
17−--- a/CMakeLists.txt
18−+++ b/CMakeLists.txt
19−@@ -13,30 +13,6 @@ endif()
20−
21− include(${CPM_DOWNLOAD_LOCATION})
22−
23−-CPMAddPackage(
24−- NAME IODash
25−- GITHUB_REPOSITORY YukiWorkshop/IODash
26−- VERSION 0.1.0
27−-)
28−-
29−-CPMAddPackage(
30−- NAME libevdevPlus
31−- GITHUB_REPOSITORY YukiWorkshop/libevdevPlus
32−- VERSION 0.2.1
33−-)
34−-
35−-CPMAddPackage(
36−- NAME libuInputPlus
37−- GITHUB_REPOSITORY YukiWorkshop/libuInputPlus
38−- VERSION 0.2.1
39−-)
40−-
41−-CPMAddPackage(
42−- NAME cxxopts
43−- GITHUB_REPOSITORY jarro2783/cxxopts
44−- VERSION 3.0.0
45−- GIT_TAG 2d8e17c4f88efce80e274cb03eeb902e055a91d3
46−-)
47−
48− set(SOURCE_FILES_LIBRARY
49− CommonIncludes.hpp
50−@@ -74,5 +50,3 @@ add_executable(ydotool ${SOURCE_FILES_CLIENT})
51− target_link_libraries(ydotool ydotool_library dl pthread uInputPlus evdevPlus)
52− install(TARGETS ydotool DESTINATION ${CMAKE_INSTALL_BINDIR})
53−
54−-add_subdirectory(Daemon)
55−-add_subdirectory(manpage)
56−--
57−2.29.2
58−