diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/xmousepasteblock/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/misc/bandwidth/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/remind/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/tkman/default.nix | 87 | ||||
-rw-r--r-- | pkgs/tools/misc/units/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/pynitrokey/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/combine.nix | 131 | ||||
-rw-r--r-- | pkgs/tools/wayland/swayrbar/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/wayland/wl-mirror/default.nix | 4 |
11 files changed, 198 insertions, 84 deletions
diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 984f6ac70a6b..ec6a5b0b8e11 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "xmousepasteblock"; - version = "1.0"; + version = "1.3"; src = fetchFromGitHub { owner = "milaq"; repo = "XMousePasteBlock"; - sha256 = "0vidckfp277cg2gsww8a8q5b18m10iy4ppyp2qipr89771nrcmns"; + hash = "sha256-0rpAbYUU0SoeQaVNStmIEuYyiWbRAdTN7Mvm0ySDnhU="; rev = version; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; buildInputs = with xorg; [ libX11 libXext libXi libev ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index e51d5f386b1e..e182fe5e8c17 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -69,11 +69,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-j7tHT486ylyWAmR34BBWw9+HbDPnYMvHU88HV+Cs1w8="; + hash = "sha256-oPa9ECqCE9+PrcZufsHWYR6EHxTZVFJOMUlK2b0mwLE="; }; patches = [ diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 39492eefb830..96d48040e1d4 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , qmake , vulkan-loader +, wayland , wrapQtAppsHook , withX11 ? true , qtx11extras @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.28"; + version = "3.29"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek="; + hash = "sha256-c7jvlwvz85cf8lUlBPyRYvDkSlvkzSW6Jc6wlyKnHBc="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ vulkan-loader + wayland ] ++ lib.lists.optionals withX11 [ qtx11extras ]; patchPhase = '' @@ -38,9 +40,8 @@ stdenv.mkDerivation rec { ''; qmakeFlags = [ - "DEFINES+=wayland" "CONFIG+=release" - ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; + ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index ea96b79fa34a..25a7e0647ef7 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "bandwidth"; - version = "1.11.2"; + version = "1.11.2d"; src = fetchurl { url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; - sha256 = "sha256-mjtvQAOH9rv12XszGdD5hIX197er7Uc74WfVaP32TpM="; + hash = "sha256-7IrNiCXKf1vyRGl73Ccu3aYMqPVc4PpEr6lnSqIa4Q8="; }; postPatch = '' @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { # Fix missing symbol exports for macOS clang echo global _VectorToVector128 >> routines-x86-64bit.asm echo global _VectorToVector256 >> routines-x86-64bit.asm + # Fix unexpected token on macOS + sed -i '/.section .note.GNU-stack/d' *-64bit.asm + sed -i '/.section code/d' *-arm-64bit.asm + sed -i 's#-Wl,-z,noexecstack##g' Makefile-arm64 ''; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 77e13b0b154c..9769402e8e9a 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.02.01"; + version = "04.02.03"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-RknG1SyKKYSMLWihR2GM8MVROJx0E0E1gD+vSLv6uk0="; + sha256 = "sha256-0hY/ee3+ErqPNucD1ZcisK7WbzT7dmV/9vQKus/sOgA="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/tools/misc/tkman/default.nix new file mode 100644 index 000000000000..e178e173108a --- /dev/null +++ b/pkgs/tools/misc/tkman/default.nix @@ -0,0 +1,87 @@ +{ lib +, stdenv +, fetchzip +, fetchpatch +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, tk +, groff +, rman +}: + +stdenv.mkDerivation rec { + pname = "tkman"; + version = "2.2"; + + src = fetchzip { + url = "mirror://sourceforge/tkman/tkman-${version}.tar.gz"; + hash = "sha256-S4ffz+7zmVy9+isz/8q+FV4wF5Rw2iL1ftY8RsJjRLs="; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + patches = [(fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/tkman/files/tkman-CVE-2008-5137.diff"; + hash = "sha256-l97SY2/YnMgzHYKnVYCVJKV7oGLN1hXNpeHFlLVzTMA="; + })]; + + makeFlags = [ + "BINDIR=$(out)/bin" + "WISH=${tk}/bin/wish" + "rman=${rman}/bin/rman" + # TODO package glimpse https://github.com/gvelez17/glimpse + "glimpse=\"\"" + ]; + + preBuild = '' + makeFlagsArray+=( + 'manformat="${groff}/bin/groff -te -Tlatin1 -mandoc $$manx(longtmp) -"' + ) + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + postInstall = '' + wrapProgram $out/bin/tkman \ + --run 'export MANPATH="$(manpath)"' + rm $out/bin/retkman # doesn't work + install -Dm644 contrib/TkMan.gif $out/share/icons/hicolor/64x64/apps/tkman.gif + ''; + + desktopItems = [(makeDesktopItem { + name = "tkman"; + desktopName = "TkMan"; + comment = "Graphical man page and info viewer"; + exec = "tkman %f"; + icon = "tkman"; + terminal = false; + type = "Application"; + categories = [ "Utility" ]; + })]; + + meta = with lib; { + description = "Graphical, hypertext manual page and Texinfo browser for UNIX"; + longDescription = '' + TkMan is a graphical, hypertext manual page and Texinfo browser for UNIX. + TkMan boasts hypertext links, unmatched online text formatting and display + quality, (optional) outline view of man pages, high quality display and + superior navigational interface to Texinfo documents, a novel information + visualization mechanism called Notemarks, full text search among man pages + and Texinfo, incremental and regular expression search within pages, + regular expression search within Texinfo that shows all matches (not just + the next), robustly attached yellow highlight annotations, a shortcut/hot + list, lists of all pages in user configurable volumes, a comprehensive + Preferences panel, and man page versioning support, among many other features. + ''; + homepage = "https://tkman.sourceforge.net/index.html"; + license = licenses.artistic1; + platforms = platforms.unix; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 04e955a78b18..71fbccdf2d50 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -11,11 +11,11 @@ assert enableCurrenciesUpdater -> pythonPackages != null; stdenv.mkDerivation rec { pname = "units"; - version = "2.21"; + version = "2.22"; src = fetchurl { url = "mirror://gnu/units/${pname}-${version}.tar.gz"; - sha256 = "sha256-bD6AqfmAWJ/ZYqWFKiZ0ZCJX2xxf1bJ8TZ5mTzSGy68="; + sha256 = "sha256-XRPhIHch/ncm2Qa6HZLcDt2qn8JnWe0i47jRp5MSWEg="; }; pythonEnv = pythonPackages.python.withPackages(ps: [ diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index 1f36eda5ab3d..e18b849c343c 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; - version = "0.4.27"; + version = "0.4.31"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aWQhMvATcDtyBtj38mGnypkKIqKQgneBzWDh5o/5Wkc="; + sha256 = "sha256-nqw5wUzQxKCBzYBRhqB6v7WWrF1Ojf8z6Kf1YUA9+wU="; }; propagatedBuildInputs = [ @@ -29,13 +29,18 @@ buildPythonApplication rec { cffi cbor nkdfu + fido2 + tlv8 + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook ]; - # spsdk is patched to allow for newer cryptography - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "cryptography >=3.4.4,<37" "cryptography" - ''; + pythonRelaxDeps = [ + "cryptography" + "spsdk" + ]; # no tests doCheck = false; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 5caebace7cbd..5681d2cd454e 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -38,16 +38,44 @@ let mkUniqueOutPaths = pkgs: lib.unique (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs)); -in (buildEnv { name = "texlive-${extraName}-${bin.texliveYear}${extraVersion}"; - extraPrefix = "/share/texmf"; + texmf = (buildEnv { + name = "${name}-texmf"; + + paths = pkgList.nonbin; + + nativeBuildInputs = [ perl bin.core.out ]; + + postBuild = # generate ls-R database + '' + perl -I "${bin.core.out}/share/texmf-dist/scripts/texlive" \ + -- "$out/scripts/texlive/mktexlsr.pl" --sort "$out" + ''; + }).overrideAttrs (_: { allowSubstitutes = true; }); + + # expose info and man pages in usual /share/{info,man} location + doc = buildEnv { + name = "${name}-doc"; + + paths = [ (texmf.outPath + "/doc") ]; + extraPrefix = "/share"; + + pathsToLink = [ + "/info" + "/man" + ]; + }; + +in (buildEnv { + + inherit name; ignoreCollisions = false; - paths = pkgList.nonbin; + paths = pkgList.bin ++ [ doc ]; pathsToLink = [ "/" - "/tex/generic/config" # make it a real directory for scheme-infraonly + "/bin" # ensure these are writeable directories ]; nativeBuildInputs = [ makeWrapper libfaketime perl bin.texlinks ]; @@ -57,54 +85,40 @@ in (buildEnv { passthru.packages = pkgList.all; postBuild = '' - mkdir -p "$out"/bin - '' + - lib.concatMapStrings - (path: '' - for f in '${path}'/bin/*; do - if [[ -L "$f" ]]; then - cp -d "$f" "$out"/bin/ - else - ln -s "$f" "$out"/bin/ - fi - done - '') - pkgList.bin - + - '' - export PATH="$out/bin:$out/share/texmf/scripts/texlive:$PATH" - export TEXMFCNF="$out/share/texmf/web2c" + TEXMFDIST="${texmf}" + export PATH="$out/bin:$PATH" + export PERL5LIB="$TEXMFDIST/scripts/texlive:${bin.core.out}/share/texmf-dist/scripts/texlive" TEXMFSYSCONFIG="$out/share/texmf-config" TEXMFSYSVAR="$out/share/texmf-var" - export PERL5LIB="$out/share/texmf/scripts/texlive:${bin.core.out}/share/texmf-dist/scripts/texlive" + export TEXMFCNF="$TEXMFSYSVAR/web2c" '' + - # patch texmf-dist -> $out/share/texmf + # patch texmf-dist -> $TEXMFDIST # patch texmf-local -> $out/share/texmf-local + # patch texmf.cnf -> $TEXMFSYSVAR/web2c/texmf.cnf # TODO: perhaps do lua actions? # tried inspiration from install-tl, sub do_texmf_cnf '' - if [ -e "$TEXMFCNF/texmfcnf.lua" ]; then + mkdir -p "$TEXMFCNF" + if [ -e "$TEXMFDIST/web2c/texmfcnf.lua" ]; then sed \ - -e 's,texmf-dist,texmf,g' \ + -e "s,\(TEXMFDIST[ ]*=[ ]*\)[^\,]*,\1\"$TEXMFDIST\",g" \ -e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \ -e "s,\$SELFAUTOLOC,$out,g" \ -e "s,selfautodir:/,$out/share/,g" \ -e "s,selfautodir:,$out/share/,g" \ -e "s,selfautoparent:/,$out/share/,g" \ -e "s,selfautoparent:,$out/share/,g" \ - -i "$TEXMFCNF/texmfcnf.lua" + "$TEXMFDIST/web2c/texmfcnf.lua" > "$TEXMFCNF/texmfcnf.lua" fi sed \ - -e 's,texmf-dist,texmf,g' \ + -e "s,\(TEXMFDIST[ ]*=[ ]*\)[^\,]*,\1$TEXMFDIST,g" \ -e "s,\$SELFAUTOLOC,$out,g" \ -e "s,\$SELFAUTODIR,$out/share,g" \ -e "s,\$SELFAUTOPARENT,$out/share,g" \ -e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \ -e "/^mpost,/d" `# CVE-2016-10243` \ - -i "$TEXMFCNF/texmf.cnf" - - mkdir "$out/share/texmf-local" + "$TEXMFDIST/web2c/texmf.cnf" > "$TEXMFCNF/texmf.cnf" '' + # now filter hyphenation patterns and formats (let @@ -132,18 +146,31 @@ in (buildEnv { + lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames + "$p;\n" ); + # formats not being installed must be disabled by prepending #! (see man fmtutil) + # sed expression that enables the formats in /start/,/end/ + enableFormats = pname: "/^# from ${pname}:$/,/^# from/{ s/^#! //; };\n"; fmtutilSed = writeText "fmtutil.sed" ( - "1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" - + "2,/^# from/{ /^# from/!p; };\n" - + lib.concatMapStrings (pname: section "^# from ${pname}:$" "^# from") formatPNames + # document how file was generated + "1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; }\n" + # disable all formats, even those already disabled + + "s/^([^#]|#! )/#! \\1/;\n" + # enable the formats from the packages being installed + + lib.concatMapStrings enableFormats formatPNames + # clean up formats that have been disabled twice + + "s/^#! #! /#! /;\n" ); in '' - for fname in "$out"/share/texmf/tex/generic/config/language.{dat,def}; do - [[ -e "$fname" ]] && sed -E -n -f '${script}' -i "$fname" + mkdir -p "$TEXMFSYSVAR/tex/generic/config" + for fname in tex/generic/config/language.{dat,def}; do + [[ -e "$TEXMFDIST/$fname" ]] && sed -E -n -f '${script}' "$TEXMFDIST/$fname" > "$TEXMFSYSVAR/$fname" done - [[ -e "$out"/share/texmf/tex/generic/config/language.dat.lua ]] && sed -E -n -f '${scriptLua}' -i "$out"/share/texmf/tex/generic/config/language.dat.lua - [[ -e "$TEXMFCNF"/fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i "$TEXMFCNF"/fmtutil.cnf + [[ -e "$TEXMFDIST"/tex/generic/config/language.dat.lua ]] && sed -E -n -f '${scriptLua}' \ + "$TEXMFDIST"/tex/generic/config/language.dat.lua > "$TEXMFSYSVAR"/tex/generic/config/language.dat.lua + [[ -e "$TEXMFDIST"/web2c/fmtutil.cnf ]] && sed -E -f '${fmtutilSed}' "$TEXMFDIST"/web2c/fmtutil.cnf > "$TEXMFCNF"/fmtutil.cnf + + # make new files visible to kpathsea + perl "$TEXMFDIST"/scripts/texlive/mktexlsr.pl --sort "$TEXMFSYSVAR" '') + # function to wrap created executables with required env vars @@ -191,16 +218,15 @@ in (buildEnv { '' + # texlive post-install actions '' - ln -sf "$out"/share/texmf/scripts/texlive/updmap.pl "$out"/bin/updmap + ln -sf "$TEXMFDIST"/scripts/texlive/updmap.pl "$out"/bin/updmap '' + # now hack to preserve "$0" for mktexfmt '' - cp "$out"/share/texmf/scripts/texlive/fmtutil.pl "$out/bin/fmtutil" + cp "$TEXMFDIST"/scripts/texlive/fmtutil.pl "$out/bin/fmtutil" patchShebangs "$out/bin/fmtutil" - sed "1s|$| -I $out/share/texmf/scripts/texlive|" -i "$out/bin/fmtutil" + sed "1s|$| -I $TEXMFDIST/scripts/texlive|" -i "$out/bin/fmtutil" ln -sf fmtutil "$out/bin/mktexfmt" - perl "$out"/share/texmf/scripts/texlive/mktexlsr.pl --sort "$out"/share/texmf texlinks "$out/bin" && wrapBin FORCE_SOURCE_DATE=1 fmtutil --sys --all | grep '^fmtutil' # too verbose #texlinks "$out/bin" && wrapBin # do we need to regenerate format links? @@ -224,16 +250,16 @@ in (buildEnv { # sort entries to improve reproducibility [[ -f "$TEXMFSYSCONFIG"/web2c/updmap.cfg ]] && sort -o "$TEXMFSYSCONFIG"/web2c/updmap.cfg "$TEXMFSYSCONFIG"/web2c/updmap.cfg - perl "$out"/share/texmf/scripts/texlive/mktexlsr.pl --sort "$out"/share/texmf-* # to make sure + perl "$TEXMFDIST"/scripts/texlive/mktexlsr.pl --sort "$TEXMFSYSCONFIG" "$TEXMFSYSVAR" # to make sure '' + # install (wrappers for) scripts, based on a list from upstream texlive '' source '${bin.core.out}/share/texmf-dist/scripts/texlive/scripts.lst' for s in $texmf_scripts; do - [[ -x "$out/share/texmf/scripts/$s" ]] || continue + [[ -x "$TEXMFDIST/scripts/$s" ]] || continue tName="$(basename $s | sed 's/\.[a-z]\+$//')" # remove extension [[ ! -e "$out/bin/$tName" ]] || continue - ln -sv "$(realpath $out/share/texmf/scripts/$s)" "$out/bin/$tName" # wrapped below + ln -sv "$(realpath "$TEXMFDIST/scripts/$s")" "$out/bin/$tName" # wrapped below done '' + # A hacky way to provide repstopdf @@ -241,8 +267,9 @@ in (buildEnv { # * ./bin/repstopdf needs to be a symlink to be processed by wrapBin '' if [[ -e "$out"/bin/epstopdf ]]; then - cp "$out"/bin/epstopdf "$out"/share/texmf/scripts/repstopdf - ln -s "$out"/share/texmf/scripts/repstopdf "$out"/bin/repstopdf + mkdir -p "$TEXMFSYSVAR/scripts" + cp "$out"/bin/epstopdf "$TEXMFSYSVAR"/scripts/repstopdf + ln -s "$TEXMFSYSVAR"/scripts/repstopdf "$out"/bin/repstopdf fi '' + # finish up the wrappers @@ -262,16 +289,6 @@ in (buildEnv { # TODO: a context trigger https://www.preining.info/blog/2015/06/debian-tex-live-2015-the-new-layout/ # http://wiki.contextgarden.net/ConTeXt_Standalone#Unix-like_platforms_.28Linux.2FMacOS_X.2FFreeBSD.2FSolaris.29 - # I would just create links from "$out"/share/{man,info}, - # but buildenv has problems with merging symlinks with directories; - # note: it's possible we might need deepen the work-around to man/*. - '' - for d in {man,info}; do - [[ -e "$out/share/texmf/doc/$d" ]] || continue; - mkdir -p "$out/share/$d" - ln -s -t "$out/share/$d" "$out/share/texmf/doc/$d"/* - done - '' + # MkIV uses its own lookup mechanism and we need to initialize # caches for it. '' @@ -283,7 +300,7 @@ in (buildEnv { # Get rid of all log files. They are not needed, but take up space # and render the build unreproducible by their embedded timestamps. '' - find $TEXMFSYSVAR/web2c -name '*.log' -delete + find "$TEXMFSYSVAR"/web2c -name '*.log' -delete '' ; }).overrideAttrs (_: { allowSubstitutes = true; }) diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index 808d5c3c31de..76a49cad8a84 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayrbar"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayrbar-${version}"; - sha256 = "sha256-OQhq5ZUe2OrfRFxoaAbbewoHgQVPv9cQy0VCpYe1SNo="; + sha256 = "sha256-uYQGwccSwqHJ1w8CyxXimmENnGx7e3EMA1MKZuZDTIk="; }; - cargoHash = "sha256-vM4SoRbVylN90b378Qk18A8/2S2IB88lnGCM6sqrhs8="; + cargoHash = "sha256-PdPaUqJUycUhleaND6XwKkRvwO0MHbvw5lzz95bdfCQ="; # don't build swayr buildAndTestSubdir = pname; diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 1ab7071a46cb..8e19bdc1d9e4 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-jjOcEr/E7l3ykdLAfiDlRSI0u76byDmBwfispTbopk8="; + hash = "sha256-qYJmcsID5qbUs27ZCU2HkWVVnBmxWmyzSgruLPB4jI8="; }; strictDeps = true; |