diff --git a/configurations/sway/status-configuration.nix b/configurations/sway/status-configuration.nix index f2b95ac2..6c7e51bc 100644 --- a/configurations/sway/status-configuration.nix +++ b/configurations/sway/status-configuration.nix @@ -40,38 +40,28 @@ pkgs.writeText "configuration.toml" '' [[block]] block = "net" device = "wlp2s0" - ssid = true - signal_strength = false - speed_up = false - speed_down = false + format = "{ssid}" hide_missing = true hide_inactive = true [[block]] block = "net" device = "wlp0s20f3" - ssid = true - signal_strength = false - speed_up = false - speed_down = false + format = "{ssid}" hide_missing = true hide_inactive = true [[block]] block = "net" device = "enp0s31f6" - ip = true - speed_up = false - speed_down = false + format = "{ip}" hide_missing = true hide_inactive = true [[block]] block = "net" device = "enp0s20f0u1u2" - ip = true - speed_up = false - speed_down = false + format = "{ip}" hide_missing = true hide_inactive = true diff --git a/flake.lock b/flake.lock index 4b178f97..2f9ff616 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1620356930, - "narHash": "sha256-eQa82tat0z3JPOMNiU/YQIHwHi1+TmZFRsWTUB1Y7bk=", + "lastModified": 1620758995, + "narHash": "sha256-R74eRNSji43x3Vc/HTzQsNk5cjgiQOeTCe2kaWztdKQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8e56d29d2b766d9fd44afc38a9447413cec76d5d", + "rev": "b74d4784e7a508f1a4eeec588c4057510ac2fbbb", "type": "github" }, "original": { @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1620337456, - "narHash": "sha256-w4Z6NYNYI3v++Pmqs4j1pPGdWJEyjGQat5rYxkhncMI=", + "lastModified": 1620692082, + "narHash": "sha256-s/eBXs4OI47yPWNTKoAg4f/H7wMLyO+VEMmobXkzfI8=", "owner": "nix-community", "repo": "home-manager", - "rev": "86944b0fb15f89bc1173efabbce556260a410154", + "rev": "23769994e8f7b212d9a257799173b120ed87736b", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1620342412, - "narHash": "sha256-+8hr31rFiATBW4Ls4PX2PIAOP/o3b+i1Y/9OROJhPLg=", + "lastModified": 1620726384, + "narHash": "sha256-RiyluT3/HDm6/LnYY+PBWHnh2SCBCwgJOjlH7TTPiE0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "86878f63f9a57a128741ef6e6144780362396cac", + "rev": "93123faae0281d2e97d12641a7cfad07c8028aff", "type": "github" }, "original": { diff --git a/modules/accentor.nix b/modules/accentor.nix index b1741378..ac673ffc 100644 --- a/modules/accentor.nix +++ b/modules/accentor.nix @@ -7,7 +7,7 @@ let owner = "accentor"; repo = "web"; rev = "develop"; - sha256 = "1rdwrm161nalznrd10b8wvankyqariki8i2mx8b0qm0q0j9dgmqq"; + sha256 = "1prjap9j42s09h2c9mvm7gdn4jr2klmphggsxa4wqjqbmpz9973b"; }; yarnNix = ./accentor/yarn.nix; buildPhase = '' diff --git a/modules/accentor/yarn.nix b/modules/accentor/yarn.nix index 2f1939ab..bd129157 100644 --- a/modules/accentor/yarn.nix +++ b/modules/accentor/yarn.nix @@ -8794,11 +8794,11 @@ }; } { - name = "url_parse___url_parse_1.4.7.tgz"; + name = "url_parse___url_parse_1.5.1.tgz"; path = fetchurl { - name = "url_parse___url_parse_1.4.7.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz"; - sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278"; + name = "url_parse___url_parse_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz"; + sha1 = "d5fa9890af8a5e1f274a2c98376510f6425f6e3b"; }; } { diff --git a/modules/emacs.nix b/modules/emacs.nix index ae827fdf..550b0121 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -3,7 +3,7 @@ let emacsPkg = pkgs.emacsWithPackagesFromUsePackage { config = ./emacs/init.el; - package = pkgs.emacsPgtkGcc; + package = pkgs.emacsPgtk; alwaysEnsure = true; extraEmacsPackages = epkgs: [ # mu4e is included in the mu package and should be used from there diff --git a/patches/119540.patch b/patches/119540.patch deleted file mode 100644 index b321ec06..00000000 --- a/patches/119540.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 456aa2db499409ab500d98c464b3321d4b7cecc3 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Thu, 15 Apr 2021 15:40:20 +0200 -Subject: [PATCH 1/2] nixos-rebuild: Allow remote building when using flakes - ---- - .../linux/nixos-rebuild/nixos-rebuild.sh | 65 +++++++++++++++---- - 1 file changed, 53 insertions(+), 12 deletions(-) - -diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh -index 5874f334fedb9..6e31e174c849a 100644 ---- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh -+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh -@@ -214,6 +214,49 @@ nixBuild() { - fi - } - -+nixFlakeBuild() { -+ if [ -z "$buildHost" ]; then -+ nix build "$@" --out-link "${tmpDir}/result" -+ readlink -f "${tmpDir}/result" -+ else -+ local attr="$1" -+ shift 1 -+ local evalArgs=() -+ local buildArgs=() -+ while [ "$#" -gt 0 ]; do -+ local i="$1"; shift 1 -+ case "$i" in -+ --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) -+ evalArgs+=("$i") -+ ;; -+ --update-input) -+ local j="$1"; shift 1 -+ evalArgs+=("$i" "$j") -+ ;; -+ --override-input) -+ local j="$1"; shift 1 -+ local k="$1"; shift 1 -+ evalArgs+=("$i" "$j" "$k") -+ ;; -+ *) -+ buildArgs+=("$i") -+ ;; -+ esac -+ done -+ -+ local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" -+ if [ -a "$drv" ]; then -+ NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" -+ # The 'nix-command flakes' part in "${flakeFlags[@]}" is seen as two separate args over SSH -+ buildHostCmd nix --experimental-features "'nix-command flakes'" build "${buildArgs[@]}" --out-link "${tmpDir}/result" "$drv" -+ buildHostCmd readlink -f "${tmpDir}/result" -+ else -+ echo "nix eval failed" -+ exit 1 -+ fi -+ fi -+} -+ - - if [ -z "$action" ]; then showSyntax; fi - -@@ -315,8 +358,14 @@ fi - - tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) - SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" -+if [ -n "$buildHost" -a -n "$flake" ]; then -+ buildHostCmd mkdir -p "$tmpDir" -+fi - - cleanup() { -+ if [ -n "$buildHost" -a -n "$flake" ]; then -+ buildHostCmd rm -rf "$tmpDir" -+ fi - for ctrl in "$tmpDir"/ssh-*; do - ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true - done -@@ -418,10 +467,7 @@ if [ -z "$rollback" ]; then - if [[ -z $flake ]]; then - pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" - else -- outLink=$tmpDir/result -- nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ -- "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink -- pathToConfig="$(readlink -f $outLink)" -+ pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" - fi - copyToTarget "$pathToConfig" - targetHostCmd nix-env -p "$profile" --set "$pathToConfig" -@@ -429,24 +475,19 @@ if [ -z "$rollback" ]; then - if [[ -z $flake ]]; then - pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" - else -- nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}" -- pathToConfig="$(readlink -f ./result)" -+ pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" - fi - elif [ "$action" = build-vm ]; then - if [[ -z $flake ]]; then - pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" - else -- nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vm" \ -- "${extraBuildFlags[@]}" "${lockFlags[@]}" -- pathToConfig="$(readlink -f ./result)" -+ pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vm" "${extraBuildFlags[@]}" "${lockFlags[@]}")" - fi - elif [ "$action" = build-vm-with-bootloader ]; then - if [[ -z $flake ]]; then - pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" - else -- nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vmWithBootLoader" \ -- "${extraBuildFlags[@]}" "${lockFlags[@]}" -- pathToConfig="$(readlink -f ./result)" -+ pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}" "${lockFlags[@]}")" - fi - else - showSyntax - -From fa827f3f624659d822666bc79d36534d6d3ea9d1 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Fri, 16 Apr 2021 12:42:26 +0200 -Subject: [PATCH 2/2] nixos-rebuild: Use old-style nix command when building - flake on a remote host - ---- - pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh -index 6e31e174c849a..01d0fa823b9b5 100644 ---- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh -+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh -@@ -247,9 +247,7 @@ nixFlakeBuild() { - local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" - if [ -a "$drv" ]; then - NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" -- # The 'nix-command flakes' part in "${flakeFlags[@]}" is seen as two separate args over SSH -- buildHostCmd nix --experimental-features "'nix-command flakes'" build "${buildArgs[@]}" --out-link "${tmpDir}/result" "$drv" -- buildHostCmd readlink -f "${tmpDir}/result" -+ buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" - else - echo "nix eval failed" - exit 1 -@@ -358,14 +356,8 @@ fi - - tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) - SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" --if [ -n "$buildHost" -a -n "$flake" ]; then -- buildHostCmd mkdir -p "$tmpDir" --fi - - cleanup() { -- if [ -n "$buildHost" -a -n "$flake" ]; then -- buildHostCmd rm -rf "$tmpDir" -- fi - for ctrl in "$tmpDir"/ssh-*; do - ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true - done diff --git a/patches/119643.patch b/patches/119643.patch deleted file mode 100644 index 8cd4da3f..00000000 --- a/patches/119643.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 66f9ad192710d18d44322f49c87bba64d2beec11 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Fri, 16 Apr 2021 18:40:48 +0200 -Subject: [PATCH 1/2] zeroad: Split data from binaries again - -The rootdir patch was lost in the update to 0.0.24b. Adding it allows -hydra to build the game. It can't when the binaries depend on the data -since the data is too big for hydra. ---- - pkgs/games/0ad/game.nix | 10 +++----- - pkgs/games/0ad/rootdir_env.patch | 39 ++++++++++++++++++++++++++++++++ - 2 files changed, 42 insertions(+), 7 deletions(-) - create mode 100644 pkgs/games/0ad/rootdir_env.patch - -diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix -index bb3b7c0138aff..81965b116be67 100644 ---- a/pkgs/games/0ad/game.nix -+++ b/pkgs/games/0ad/game.nix -@@ -2,7 +2,7 @@ - , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium - , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc - , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 --, gloox, nvidia-texture-tools, zeroad-data -+, gloox, nvidia-texture-tools - , withEditor ? true, wxGTK - }: - -@@ -50,6 +50,8 @@ stdenv.mkDerivation rec { - "-I${fmt.dev}/include" - ]; - -+ patches = [ ./rootdir_env.patch ]; -+ - configurePhase = '' - # Delete shipped libraries which we don't need. - rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} -@@ -62,7 +64,6 @@ stdenv.mkDerivation rec { - ${lib.optionalString withEditor "--enable-atlas"} \ - --bindir="$out"/bin \ - --libdir="$out"/lib/0ad \ -- --datadir="$out"/share/0ad/data \ - --without-tests \ - -j $NIX_BUILD_CORES - popd -@@ -85,11 +86,6 @@ stdenv.mkDerivation rec { - # Copy l10n data. - install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/* - -- # Link in game data from package -- ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config -- ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods -- ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools -- - # Copy libraries. - install -Dm644 -t $out/lib/0ad binaries/system/*.so - -diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/games/0ad/rootdir_env.patch -new file mode 100644 -index 0000000000000..95463c7e2df46 ---- /dev/null -+++ b/pkgs/games/0ad/rootdir_env.patch -@@ -0,0 +1,39 @@ -+diff --git a/source/ps/GameSetup/Paths.cpp b/source/ps/GameSetup/Paths.cpp -+index 474364e..bf084b4 100644 -+--- a/source/ps/GameSetup/Paths.cpp -++++ b/source/ps/GameSetup/Paths.cpp -+@@ -155,32 +155,8 @@ Paths::Paths(const CmdLineArgs& args) -+ -+ /*static*/ OsPath Paths::Root(const OsPath& argv0) -+ { -+-#if OS_ANDROID -+- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus -+-#else -+- -+- // get full path to executable -+- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation -+- if(pathname.empty()) // failed, use argv[0] instead -+- { -+- errno = 0; -+- pathname = wrealpath(argv0); -+- if(pathname.empty()) -+- WARN_IF_ERR(StatusFromErrno()); -+- } -+- -+- // make sure it's valid -+- if(!FileExists(pathname)) -+- { -+- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8()); -+- WARN_IF_ERR(StatusFromErrno()); -+- } -+- -+- for(size_t i = 0; i < 2; i++) // remove "system/name.exe" -+- pathname = pathname.Parent(); -+- return pathname; -+- -+-#endif -++ UNUSED2(argv0); -++ return OsPath(getenv("ZEROAD_ROOTDIR")); -+ } -+ -+ /*static*/ OsPath Paths::RootData(const OsPath& argv0) - -From 8d6375ba029851c053388ff95ed445d2ae0a56cc Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Fri, 16 Apr 2021 18:42:32 +0200 -Subject: [PATCH 2/2] zeroad: Add myself as a maintainer - ---- - pkgs/games/0ad/data.nix | 1 + - pkgs/games/0ad/game.nix | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix -index 5cb28b3f3bd63..9533af21b15d1 100644 ---- a/pkgs/games/0ad/data.nix -+++ b/pkgs/games/0ad/data.nix -@@ -19,6 +19,7 @@ stdenv.mkDerivation rec { - description = "A free, open-source game of ancient warfare -- data files"; - homepage = "https://play0ad.com/"; - license = licenses.cc-by-sa-30; -+ maintainers = with maintainers; [ chvp ]; - platforms = platforms.linux; - hydraPlatforms = []; - }; -diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix -index 81965b116be67..feaf4347329c4 100644 ---- a/pkgs/games/0ad/game.nix -+++ b/pkgs/games/0ad/game.nix -@@ -101,6 +101,7 @@ stdenv.mkDerivation rec { - gpl2 lgpl21 mit cc-by-sa-30 - licenses.zlib # otherwise masked by pkgs.zlib - ]; -+ maintainers = with maintainers; [ chvp ]; - platforms = subtractLists platforms.i686 platforms.linux; - }; - } diff --git a/patches/122247.patch b/patches/122247.patch new file mode 100644 index 00000000..18dbd817 --- /dev/null +++ b/patches/122247.patch @@ -0,0 +1,129 @@ +From 9865b13d73a1c01b43a039edd58e0eeba90d61e6 Mon Sep 17 00:00:00 2001 +From: Charlotte Van Petegem +Date: Sat, 8 May 2021 23:55:56 +0200 +Subject: [PATCH 1/2] eid-mw: 4.4.27 -> 5.0.14 + +--- + pkgs/tools/security/eid-mw/default.nix | 65 +++++++++++++++----------- + 1 file changed, 38 insertions(+), 27 deletions(-) + +diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix +index cbe56694da1421..d943274a98e9b3 100644 +--- a/pkgs/tools/security/eid-mw/default.nix ++++ b/pkgs/tools/security/eid-mw/default.nix +@@ -1,24 +1,36 @@ +-{ lib, stdenv, fetchFromGitHub +-, autoreconfHook, pkg-config +-, gtk3, nssTools, pcsclite +-, libxml2, libproxy +-, openssl, curl ++{ lib ++, stdenv ++, fetchFromGitHub ++, autoreconfHook ++, autoconf-archive ++, pkg-config + , makeWrapper +-, substituteAll }: ++, curl ++, gtk3 ++, libassuan ++, libbsd ++, libproxy ++, libxml2 ++, openssl ++, p11-kit ++, pcsclite ++, nssTools ++, substituteAll ++}: + + stdenv.mkDerivation rec { + pname = "eid-mw"; +- version = "4.4.27"; ++ version = "5.0.14"; + + src = fetchFromGitHub { + rev = "v${version}"; +- sha256 = "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1"; ++ sha256 = "1hyxsbxjjn9hh5p7jlcfb5yplf3n8dg49dfgi8fjp95phis3gbd4"; + repo = "eid-mw"; + owner = "Fedict"; + }; + +- nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; +- buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; ++ nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; ++ buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ]; + preConfigure = '' + mkdir openssl + ln -s ${openssl.out}/lib openssl +@@ -27,30 +39,29 @@ stdenv.mkDerivation rec { + export SSL_PREFIX=$(realpath openssl) + substituteInPlace plugins_tools/eid-viewer/Makefile.in \ + --replace "c_rehash" "openssl rehash" +- ''; ++ ''; ++ configureFlags = [ "--disable-pinentry" ]; + + postPatch = '' + sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac + ''; + +- configureFlags = [ "--enable-dialogs=yes" ]; +- + postInstall = +- let +- eid-nssdb-in = substituteAll { +- inherit (stdenv) shell; +- isExecutable = true; +- src = ./eid-nssdb.in; +- }; +- in +- '' +- install -D ${eid-nssdb-in} $out/bin/eid-nssdb +- substituteInPlace $out/bin/eid-nssdb \ +- --replace "modutil" "${nssTools}/bin/modutil" ++ let ++ eid-nssdb-in = substituteAll { ++ inherit (stdenv) shell; ++ isExecutable = true; ++ src = ./eid-nssdb.in; ++ }; ++ in ++ '' ++ install -D ${eid-nssdb-in} $out/bin/eid-nssdb ++ substituteInPlace $out/bin/eid-nssdb \ ++ --replace "modutil" "${nssTools}/bin/modutil" + +- rm $out/bin/about-eid-mw +- wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" +- ''; ++ rm $out/bin/about-eid-mw ++ wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" ++ ''; + + enableParallelBuilding = true; + + +From c6b73cfad86428d2fca84c2064a03e4dd48b8c46 Mon Sep 17 00:00:00 2001 +From: Charlotte Van Petegem +Date: Sat, 8 May 2021 23:56:10 +0200 +Subject: [PATCH 2/2] eid-mw: add chvp as maintainer + +--- + pkgs/tools/security/eid-mw/default.nix | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix +index d943274a98e9b3..a104112265730f 100644 +--- a/pkgs/tools/security/eid-mw/default.nix ++++ b/pkgs/tools/security/eid-mw/default.nix +@@ -94,6 +94,6 @@ stdenv.mkDerivation rec { + firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; } + ''; + platforms = platforms.linux; +- maintainers = with maintainers; [ bfortz ]; ++ maintainers = with maintainers; [ bfortz chvp ]; + }; + } diff --git a/patches/arc-theme.patch b/patches/arc-theme.patch new file mode 100644 index 00000000..0fe978b7 --- /dev/null +++ b/patches/arc-theme.patch @@ -0,0 +1,64 @@ +diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix +index fff5e4bf41a..0ece2d6e0e0 100644 +--- a/pkgs/data/themes/arc/default.nix ++++ b/pkgs/data/themes/arc/default.nix +@@ -1,7 +1,8 @@ + { lib, stdenv + , fetchFromGitHub + , sassc +-, autoreconfHook ++, meson ++, ninja + , pkg-config + , gtk3 + , gnome +@@ -13,7 +14,7 @@ + + stdenv.mkDerivation rec { + pname = "arc-theme"; +- version = "20210127"; ++ version = "20210412"; + + src = fetchFromGitHub { + owner = "jnsh"; +@@ -23,12 +24,15 @@ stdenv.mkDerivation rec { + }; + + nativeBuildInputs = [ +- autoreconfHook ++ meson ++ ninja + pkg-config + sassc + optipng + inkscape + gtk3 ++ gnome.gnome-shell ++ cinnamon.cinnamon-common + ]; + + propagatedUserEnvPkgs = [ +@@ -43,14 +47,18 @@ stdenv.mkDerivation rec { + export HOME="$NIX_BUILD_ROOT" + ''; + +- configureFlags = [ +- "--with-cinnamon=${cinnamon.cinnamon-common.version}" +- "--with-gnome-shell=${gnome.gnome-shell.version}" +- "--disable-unity" ++ mesonFlags = [ ++ "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm" ++ "-Dvariants=light,darker,dark,lighter" ++ "-Dtransparency=true" ++ "-Dcinnamon_version=${cinnamon.cinnamon-common.version}" ++ "-Dgnome_shell_version=${lib.elemAt (lib.splitString "-" gnome.gnome-shell.version) 0}" ++ "-Dgtk3_version=${gtk3.version}" ++ "-Dgnome_shell_resource=false" + ]; + + postInstall = '' +- install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ++ install -Dm644 -t $out/share/doc/${pname} $src/AUTHORS $src/*.md + ''; + + meta = with lib; {