diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a3a6834dfe5a..15e253be5b80 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -359,3 +359,8 @@ nixos/tests/zfs.nix @raitobezarius nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq nixos/tests/buildbot.nix @Mic92 @zowoq pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq + +# Pretix +pkgs/by-name/pr/pretix/ @mweinelt +nixos/modules/services/web-apps/pretix.nix @mweinelt +nixos/tests/web-apps/pretix.nix @mweinelt diff --git a/doc/anchor-use.js b/doc/anchor-use.js new file mode 100644 index 000000000000..06ec24883aa3 --- /dev/null +++ b/doc/anchor-use.js @@ -0,0 +1,3 @@ +document.addEventListener('DOMContentLoaded', function(event) { + anchors.add('h1:not(div.note h1, div.warning h1, div.tip h1, div.caution h1, div.important h1), h2:not(div.note h2, div.warning h2, div.tip h2, div.caution h2, div.important h2), h3:not(div.note h3, div.warning h3, div.tip h3, div.caution h3, div.important h3), h4:not(div.note h4, div.warning h4, div.tip h4, div.caution h4, div.important h4), h5:not(div.note h5, div.warning h5, div.tip h5, div.caution h5, div.important h5), h6:not(div.note h6, div.warning h6, div.tip h6, div.caution h6, div.important h6)'); +}); diff --git a/doc/anchor.min.js b/doc/anchor.min.js new file mode 100644 index 000000000000..00f80c058f6d --- /dev/null +++ b/doc/anchor.min.js @@ -0,0 +1,9 @@ +// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat +// +// AnchorJS - v5.0.0 - 2023-01-18 +// https://www.bryanbraun.com/anchorjs/ +// Copyright (c) 2023 Bryan Braun; Licensed MIT +// +// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat +!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(globalThis,function(){"use strict";return function(A){function u(A){A.icon=Object.prototype.hasOwnProperty.call(A,"icon")?A.icon:"",A.visible=Object.prototype.hasOwnProperty.call(A,"visible")?A.visible:"hover",A.placement=Object.prototype.hasOwnProperty.call(A,"placement")?A.placement:"right",A.ariaLabel=Object.prototype.hasOwnProperty.call(A,"ariaLabel")?A.ariaLabel:"Anchor",A.class=Object.prototype.hasOwnProperty.call(A,"class")?A.class:"",A.base=Object.prototype.hasOwnProperty.call(A,"base")?A.base:"",A.truncate=Object.prototype.hasOwnProperty.call(A,"truncate")?Math.floor(A.truncate):64,A.titleText=Object.prototype.hasOwnProperty.call(A,"titleText")?A.titleText:""}function d(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new TypeError("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}this.options=A||{},this.elements=[],u(this.options),this.add=function(A){var e,t,o,i,n,s,a,r,l,c,h,p=[];if(u(this.options),0!==(e=d(A=A||"h2, h3, h4, h5, h6")).length){for(null===document.head.querySelector("style.anchorjs")&&((A=document.createElement("style")).className="anchorjs",A.appendChild(document.createTextNode("")),void 0===(h=document.head.querySelector('[rel="stylesheet"],style'))?document.head.appendChild(A):document.head.insertBefore(A,h),A.sheet.insertRule(".anchorjs-link{opacity:0;text-decoration:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}",A.sheet.cssRules.length),A.sheet.insertRule(":hover>.anchorjs-link,.anchorjs-link:focus{opacity:1}",A.sheet.cssRules.length),A.sheet.insertRule("[data-anchorjs-icon]::after{content:attr(data-anchorjs-icon)}",A.sheet.cssRules.length),A.sheet.insertRule('@font-face{font-family:anchorjs-icons;src:url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype")}',A.sheet.cssRules.length)),h=document.querySelectorAll("[id]"),t=[].map.call(h,function(A){return A.id}),i=0;i\]./()*\\\n\t\b\v\u00A0]/g,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&-1<(" "+A.firstChild.className+" ").indexOf(" anchorjs-link "),A=A.lastChild&&-1<(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ");return e||A||!1}}}); +// @license-end diff --git a/doc/default.nix b/doc/default.nix index bcbc20b9f983..76aba1a03eaf 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -122,16 +122,17 @@ in pkgs.stdenv.mkDerivation { ${pkgs.documentation-highlighter}/mono-blue.css \ ${pkgs.documentation-highlighter}/loader.js - cp -t out ./overrides.css ./style.css + cp -t out ./style.css ./anchor.min.js ./anchor-use.js nixos-render-docs manual html \ --manpage-urls ./manpage-urls.json \ --revision ${pkgs.lib.trivial.revisionWithDefault (pkgs.rev or "master")} \ --stylesheet style.css \ - --stylesheet overrides.css \ --stylesheet highlightjs/mono-blue.css \ --script ./highlightjs/highlight.pack.js \ --script ./highlightjs/loader.js \ + --script ./anchor.min.js \ + --script ./anchor-use.js \ --toc-depth 1 \ --section-toc-depth 1 \ manual.md \ diff --git a/doc/overrides.css b/doc/overrides.css deleted file mode 100644 index 73901a3f543b..000000000000 --- a/doc/overrides.css +++ /dev/null @@ -1,22 +0,0 @@ -.docbook .xref img[src^=images\/callouts\/], -.screen img, -.programlisting img, -.literallayout img, -.synopsis img { - width: 1em; -} - -.calloutlist img { - width: 1.5em; -} - -.prompt, -.screen img, -.programlisting img, -.literallayout img, -.synopsis img { - -moz-user-select: none; - -webkit-user-select: none; - -ms-user-select: none; - user-select: none; -} diff --git a/doc/style.css b/doc/style.css index 474dd32e3fb1..fddf4f4823c7 100644 --- a/doc/style.css +++ b/doc/style.css @@ -1,291 +1,416 @@ -/* Copied from http://bakefile.sourceforge.net/, which appears - licensed under the GNU GPL. */ - - -/*************************************************************************** - Basic headers and text: - ***************************************************************************/ - -body -{ - font-family: "Nimbus Sans L", sans-serif; - font-size: 1em; - background: white; - margin: 2em 1em 2em 1em; +html { + line-height: 1.15; + -webkit-text-size-adjust: 100%; } -h1, h2, h3, h4 -{ - color: #005aa0; +body { + margin: 0; } -h1 /* title */ -{ - font-size: 200%; -} - -h2 /* chapters, appendices, subtitle */ -{ - font-size: 180%; -} - -div.book -{ - text-align: center; -} - -div.book > div -{ - /* - * based on https://medium.com/@zkareemz/golden-ratio-62b3b6d4282a - * we do 70 characters per line to fit code listings better - * 70 * (font-size / 1.618) - * expression for emacs: - * (* 70 (/ 1 1.618)) - */ - max-width: 43.2em; - text-align: left; +.book { margin: auto; + width: 100%; } -/* Extra space between chapters, appendices. */ -div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 -{ - margin-top: 1.5em; +@media screen and (min-width: 768px) { + .book { + max-width: 46rem; + } } -div.section > div.titlepage h2 /* sections */ -{ - font-size: 150%; - margin-top: 1.5em; +@media screen and (min-width: 992px) { + .book { + max-width: 60rem; + } } -h3 /* subsections */ -{ - font-size: 125%; +@media screen and (min-width: 1200px) { + .book { + max-width: 73rem; + } } -div.simplesect h2 -{ - font-size: 110%; +.book .list-of-examples { + display: none; } -div.appendix h3 -{ - font-size: 150%; - margin-top: 1.5em; +h1 { + font-size: 2em; + margin: 0.67em 0; } -div.refnamediv h2, div.refsynopsisdiv h2, div.refsection h2 /* refentry parts */ -{ - margin-top: 1.4em; - font-size: 125%; +hr { + box-sizing: content-box; + height: 0; + overflow: visible; } -div.refsection h3 -{ - font-size: 110%; +pre { + font-family: monospace, monospace; + font-size: 1em; } - -/*************************************************************************** - Examples: - ***************************************************************************/ - -div.example -{ - border: 1px solid #b0b0b0; - padding: 6px 6px; - margin-left: 1.5em; - margin-right: 1.5em; - background: #f4f4f8; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; +a { + background-color: transparent; } -div.example p.title -{ - margin-top: 0em; +strong { + font-weight: bolder; } -div.example pre -{ - box-shadow: none; +code { + font-family: monospace, monospace; + font-size: 1em; } - -/*************************************************************************** - Screen dumps: - ***************************************************************************/ - -pre.screen, pre.programlisting -{ - border: 1px solid #b0b0b0; - padding: 3px 3px; - margin-left: 0.5em; - margin-right: 0.5em; - - background: #f4f4f8; - font-family: monospace; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } -div.example pre.programlisting -{ - border: 0px; - padding: 0 0; - margin: 0 0 0 0; +sup { + top: -0.5em; } -/*************************************************************************** - Notes, warnings etc: - ***************************************************************************/ - -.note, .warning -{ - border: 1px solid #b0b0b0; - padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; - margin-bottom: 1em; - padding: 0.3em 0.3em 0.3em 0.3em; - background: #fffff5; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit; } -div.note, div.warning -{ - font-style: italic; +pre { + overflow: auto; } -div.note h3, div.warning h3 -{ - color: red; +*, +*::before, +*::after { + box-sizing: border-box; +} + +html { font-size: 100%; - padding-right: 0.5em; - display: inline; + line-height: 1.77777778; } -div.note p, div.warning p -{ - margin-bottom: 0em; +@media screen and (min-width: 4000px) { + html { + background: #000; + } + + html body { + margin: auto; + max-width: 250rem; + } } -div.note h3 + p, div.warning h3 + p -{ - display: inline; +@media screen and (max-width: 320px) { + html { + font-size: calc(16 / 320 * 100vw); + } } -div.note h3 -{ - color: blue; - font-size: 100%; +body { + font-size: 1rem; + font-family: 'Roboto', sans-serif; + font-weight: 300; + color: #000000; + background-color: #ffffff; + min-height: 100vh; + display: flex; + flex-direction: column; } -div.navfooter * -{ - font-size: 90%; +@media screen and (max-width: 767.9px) { + body { + padding-left: 1rem; + padding-right: 1rem; + } } - -/*************************************************************************** - Links colors and highlighting: - ***************************************************************************/ - -a { text-decoration: none; } -a:hover { text-decoration: underline; } -a:link { color: #0048b3; } -a:visited { color: #002a6a; } - - -/*************************************************************************** - Table of contents: - ***************************************************************************/ - -div.toc -{ - font-size: 90%; +a { + text-decoration: none; + border-bottom: 1px solid; + color: #405d99; } -div.toc dl -{ - margin-top: 0em; - margin-bottom: 0em; +ul { + padding: 0; + margin-top: 0; + margin-right: 0; + margin-bottom: 1rem; + margin-left: 1rem; } - -/*************************************************************************** - Special elements: - ***************************************************************************/ - -tt, code -{ - color: #400000; -} - -.term -{ - font-weight: bold; - -} - -div.variablelist dd p, div.glosslist dd p -{ - margin-top: 0em; -} - -div.variablelist dd, div.glosslist dd -{ - margin-left: 1.5em; -} - -div.glosslist dt -{ - font-style: italic; -} - -.varname -{ - color: #400000; -} - -span.command strong -{ - font-weight: normal; - color: #400000; -} - -div.calloutlist table -{ - box-shadow: none; -} - -table -{ +table { border-collapse: collapse; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; + width: 100%; + margin-bottom: 1rem; } -table.simplelist -{ +thead th { text-align: left; - color: #005aa0; +} + +hr { + margin-top: 1rem; + margin-bottom: 1rem; +} + +h1 { + font-weight: 800; + line-height: 110%; + font-size: 200%; + margin-bottom: 1rem; + color: #6586c8; +} + +h2 { + font-weight: 800; + line-height: 110%; + font-size: 170%; + margin-bottom: 0.625rem; + color: #6586c8; +} + +h2:not(:first-child) { + margin-top: 1rem; +} + +h3 { + font-weight: 800; + line-height: 110%; + margin-bottom: 1rem; + font-size: 150%; + color: #6586c8; +} + +.note h3, +.tip h3, +.warning h3, +.caution h3, +.important h3 { + font-size: 120%; +} + +h4 { + font-weight: 800; + line-height: 110%; + margin-bottom: 1rem; + font-size: 140%; + color: #6586c8; +} + +h5 { + font-weight: 800; + line-height: 110%; + margin-bottom: 1rem; + font-size: 130%; + color: #6a6a6a; +} + +h6 { + font-weight: 800; + line-height: 110%; + margin-bottom: 1rem; + font-size: 120% +} + +strong { + font-weight: bold; +} + +p { + margin-top: 0; + margin-bottom: 1rem; +} + +dt>*:first-child, +dd>*:first-child { + margin-top: 0; +} + +dt>*:last-child, +dd>*:last-child { + margin-bottom: 0; +} + +pre, +code { + font-family: monospace; +} + +code { + color: #ff8657; + background: #f4f4f4; + display: inline-block; + padding: 0 0.5rem; + border: 1px solid #d8d8d8; + border-radius: 0.5rem; + line-height: 1.57777778; +} + +div.book .programlisting, +div.appendix .programlisting { + border-radius: 0.5rem; + padding: 1rem; + overflow: auto; + background: #f2f8fd; + color: #000000; +} + +div.book .note, +div.book .tip, +div.book .warning, +div.book .caution, +div.book .important, +div.appendix .note, +div.appendix .tip, +div.appendix .warning, +div.appendix .caution, +div.appendix .important { + margin-bottom: 1rem; + border-radius: 0.5rem; + padding: 1.5rem; + overflow: auto; + background: #f4f4f4; +} + +div.book .note>.title, +div.book .tip>.title, +div.book .warning>.title, +div.book .caution>.title, +div.book .important>.title, +div.appendix .note>.title, +div.appendix .tip>.title, +div.appendix .warning>.title, +div.appendix .caution>.title, +div.appendix .important>.title { + font-weight: 800; + /* font-family: 'Overpass', serif; */ + line-height: 110%; + margin-bottom: 1rem; + color: inherit; + margin-bottom: 0; +} + +div.book .note> :first-child, +div.book .tip> :first-child, +div.book .warning> :first-child, +div.book .caution> :first-child, +div.book .important> :first-child, +div.appendix .note> :first-child, +div.appendix .tip> :first-child, +div.appendix .warning> :first-child, +div.appendix .caution> :first-child, +div.appendix .important> :first-child { + margin-top: 0; +} + +div.book .note> :last-child, +div.book .tip> :last-child, +div.book .warning> :last-child, +div.book .caution> :last-child, +div.book .important> :last-child, +div.appendix .note> :last-child, +div.appendix .tip> :last-child, +div.appendix .warning> :last-child, +div.appendix .caution> :last-child, +div.appendix .important> :last-child { + margin-bottom: 0; +} + +div.book .note, +div.book .tip, +div.appendix .note, +div.appendix .tip { + color: #5277c3; + background: #f2f8fd; +} + +div.book .warning, +div.book .caution, +div.appendix .warning, +div.appendix .caution { + color: #cc3900; + background-color: #fff5e1; +} + +div.book .section, +div.appendix .section { + margin-top: 2em; +} + +div.book div.example, +div.appendix div.example { + margin-top: 1.5em; +} + +div.book br.example-break, +div.appendix br.example-break { + display: none; +} + +div.book div.footnotes>hr, +div.appendix div.footnotes>hr { + border-color: #d8d8d8; +} + +div.book div.footnotes>br, +div.appendix div.footnotes>br { + display: none; +} + +div.book dt, +div.appendix dt { + margin-top: 1em; +} + +div.book .toc dt, +div.appendix .toc dt { + margin-top: 0; +} + +div.book .list-of-examples dt, +div.appendix .list-of-examples dt { + margin-top: 0; +} + +div.book code, +div.appendix code { + padding: 0; border: 0; - padding: 5px; - background: #fffff5; - font-weight: normal; - font-style: italic; - box-shadow: none; - margin-bottom: 1em; + background-color: inherit; + color: inherit; + font-size: 100%; + -webkit-hyphens: none; + -moz-hyphens: none; + hyphens: none; } -div.navheader table, div.navfooter table { - box-shadow: none; +div.book div.toc, +div.appendix div.toc { + margin-bottom: 3em; + border-bottom: 0.0625rem solid #d8d8d8; } -div.affiliation -{ - font-style: italic; +div.book div.toc dd, +div.appendix div.toc dd { + margin-left: 2em; +} + +div.book span.command, +div.appendix span.command { + font-family: monospace; + -webkit-hyphens: none; + -moz-hyphens: none; + hyphens: none; +} + +div.book .informaltable th, +div.book .informaltable td, +div.appendix .informaltable th, +div.appendix .informaltable td { + padding: 0.5rem; } diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index a368b16201f8..5f51bb53ad7f 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -105,7 +105,9 @@ in rec { mkdir -p $dst cp ${../../../doc/style.css} $dst/style.css - cp ${../../../doc/overrides.css} $dst/overrides.css + cp ${../../../doc/anchor.min.js} $dst/anchor.min.js + cp ${../../../doc/anchor-use.js} $dst/anchor-use.js + cp -r ${pkgs.documentation-highlighter} $dst/highlightjs ${prepareManualFromMD} @@ -115,10 +117,11 @@ in rec { --revision ${lib.escapeShellArg revision} \ --generator "nixos-render-docs ${lib.version}" \ --stylesheet style.css \ - --stylesheet overrides.css \ --stylesheet highlightjs/mono-blue.css \ --script ./highlightjs/highlight.pack.js \ --script ./highlightjs/loader.js \ + --script ./anchor.min.js \ + --script ./anchor-use.js \ --toc-depth 1 \ --chunk-toc-depth 1 \ ./manual.md \ diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index b4eea551d270..1a86beaba73f 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -103,6 +103,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Monado](https://monado.freedesktop.org/), an open source XR runtime. Available as [services.monado](#opt-services.monado.enable). +- [Pretix](https://pretix.eu/about/en/), an open source ticketing software for events. Available as [services.pretix]($opt-services-pretix.enable). + - [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable). - [armagetronad](https://wiki.armagetronad.org), a mid-2000s 3D lightcycle game widely played at iD Tech Camps. You can define multiple servers using `services.armagetronad..enable`. @@ -129,6 +131,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. +- `pdns` was updated to version [v4.9.x](https://doc.powerdns.com/authoritative/changelog/4.9.html), which introduces breaking changes. Check out the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-9-0) for details. + - `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information. - `k9s` was updated to v0.31. There have been various breaking changes in the config file format, @@ -320,7 +324,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `addDriverRunpath` has been added to facilitate the deprecation of the old `addOpenGLRunpath` setuphook. This change is motivated by the evolution of the setuphook to include all hardware acceleration. -- Cinnamon has been updated to 6.0. Please beware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release. +- Cinnamon has been updated to 6.0. Please beware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release and could potentially [affect Xorg sessions](https://blog.linuxmint.com/?p=4639). We suggest a reboot when switching between sessions. + +- MATE has been updated to 1.28. + - To properly support panel plugins built with Wayland (in-process) support, we are introducing `services.xserver.desktopManager.mate.extraPanelApplets` option, please use that for installing panel applets. + - Similarly, please use `services.xserver.desktopManager.mate.extraCajaExtensions` option for installing Caja extensions. + - To use the Wayland session, enable `services.xserver.desktopManager.mate.enableWaylandSession`. This is opt-in for now as it is in early stage and introduces a new set of Wayfire closure. Due to [known issues with LightDM](https://github.com/canonical/lightdm/issues/63), we suggest using SDDM for display manager. - New `boot.loader.systemd-boot.xbootldrMountPoint` allows setting up a separate [XBOOTLDR partition](https://uapi-group.org/specifications/specs/boot_loader_specification/) to store boot files. Useful on systems with a small EFI System partition that cannot be easily repartitioned. @@ -347,6 +356,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0. +- The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default. + - The following options of the Nextcloud module were moved into [`services.nextcloud.settings`](#opt-services.nextcloud.settings) and renamed to match the name from Nextcloud's `config.php`: - `logLevel` -> [`loglevel`](#opt-services.nextcloud.settings.loglevel), - `logType` -> [`log_type`](#opt-services.nextcloud.settings.log_type), diff --git a/nixos/modules/hardware/video/webcam/ipu6.nix b/nixos/modules/hardware/video/webcam/ipu6.nix index c2dbdc217bd6..a7767e446bd4 100644 --- a/nixos/modules/hardware/video/webcam/ipu6.nix +++ b/nixos/modules/hardware/video/webcam/ipu6.nix @@ -30,7 +30,10 @@ in ipu6-drivers ]; - hardware.firmware = [ pkgs.ipu6-camera-bins ]; + hardware.firmware = with pkgs; [ + ipu6-camera-bins + ivsc-firmware + ]; services.udev.extraRules = '' SUBSYSTEM=="intel-ipu6-psys", MODE="0660", GROUP="video" diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 41e369ac1c65..2ccaea466c6a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1358,6 +1358,7 @@ ./services/web-apps/plausible.nix ./services/web-apps/powerdns-admin.nix ./services/web-apps/pretalx.nix + ./services/web-apps/pretix.nix ./services/web-apps/prosody-filer.nix ./services/web-apps/rimgo.nix ./services/web-apps/sftpgo.nix diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 31803f061dce..c93a34f61849 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -44,8 +44,8 @@ in { ''; apply = steam: steam.override (prev: { extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) { - STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeBinPath cfg.extraCompatPackages; - }) // (prev.extraEnv or {}); + STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages; + }) // (prev.extraEnv or {}); extraLibraries = pkgs: let prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ]; additionalLibs = with config.hardware.opengl; @@ -74,10 +74,17 @@ in { extraCompatPackages = mkOption { type = types.listOf types.package; default = [ ]; + example = literalExpression '' + with pkgs; [ + proton-ge-bin + ] + ''; description = lib.mdDoc '' Extra packages to be used as compatibility tools for Steam on Linux. Packages will be included in the `STEAM_EXTRA_COMPAT_TOOLS_PATHS` environmental variable. For more information see - . + https://github.com/ValveSoftware/steam-for-linux/issues/6310. + + These packages must be Steam compatibility tools that have a `steamcompattool` output. ''; }; diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index 3ac3beb4de07..7a5661510e25 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -13,48 +13,60 @@ in { options = { services.ollama = { - enable = lib.mkEnableOption ( - lib.mdDoc "Server for local large language models" - ); + enable = lib.mkEnableOption "ollama server for local large language models"; + package = lib.mkPackageOption pkgs "ollama" { }; listenAddress = lib.mkOption { type = types.str; default = "127.0.0.1:11434"; - description = lib.mdDoc '' - Specifies the bind address on which the ollama server HTTP interface listens. + example = "0.0.0.0:11111"; + description = '' + The address which the ollama server HTTP interface binds and listens to. ''; }; acceleration = lib.mkOption { type = types.nullOr (types.enum [ "rocm" "cuda" ]); default = null; example = "rocm"; - description = lib.mdDoc '' - Specifies the interface to use for hardware acceleration. + description = '' + What interface to use for hardware acceleration. - `rocm`: supported by modern AMD GPUs - `cuda`: supported by modern NVIDIA GPUs ''; }; - package = lib.mkPackageOption pkgs "ollama" { }; + environmentVariables = lib.mkOption { + type = types.attrsOf types.str; + default = { }; + example = { + HOME = "/tmp"; + OLLAMA_LLM_LIBRARY = "cpu"; + }; + description = '' + Set arbitrary environment variables for the ollama service. + + Be aware that these are only seen by the ollama server (systemd service), + not normal invocations like `ollama run`. + Since `ollama run` is mostly a shell around the ollama server, this is usually sufficient. + ''; + }; }; }; config = lib.mkIf cfg.enable { - systemd = { - services.ollama = { - wantedBy = [ "multi-user.target" ]; - description = "Server for local large language models"; - after = [ "network.target" ]; - environment = { - HOME = "%S/ollama"; - OLLAMA_MODELS = "%S/ollama/models"; - OLLAMA_HOST = cfg.listenAddress; - }; - serviceConfig = { - ExecStart = "${lib.getExe ollamaPackage} serve"; - WorkingDirectory = "/var/lib/ollama"; - StateDirectory = [ "ollama" ]; - DynamicUser = true; - }; + systemd.services.ollama = { + description = "Server for local large language models"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = cfg.environmentVariables // { + HOME = "%S/ollama"; + OLLAMA_MODELS = "%S/ollama/models"; + OLLAMA_HOST = cfg.listenAddress; + }; + serviceConfig = { + ExecStart = "${lib.getExe ollamaPackage} serve"; + WorkingDirectory = "%S/ollama"; + StateDirectory = [ "ollama" ]; + DynamicUser = true; }; }; diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix index 2862cdd80128..fbe8ab25299e 100644 --- a/nixos/modules/services/monitoring/scrutiny.nix +++ b/nixos/modules/services/monitoring/scrutiny.nix @@ -2,7 +2,7 @@ let inherit (lib) maintainers; inherit (lib.meta) getExe; - inherit (lib.modules) mkIf; + inherit (lib.modules) mkIf mkMerge; inherit (lib.options) literalExpression mkEnableOption mkOption mkPackageOption; inherit (lib.types) bool enum nullOr port str submodule; @@ -156,42 +156,44 @@ in }; }; - config = mkIf (cfg.enable || cfg.collector.enable) { - services.influxdb2.enable = cfg.influxdb.enable; + config = mkMerge [ + (mkIf cfg.enable { + services.influxdb2.enable = cfg.influxdb.enable; - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.settings.web.listen.port ]; - }; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.settings.web.listen.port ]; + }; - services.smartd = mkIf cfg.collector.enable { - enable = true; - extraOptions = [ - "-A /var/log/smartd/" - "--interval=600" - ]; - }; - - systemd = { - services = { - scrutiny = mkIf cfg.enable { - description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - environment = { - SCRUTINY_VERSION = "1"; - SCRUTINY_WEB_DATABASE_LOCATION = "/var/lib/scrutiny/scrutiny.db"; - SCRUTINY_WEB_SRC_FRONTEND_PATH = "${cfg.package}/share/scrutiny"; - }; - serviceConfig = { - DynamicUser = true; - ExecStart = "${getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}"; - Restart = "always"; - StateDirectory = "scrutiny"; - StateDirectoryMode = "0750"; - }; + systemd.services.scrutiny = { + description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ] ++ lib.optional cfg.influxdb.enable "influxdb2.service"; + wants = lib.optional cfg.influxdb.enable "influxdb2.service"; + environment = { + SCRUTINY_VERSION = "1"; + SCRUTINY_WEB_DATABASE_LOCATION = "/var/lib/scrutiny/scrutiny.db"; + SCRUTINY_WEB_SRC_FRONTEND_PATH = "${cfg.package}/share/scrutiny"; }; + serviceConfig = { + DynamicUser = true; + ExecStart = "${getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}"; + Restart = "always"; + StateDirectory = "scrutiny"; + StateDirectoryMode = "0750"; + }; + }; + }) + (mkIf cfg.collector.enable { + services.smartd = { + enable = true; + extraOptions = [ + "-A /var/log/smartd/" + "--interval=600" + ]; + }; - scrutiny-collector = mkIf cfg.collector.enable { + systemd = { + services.scrutiny-collector = { description = "Scrutiny Collector Service"; environment = { COLLECTOR_VERSION = "1"; @@ -203,13 +205,11 @@ in }; startAt = cfg.collector.schedule; }; - }; - timers = mkIf cfg.collector.enable { - scrutiny-collector.timerConfig.Persistent = true; + timers.scrutiny-collector.timerConfig.Persistent = true; }; - }; - }; + }) + ]; meta.maintainers = [ maintainers.jnsgruk ]; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 63804a3b1c54..b7f0d9373608 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -584,6 +584,7 @@ in description = "Ensure that NetworkManager declarative profiles are created"; wantedBy = [ "multi-user.target" ]; before = [ "network-online.target" ]; + after = [ "NetworkManager.service" ]; script = let path = id: "/run/NetworkManager/system-connections/${id}.nmconnection"; in '' @@ -593,9 +594,7 @@ in ${pkgs.envsubst}/bin/envsubst -i ${ini.generate (lib.escapeShellArg profile.n) profile.v} > ${path (lib.escapeShellArg profile.n)} '') (lib.mapAttrsToList (n: v: { inherit n v; }) cfg.ensureProfiles.profiles) + '' - if systemctl is-active --quiet NetworkManager; then - ${pkgs.networkmanager}/bin/nmcli connection reload - fi + ${pkgs.networkmanager}/bin/nmcli connection reload ''; serviceConfig = { EnvironmentFile = cfg.ensureProfiles.environmentFiles; diff --git a/nixos/modules/services/web-apps/komga.nix b/nixos/modules/services/web-apps/komga.nix index 31f475fc7b04..d7ab2a9e612e 100644 --- a/nixos/modules/services/web-apps/komga.nix +++ b/nixos/modules/services/web-apps/komga.nix @@ -1,99 +1,122 @@ -{ config, pkgs, lib, ... }: - -with lib; +{ + config, + pkgs, + lib, + ... +}: let cfg = config.services.komga; - -in { + inherit (lib) mkOption mkEnableOption maintainers; + inherit (lib.types) port str bool; +in +{ options = { services.komga = { - enable = mkEnableOption (lib.mdDoc "Komga, a free and open source comics/mangas media server"); + enable = mkEnableOption "Komga, a free and open source comics/mangas media server"; port = mkOption { - type = types.port; + type = port; default = 8080; - description = lib.mdDoc '' - The port that Komga will listen on. - ''; + description = "The port that Komga will listen on."; }; user = mkOption { - type = types.str; + type = str; default = "komga"; - description = lib.mdDoc '' - User account under which Komga runs. - ''; + description = "User account under which Komga runs."; }; group = mkOption { - type = types.str; + type = str; default = "komga"; - description = lib.mdDoc '' - Group under which Komga runs. - ''; + description = "Group under which Komga runs."; }; stateDir = mkOption { - type = types.str; + type = str; default = "/var/lib/komga"; - description = lib.mdDoc '' - State and configuration directory Komga will use. - ''; + description = "State and configuration directory Komga will use."; }; openFirewall = mkOption { - type = types.bool; + type = bool; default = false; - description = lib.mdDoc '' - Whether to open the firewall for the port in {option}`services.komga.port`. - ''; + description = "Whether to open the firewall for the port in {option}`services.komga.port`."; }; }; }; - config = mkIf cfg.enable { + config = + let + inherit (lib) mkIf getExe; + in + mkIf cfg.enable { - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; - users.groups = mkIf (cfg.group == "komga") { - komga = {}; - }; + users.groups = mkIf (cfg.group == "komga") { komga = { }; }; - users.users = mkIf (cfg.user == "komga") { - komga = { - group = cfg.group; - home = cfg.stateDir; - description = "Komga Daemon user"; - isSystemUser = true; - }; - }; - - systemd.services.komga = { - environment = { - SERVER_PORT = builtins.toString cfg.port; - KOMGA_CONFIGDIR = cfg.stateDir; + users.users = mkIf (cfg.user == "komga") { + komga = { + group = cfg.group; + home = cfg.stateDir; + description = "Komga Daemon user"; + isSystemUser = true; + }; }; - description = "Komga is a free and open source comics/mangas media server"; + systemd.services.komga = { + environment = { + SERVER_PORT = builtins.toString cfg.port; + KOMGA_CONFIGDIR = cfg.stateDir; + }; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; + description = "Komga is a free and open source comics/mangas media server"; - serviceConfig = { - User = cfg.user; - Group = cfg.group; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; - Type = "simple"; - Restart = "on-failure"; - ExecStart = "${pkgs.komga}/bin/komga"; + serviceConfig = { + User = cfg.user; + Group = cfg.group; - StateDirectory = mkIf (cfg.stateDir == "/var/lib/komga") "komga"; + Type = "simple"; + Restart = "on-failure"; + ExecStart = getExe pkgs.komga; + + StateDirectory = mkIf (cfg.stateDir == "/var/lib/komga") "komga"; + + RemoveIPC = true; + NoNewPrivileges = true; + CapabilityBoundingSet = ""; + SystemCallFilter = [ "@system-service" ]; + ProtectSystem = "full"; + PrivateTmp = true; + ProtectProc = "invisible"; + ProtectClock = true; + ProcSubset = "pid"; + PrivateUsers = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + LockPersonality = true; + RestrictNamespaces = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + SystemCallArchitectures = "native"; + RestrictSUIDSGID = true; + RestrictRealtime = true; + }; }; - }; - }; meta.maintainers = with maintainers; [ govanify ]; } diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix new file mode 100644 index 000000000000..65e658d474eb --- /dev/null +++ b/nixos/modules/services/web-apps/pretix.nix @@ -0,0 +1,579 @@ +{ config +, lib +, pkgs +, utils +, ... +}: + +let + inherit (lib) + concatMapStringsSep + escapeShellArgs + filter + filterAttrs + getExe + getExe' + isAttrs + isList + literalExpression + mapAttrs + mkDefault + mkEnableOption + mkIf + mkOption + mkPackageOption + optionals + optionalString + recursiveUpdate + types + ; + + filterRecursiveNull = o: + if isAttrs o then + mapAttrs (_: v: filterRecursiveNull v) (filterAttrs (_: v: v != null) o) + else if isList o then + map filterRecursiveNull (filter (v: v != null) o) + else + o; + + cfg = config.services.pretix; + format = pkgs.formats.ini { }; + + configFile = format.generate "pretix.cfg" (filterRecursiveNull cfg.settings); + + finalPackage = cfg.package.override { + inherit (cfg) plugins; + }; + + pythonEnv = cfg.package.python.buildEnv.override { + extraLibs = with cfg.package.python.pkgs; [ + (toPythonModule finalPackage) + gunicorn + ] + ++ lib.optionals (cfg.settings.memcached.location != null) + cfg.package.optional-dependencies.memcached + ; + }; + + withRedis = cfg.settings.redis.location != null; +in +{ + meta = with lib; { + maintainers = with maintainers; [ hexa ]; + }; + + options.services.pretix = { + enable = mkEnableOption "pretix"; + + package = mkPackageOption pkgs "pretix" { }; + + group = mkOption { + type = types.str; + default = "pretix"; + description = '' + Group under which pretix should run. + ''; + }; + + user = mkOption { + type = types.str; + default = "pretix"; + description = '' + User under which pretix should run. + ''; + }; + + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pretix-secrets.env"; + description = '' + Environment file to pass secret configuration values. + + Each line must follow the `PRETIX_SECTION_KEY=value` pattern. + ''; + }; + + plugins = mkOption { + type = types.listOf types.package; + default = []; + example = literalExpression '' + with config.services.pretix.package.plugins; [ + passbook + pages + ]; + ''; + description = '' + Pretix plugins to install into the Python environment. + ''; + }; + + gunicorn.extraArgs = mkOption { + type = with types; listOf str; + default = [ + "--name=pretix" + ]; + example = [ + "--name=pretix" + "--workers=4" + "--max-requests=1200" + "--max-requests-jitter=50" + "--log-level=info" + ]; + description = '' + Extra arguments to pass to gunicorn. + See for details. + ''; + apply = escapeShellArgs; + }; + + celery = { + extraArgs = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + Extra arguments to pass to celery. + + See for more info. + ''; + apply = utils.escapeSystemdExecArgs; + }; + }; + + nginx = { + enable = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to set up an nginx virtual host. + ''; + }; + + domain = mkOption { + type = types.str; + example = "talks.example.com"; + description = '' + The domain name under which to set up the virtual host. + ''; + }; + }; + + database.createLocally = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to automatically set up the database on the local DBMS instance. + + Only supported for PostgreSQL. Not required for sqlite. + ''; + }; + + settings = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + pretix = { + instance_name = mkOption { + type = types.str; + example = "tickets.example.com"; + description = '' + The name of this installation. + ''; + }; + + url = mkOption { + type = types.str; + example = "https://tickets.example.com"; + description = '' + The installation’s full URL, without a trailing slash. + ''; + }; + + cachedir = mkOption { + type = types.path; + default = "/var/cache/pretix"; + description = '' + Directory for storing temporary files. + ''; + }; + + datadir = mkOption { + type = types.path; + default = "/var/lib/pretix"; + description = '' + Directory for storing user uploads and similar data. + ''; + }; + + logdir = mkOption { + type = types.path; + default = "/var/log/pretix"; + description = '' + Directory for storing log files. + ''; + }; + + currency = mkOption { + type = types.str; + default = "EUR"; + example = "USD"; + description = '' + Default currency for events in its ISO 4217 three-letter code. + ''; + }; + + registration = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to allow registration of new admin users. + ''; + }; + }; + + database = { + backend = mkOption { + type = types.enum [ + "sqlite3" + "postgresql" + ]; + default = "postgresql"; + description = '' + Database backend to use. + + Only postgresql is recommended for production setups. + ''; + }; + + host = mkOption { + type = with types; nullOr types.path; + default = if cfg.settings.database.backend == "postgresql" then "/run/postgresql" else null; + defaultText = literalExpression '' + if config.services.pretix.settings..database.backend == "postgresql" then "/run/postgresql" + else null + ''; + description = '' + Database host or socket path. + ''; + }; + + name = mkOption { + type = types.str; + default = "pretix"; + description = '' + Database name. + ''; + }; + + user = mkOption { + type = types.str; + default = "pretix"; + description = '' + Database username. + ''; + }; + }; + + mail = { + from = mkOption { + type = types.str; + example = "tickets@example.com"; + description = '' + E-Mail address used in the `FROM` header of outgoing mails. + ''; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + example = "mail.example.com"; + description = '' + Hostname of the SMTP server use for mail delivery. + ''; + }; + + port = mkOption { + type = types.port; + default = 25; + example = 587; + description = '' + Port of the SMTP server to use for mail delivery. + ''; + }; + }; + + celery = { + backend = mkOption { + type = types.str; + default = "redis+socket://${config.services.redis.servers.pretix.unixSocket}?virtual_host=1"; + defaultText = literalExpression '' + optionalString config.services.pretix.celery.enable "redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=1" + ''; + description = '' + URI to the celery backend used for the asynchronous job queue. + ''; + }; + + broker = mkOption { + type = types.str; + default = "redis+socket://${config.services.redis.servers.pretix.unixSocket}?virtual_host=2"; + defaultText = literalExpression '' + optionalString config.services.pretix.celery.enable "redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=2" + ''; + description = '' + URI to the celery broker used for the asynchronous job queue. + ''; + }; + }; + + redis = { + location = mkOption { + type = with types; nullOr str; + default = "unix://${config.services.redis.servers.pretix.unixSocket}?db=0"; + defaultText = literalExpression '' + "unix://''${config.services.redis.servers.pretix.unixSocket}?db=0" + ''; + description = '' + URI to the redis server, used to speed up locking, caching and session storage. + ''; + }; + + sessions = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to use redis as the session storage. + ''; + }; + }; + + memcached = { + location = mkOption { + type = with types; nullOr str; + default = null; + example = "127.0.0.1:11211"; + description = '' + The `host:port` combination or the path to the UNIX socket of a memcached instance. + + Can be used instead of Redis for caching. + ''; + }; + }; + + tools = { + pdftk = mkOption { + type = types.path; + default = getExe pkgs.pdftk; + defaultText = literalExpression '' + lib.getExe pkgs.pdftk + ''; + description = '' + Path to the pdftk executable. + ''; + }; + }; + }; + }; + default = { }; + description = '' + pretix configuration as a Nix attribute set. All settings can also be passed + from the environment. + + See for possible options. + ''; + }; + }; + + config = mkIf cfg.enable { + # https://docs.pretix.eu/en/latest/admin/installation/index.html + + environment.systemPackages = [ + (pkgs.writeScriptBin "pretix-manage" '' + cd ${cfg.settings.pretix.datadir} + sudo=exec + if [[ "$USER" != ${cfg.user} ]]; then + sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} ${optionalString withRedis "-g redis-pretix"} --preserve-env=PRETIX_CONFIG_FILE' + fi + export PRETIX_CONFIG_FILE=${configFile} + $sudo ${getExe' pythonEnv "pretix-manage"} "$@" + '') + ]; + + services = { + nginx = mkIf cfg.nginx.enable { + enable = true; + recommendedGzipSettings = mkDefault true; + recommendedOptimisation = mkDefault true; + recommendedProxySettings = mkDefault true; + recommendedTlsSettings = mkDefault true; + upstreams.pretix.servers."unix:/run/pretix/pretix.sock" = { }; + virtualHosts.${cfg.nginx.domain} = { + # https://docs.pretix.eu/en/latest/admin/installation/manual_smallscale.html#ssl + extraConfig = '' + more_set_headers Referrer-Policy same-origin; + more_set_headers X-Content-Type-Options nosniff; + ''; + locations = { + "/".proxyPass = "http://pretix"; + "/media/" = { + alias = "${cfg.settings.pretix.datadir}/media/"; + extraConfig = '' + access_log off; + expires 7d; + ''; + }; + "^~ /media/(cachedfiles|invoices)" = { + extraConfig = '' + deny all; + return 404; + ''; + }; + "/static/" = { + alias = "${finalPackage}/${cfg.package.python.sitePackages}/pretix/static.dist/"; + extraConfig = '' + access_log off; + more_set_headers Cache-Control "public"; + expires 365d; + ''; + }; + }; + }; + }; + + postgresql = mkIf (cfg.database.createLocally && cfg.settings.database.backend == "postgresql") { + enable = true; + ensureUsers = [ { + name = cfg.settings.database.user; + ensureDBOwnership = true; + } ]; + ensureDatabases = [ cfg.settings.database.name ]; + }; + + redis.servers.pretix.enable = withRedis; + }; + + systemd.services = let + commonUnitConfig = { + environment.PRETIX_CONFIG_FILE = configFile; + serviceConfig = { + User = "pretix"; + Group = "pretix"; + EnvironmentFile = optionals (cfg.environmentFile != null) [ + cfg.environmentFile + ]; + StateDirectory = [ + "pretix" + ]; + CacheDirectory = "pretix"; + LogsDirectory = "pretix"; + WorkingDirectory = cfg.settings.pretix.datadir; + SupplementaryGroups = optionals withRedis [ + "redis-pretix" + ]; + AmbientCapabilities = ""; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "@chown" + ]; + UMask = "0077"; + }; + }; + in { + pretix-web = recursiveUpdate commonUnitConfig { + description = "pretix web service"; + after = [ + "network.target" + "redis-pretix.service" + "postgresql.service" + ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + versionFile="${cfg.settings.pretix.datadir}/.version" + version=$(cat "$versionFile" 2>/dev/null || echo 0) + + pluginsFile="${cfg.settings.pretix.datadir}/.plugins" + plugins=$(cat "$pluginsFile" 2>/dev/null || echo "") + configuredPlugins="${concatMapStringsSep "|" (package: package.name) cfg.plugins}" + + if [[ $version != ${cfg.package.version} || $plugins != $configuredPlugins ]]; then + ${getExe' pythonEnv "pretix-manage"} migrate + + echo "${cfg.package.version}" > "$versionFile" + echo "$configuredPlugins" > "$pluginsFile" + fi + ''; + serviceConfig = { + ExecStart = "${getExe' pythonEnv "gunicorn"} --bind unix:/run/pretix/pretix.sock ${cfg.gunicorn.extraArgs} pretix.wsgi"; + RuntimeDirectory = "pretix"; + }; + }; + + pretix-periodic = recursiveUpdate commonUnitConfig { + description = "pretix periodic task runner"; + # every 15 minutes + startAt = [ "*:3,18,33,48" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${getExe' pythonEnv "pretix-manage"} runperiodic"; + }; + }; + + pretix-worker = recursiveUpdate commonUnitConfig { + description = "pretix asynchronous job runner"; + after = [ + "network.target" + "redis-pretix.service" + "postgresql.service" + ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${getExe' pythonEnv "celery"} -A pretix.celery_app worker ${cfg.celery.extraArgs}"; + }; + }; + + systemd.sockets.pretix-web.socketConfig = { + ListenStream = "/run/pretix/pretix.sock"; + SocketUser = "nginx"; + }; + + users = { + groups."${cfg.group}" = {}; + users."${cfg.user}" = { + isSystemUser = true; + createHome = true; + home = cfg.settings.pretix.datadir; + inherit (cfg) group; + }; + }; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index f535a1d298b9..957eac7848e7 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -20,6 +20,22 @@ in }; debug = mkEnableOption (lib.mdDoc "mate-session debug messages"); + + extraPanelApplets = mkOption { + default = [ ]; + example = literalExpression "with pkgs.mate; [ mate-applets ]"; + type = types.listOf types.package; + description = lib.mdDoc "Extra applets to add to mate-panel."; + }; + + extraCajaExtensions = mkOption { + default = [ ]; + example = lib.literalExpression "with pkgs.mate; [ caja-extensions ]"; + type = types.listOf types.package; + description = lib.mdDoc "Extra extensions to add to caja."; + }; + + enableWaylandSession = mkEnableOption (lib.mdDoc "MATE Wayland session"); }; environment.mate.excludePackages = mkOption { @@ -31,55 +47,63 @@ in }; - config = mkIf cfg.enable { + config = mkMerge [ + (mkIf (cfg.enable || cfg.enableWaylandSession) { + services.xserver.displayManager.sessionPackages = [ + pkgs.mate.mate-session-manager + ]; - services.xserver.displayManager.sessionPackages = [ - pkgs.mate.mate-session-manager - ]; + # Debugging + environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; - # Let caja find extensions - environment.sessionVariables.CAJA_EXTENSION_DIRS = [ "${config.system.path}/lib/caja/extensions-2.0" ]; + environment.systemPackages = utils.removePackagesByName + (pkgs.mate.basePackages ++ + pkgs.mate.extraPackages ++ + [ + (pkgs.mate.caja-with-extensions.override { + extensions = cfg.extraCajaExtensions; + }) + (pkgs.mate.mate-panel-with-applets.override { + applets = cfg.extraPanelApplets; + }) + pkgs.desktop-file-utils + pkgs.glib + pkgs.gtk3.out + pkgs.shared-mime-info + pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + pkgs.yelp # for 'Contents' in 'Help' menus + ]) + config.environment.mate.excludePackages; - # Let mate-panel find applets - environment.sessionVariables."MATE_PANEL_APPLETS_DIR" = "${config.system.path}/share/mate-panel/applets"; - environment.sessionVariables."MATE_PANEL_EXTRA_MODULES" = "${config.system.path}/lib/mate-panel/applets"; + programs.dconf.enable = true; + # Shell integration for VTE terminals + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; - # Debugging - environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; + # Mate uses this for printing + programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); - environment.systemPackages = utils.removePackagesByName - (pkgs.mate.basePackages ++ - pkgs.mate.extraPackages ++ - [ - pkgs.desktop-file-utils - pkgs.glib - pkgs.gtk3.out - pkgs.shared-mime-info - pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - pkgs.yelp # for 'Contents' in 'Help' menus - ]) - config.environment.mate.excludePackages; + services.gnome.at-spi2-core.enable = true; + services.gnome.gnome-keyring.enable = true; + services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; + services.gvfs.enable = true; + services.upower.enable = config.powerManagement.enable; + services.xserver.libinput.enable = mkDefault true; - programs.dconf.enable = true; - # Shell integration for VTE terminals - programs.bash.vteIntegration = mkDefault true; - programs.zsh.vteIntegration = mkDefault true; + security.pam.services.mate-screensaver.unixAuth = true; - # Mate uses this for printing - programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ]; - services.gnome.at-spi2-core.enable = true; - services.gnome.gnome-keyring.enable = true; - services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; - services.gvfs.enable = true; - services.upower.enable = config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; + environment.pathsToLink = [ "/share" ]; + }) + (mkIf cfg.enableWaylandSession { + programs.wayfire.enable = true; + programs.wayfire.plugins = [ pkgs.wayfirePlugins.firedecor ]; - security.pam.services.mate-screensaver.unixAuth = true; - - xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ]; - - environment.pathsToLink = [ "/share" ]; - }; + environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${pkgs.mate.mate-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; + environment.systemPackages = [ pkgs.mate.mate-wayland-session ]; + services.xserver.displayManager.sessionPackages = [ pkgs.mate.mate-wayland-session ]; + }) + ]; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index c7fe1bed5159..77730178422c 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -79,6 +79,10 @@ in serviceConfig.StandardOutput = "journal+console"; }; + # Amazon-issued AMIs include the SSM Agent by default, so we do the same. + # https://docs.aws.amazon.com/systems-manager/latest/userguide/ami-preinstalled-agent.html + services.amazon-ssm-agent.enable = true; + # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6726b9071ef6..89e92bc8a999 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -513,6 +513,7 @@ in { mastodon = discoverTests (import ./web-apps/mastodon { inherit handleTestOn; }); pixelfed = discoverTests (import ./web-apps/pixelfed { inherit handleTestOn; }); mate = handleTest ./mate.nix {}; + mate-wayland = handleTest ./mate-wayland.nix {}; matter-server = handleTest ./matter-server.nix {}; matomo = handleTest ./matomo.nix {}; matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; @@ -729,6 +730,7 @@ in { pppd = handleTest ./pppd.nix {}; predictable-interface-names = handleTest ./predictable-interface-names.nix {}; pretalx = runTest ./web-apps/pretalx.nix; + pretix = runTest ./web-apps/pretix.nix; printing-socket = handleTest ./printing.nix { socket = true; }; printing-service = handleTest ./printing.nix { socket = false; }; privoxy = handleTest ./privoxy.nix {}; diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index ca898bba1bc4..99804303e397 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -29,6 +29,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { testScript = { nodes, ... }: let user = nodes.machine.users.users.alice; + env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0"; + su = command: "su - ${user.name} -c '${env} ${command}'"; in '' with subtest("Wait for login"): @@ -47,21 +49,45 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Check if Budgie session components actually start"): - machine.wait_until_succeeds("pgrep budgie-daemon") - machine.wait_for_window("budgie-daemon") - machine.wait_until_succeeds("pgrep budgie-panel") - machine.wait_for_window("budgie-panel") - # We don't check xwininfo for this one. + for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]: + machine.wait_until_succeeds(f"pgrep -f {i}") + # We don't check xwininfo for budgie-wm. # See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754 - machine.wait_until_succeeds("pgrep budgie-wm") + machine.wait_for_window("budgie-daemon") + machine.wait_for_window("budgie-panel") + + with subtest("Check if various environment variables are set"): + cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ" + machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'") + machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie.budgie-desktop-with-plugins.pname}'") + + with subtest("Open Budgie Control Center"): + machine.send_key("alt-f2") + machine.wait_until_succeeds("pgrep -f budgie-run-dialog") + machine.wait_for_window("budgie-run-dialog") + machine.sleep(3) + machine.send_chars("Budgie Control Center", delay=0.5) + machine.screenshot("quick_search") + machine.send_chars("\n") + machine.wait_for_window("Budgie Control Center") + + with subtest("Lock the screen"): + machine.succeed("${su "budgie-screensaver-command -l >&2 &"}") + machine.wait_until_succeeds("${su "budgie-screensaver-command -q"} | grep 'The screensaver is active'") + machine.sleep(2) + machine.send_chars("${user.password}", delay=0.5) + machine.screenshot("budgie_screensaver") + machine.send_chars("\n") + machine.wait_until_succeeds("${su "budgie-screensaver-command -q"} | grep 'The screensaver is inactive'") + machine.sleep(2) with subtest("Open MATE terminal"): - machine.succeed("su - ${user.name} -c 'DISPLAY=:0 mate-terminal >&2 &'") + machine.succeed("${su "mate-terminal >&2 &"}") machine.wait_for_window("Terminal") - with subtest("Check if budgie-wm has ever coredumped"): - machine.fail("coredumpctl --json=short | grep budgie-wm") - machine.sleep(20) + with subtest("Check if Budgie has ever coredumped"): + machine.fail("coredumpctl --json=short | grep budgie") + machine.sleep(10) machine.screenshot("screen") ''; }) diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix new file mode 100644 index 000000000000..df39ead286e1 --- /dev/null +++ b/nixos/tests/mate-wayland.nix @@ -0,0 +1,63 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "mate-wayland"; + + meta.maintainers = lib.teams.mate.members; + + nodes.machine = { ... }: { + imports = [ + ./common/user-account.nix + ]; + + services.xserver.enable = true; + services.xserver.displayManager = { + sddm.enable = true; # https://github.com/canonical/lightdm/issues/63 + sddm.wayland.enable = true; + defaultSession = "MATE"; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + services.xserver.desktopManager.mate.enableWaylandSession = true; + + hardware.pulseaudio.enable = true; + + # Need to switch to a different GPU driver than the default one (-vga std) so that wayfire can launch: + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: + let + user = nodes.machine.users.users.alice; + in + '' + machine.wait_for_unit("display-manager.service") + + with subtest("Wait for Wayland server"): + machine.wait_for_file("/run/user/${toString user.uid}/wayland-1") + + with subtest("Check if MATE session components actually start"): + for i in ["wayfire", "mate-panel", "mate-wayland.sh", "mate-wayland-components.sh"]: + machine.wait_until_succeeds(f"pgrep -f {i}") + machine.wait_for_text('(Applications|Places|System)') + # It is expected that this applet doesn't work in Wayland + machine.wait_for_text('WorkspaceSwitcherApplet') + + with subtest("Check if various environment variables are set"): + cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ" + machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'") + machine.succeed(f"{cmd} | grep 'XDG_SESSION_DESKTOP' | grep 'MATE'") + machine.succeed(f"{cmd} | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'") + + with subtest("Check if Wayfire config is properly configured"): + for i in ["button_style = mate", "firedecor", "mate-wayland-components.sh"]: + machine.wait_until_succeeds(f"cat /home/${user.name}/.config/mate/wayfire.ini | grep '{i}'") + + with subtest("Check if Wayfire has ever coredumped"): + machine.fail("coredumpctl --json=short | grep wayfire") + machine.sleep(10) + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix index 48582e18d520..1252ec43cf3d 100644 --- a/nixos/tests/mate.nix +++ b/nixos/tests/mate.nix @@ -54,6 +54,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_text('(Applications|Places|System)') machine.wait_for_text('(Computer|Home|Trash)') + with subtest("Check if various environment variables are set"): + machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf marco)/environ | grep 'XDG_CURRENT_DESKTOP' | grep 'MATE'") + # From mate-panel-with-applets packaging + machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'") + + with subtest("Check if applets are built with in-process support"): + # This is needed for Wayland support + machine.fail("pgrep -fa clock-applet") + with subtest("Lock the screen"): machine.wait_until_succeeds("su - ${user.name} -c '${env} mate-screensaver-command -q' | grep 'The screensaver is inactive'") machine.succeed("su - ${user.name} -c '${env} mate-screensaver-command -l >&2 &'") diff --git a/nixos/tests/web-apps/pretix.nix b/nixos/tests/web-apps/pretix.nix new file mode 100644 index 000000000000..559316f9b85c --- /dev/null +++ b/nixos/tests/web-apps/pretix.nix @@ -0,0 +1,47 @@ +{ + lib, + pkgs, + ... +}: + +{ + name = "pretix"; + meta.maintainers = with lib.maintainers; [ hexa ]; + + nodes = { + pretix = { + networking.extraHosts = '' + 127.0.0.1 tickets.local + ''; + + services.pretix = { + enable = true; + nginx.domain = "tickets.local"; + plugins = with pkgs.pretix.plugins; [ + passbook + pages + ]; + settings = { + pretix = { + instance_name = "NixOS Test"; + url = "http://tickets.local"; + }; + mail.from = "hello@tickets.local"; + }; + }; + }; + }; + + testScript = '' + start_all() + + pretix.wait_for_unit("pretix-web.service") + pretix.wait_for_unit("pretix-worker.service") + + pretix.wait_until_succeeds("curl -q --fail http://tickets.local") + + pretix.succeed("pretix-manage --help") + + pretix.log(pretix.succeed("systemd-analyze security pretix-web.service")) + ''; +} diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix index 50c39da09867..4a5bd601ced7 100644 --- a/pkgs/applications/blockchains/gridcoin-research/default.nix +++ b/pkgs/applications/blockchains/gridcoin-research/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gridcoin-research"; - version = "5.4.6.0-hotfix-1"; + version = "5.4.7.0"; src = fetchFromGitHub { owner = "gridcoin-community"; repo = "Gridcoin-Research"; rev = "${version}"; - sha256 = "sha256-fFxHJJ+EMnv0CterTwJbAfybF9WCzaSP7ynlxx2hE5A="; + sha256 = "sha256-wdXah7QnWohGAtC98exPSkhg5F3BaBOiFs6bklFxD7E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index 6c40b8f52daa..f74d554a8c73 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.22.0"; + version = "15.22.2"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-6UYWg018TumJVgZpLVLlkM+/sTqC6y0A7KVfiwn0hzw="; + sha256 = "sha256-aYGZPoA2Tux6pmpZFShkZB+os34jZczXsfmYN/pu+Ic="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 6566a2808b70..162bc4a19c65 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -24,7 +24,7 @@ "new": "nvchad-ui" }, "nvim-base16": { - "date": "2024-02-15", + "date": "2024-03-16", "new": "base16-nvim" }, "nvim-bufferline-lua": { @@ -47,6 +47,10 @@ "date": "2021-09-03", "new": "sqlite-lua" }, + "vim-fsharp": { + "date": "2024-03-16", + "new": "zarchive-vim-fsharp" + }, "vim-jade": { "date": "2020-03-27", "new": "vim-pug" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 75f34b1d32a9..5c8f612b9fcd 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,24 +29,24 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2024-02-29"; + version = "2024-03-06"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "dc6f76efcf8db15d21c9554d5da2211990ba4099"; - sha256 = "13hm0q0yk7rhhb5gvn2kn5l7hixkx2v2kl3fjl07p7r9iia0rjy8"; + rev = "df53728e05129278d6ea26271ec086aa013bed90"; + sha256 = "0yh7awf26cqfndhliizi0mfqj2111hicg3hlqjjiag96qq9csgdw"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; CheckAttach = buildVimPlugin { pname = "CheckAttach"; - version = "2019-05-08"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "CheckAttach"; - rev = "8f0b1350431d1d34655a147e6f1cfe6cb5dda5f7"; - sha256 = "1z9a40nbdjd3pnp28nfsi2bijsbaiphc0ia816f5flkchn07gmmj"; + rev = "6d22144650029a5d4dc3c8f5e303a3f6ce56e76b"; + sha256 = "04jcnq024zss9snv26py3969pflxkhn4ak0a4ap55qy9za4fcsi7"; }; meta.homepage = "https://github.com/chrisbra/CheckAttach/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-02-21"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "91126b9896bebcea9a21bce43be4e613e7607164"; - sha256 = "0cp56d4vy8mwdf3gl64cnw25fizqw0p1nfwnn470b3mwk9851i7g"; + rev = "864c58cae6df28c602ecb4c94bc12a46206760aa"; + sha256 = "07gaiw4xbyqjpw15lry2m4cb42szwmi77dvnkhdj4ii4n7iv749s"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-02-25"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "f166222d21995f23417df604b3d500636d63d99a"; - sha256 = "1zj19xz50xdvqlb8li45mdv1s7irxisckijx2r6xl79ykdm998jb"; + rev = "1b1c9f21ed72a12fb7cc430edb1549e83f9b413b"; + sha256 = "0q36mmi3jf1i1z12nddk0zdqla4289pj5mvak9sd79mpi9yrvnp8"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-02-29"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "f3a32e89db213900a7dae31f2243c2a41e8b16c9"; - sha256 = "0zwvjqdk2a7w0r6msnnagqnx506163b0xy6qz0saaksfmi2zmws2"; + rev = "9f74c6a52f4f6adaf3b3d64b15d2363219afefae"; + sha256 = "0kblp05s42n10w5nl56x4mks967na0fljwva387sgympqibwpgws"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-02-18"; + version = "2024-03-04"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "c3c03323c4e4bd84b8fc6173a6c95bbd6c922b11"; - sha256 = "1977s7082pvml4yi6km3i0k81n5vp0ym25ybxgl28ym66xrxcl28"; + rev = "d088ff721ea2f1a56649157fa91771d068f1706f"; + sha256 = "0mxf52vgmk3j6fyymkzrl19lsgdk0jvhx2w7imblsswabqx5xc7a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2024-02-25"; + version = "2024-03-09"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "5c240e6356156b72cfbf7c05feefadae61d7a06f"; - sha256 = "11p2393x80mym11nz3p1v3sz88y04sy8rknvfv5spd1gxcm7172w"; + rev = "5072b1b1065a6b22bdd46b5c21780a91d6a08071"; + sha256 = "195ns7dw3g4sq3pmh3h3xas4kfmwwhidlg4q7nnffkd6x9cdg31w"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-02-05"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "3748e87a316a68754341cdffcef44fee61dee51c"; - sha256 = "0d7623dibwrp7nzl512laznai478rw8vz2jxlmbihs5gccnxnvp7"; + rev = "993142d49274092c64a2d475aa726df3c323949d"; + sha256 = "06pw6ygbmf65zkg65ajy3cr0g3y1fg0lk8kkw2q5f9s2qq2fs306"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-02-28"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "24a937e04f3c59add32d8bd8533e02ab93268772"; - sha256 = "0z5nbdarhxnw7qp0j1hk98my7ks5vm0llgm1i2jrq2y52x0lp2xh"; + rev = "712b4b3a9714ff58a5c0798c7b6e0ecf7c59857d"; + sha256 = "1fsnjcw503ca9612q3vjl32q1sq5wyjbiqy2rbwjy2w1cjny7160"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -799,12 +799,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-02-24"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "915e36a2ed84b73741e13d2df3edc8e01ca56f5b"; - sha256 = "0rw3wnxsk9gx4kvw2x5h1pbmpls7fvlim3ihlhw37zf2irsfph5w"; + rev = "c572812e1d32c064859d8e9790c05e09f78ce508"; + sha256 = "126ipiv31igbxppgji4p4ahzqgzyrkn08fqn7ws4l6nsm2h75xl3"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -1015,24 +1015,24 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-02-13"; + version = "2024-03-09"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "2c5a7442f8db3dcc3f5175f0bed73675e26e3931"; - sha256 = "0ana0pad4lcqg6mcava4mvvi0c9bwkcgfql1xgmcxmz1svgrqkqg"; + rev = "ca93b6193742f80330ace6d5e4e9f0f0480e0c45"; + sha256 = "1hqjwzn5pfzg46rq316vx83sqyl7fv1y7kk1b9i550zmv7q6qvlj"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-02-27"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "1d6b1386abe97d1d8cba47eb9afa8a9f2d1bbe66"; - sha256 = "1cwyghc81fsqbmfqq0gs2y38x5dddlz9asfcjhc1diyf2x78wycv"; + rev = "3c48b5edf61dda21ad41c514e53448fee366a824"; + sha256 = "1fys0jay5ij0xh0sinmyr00z903ksdpcm8cyp6rjwsryrjqda8km"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1075,12 +1075,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-02-29"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "36a44bf1c712a42b46479540ee89e296c6c63cdc"; - sha256 = "0j7zgyg1f17b7lzlgq39hmcvzshh1saav7f2jn87kb46jvng7nva"; + rev = "6ffabeac88203b6d74afb4be4de5d3daa5dbbda8"; + sha256 = "0048smdfljgxfr7g425m0wxj5whd164r13zrcf2yfzyj7lhb93k6"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1279,12 +1279,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-01-29"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "b15c6daf5a64426c69732b31a951f4e438cb6590"; - sha256 = "09yj7gkk4ba50cdfmnn56g5hrbh4hk9934mj3xm08nbqhh4jir1k"; + rev = "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef"; + sha256 = "1r9bb6jmcj2048ny86v7ha8scjv1qispmxhj98l11jb2xb1f1fvn"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1303,12 +1303,12 @@ final: prev: bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2024-01-31"; + version = "2024-03-08"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "d9a47f114031d3030b1e4de3c0b6a664b1201524"; - sha256 = "0ypf8ggvl1q5kgrzanr20n6bllfl547hk50aq0jmw0mprhi5npds"; + rev = "0cc28d53e9da628e006c89bb2d3b03b94a0dee33"; + sha256 = "0gxa73q89w7mkhhmy3f2zdcsys4p9m4z61ff1c9lmbvd1r8dh898"; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; }; @@ -1351,24 +1351,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-03-01"; + version = "2024-03-08"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "fb740df82b25aaab3988cdaf9d9e908eba1a0111"; - sha256 = "06jya7svz3q0vcwgmj8xqjvhix92q9d40iwybm0qqlv69k09lqwc"; + rev = "f3d9d31aab7990d50ae6922fd7c1e3a9eb7da183"; + sha256 = "0h94gcp1labwgkphd1n9nn9jw1ps4ij2s6pmkdxag8j15kbh3r7k"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-03-01"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b2e5c4a744cae86f3103157c6834043d189829fe"; - sha256 = "1p54rnyicimi2slhz47s16m6c2khy5bda0f19k5i5kwib042g0dh"; + rev = "d2afbb28ed1b6de119fe7c1d4fe248da0819b4d8"; + sha256 = "0gmjs4ms7nxmfd4wyw082mqqgj82309x75yi8rxvnaqyksn70bas"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1495,12 +1495,12 @@ final: prev: cloak-nvim = buildVimPlugin { pname = "cloak.nvim"; - version = "2024-02-02"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "laytan"; repo = "cloak.nvim"; - rev = "9abe4e986e924fc54a972c1b0ff52b65a0622624"; - sha256 = "0jnhxxq2c7bprkicqxqi17fybfgpzv0z1jxrqm346hmnmm8amgvw"; + rev = "462e84e1659d984196d09f7d16690b19b9aee804"; + sha256 = "1gg29wngh1cgxpmjvhzg9dx062xklbz87961p81jbpx4m1xsaxwi"; }; meta.homepage = "https://github.com/laytan/cloak.nvim/"; }; @@ -1663,12 +1663,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-02-02"; + version = "2024-03-03"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "afa18f35a818af7bcb65b05c183a6777ede6c0ad"; - sha256 = "1nz0ywakqvvscrvdzk86w8f29s8mrcyln2jqgh24kvic5zwb66xj"; + rev = "3dab73d34a889eafdb57c666c3c2076b4c3e126b"; + sha256 = "08nyng2ykxnapih97m1wsj1fskjz7yb09g2mb3428l7zbvjjk3nq"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1687,12 +1687,12 @@ final: prev: cmp-emoji = buildVimPlugin { pname = "cmp-emoji"; - version = "2021-09-28"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-emoji"; - rev = "19075c36d5820253d32e2478b6aaf3734aeaafa0"; - sha256 = "00jrwg491q6nx3q36krarxfpchg3fgdsz7l02ag7cm0x9hv4dknd"; + rev = "0acd702358230abeb6576769f7116e766bca28a0"; + sha256 = "1i9ak17cair797fijxd61lnjqy3qykpscah7303arvkxdr8w1zik"; }; meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; @@ -2179,12 +2179,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-02-28"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "0ce9a96b95e5d88181b0bed26f40922d1bf65b90"; - sha256 = "1b227bqjy196srr0djkrjhil2y74vvcrz2qkg04fy2i5h87rd2ip"; + rev = "a0f3e2c1b13157a25063b32b49debf46cc96a873"; + sha256 = "1lqd93663nrcbwkhr3a1yyh22zamv38zf3nazxsq36aix4h0v616"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2203,24 +2203,24 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-02-14"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "cd5913ff5481229b15186293d1d46dd9500789f9"; - sha256 = "1lsf60aaxzc0w0sgvb8pghrx6hwfh57jx9xaj6g7rhbpxw9l05cx"; + rev = "73ba2a3a41484437ff8a45ca1e796fa9d6fa1153"; + sha256 = "1lcliki38mamk722klb3a0an2bsblx9rsgwixa9f0j7naril4z9z"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-02-27"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "f2d90dedb45e35f7563d2ce3a31c6928f79de678"; - sha256 = "17884drb1mqgbb1pccczpjal623jnyb8z33wrrzgajg3k4z8i2b2"; + rev = "bef9cbaa5c19ab85d8048f364bfc0ac8c7ab335d"; + sha256 = "13b4nq2z1pw6v0rbmjkxynjs6w4b859hhcnhnsl2r0imhkgss4l5"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2251,12 +2251,12 @@ final: prev: colorbuddy-nvim = buildVimPlugin { pname = "colorbuddy.nvim"; - version = "2022-02-28"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "tjdevries"; repo = "colorbuddy.nvim"; - rev = "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a"; - sha256 = "1gjwgh77xgpdpzlz51c7gxnbpqyzm4hy9baspgjf9j5ny4yisn03"; + rev = "e498b2b49d9ad0c3fb8168a02b237b689dcd4051"; + sha256 = "1dxxxdbml12p8awcp78vxj1i2jbhvcdn4m4lnqczxb7qxwpb6g2r"; }; meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; @@ -2455,12 +2455,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-03-01"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "c36fc6492be27108395443a67bcbd2b3280f29c5"; - sha256 = "0vd9qj4ga3l21v84v3a9bj1qs4mkw7dbmslygs9ibchihv2kw98j"; + rev = "67ee2258e08ccb91345d52f62484b657feccef25"; + sha256 = "0d76rrjbmi3rmvm27jh61zs35z9axc5l6yacr3yrrnfi0kahi0fy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2468,12 +2468,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-02-02"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "f50d4db821489f66ff93afe58155eef42c273a5d"; - sha256 = "1q0in2yay28887vjirs15dcbx9p29rqcwg6fzfg01b8vs7nq63gw"; + rev = "dfb9f75010a181c090ab905b2a2b4180aea20f15"; + sha256 = "0swwnb5sr3j5yx77f94ymdc1jpv1nyi0qj9l402qzz5dc4pi2mp6"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2528,24 +2528,24 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-03-01"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "0754163b9d070d4a99d60ecb45f060bc5f97e281"; - sha256 = "0qslfc64x16a8jwasva08xa8x33lq0q1vkx7mhk29a94r7l6rdjd"; + rev = "9484e35cf222e9360e05450622a884f95c662c4c"; + sha256 = "1c7dabbyk5124xw5k5b29h9nmv04ix6p3j3p7qns7ssqinvfphmm"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2024-02-18"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "1b7915035e1cc6b40d27c69051fd81e8fe6b62db"; - sha256 = "076n62rnr9gahw1n8j94xgrab5q1d09sf98p4nhh32gc1z4w2hd1"; + rev = "9c5067a471322c6bb866545e88e5b28c82511865"; + sha256 = "0c0l259qyywck43hgs09qznrw1wm72idprlfk4ddcdj8g99vny84"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; @@ -2576,12 +2576,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-03-01"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "2f6c60ffbcdb7f61cb9c88364eb4f3886f3a3813"; - sha256 = "0r2w77psva2imp7ixrc00z2ia38bnihgz7dx0qlfd38q2lkz8qgi"; + rev = "a290446adad540d780e87d7fa8ef86bb2fdc2951"; + sha256 = "1z8icxpxv03yiigav70r5v463pj5n5v5lq6czwpq2x51pxkaznym"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2600,24 +2600,24 @@ final: prev: cpsm = buildVimPlugin { pname = "cpsm"; - version = "2021-07-25"; + version = "2024-03-06"; src = fetchFromGitHub { owner = "nixprime"; repo = "cpsm"; - rev = "814961aef3eba4412e5e63342575c46f87eaead4"; - sha256 = "13qp6qaghaw355wjwmmd8d7cakb3ry9ijpnz06mj8yza50w7p3fx"; + rev = "1a5fc1b6169bb80c29b0b986130c4f3f1a9ed82e"; + sha256 = "0gsf2xaa9nw0yhlnhvllz03kbdbfjvazdgb753rblkxrqnbjjs6w"; }; meta.homepage = "https://github.com/nixprime/cpsm/"; }; crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-02-04"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "ec2b04a380c9f3a8e6ca38c230e4990d71978143"; - sha256 = "0x3zlvwz3w69sdfp0hqs3ra83mgdf72nmffkpm56f56hnld7r1f1"; + rev = "b4f4987ccdb1cc3899ee541ef4375c73c48c4570"; + sha256 = "0r9l018sfymmbg7lc31bp4q2aqdljaqini5s14mg3r7lwcg15z61"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2708,12 +2708,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-02-15"; + version = "2024-03-09"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "7b83422a9318e036ac21df6a63c0ab1ca745e54f"; - sha256 = "0dhp2726drdvx63vqcm3kmlk6bi7mwjr40fgwz9zspj8jg8gj40n"; + rev = "7ad27cf30a2aeeaefb8e4d25a9ae7c06bd4ce299"; + sha256 = "02nqql0bw4d3izvxi77ml7akkhi6ihgs3ra998zb4c5kf1mcf5nw"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2756,24 +2756,24 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-02-22"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "4432f917be7e0c95a21af17b31b216fba60fb131"; - sha256 = "0q21kdch8ksb7i94160w5fmja30yvz6rpxkpls0g3ijaafxyk6w3"; + rev = "39d21298151dda8bfab537ae7741528cffe07aa3"; + sha256 = "0ah84grvp1j8nvrv5rj6l63vw5d0d6678dylv91dmd78rfdwna7g"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; deepwhite-nvim = buildVimPlugin { pname = "deepwhite.nvim"; - version = "2024-01-23"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "Verf"; repo = "deepwhite.nvim"; - rev = "7c8d12505dafac651f14d4eaa21623a7658871ab"; - sha256 = "1hz07976ka8q45sgk3ggmb0gk9qz463i8narda3hcws302h8nw8k"; + rev = "fe78337404c36f48ef0824ad1bb43de3bb4211bc"; + sha256 = "0jxkjm83fgzjhgid57aj92775gdcy6ag280h8img2zjfnq9kgh27"; }; meta.homepage = "https://github.com/Verf/deepwhite.nvim/"; }; @@ -2804,12 +2804,12 @@ final: prev: defx-nvim = buildVimPlugin { pname = "defx.nvim"; - version = "2023-12-28"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "492096c69e90fcb0242db877269c304bd0cded19"; - sha256 = "0zax6lbmvvphmga12kcwksgdbxrpb526sqz1li7mvhqsi6vyi366"; + rev = "1b17dc334294ef0da74ffa5a05d425ffcaf39a3f"; + sha256 = "1wfrff59kirvbsdyrgavcv17fmwzvi6iszzsxnncgfnshf184mnb"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -2852,12 +2852,12 @@ final: prev: denite-nvim = buildVimPlugin { pname = "denite.nvim"; - version = "2023-12-28"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "83e2a4f29dae330eabd4dcc63359469106880ce8"; - sha256 = "1a9r44z2fiwj9vj7ys8w0dvqikza45s9qmdzgr1ndnnb3azr2mki"; + rev = "055dd686c274a293dc4b7365be07c159148c31dd"; + sha256 = "0rxpj0xhd188xlpm0h557ljdv3zhwxmwm5mf7fsjxcka3m7iy1n1"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -2876,12 +2876,12 @@ final: prev: deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2023-12-09"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "0fcdadc7636ef82636e972c4c651fb77e3cf1954"; - sha256 = "14nhfxaxd771rh784acs1s21cvlx8877wsb9qmyk821sljb4hcwn"; + rev = "8ac4d600ebc51565cb1fa5c045e8e71e2eeaa009"; + sha256 = "1pak5m9aicnqw8akc2zbh3aqmq0rl5j7m4xidh2h5hm5xnjidp9x"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3094,12 +3094,12 @@ final: prev: deoplete-nvim = buildVimPlugin { pname = "deoplete.nvim"; - version = "2023-12-28"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "00a179968eb5f53408dafc22567c1e2933c01079"; - sha256 = "0xa3gvfh7yd932fk641h3jp2mq52pcpi5yvgcdybyx7znfdd84sr"; + rev = "43d7457059d65335ee0ceaa5505befbdd78ad705"; + sha256 = "1x41fdynyb68r6lw62244avic5br6bw28bgz7n2rfdlz9ayimbz1"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -3226,12 +3226,12 @@ final: prev: doom-one-nvim = buildVimPlugin { pname = "doom-one.nvim"; - version = "2024-02-25"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "NTBBloodbath"; repo = "doom-one.nvim"; - rev = "84d7a3ab8a0458649f10b328a3db7415b0d911d4"; - sha256 = "1szsvx94b30a3p2rpj5idk2yjfc6m2avnclh68yqd3rckrk2nzsa"; + rev = "76595eec15896a5da7f4e39ceeded6ffb0f4dc38"; + sha256 = "0ir882521yc9ir9n8kqpra9nyc232f4gnsywvzjkbm98qdrpjvy2"; }; meta.homepage = "https://github.com/NTBBloodbath/doom-one.nvim/"; }; @@ -3250,24 +3250,24 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-01-29"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "6f212262061a2120e42da0d1e87326e8a41c0478"; - sha256 = "1xm7jbhgs3raaqc10lg0czayii36di6cx47b527qc67p2qp03q33"; + rev = "18e5beb3845f085b6a33c24112b37988f3f93c06"; + sha256 = "0pvkm9s0lg0vlk7qbn1sjf6sis3i3xba1824xml631bg6hahw37l"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-02-24"; + version = "2024-03-08"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "a133a7deed7431496d8e87e8e4cc9c09a9d78945"; - sha256 = "1ai1fhwlrvr0p8brqapfrdd7rlkarwf78f6plannydd58zlc4j7p"; + rev = "f1034cfe852cf62a0ebb12ae583f1477ea07e060"; + sha256 = "1f9fd6m31xjkf6rhi05p0cxdx7xp3lpfg13yasaaabasxqwz92sz"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3286,12 +3286,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-01-23"; + version = "2024-03-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "7506891a93dd0954d59b556ae5bb4c85403150ed"; - sha256 = "1228zzwx0vghmhf2fma6fdj8pcw8kslw6kw14kwv5b1sfxg7rap3"; + rev = "86af25173e7e0d43c70f6621305c2b816635c4bf"; + sha256 = "1xdkz51z7cxy55j7s0hvv3jyk61nwn4d21lf3y2yf5z87wnzl604"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3359,12 +3359,12 @@ final: prev: elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2024-02-27"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "0de83ff15ab76608ed4020676193bdf5a9d8b9b7"; - sha256 = "052svi6px486jdgvga8mh5z1djx8fd73jf9j9k1hp7383x9bq56b"; + rev = "4d003f4b41ab9b4f8b569104fa7818f048ed4e25"; + sha256 = "08qz9azq1m4rfw8s2sd6hhrds5zx0vv2azyjnwyk05q2v95xwl55"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3444,24 +3444,24 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-02-10"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "4ce8ea3588265dd7d82113d3a937f53c59685164"; - sha256 = "0p8jp04dx0y3l6ll163m2pvanhysfakra2knmp9mp9rmzyyqk8xp"; + rev = "4c7fef2eea3ad22958927d6d1b261b4f2c2c384e"; + sha256 = "0dbs7y4xdlgaqzbrn0ang9yshma3l3i4wd0ffmcczh4sxbsis5b6"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; executor-nvim = buildVimPlugin { pname = "executor.nvim"; - version = "2023-11-25"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "2af6072829562922e047ed644fc83749c4b10d92"; - sha256 = "0v2bk4nyrkc7qkrh6sb16dif382b26gjix83sfnyk973g07v43in"; + rev = "f6c3109f714d89641fb939b42044b2136f8520b7"; + sha256 = "17j4x4wx50mhhafmp1c5rn644vsnx2473g9i32gg9hmzf27phcdn"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; @@ -3552,12 +3552,12 @@ final: prev: fern-vim = buildVimPlugin { pname = "fern.vim"; - version = "2023-12-04"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "56f8e4c79da01eecb0f7f3803c051cd23c803b35"; - sha256 = "13bfp6qgvxx4xbngnpssxv8z1w2f63jalhj69haazaca8yhr4599"; + rev = "00faa2cd9a0efad9d23f362141f73c786de3389b"; + sha256 = "0g3akjn2sz9hs9sq138d9yj30g3lynbca79yhk9vfxbs9s1cgzdl"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -3612,12 +3612,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-01-23"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2"; - sha256 = "0d1c3km53v1g8c2aa8fqrs0yhrq80mw1wcfglxkyppg81q91qfs6"; + rev = "3363c140dca2ef0b89e2be0317917f077d752cd7"; + sha256 = "1c9k848y320fkn4mbsxb3x7i5dfwms1waq12yig1fn9mspw83vqy"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3889,24 +3889,24 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2024-02-28"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "d68d1cfde9bf82061dfdfe35b83fb8636e03766d"; - sha256 = "0mvj6pwlas6gjjfzvh5qhhnkz2i8b90l21qxsbpjyy0p9jp046vv"; + rev = "a1d6608b6ba5309f9abda776398c97fe8ed26c11"; + sha256 = "1njnbjyi8n4sgs3zpl1hcdi237crp9x5h52fxwnv3j8nxnbai5kj"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-02-15"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "8ea9574b3ebdc44fbe3dc6381a13f9ce0c290e2f"; - sha256 = "14b8rwmhv47ls8ncr8zhf7zb0ziq5ccgcii9fwn71iqrqhzs0m0b"; + rev = "e69f2dcdad44e7eafe764969ed7281d7290db18f"; + sha256 = "0c9p6qyq4wfvvkmgn77nkppwfqnr1si2xzcwlgmmp1vvfjdmam7m"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4057,12 +4057,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-01-27"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae"; - sha256 = "0j9q39pks1lvp9zd97lc1frb2fq0irjizza34kp381gg6smxmc28"; + rev = "4e348641b8206c3b8d23080999e3ddbe4ca90efc"; + sha256 = "0apzslpij9sq7h0rpilvgrn5naqiwrz69x5g5n7m82pj9pz0d2m5"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4117,12 +4117,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-03-01"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "8efd0c89f2305a6840a99d7823c40cc3acea91d6"; - sha256 = "087ik3zkw46czxvh8wbg0pci8p9lxb836j922gnvlwm845jxpkif"; + rev = "9ac3e6faa32d01479973f4ca368d00b7ae328646"; + sha256 = "0rllids06cgfb6hwgacqss7mnmvbrna2h0qwic0mslhg1m8wkq96"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4331,6 +4331,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/gv.vim/"; }; + hardhat-nvim = buildVimPlugin { + pname = "hardhat.nvim"; + version = "2024-03-14"; + src = fetchFromGitHub { + owner = "TheSnakeWitcher"; + repo = "hardhat.nvim"; + rev = "fd61b2623f72751d661d9e2a22beeac2d561dd1d"; + sha256 = "0kkzcqwzi5lig6kv9zp4sdncnx1qnwlkvw0lnsckq4xnp2x1dd92"; + }; + meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; + }; + hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; version = "2024-02-03"; @@ -4380,24 +4392,24 @@ final: prev: haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-02-05"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "0adc2b0956c2de107bbf3b0329b5b7450a1d07e4"; - sha256 = "1mpj9vpisd0g0w5qg0ck5lg4birxwlc9dw9haqcsynjpfk3za8q3"; + rev = "66a7525706b03a730accab3f706d3f0f8078569d"; + sha256 = "0nh1f1ajd25lrw3y7pp013586gx6vklqfqai8z6lgk7dfzm9cpcj"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-02-25"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "0f95fb809b2cfa28f7540ba874356d12426b8d29"; - sha256 = "1qysrm4y83x81f1iymjqfs9qqgmiazgsn4qm6gi8nh2adiwsijmb"; + rev = "d8b57f073d844380a7f18c65227e5ce7cb6bc325"; + sha256 = "02w9982qimq4xi79l29n3jky9pgqrfisfff4fxv485gz5hnl65hj"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4464,12 +4476,12 @@ final: prev: hex-nvim = buildVimPlugin { pname = "hex.nvim"; - version = "2023-09-09"; + version = "2024-03-03"; src = fetchFromGitHub { owner = "RaafatTurki"; repo = "hex.nvim"; - rev = "dc51e5d67fc994380b7c7a518b6b625cde4b3062"; - sha256 = "13j27zc18chlgv9w7ml7j3lxbl7lkcqvvwys05hw0dbhik13bcyh"; + rev = "cbffd2ce4b8be089360e3c95d5909cd511d8840c"; + sha256 = "0dvhgdab3f2w7irh164qglj44h4hqba15yq223ckhka7l9r8nggq"; }; meta.homepage = "https://github.com/RaafatTurki/hex.nvim/"; }; @@ -4523,12 +4535,12 @@ final: prev: hmts-nvim = buildVimPlugin { pname = "hmts.nvim"; - version = "2024-02-02"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "calops"; repo = "hmts.nvim"; - rev = "ba1239972a1f56b94252d4f85a43e777ac419662"; - sha256 = "1n67k7kl2xz3zi75h1qb524nxlgvrgwr4ywsykqwz1k7dlkxh3ck"; + rev = "473d74cf54da8f51aaa9993ec3e6bfae278eb47b"; + sha256 = "14a6k53b002zvz336s6q5yznvyjfdn9y2qdnickhz2cwkrgr1hvf"; }; meta.homepage = "https://github.com/calops/hmts.nvim/"; }; @@ -4583,12 +4595,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-01-26"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "4d04667cf3d6b22379e02ccef6a2fdc6e8837d56"; - sha256 = "066c7gjkgp9gj0kcg7vjik3sgzbfrbjm2j6fwcssh1vy9lgx12wk"; + rev = "1084aa544477cf878d466cacaec0d8d4692c7360"; + sha256 = "0f80nhm6lfa6nph6a4w7748ggvmwg2wh29nwv1sniakjvnk0vr6b"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4739,12 +4751,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2024-02-13"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "821a7acd88587d966f7e464b0b3031dfe7f5680c"; - sha256 = "0pc9irbfqvy55ymdyd60a69y3vvi1nqvs4j9akg624pvnda10fv7"; + rev = "3d08501caef2329aba5121b753e903904088f7e6"; + sha256 = "09p7y9d08sb1fqpy84yga39cf9misir6wx3rby67v2pl3i01k7sy"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5088,24 +5100,24 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-02-13"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "cdfeaf4f6c1714990180453723921002374a30de"; - sha256 = "12y750mwy5awndapvsjsxqk77samyvjsb156fc8ggpwmd067jlq8"; + rev = "d60bc498c9d1d890e8aa4257c784f5103a2d1f13"; + sha256 = "1k484kfwznq93fk7sqin8767knjfv4anb7vig7ihambvdcd1l74b"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-01-23"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "aedcd79811d491b60d0a6577a9c1701063c2a609"; - sha256 = "1lsxb684pdsn625krshxr65lyqb5aa07ryqb5yif8p19766g01pj"; + rev = "83493db50a434a4c5c648faf41e2ead80f96e478"; + sha256 = "0p9ssd6ja90a90vckhpr4xbf0sfa62yrmmc30jbxln9wxqaylcaw"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5124,12 +5136,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-02-25"; + version = "2024-03-04"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "fbc0dc43643497587dac79f666565111ec71f7f8"; - sha256 = "17fvhls0d9apk2wxjj1k8jvy1cvgwqifigzj7rabqq03ayhzv59m"; + rev = "2dc102db03e83afc473c80a7d962974841e13b54"; + sha256 = "0nwb71f49838fzgpgq0y5q9n9yhg2k7ga4rd2dib2cd3msccb09g"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5160,24 +5172,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-02-29"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "d74388c49da2ef51bcae0f386f1c699c8394ce6e"; - sha256 = "0yl1980bcdvdlqgaxa9h6y5skrdhv0hcxday4rlgvj8nj6swbha6"; + rev = "812604b7b100e555062fa41c82bfd9c6c776d856"; + sha256 = "0llfdja9ppkmfak9hj7v5j0raijcqwbj9jlqkk312x65040wda87"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-02-02"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "8277e7ffbde3d32cc582e81b5d109f4071bbbc4b"; - sha256 = "1frbi1wvhmhgr4cvlxh419fjww98h8b0h1zpcbjbvbv17iakchj9"; + rev = "2f7192410e5a20981d5b778f3390896f016897f9"; + sha256 = "148h3cbsnh1fs02liiqxzw4iy3wk1lln0k4m3w1vxz5v3h27yscn"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5352,12 +5364,12 @@ final: prev: lir-nvim = buildVimPlugin { pname = "lir.nvim"; - version = "2023-07-12"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "969e95bd07ec315b5efc53af69c881278c2b74fa"; - sha256 = "1rrmsib2frr4x00kl07v9acva8wa75fbpvpwq8yvdyjy1zgmir7q"; + rev = "7a9d45de08fecd23a04aca1f96688d744830029e"; + sha256 = "17pvzsk1w50bdl9ddrgylck7sam41vvz4x4pm5jkxc4bs7vvffd8"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -5508,12 +5520,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-02-27"; + version = "2024-03-09"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "009ace7a0ca360d9299ff7eb33364b5c16556561"; - sha256 = "0550ld8q8wwskf6s02azdz3q8s1j8vmdzwar1v72fdmawb97hchz"; + rev = "14c9164413df4be17a5a0ca9e01a376691cbcaef"; + sha256 = "0j14qznpwi80hildcd0gwmn2qyq3cq2y320g812c0g4lp6w30m83"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5532,23 +5544,23 @@ final: prev: lsp_lines-nvim = buildVimPlugin { pname = "lsp_lines.nvim"; - version = "2023-10-29"; + version = "2024-03-09"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "cf2306dd332e34a3e91075b40bdd4f6db824b2ee"; - sha256 = "18g9fhwr2mrjcns36h6x1xgy8q84i80566474zxsd6z7ckd8qdfw"; + rev = "6f3defec73f7c87939e800e9afa5d0571b19b401"; + sha256 = "1bkvghdj53wak8c0s293vzl788z96cz2p5c61qh2bdzh6qpn55d2"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-11-28"; + version = "2024-03-10"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0"; - sha256 = "18cwrdww4yxl597d95yixhwxlavmkl37nslpida9cincxrz16rz0"; + rev = "1b32f64549478efd8f9e0d00517db84cf41aa0ea"; + sha256 = "027fhgpxngagn5khswz4h7kxp9wvyfx2ql9vpxbvvvckwdhy6ql8"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5579,12 +5591,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-02-17"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "b1b140aa20a0cf353cd3e282870429b48b30a169"; - sha256 = "1psgxp5ynnbnks8337ralc0whw79d0l75n9q2sb62845dgs8i00f"; + rev = "74b13f63417014739ac09576f7196bec301fa2ac"; + sha256 = "0gmq17w6fn4zvkqi7q1ixdsk54w5aswl8w0s5rrs12qk852fymra"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5615,24 +5627,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-01-25"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "7d131a8d3ba5016229e8a1d08bf8782acea98852"; - sha256 = "00ns525n4a3yqsnrsfbffj38nhh03s39g0dffjq6r71air2irhrc"; + rev = "af4c3cf17206810880d2a93562e0a4c0d901c684"; + sha256 = "0nxz4gw4lycajmi22mnrhpzrrcrszgmy9xi9a4n9k6ps716icq25"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-02-15"; + version = "2024-03-03"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1"; - sha256 = "17q0z9jm9n3c4jj27xxd0nk3vflwnnwybkf47rxvpx95d3wkr0gi"; + rev = "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32"; + sha256 = "1v8ya2vgff4c4k8sfyy2wn9spwwirad56p0jb3k3kiz4j2vf4spv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5736,12 +5748,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-02-22"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "21d33d69a81f6351e5a5f49078b2e4f0075c8e73"; - sha256 = "1dxx7b5aadhws58dzxh7am0rcnzzzhfxbsnkcl5hp9d221wkvi3q"; + rev = "82c7cb08ddb836ad938b2708e50085f12a8825d2"; + sha256 = "18x9a7dr4904aqnnz0wqkx7bx6xnd1wnhbx3adq8sr651vj6pb1y"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5796,12 +5808,12 @@ final: prev: material-vim = buildVimPlugin { pname = "material.vim"; - version = "2023-02-09"; + version = "2024-03-04"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "b47e7f884cb606c19a20e8e520dfa10c3b3a52f9"; - sha256 = "1abhf71ap9cs03ibi3qm8lw8kdynb86x85didnhlhb673xg0kbcz"; + rev = "07e70d5d675fadb1e81191b2d990b2a72edccf0d"; + sha256 = "1rv7hp3gvzvvvh2vifz8r9g12srbldysgnydljp71qs3pwbqpp2v"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -5880,24 +5892,24 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-02-29"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f24747266a047617d06605a2316aa6c071662fa2"; - sha256 = "1f10jzypias9cji4y7bvl095b5qs9i4i5gi2khhk1nbqkpqyyala"; + rev = "9968f6e221ae7bdac57a910c5bf2026186aa023c"; + sha256 = "0sg5y4f3idxfcalngipgsajsrr0jjhpy4klarcnmq60sv6dmz5dh"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPlugin { pname = "minimap.vim"; - version = "2023-10-02"; + version = "2024-03-03"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "701f4cf4b60a3e1685d2da484282f3a3d8bf9db6"; - sha256 = "1kgzg69v9gsl0whq7740av3iyih0z460l42js5jxl8mg630bzxbc"; + rev = "6dc0c36fd92eab38064f22c016e43639f42293d3"; + sha256 = "0ch6j2xdgh61pb5qzhsavvypk1b8mck99zn9j2k5fdn7b08i90av"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -5916,12 +5928,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-02-08"; + version = "2024-03-04"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "1b24b8b5fe10fe09af4572c0165293e0dcd998aa"; - sha256 = "04bsnj8v1wwkq92dlgk1jn8sx964zawcc7im858r4jxczycg8kj8"; + rev = "0a42aa3c7c2c982a1503e63ce8f0f065e0eb63df"; + sha256 = "1p5vwzl48bgfzxk4nwxlyf98ymjyglm44942lpm8al908ysnpwc2"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -5940,12 +5952,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2024-02-10"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "d35bb7c3a93e311c784cb439ca26209181c0815e"; - sha256 = "0dg7q1x2mzkhlvrbr26zcqih81b5wzb9wvh5zm0iw099pgf2fq37"; + rev = "780ea1e98c9bee8f3816685213b0aac42b34cd75"; + sha256 = "1db48c8yfpvlz5v17c7vxrsjz8n0x0fxjbb59w0bm88n85rd2pnv"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5976,12 +5988,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-02-23"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "8346bba69e0de96278dad2038e9be74605908b7d"; - sha256 = "08f3zxzka43f87fks56594476h57yq01x7a1zdsn4acc278xg1nb"; + rev = "8d31d04e18acc419f147452861ad5eb34b998276"; + sha256 = "1nlpg57zfjbla9draxpp3iw8lcsgkyd7y9vgc81q842mb1syby4z"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6288,12 +6300,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-02-25"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "459c60317cc1d251f6eb3b6f010d015d5d24b806"; - sha256 = "0ynfilsp93gl9f89js30jk9h8bh21v19snl4f1x80b7wrr64agak"; + rev = "00b46a1ee17ec2bb93b52e1aac7d1449b659f53f"; + sha256 = "1vmfscin3lgs97pxxfhlw2nvc0nag37pwhba4p1sr3z89jrc4xi5"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6312,12 +6324,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-03-01"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "2feab3abaa2c00dc21f490619f5c0f4ccf0ba495"; - sha256 = "1197rs8mpq77x54h2r8m385gdpxd5liql3dwivqk89cica0av8db"; + rev = "68753daced3b41d6b5e4a441b10a69c1ec33523c"; + sha256 = "0f3lvrvs9sfwvr47bnjhxapgkgz790vwdgn50cd6lgr849n64s8z"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6372,24 +6384,24 @@ final: prev: neogen = buildVimPlugin { pname = "neogen"; - version = "2023-09-09"; + version = "2024-03-03"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "70127baaff25611deaf1a29d801fc054ad9d2dc1"; - sha256 = "00za9qbc8jmf9asqqgr37dpm21xf8cq3pn529zgarmz1gbk106cp"; + rev = "b95347a588401a755eadd17482edc1662876bd58"; + sha256 = "16aw070mfm9d33jsc0xbmpwsna61pqci8h896phizvndp1lx9lfw"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPlugin { pname = "neogit"; - version = "2024-02-23"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "0d0879b0045fb213c328126969a3317c0963d34a"; - sha256 = "1nflx2kk2q0kwwxafbvdfa92pn4vzvynr4jqd5jni9h7n5xvg9dl"; + rev = "bc6aca9242bdcf61ea8aa4355e24f7bffb2aa8f3"; + sha256 = "1zn5akv15069ldjnlbiy1b5hi5d2jfcj45wqh2zj09cq8hd3zqpb"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6456,12 +6468,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-02-26"; + version = "2024-03-04"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "a4072328c089725c7a53f586884384133d68c0ed"; - sha256 = "0p981gv1f5gggxi2dkxlp5wz73mb9pf6ws4icf4phg2k22yha7ww"; + rev = "086891d396ac9fccd91faf1520f563b6eb9eb942"; + sha256 = "1k152lzvizaf1i7gkbjilcvs9l9d13zs606qjw0mpvyhzy4rqd0r"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6480,12 +6492,12 @@ final: prev: neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-02-04"; + version = "2024-03-10"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "6e3546751076890304428150e53bd59198a4505d"; - sha256 = "1hm93lzg9mgpcm871gln6dq864mm2llaypcm0415gyvpqy2fmr3n"; + rev = "21d52973bde32db998fc8b6590f87eb3c3c6d8e4"; + sha256 = "1hxf9218asn22lpa28zb6kmj64a8ak4njxj0whl60a1p0349s4qb"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6538,6 +6550,19 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; + neotest-bash = buildVimPlugin { + pname = "neotest-bash"; + version = "2023-11-18"; + src = fetchFromGitHub { + owner = "rcasia"; + repo = "neotest-bash"; + rev = "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb"; + sha256 = "0w1x9ya843pa8514974frdd8qmzycnvj418igni4y3wy3s0dc65v"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/rcasia/neotest-bash/"; + }; + neotest-dart = buildVimPlugin { pname = "neotest-dart"; version = "2024-02-28"; @@ -6564,12 +6589,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2024-02-22"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "c19df2a139d88c5b4130b830d2cbe63a2c6c6c0c"; - sha256 = "1bb9dv6g7x793hgbg20lf8igjym2ixcxk8ymrrhlcn0489sx79rb"; + rev = "15943dd05e2d4d9393531b647ad661e60820c608"; + sha256 = "0vcx6avfbsjxv3nwbmy6101yb33msx6s3l1mzmnb7rprgcy53zm5"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6587,6 +6612,18 @@ final: prev: meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; }; + neotest-foundry = buildVimPlugin { + pname = "neotest-foundry"; + version = "2024-02-03"; + src = fetchFromGitHub { + owner = "llllvvuu"; + repo = "neotest-foundry"; + rev = "efe5fae9a602946b3e7d60a8a9b2a8b7f255a66c"; + sha256 = "0xx32s8lc2c2c8xrm95l74q269b0gy8ic3vs20gax1931dlk5d3s"; + }; + meta.homepage = "https://github.com/llllvvuu/neotest-foundry/"; + }; + neotest-go = buildVimPlugin { pname = "neotest-go"; version = "2024-02-24"; @@ -6599,18 +6636,55 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; + neotest-gradle = buildVimPlugin { + pname = "neotest-gradle"; + version = "2023-12-05"; + src = fetchFromGitHub { + owner = "weilbith"; + repo = "neotest-gradle"; + rev = "cfb5d5d7d193631fc2a60244adc78313561c5d0d"; + sha256 = "1prf726livgkld935r648d72flsbm3lylw6h1y3864fj034kvq5v"; + }; + meta.homepage = "https://github.com/weilbith/neotest-gradle/"; + }; + + neotest-gtest = buildVimPlugin { + pname = "neotest-gtest"; + version = "2023-12-10"; + src = fetchFromGitHub { + owner = "alfaix"; + repo = "neotest-gtest"; + rev = "6e794ac91f4c347e2ea5ddeb23d594f8fc64f2a8"; + sha256 = "0syyi8y064pm06nj0fczqqy5dnmmps3ykc4k06jl05pk3jfilhaa"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/alfaix/neotest-gtest/"; + }; + neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-02-05"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "02852878c8d1e9f3cc61ea2d6592335d4cf6a54a"; - sha256 = "0967yv47gld3gy3nh1fxqxqnfjjaajqnil42z7pwz7bkxgs63hib"; + rev = "948fdb3fd73fa7c12692c48b6923344557d81b42"; + sha256 = "0sb7nhw3mf15by21a6387qs482b9aysin220cvw4w2schf6h760v"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; + neotest-java = buildVimPlugin { + pname = "neotest-java"; + version = "2024-02-11"; + src = fetchFromGitHub { + owner = "rcasia"; + repo = "neotest-java"; + rev = "311acc2855cc76917f59f5c534d55e5c91e26810"; + sha256 = "0gqhddq6z6q7jdla19l48iyac29wg8m58z27ybbas8sq96p9lqrf"; + }; + meta.homepage = "https://github.com/rcasia/neotest-java/"; + }; + neotest-jest = buildVimPlugin { pname = "neotest-jest"; version = "2024-02-19"; @@ -6623,6 +6697,18 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; + neotest-minitest = buildVimPlugin { + pname = "neotest-minitest"; + version = "2023-11-05"; + src = fetchFromGitHub { + owner = "zidhuss"; + repo = "neotest-minitest"; + rev = "0129b64b7b7ce6c8a6dbd53782a5c8a855c10835"; + sha256 = "0xb1q1xkw6g4jpg1q7lw97a2fd4xi9zizvrfcj9xc1m6vx1nh8b5"; + }; + meta.homepage = "https://github.com/zidhuss/neotest-minitest/"; + }; + neotest-pest = buildVimPlugin { pname = "neotest-pest"; version = "2024-02-16"; @@ -6637,16 +6723,28 @@ final: prev: neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; - version = "2024-02-24"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-phpunit"; - rev = "2f01e83eedbcf6f0257934b32b5d4fda404a9f11"; - sha256 = "0yqi7n6ljr3drgng9yj7im6x35fjb9ap5p0svv1n7lwcbnnbywai"; + rev = "d5e920ab861d175080524b9a3caa5ab8c372def0"; + sha256 = "0wa3f383narj388xs3nrb3l7fjfrrvmcnqwd64mr2n6347gqc3f0"; }; meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; + neotest-playwright = buildVimPlugin { + pname = "neotest-playwright"; + version = "2024-02-23"; + src = fetchFromGitHub { + owner = "thenbe"; + repo = "neotest-playwright"; + rev = "39968792371cb48d395dc54c0498b7373ef73986"; + sha256 = "0vvw5rv36iyfz3gk9rngvz3jdahyhzjvv5gics0qr88mww923m5q"; + }; + meta.homepage = "https://github.com/thenbe/neotest-playwright/"; + }; + neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; version = "2023-09-29"; @@ -6721,16 +6819,28 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-02-29"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "ae774282a592b872e84ffdcc5b4d11fc991eca7b"; - sha256 = "0d6bfl6w1r1gylanlwymiq79aqxr5hyzs37lmm67lh6zqmadk4g4"; + rev = "102e7494bbe0f205d28c31a3fd75a9dfbcc78c73"; + sha256 = "03j5vfqryi419d5x0ssxpasx93jkpraj2vhwfclbhwfjf1d20jkl"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; + neotest-zig = buildVimPlugin { + pname = "neotest-zig"; + version = "2023-12-10"; + src = fetchFromGitHub { + owner = "lawrence-laz"; + repo = "neotest-zig"; + rev = "742f97f971a39d44b4832b432083608834a0e59c"; + sha256 = "06sxdbxqfv2wzrw1v0hzsvy4cnynrym3irzi0c43gqiq7k1fksq4"; + }; + meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; + }; + neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; version = "2024-02-05"; @@ -6877,24 +6987,24 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-02-26"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "b9205dac99317b9ece31636a0414d35efb957aca"; - sha256 = "1dzvd3bhmnbazhlwp5g9zpjj5vbisxz1l578g9fl5gfqyv5yyvqr"; + rev = "7f139517b6d2f05ee6542850b04de004a6b25dce"; + sha256 = "1c20y1f0sakbajsmzk0fhv3wqwsni3wxlvsgcgzxbf922rm9ln3x"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-01-31"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "a408e6bb101066952b81de9c11be367114bd561f"; - sha256 = "0h9dcwh404jzrjw78y98s59pcqcyki5wrsap77lilzq0j8zh1lj1"; + rev = "a4eb88b2dad3fba5c2d87f82cd15dfb9de73913d"; + sha256 = "1vcpb1zc9fxlb3vsrg4p9kqclmfmngkz1sikrhv61ikzfsdwcbpn"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -6961,24 +7071,24 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-02-20"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "667d51fd990d52f7ba80d9f76baa217dd79c6b11"; - sha256 = "17kg08fx15fn94073ppnmga3npr8ba9qjxnmhfccph49i90q7d95"; + rev = "0cf858e14aa98218c4aec92011bded80e935549b"; + sha256 = "0vfii1m25c64846yy3kj9yabiqyhf64msd7p5rlqwfqc4l2y67hh"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-02-05"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "7ab539aaa083e92ef438d4cdc0261d8661916f1d"; - sha256 = "0pprczdx9bfsdvkc2l3szkdfvkpbcmblz3bz9cn68vldnw1z4yvx"; + rev = "ca5c80feaf6b412bf16244bc2d802a7e99cbae7a"; + sha256 = "0s9s21hpsiwxrwglpr9qdl8sbazx4nmkqk55wfwsrkinchx6zcg9"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7009,12 +7119,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-02-29"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "e6d3abffa77597dac35de723e11daaee2fafce77"; - sha256 = "0v8b8if96wwd7czjdlgl7a8vz8pfcwvcwbbmz6sa7dcynj7pvids"; + rev = "72e25ed4162474ef5d666525853f8a42bffd97c5"; + sha256 = "13h0ldwvl1iysz1xz22bd9k8rp7ilcsbhibv5xc0ybqqsfv0ndhn"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7033,12 +7143,12 @@ final: prev: nordic-nvim = buildVimPlugin { pname = "nordic.nvim"; - version = "2022-12-08"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "cd552784eeeae61644fec60f6cc52c267dbddc73"; - sha256 = "0pv3z3kz1v399q283fymz10rq46980a5z2nvhzrfg3i0ws4gpni0"; + rev = "9697dc86e888f603cdb7e3a0742b7814b8a01cd1"; + sha256 = "1rf4z8rvdh4iv4ifq3z1hic2ldcpkja82834w5nhig3x2rn5hw7m"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -7069,12 +7179,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-02-16"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b"; - sha256 = "0wj2mgmykplg6dwgdh63342fdfqwmr7x2pnykk47646gzzixlgl1"; + rev = "3dc46d725f7b94bee5117c0a699b57b1902b5d65"; + sha256 = "1wqf7p8hvspnnr6w3vd3kn4z0wmsg3ishmim68na0h0x8hvx5h2h"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7105,12 +7215,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-02-29"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "8fe6a6560eff96238f55701470494ad911eab955"; - sha256 = "0kxr0z0n8whs2qxnywc8whdi15cp3wajp9rr6ys0ndqb995bcp67"; + rev = "178bf21fdef6679ea70af3f6e45b1c1e6ed8e8a6"; + sha256 = "0rhyh9j28y2f3s4j1lc1fcwwxh67xnc7i2pd3pz3j95zvbws8xg8"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7189,12 +7299,12 @@ final: prev: nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2024-02-20"; + version = "2024-03-02"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "654c904d5ad9dc4846445056086168e25bd8ba2d"; - sha256 = "03gy2qnx7r6h0kk6h1x4pshwh08q5zaw5pxdpwnyfi9fkgdidcyc"; + rev = "b51a37fcd808edafd52511458467c8c9a701ea8d"; + sha256 = "0pvzhj7b0cw3rgy87rq1n194348ws6a0z9pjxrc8rxwsv79mphsq"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -7345,12 +7455,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-02-17"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "fc880e82059eb21c0fa896be60146e5f17680648"; - sha256 = "1dg4sh3dxswak311faz5n3g2l7zy6jvqdvdrbj51n5flm7bgzscq"; + rev = "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d"; + sha256 = "1aspwwmrv6jfg2cvb9n7rfaa57w72d4yf5gvhfxnva8rfwy907gb"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7393,12 +7503,12 @@ final: prev: nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2023-12-28"; + version = "2024-03-10"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "d4542ac257d3c7ee4131350db6179ae6340ce40b"; - sha256 = "1xgj7m5b89ndy5asg6zknhpqbgflhd82vvwafzqxgc6zr86iv4r0"; + rev = "baa5b0dc6663284cce32e0d00ac1f2511b13496f"; + sha256 = "136qm88phwbyn5zdbr6xnw0hvsa7zcycxyg5anhfdc1vxdsh8lfm"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -7477,24 +7587,24 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-02-25"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "abff2ecd998de946e091ea7749b613ab6975f6f7"; - sha256 = "0yhflyvjdfr4s6ipvcs98375lbhmg7wslvkfrmz1xmlmxpw63w0y"; + rev = "a9f191d5ba27a5943b8992bf618858fa7374758f"; + sha256 = "036mb597k4w86lypjjk0554z7vambyndasnnkl035m885n2vny1q"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-02-29"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "a85f9d0b8a31d60db79adfdbe3d6e62ae9466826"; - sha256 = "0w0ycxqmpa1pg0jm3p68bi3z3666g8qzf234k15sir04yzd7rhgg"; + rev = "e86a34da29d385c3f7c85de176b358191fb36808"; + sha256 = "1dvkyzhns94mkvv3midhnb8jqa5wc139768laszxnan1s71rmxbf"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7525,12 +7635,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2024-02-21"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "382b9f625861f47d95876bcfb4c261f3b96077cb"; - sha256 = "1c65a12w1lmh16f6rwpq5nf5xqr3sna7arbwywh0bnxg6i3lhbgf"; + rev = "8eb5f0dbe6e126b392ddcaf45893358619893e45"; + sha256 = "04v31198sqrw18ycrxhz94zq4q9bn879cdlyc06f8fc2hwqnz1ya"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7608,12 +7718,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-02-29"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "e824adb9bc01647f71e55457353a68f0f37f9931"; - sha256 = "1494d979kpmbvlhq4na4hjr7zyl9gfh70pm0ikg26sasad8a51kx"; + rev = "03b1fc593638098a35de26d768d5f43b0fe57041"; + sha256 = "1rf9m7skw7zmkp8wlipgdhc33jni97p2lbax6gsxsziajzxmvrih"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7644,12 +7754,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-02-29"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9553725789be682ecd945a527ec552e489ea8534"; - sha256 = "1gny37nw2sy88ddyd0jx23ks5grdmi2ipwyl6zkv1kl1lv2v9n39"; + rev = "5b364bd4db0fb68a56ffe427a370920854acb834"; + sha256 = "0aljwqk4r6dx3hyshz62zd0n39a3vx94zrg7v923zbkjk77hr3dd"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7704,12 +7814,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-02-22"; + version = "2024-03-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "9f498a5f74771cedaa05871a79df91aa09ad6bd9"; - sha256 = "1ll7nihbwl8rk0l9zrl55rapnc7h1hwcgmvgm6595zjba30sjazn"; + rev = "4f9bf0c821092f20dd34c1a4ea5b07b0500ff089"; + sha256 = "05d2v6yfs60n4xli5c682nlczqnib9pg6hxp79fiidhdidrf9zfj"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7920,24 +8030,24 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-02-19"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf"; - sha256 = "1112r1qz44mgvqda98a1ch4w262n5hs9ylgp9fdvgz62nhgxgl5m"; + rev = "d1db6c1d37252b5a38f199e2f590c5a1617d9254"; + sha256 = "1baavgxg61ww72avgzjjhkwkjaqcs9qw95p9a589ifgb9sclxklb"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-01-02"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "dc371a116041c49ae6d3813f6e1722c2dcdabdcf"; - sha256 = "0x0plf8gxyl3cy6h2adhz535g00k1qmq0ibx9scxp00chh0g8nr4"; + rev = "bcc9fa38a62637491b75b02e364191553fd858a2"; + sha256 = "184i4zwp0m4bgv0pzj9acc7c2h0yzjc9jdcjp3k81j1kmfpva1fp"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -7992,36 +8102,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-02-24"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677"; - sha256 = "0dngnviq36z9jsm1p6w4b3xg31k6fj05xdk6qn0cxjjharrskazi"; + rev = "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3"; + sha256 = "09dmcbl4mhwr9p5wngn10d4y48qhqhr07xkblc3zwgf0n4cqrkxj"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-03-01"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c2a265156d5799adbd9f9e7d5385735fa5d21776"; - sha256 = "08cish176w59wj1j221q1k67mjgabdkl676v5kp79ig7b23hfzz5"; + rev = "f87882858438834d2fbb6379aa2be37de901751b"; + sha256 = "1il8iph7qh2z8clwbqwc8l2fn91wpv651sqyhdkyqz9iznb7h2fq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-02-25"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "b8d1ffe58a88e0356da56b167373e89c4579ce15"; - sha256 = "1z5my5hk7mwrvmjb36w7q82mi8n6q1a63i0p94vphx8vchipa60n"; + rev = "b8b7e52c1517d401d7c519787d5dc4528c41291a"; + sha256 = "1wcwx29n24wy5hlfh6ilsj5x1q3acdv4khh0c4p5a9m5vg4zbyn2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8064,12 +8174,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-02-28"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "95933e762e28f9d38b572d65e7e4da9d2f4d90cb"; - sha256 = "09hnk52jzw4xjhd5ls1r81r1ncy4pnqhz7vdsq843il8psxg50ng"; + rev = "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4"; + sha256 = "159fcx7kfbgrk8lywfrx7vpdd6pdzphrqv4jwlvmjmzmmnbayhm7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -8112,12 +8222,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-02-27"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "239ae620d818ffa1319ca3056546df71906d4bfb"; - sha256 = "17nd2clil96j1a8l5rxvb83c1aqkff31sxylv4kac6rx30g8k9qa"; + rev = "2296dbb8939c4050c222f4eb24889540ef8acd76"; + sha256 = "0dlrn9nlf43byn2dk24pkyjidm9i1zalrkn45pr76ayqy34fxp9n"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -8136,12 +8246,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-02-25"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "0bb67ef952ea3eb7b1bac9c011281471d99a27bc"; - sha256 = "0rykazpyv111w408c4xm1x76nr0vdwss8f7mbkfdgijxj9llk87b"; + rev = "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec"; + sha256 = "038inkii20fxk33c8bqz86nb81jf0z02l1gq2ml0k2fd5ffaq0nw"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8208,24 +8318,24 @@ final: prev: nvterm = buildVimPlugin { pname = "nvterm"; - version = "2023-09-09"; + version = "2024-03-09"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvterm"; - rev = "3e43be1d0ca60cc5e2dfc2d289b06577e7e57e98"; - sha256 = "10k9x2mg0pcrrf83ysxc0amldjnfgvxl8r74j42czdw5my8aqgcf"; + rev = "9d7ba3b6e368243175d38e1ec956e0476fd86ed9"; + sha256 = "0pnh3mva0jjm2li5xnkbfa3cvn0di01b24kqn82g43fjvmf3kxzx"; }; meta.homepage = "https://github.com/nvchad/nvterm/"; }; obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-03-01"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "c7812abe3ab5c6a6a8b29a9ec08b32142a2e7011"; - sha256 = "0jmhabvlbrgy1bkjlaf6dvajr5lypif541a62pmk1w7i7jlgv2h8"; + rev = "450c3dabffa395502800d6ac0b1d1dcd5d89f80e"; + sha256 = "003z6v2r8bd20jlpwknp1la4gqxbqcmkiqq1yvp68b4i1klll5a1"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8256,24 +8366,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-02-16"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "feae1e5519deebad3c59ee1d57d28aa22822f7c8"; - sha256 = "0nvd93ml9gv20qh7bl1q69bk7ya6k3lnl49ywhaixh41f28z39wf"; + rev = "1e2376ac6966805be9967f4ea0e4cf7c750f8214"; + sha256 = "04v882ym3kgmja01gw1wgpw09dzjcy665jrmrza3ilir4c192ddh"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-02-23"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "132b4ea0740c417b9d717411cab4cf187e1fd095"; - sha256 = "085n2mfsv0gmz4f31wpzld804033h73mm7zfhni6xa8ffd7vvldj"; + rev = "32e18df30f937e02135398c270b72a4d24b40120"; + sha256 = "15w8adbb9pwsnjch41d3dw4q3dpvrw61wvwbxzyfzhk032133dz6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8305,12 +8415,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; - version = "2023-12-25"; + version = "2024-03-09"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "4be2e8689067494ed7e5a4f1221adc31d1a07783"; - sha256 = "1mzbyz5p10d7ilpi7c05qcjjixc6nrnd0shzh49ic20d2c9wnzdy"; + rev = "f7310a06ad86072158adc37f394650e7fba9631d"; + sha256 = "0li9zsh7g149jb4154x0z5v8frwlziv45iqam4zl9yjnx0m6s085"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -8365,12 +8475,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-02-29"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "0059f3f9b21daf3540f1108c2bab3fa9e9082331"; - sha256 = "1jiisdy9b9ia806fiq635r2ljqrd8caxpvk3xmrc3w04xhsnb38y"; + rev = "e4fc3641aa3b52e30496bf34b87f70ef5506686e"; + sha256 = "05kzbw4zm4c213clfc6wn0pjqqyx3baivmbzyppmwmx54l6qqdsy"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8389,12 +8499,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2024-03-01"; + version = "2024-03-08"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "1527c93d7fcaea743f5ad8f1c58b11bbcffb38bc"; - sha256 = "0k5lcc3cml0bh9dwbkyyp7hj0wp783zzhl9k17ckv4kc56fz6qs4"; + rev = "ce4aacbaa50b6b44a3e69eee6a3f380e96ccdbd0"; + sha256 = "1i1n746bf0gfmq22ajj2p4f7819sql4f051gwjmcypd1hrn651lh"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -8425,36 +8535,36 @@ final: prev: openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "2024-02-02"; + version = "2024-03-10"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "52e2727cbd7b52cdc7a5bb52c77c07a329db6cba"; - sha256 = "06v4b07ary1swli801ay0g7jd14c7b3pp75vndkxab79nshcs88c"; + rev = "613c18967d42202f3e2a9ac788caf62a402e7c1a"; + sha256 = "1s1rnk1slw6bc9dvk70r9hgsva598n19smpyk89ix3h5xw81sr64"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; - version = "2023-06-19"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "salkin-mada"; repo = "openscad.nvim"; - rev = "d77e7b3822da685d24a58081e94c4384e254d91f"; - sha256 = "1sf8fhp7mfr9kwf7x1qf4gdbi4xc6qfwjlyyj1aykbxd1b39kg2x"; + rev = "5c35ce921a63d59f2a0bb20d872c15a0d4c8aa72"; + sha256 = "1l3xhv670apfjns12xzhf7sn3mf3gdd3xiyirydrnp7bxy7dyv1h"; }; meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-03-01"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "9d92c8f2c88a95b859710f77fdd8a35fb4c19694"; - sha256 = "1gfy8s1kbiy11p1n9fr10znhc1knqq5ilf2160n9zwd4ms60l97y"; + rev = "261c987345131a736066c25ea409f4d10904b0af"; + sha256 = "1k1q49gymnpb3b1kp5kwn8q0r6pd7smadjv1v9d70q4ij8j3hi9i"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8473,24 +8583,24 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-02-25"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "9f6e9c083e314c471a9f420baa80954b28c539fa"; - sha256 = "1idgx8p2hzcbjvdk69pih5gsagk18x1bdq5a3k17hhj0mcz5hz6q"; + rev = "6dd878c49520f7e53c75fc14d20dcf2c4a5f326d"; + sha256 = "0xjkp8fp8405bpjg0jwkhw6jris1sz39d46d0n4idyzxf5n8pcf4"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-02-21"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "4855aefcf335bbac71eea9c6a888958fb1ed1e1a"; - sha256 = "1p5cr628qcla3ad1nfnpk9vmaxxspvfjiimyw5n81giywlf136sg"; + rev = "b72f6d23ce47ccd427be2341f389c63448278f17"; + sha256 = "0b44hqiwgh1zvgwslwjmmry4qznpwaymydz0pjgks9msw8zbld06"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8570,12 +8680,12 @@ final: prev: papercolor-theme = buildVimPlugin { pname = "papercolor-theme"; - version = "2022-06-08"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "9051480ad9129ff4ab4fffb38b44779b9081626f"; - sha256 = "15vx37jy75xs1ibxrwwxi3p4yzgsw7y63l8ksaxvddg4lv63gidi"; + rev = "0cfe64ffb24c21a6101b5f994ca342a74c977aef"; + sha256 = "1w6j57lri4r79igzi5rvvfv93c3pb4lrvvcg95gpa9rg122plw15"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -8702,12 +8812,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-01-29"; + version = "2024-03-06"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d"; - sha256 = "0kr8c5fgvv7ijsvk4z0c9dawqy58mg5yz9yzx0al2ljax32lfqh1"; + rev = "f7adfc4b3f4f91aab6caebf42b3682945fbc35be"; + sha256 = "0brfbf9ygzb050p4kmk5mx17y8p5zvz2wa1zyw430cdrlqb68nzy"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8908,12 +9018,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-02-19"; + version = "2024-03-06"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "a6e7452de5944f7f38a4b12f1d50e460c1dccd95"; - sha256 = "0l2qgz51yh4pvx494k8p34xrda4mg38m9dwhy9sdxw01qy910xp8"; + rev = "67e09027b5d8bd948907734fc6fb15028ffdcd28"; + sha256 = "07p45qmxnc10kfn9syfqv5v5jm75rd8bs9gv90a246dxis4p0515"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8980,11 +9090,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-02-29"; + version = "2024-03-16"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "cfc3f53cfa0fbabd95bd33747288aea24fe45211"; - sha256 = "07qd0875h1ccvpx8kvb0wl0qvbgz6hcg2lwhsqwv1jmi7d95sib8"; + rev = "2200900e3c1aae21dadb65c2ea2e91bcc39ca368"; + sha256 = "1hbak03xdkj0gfg5zjqdmlaih3pjm0339qvd9jjbp29gzjy6q8hl"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9063,12 +9173,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-02-27"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "94444558fc651b7e36f39d86c518e44b4de15123"; - sha256 = "005bmgmlpqn876mjgykh072z1n4vl7xk76hxp99hqys7vp65b6gr"; + rev = "d2786877c91aa409c824f27b4ce8a9f560dda60a"; + sha256 = "0s0pd2b9hnz4rbgva1xad7lzg8z8mq7j8x15ppnrw6bplx5m35jd"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -9123,12 +9233,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-02-18"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "c27a0bcb84ab5534d89065d638119ed2dbbae189"; - sha256 = "078w4zr4h302i3d5vd31qypxr2yxhnz0yxkpgvam2z0l3mp07qz0"; + rev = "91badd46c60df6bd9800c809056af2d80d33da4c"; + sha256 = "13swdcp23fb4kl6hr40l3zv4m6zw3d0q91g8anphrv751xqjkyx1"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9243,12 +9353,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-02-27"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "b5342fcd1f8dc694d375983c60df928b58a02eb4"; - sha256 = "10slkraz8ap0apv2jii9ympxnxrr3rygazlz1qh6bbdnvy4s7hcx"; + rev = "69a22c2ec63ab375190006751562b62ebb318250"; + sha256 = "0nr48zm6wrldx43zc4v4j2jm6sp9627a2mjd6jh62bg4g210ipci"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9411,12 +9521,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2024-02-02"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "d8286f431981f32e5e6e494c8a6f9ffbd2ee1428"; - sha256 = "197bg1ndc33s2bcb026qy2cwazgaz9djgw1g9fcp7gj0ki900h1d"; + rev = "8d7735bfb810d919806da1e1c4f839fbc6ecccfe"; + sha256 = "1wb6k3zyk5xa2s6v9x5kly9wv6hi4mpw9630fkyj0ixc4z67y4j9"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9484,24 +9594,24 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-03-01"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "1339ffe7426d1b20f179ffc03f858eaab38376c0"; - sha256 = "0k00z8kvqzzkb0vmcgv24yzcxl4girw86avmg6pkjnyp273y9l11"; + rev = "83bdcc3db3b272a6e73b0f3aea0f5bc0a8da2696"; + sha256 = "1jj19kffws1fi309qzazq35szq43kdga732wvgy2sb4wc28s7vfs"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; smartcolumn-nvim = buildVimPlugin { pname = "smartcolumn.nvim"; - version = "2023-12-26"; + version = "2024-03-10"; src = fetchFromGitHub { owner = "m4xshen"; repo = "smartcolumn.nvim"; - rev = "a52915d6d9abf9972e249ebcffcc651cf9b062dd"; - sha256 = "1mqmbyy2a8b74xyag3jaz24pi3v8gzm0hvmw228s898bxqs496vk"; + rev = "cefb17be095ad5526030a21bb2a80553cae09127"; + sha256 = "1lddpzrqcvq4vqjqcc89zi851kn1r247m5c1sxn7zxh5sl61wwhc"; }; meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/"; }; @@ -9520,12 +9630,12 @@ final: prev: smartyank-nvim = buildVimPlugin { pname = "smartyank.nvim"; - version = "2023-12-06"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "smartyank.nvim"; - rev = "b048fec8c6b7d122adab6f78606057d59975ece7"; - sha256 = "1i9lyl7yy96rvjpl676pgs1irvrrqx8xsrbz9b8ri37md8h3zjym"; + rev = "d9e078fe08d6466e37ea45ac446a9f60e6866789"; + sha256 = "13l8mj2wp8a3n7n5k7c1pdywv6l8rlgahwg8mnbnk11q7i03a1y3"; }; meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; }; @@ -9773,12 +9883,12 @@ final: prev: staline-nvim = buildVimPlugin { pname = "staline.nvim"; - version = "2024-02-28"; + version = "2024-03-08"; src = fetchFromGitHub { owner = "tamton-aquib"; repo = "staline.nvim"; - rev = "c0f0d4ab31e0fe4aea466a016a81ca560bcaa7b8"; - sha256 = "0k5yd2l8v697djamw5p2k4pfbiy8cwszbln6y1h1c77viq7pm78w"; + rev = "c49f2deaba3d3c669e7243b57619e0078e7a351b"; + sha256 = "1d3mp5ymzi5pb8y246h38bydd2cw4iacakaj9a7r7hf87i6kfz6k"; }; meta.homepage = "https://github.com/tamton-aquib/staline.nvim/"; }; @@ -9893,12 +10003,12 @@ final: prev: suda-vim = buildVimPlugin { pname = "suda.vim"; - version = "2023-06-27"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "8b0fc3711760195aba104e2d190cff9af8267052"; - sha256 = "196fl3anzpw5999035xjmm00qsrg2d2mmbkjr7f72bk7rqiqyl8c"; + rev = "66727b416837836712975e748bc8a19fb6cf4ec3"; + sha256 = "09lbnx6mrqsrn6fvcp3mb6mkwbrkdrvr5rgzp43idj0ipm5j809h"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -10220,12 +10330,12 @@ final: prev: telescope-coc-nvim = buildVimPlugin { pname = "telescope-coc.nvim"; - version = "2024-01-10"; + version = "2024-03-02"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "96cd72d1e246faf16ef90a6f602330d1d03a446a"; - sha256 = "02wxz1pkz051wgjix933xszm61md3f0gr97ap5m3ljhg1blrpsb3"; + rev = "421f50c56d66bc8f39c5deec05532deb071b597d"; + sha256 = "1cf6990fkrzbagwphzkyh10i30hrv8vbqgmf4znva3ms1ad7ilhf"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -10244,36 +10354,36 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-02-15"; + version = "2024-03-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "48ffb8de688a22942940f50411d5928631368848"; - sha256 = "0f00kag7jjs7h9mz43jik45xmffvz0biiyj37qkzkq7s6zjgh7ml"; + rev = "8839e3f8070dfafa5b0c0e4652700298e7b872c4"; + sha256 = "0arrbh4n7y1x8gjj6qkfssrfh3ni6ls9lsvdzjwm4b7hq6b79pxj"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-02-25"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "771726f7d6e7e96e9273e454b1c1f49168663a37"; - sha256 = "06xwzib8x3c7l9dkrh3w9f6sy1vch6zy37hpy20hd5i38pks1x56"; + rev = "bd52772bf2e8d3e83f1575a018cf4a0e8c3c09a3"; + sha256 = "0i6qpsjj78yyqkvnxmk8rpf654ll649rvi6ck0qcf0v91m27i509"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; - version = "2023-09-10"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "6c921ca12321edaa773e324ef64ea301a1d0da62"; - sha256 = "101dxn7jfyg2wdzkw5cnrw475mg0p3w475l1hplqfhghz33zb1hy"; + rev = "9ef21b2e6bb6ebeaf349a0781745549bbb870d27"; + sha256 = "0lvykmaarl5nd3iaphp8jgnxg6cly5p6ignd3i1450rpbdp1w9xg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -10341,12 +10451,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-02-28"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "d08cb87f8789dbab4be37713ff50c3acbe85787d"; - sha256 = "0y3n270zkii123r3987xzvp194dl0q1hy234v95w7l48cf4v495k"; + rev = "bebbcf6d6980c6b8f843508d42f641413af0505c"; + sha256 = "08chi9p3gpgxvyb985fzzlfxpy13al01zv96mqz4kzl3k78nnz3j"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10486,12 +10596,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-02-29"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "5f5fc3aa75e9fc824d4fbbb5de31f172b43f620d"; - sha256 = "0yx5160hg3pj4n394jicw7h37px3g9xa6dywlf89zq6fjknj65fw"; + rev = "e9e01d699843af530ef4ad2c8679a7e273bb3dd1"; + sha256 = "0p4yfxdgf6wjzhg72ial4rzls7imsbf6skf82q1nqg7ihkng9rby"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10522,12 +10632,12 @@ final: prev: tender-vim = buildVimPlugin { pname = "tender.vim"; - version = "2021-05-24"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "7746453a045eaa97dc413a7209268345f33f3243"; - sha256 = "0yxgcnx5x82ak74nz3pvkd1z8i3c7lcl068lh5izdpx65fk7m5yh"; + rev = "ff01136712d2000760c7077f2aa06dac7987b696"; + sha256 = "091xrfpa225ia8fk6rr30hzih1wcanmpf5chp3bx8fj0nwmd06wv"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -10678,12 +10788,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2024-02-12"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "9c02adf16ff2f18c8e236deba91e9cf4356a02d2"; - sha256 = "0lg3zcyd76qfbz90i01jwhxfglsnmggynh6v48lnbz0kj1prik4y"; + rev = "63e9c5e054099dd30af306bd8ceaa2f1086e1b07"; + sha256 = "0ynzljwq6hv7415p7pr0aqx8kycp84p3p3dy4jcx61dxfgdpgc4c"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -10739,12 +10849,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-01-31"; + version = "2024-03-10"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "610179f7f12db3d08540b6cc61434db2eaecbcff"; - sha256 = "1vdw6rav1y4i4x8pgxh6lgi6d21fvvzkw25maihxh865zrqrsc4v"; + rev = "c025baf23b62f044eff1f4ef561c45de636f0e32"; + sha256 = "1sd5ib228yw8vxb4xfg0pgbd06r90kz6pq8bn4f5qhrwi91jnvn0"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10782,7 +10892,7 @@ final: prev: rev = "fd35a46f4b7c1b244249266bdcb2da3814f01724"; sha256 = "sha256-wT+7rmp08r0XYGp+MhjJX8dsFTar8+nf10CV9OdkOSk="; }; - meta.homepage = "https://github.com/xiyaowong/transparent.nvim"; + meta.homepage = "https://github.com/xiyaowong/transparent.nvim/"; }; treesj = buildVimPlugin { @@ -10811,12 +10921,12 @@ final: prev: trim-nvim = buildVimPlugin { pname = "trim.nvim"; - version = "2024-02-26"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "17a16c532a0ba1528fe9a4d79015b2843734502d"; - sha256 = "0p4nv4nyand3ksdg8wk8lybph6f9rcnrk4kn5awlih23nx88bsi1"; + rev = "4fe47a46c02a58894ded8328ca81f6c214a892f5"; + sha256 = "1h8w50an3fmp8xl052apblsnm0x70m1ykygjn5wb94wsb7crydl9"; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; @@ -10919,12 +11029,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-02-26"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "ff57d27cf5ee7427941a63fb537714f9a80e0246"; - sha256 = "038llp0k4n1vnh06wgxf02qjik18as0cg346xz36f0h9hizxf36l"; + rev = "8dbc6160138b8d12adbdce5d54595de9fbee9e8c"; + sha256 = "18ajsy8cfqs4si0xz6l72w4a3015icxc59mibcvxa5m42hjvxf6s"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10943,24 +11053,24 @@ final: prev: ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "2023-10-17"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "b393ba65386d47664421e1f8b246a87a6e8b218c"; - sha256 = "1g6r2nd3nplilgp6fj012smlhs857kn10mb8qab2phh2ja1r25c7"; + rev = "49dc8cb2086db19d385791c8e1635723b0fd95c7"; + sha256 = "1awhd7iprh4387m97pak46cw81240wqyrrrkkkzgmw1qzmwh3nip"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPlugin { pname = "undotree"; - version = "2024-02-11"; + version = "2024-03-08"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "9dbbf3b7d19dda0d22ceca461818e4739ad8154d"; - sha256 = "1avs5cmwcnp5pnyk2d6krsmgqlbd5zf32nwwcxk5ac1mhyx9fcln"; + rev = "aa93a7e5890dbbebbc064cd22260721a6db1a196"; + sha256 = "110w9nr24rph717w1vs3vhfq1ggsjgq91zvyp431qxpa7wzd5pyk"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -10979,12 +11089,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-02-29"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "d20e9b1fe531a280b6f248a3d0dde1d8fb866491"; - sha256 = "11fxrw31m9bq20gkh30wcfz155wfd9rzmh4if5spxrnfiar8vqh7"; + rev = "dca4fa3a6c4713cb53621ba0bc04fba86060f8c3"; + sha256 = "0ppr7hiakykdwf9ss2xnlx6cf4z3x4jvl28xz85n4qgi6yq5y025"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11075,24 +11185,24 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-02-25"; + version = "2024-03-11"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "8021ee9734e08ace56b5ddf92d929d13b5352509"; - sha256 = "1vbflxjh3x4a4agg7ha6qdxdl843dhk1g522m1ddmlx26w8gxq6c"; + rev = "7a3dcb5796d7f8967fb3f53d0eb18526a41766eb"; + sha256 = "1w1z25lf50m6yjjr7ss96scgii3k020bzvfcbypjrx72gnqrv18g"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; - version = "2024-03-01"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-CtrlXA"; - rev = "1c8621b1b0018d7fbe7cc8ede03595acc7b83a91"; - sha256 = "0zsl85fn5nf2ffmv130nr49zzxspw97k48pdwnh87lbn4rs8pixg"; + rev = "26ab577a888c6346a009702caa4522e73b42242f"; + sha256 = "0ji9dabhylj83wanbsg3glag00ajfzdchd5jd9j2pv7aldndvbpa"; }; meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; @@ -11723,12 +11833,12 @@ final: prev: vim-bracketed-paste = buildVimPlugin { pname = "vim-bracketed-paste"; - version = "2022-03-21"; + version = "2024-03-06"; src = fetchFromGitHub { owner = "ConradIrwin"; repo = "vim-bracketed-paste"; - rev = "45411da73cc159e4fc2138d930553d247bbfbcdc"; - sha256 = "1bz40p7zr439ziy7mfks4jcs5rdnw4zinp81fw6wsm5knrx1r5qy"; + rev = "ffa3bc10ab511a646f1b30bc9345f240c15394e9"; + sha256 = "0vd2da853c9ms7dzqfcr8wz58gfiq4if20cn530hdg5b3pbsl6z2"; }; meta.homepage = "https://github.com/ConradIrwin/vim-bracketed-paste/"; }; @@ -12131,12 +12241,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2024-02-26"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "acb78e078dc4fe1e997ebf006be17aa3766d2ef4"; - sha256 = "0bfyj49wkdlila4qnf9ymf06z8kzfx74f932yvg1n4b25m1gyqf0"; + rev = "960bbb7de11b7282a68d579a64e838b487934493"; + sha256 = "0x7ax3d6srqa8b7hhnyxh8rp2f9aiv5z5vlv5n6mjgjgcpbqydg6"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -12662,11 +12772,11 @@ final: prev: version = "2018-11-13"; src = fetchFromGitHub { owner = "fsharp"; - repo = "vim-fsharp"; + repo = "zarchive-vim-fsharp"; rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; }; - meta.homepage = "https://github.com/fsharp/vim-fsharp/"; + meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; }; vim-ft-diff_fold = buildVimPlugin { @@ -12695,12 +12805,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-02-24"; + version = "2024-03-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2e88f14a585c014691904ba8fe39e6ea851c9422"; - sha256 = "1218q9q6za9zlc383f6v2k6grl0sbsdc6rfi5cwssypp6npcmyfm"; + rev = "41beedabc7e948c787ea5696e04c3544c3674e23"; + sha256 = "17vwycm78bxk7y2s931lz3plzsfx39mkbgc4dnhbp9np16ywb0hc"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13441,12 +13551,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-02-08"; + version = "2024-03-04"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "974b16e257e2d30d94ec954d815ff2755fa229fb"; - sha256 = "0n0n9dgcp7fqc299khjddn661sv0pbbc17qsnnqwqh2fmdfpdnpc"; + rev = "ace92c34d72a413d51459ce5e9503e50f3262988"; + sha256 = "18vl1ci6plwfhvq542ad7y2vygfidq7f1cn00s6pf0npiyhghsi4"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13705,12 +13815,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-02-28"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "2bdd9757e71384eab3b5eaec846a194cf70ae5f3"; - sha256 = "1c5bsnb1nv88m9rz2ks90c2laqwkkf0ac8h4kzqx7kxc6as8xin5"; + rev = "b93c195d521ea4d6559880eb8d18f5a503e946d9"; + sha256 = "047654s76zgv64hp2rvx94w5prb6i5wz7l6zbifa2m4ac9sjyqr2"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -13814,12 +13924,12 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2023-12-13"; + version = "2024-03-10"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "0e2c7cdc3ac1d067eb309a10220d001bb7be39cd"; - sha256 = "0ggdbvv4mca4z0xhkdybimc4yy3bah1v21660wjs8n2v4f5rvslx"; + rev = "5acf680e820940b1bd78a501298ff953455b8d65"; + sha256 = "1r3nlqd7b6g5hrcqwrqm0rg095d9a6dnwazxw66wkda2psyj9xdd"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; @@ -14450,12 +14560,12 @@ final: prev: vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2024-02-24"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "2f8f04cf79f424aab8c2372d8e0b89099e3dba65"; - sha256 = "03jvf9fcz5894g990jbmn7mr9afl07fkglph2lz3b5015i6ywy08"; + rev = "2cd7bf673b5796ad7ee341a4b595a5479c4e9201"; + sha256 = "0m0y9gi200aqvpb17cy5sjlkqm6vnd942xhq817wjpf5kgbdj4fk"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -14558,24 +14668,24 @@ final: prev: vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; - version = "2024-02-26"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "afc737df8cb62bf630813edb84fd344b025b8b1a"; - sha256 = "1kfn7arvdmyd0wc5kvb2hykwy7h44d2i4psmy70z6h6iy8lhhd42"; + rev = "729f3630a4c19e52e1fd825802d2a1659daeaf48"; + sha256 = "07mg6m47x9ab6awlc1kviahgzmfdxm1ykvnqrlf81msa5gb4a36k"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; vim-prosession = buildVimPlugin { pname = "vim-prosession"; - version = "2023-11-01"; + version = "2024-03-07"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "a79ac2677c5f7ee766454b6c30f21bc033049037"; - sha256 = "0rvimllhz91yykwqgl1ffxc19c4dds4q17wa4ip0zv7y7fydhzvf"; + rev = "1cb2eadde0b79f49eb4b5a54cc78735aea33cbca"; + sha256 = "01ky6lgxcb9ghgmd8bw0ja6rvd0hsds8fzdpa7dn8j6x7yl4mcbv"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -14594,12 +14704,12 @@ final: prev: vim-ps1 = buildVimPlugin { pname = "vim-ps1"; - version = "2023-12-09"; + version = "2024-03-06"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "be5dce9cd15176c6b1ecd056a8ced93fc2f6efac"; - sha256 = "1k8a1ilsshjvahf9az1x8nalb5wkin8jxzi3zqc658liww2qm98z"; + rev = "839cec1550e09fc902c74103053e9e765051083d"; + sha256 = "0cpkxhyvcdbwicyb6h1lknb0r666rxlgjx6pq5s1xwxqva6lpmqv"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -14906,12 +15016,12 @@ final: prev: vim-sentence-chopper = buildVimPlugin { pname = "vim-sentence-chopper"; - version = "2023-02-15"; + version = "2024-03-08"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-sentence-chopper"; - rev = "39f50c65a46909e8c4c808310fa4187a8e3c1b38"; - sha256 = "11kcja7gpi7ri7j8241ay6py75a6va72qv0bl2w235vx0l3zv486"; + rev = "b1394d3dbc3675324b2735c12f0df99395d9d7ba"; + sha256 = "12llyn54qmbwzvn3m08r8k1fp6xwqp71sbbkp9j587kd4d6y5kps"; }; meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/"; }; @@ -15314,24 +15424,24 @@ final: prev: vim-tabby = buildVimPlugin { pname = "vim-tabby"; - version = "2024-02-01"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "TabbyML"; repo = "vim-tabby"; - rev = "0b62bc2ed5c7d930c7435c3504d5c18ea6379b28"; - sha256 = "06crxhvwz04s6sfj0q22kkp3g5zvip13088m95qwznw9bv2gpx3s"; + rev = "afd76df166ed0f223ede1071e0cfde8075cc4a24"; + sha256 = "0wp5c1m95k000sw8j4b8rwphmkg529dscch6ps50fjn9j91ab96g"; }; meta.homepage = "https://github.com/TabbyML/vim-tabby/"; }; vim-table-mode = buildVimPlugin { pname = "vim-table-mode"; - version = "2023-10-29"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "4ff8de2ac93431ee6d85a9e04177012752e6abdc"; - sha256 = "0wpdh17chadai08kbvd1gkfyzv5b64l4nwbj80jgsig5p4qqz3pj"; + rev = "e4365bde024f73e205eefa2fb78e3029ddb92ea9"; + sha256 = "0n7wsh9mrh4n24wwdgdwk52sqrwzii6v5bkvbihhaxbwhxq397pj"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -15411,12 +15521,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-01-26"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "46d2067586b788e2194e812bbfdbb2061b93a5ee"; - sha256 = "150wl2gky4v4qs9czag3q64p4xcp1x53dyy5dkiyz2bwalphwv01"; + rev = "a49c9cade75e97cace5e3ba545ce82d02f689feb"; + sha256 = "0mw7jzi5qf4wn4zbm63ddn2xa97fhd38rp68ddnbvj8lqqjjkxam"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15507,12 +15617,12 @@ final: prev: vim-themis = buildVimPlugin { pname = "vim-themis"; - version = "2023-11-06"; + version = "2024-03-02"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "77b37bef259b9979e15fd7fdaf659cc167487f21"; - sha256 = "1xskpb8ah9p5qw5vljc12zq7alm95xjhlcy78jhahb48nkf2b39l"; + rev = "5c8df1b5fa495ece990df5596d8e7fa1be2c2355"; + sha256 = "14v75zl5dgxi9pyv8vm79gd578mnq0mw4c947v8f2zhlc4xbda04"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -15831,12 +15941,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-02-22"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "285c2e4e48fb0c63ced233c00fb10a2edb3b6c94"; - sha256 = "1f7jqmsr7b9103g9fif3p8fglrqlgk5nf3ckhkjpwfy6355vk41h"; + rev = "56b4d073adaf18c04c7bb5728d41c03b2f25754d"; + sha256 = "1qcx81hgamz4v7nxhbx0kbwsx2qm0b7rsgpja16imhycvlaf28n1"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -15927,12 +16037,12 @@ final: prev: vim-xkbswitch = buildVimPlugin { pname = "vim-xkbswitch"; - version = "2023-05-11"; + version = "2024-03-12"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "42b55bfec8f6dbd715135ce582a6f769831face1"; - sha256 = "0asqj8icak9a6rqvf0xqax1g6lj0gjp6c2yhmmrzql5d4kbx1id6"; + rev = "42ef558e792e35600e608d1cd7ad8a760f157269"; + sha256 = "0aim4bdznk4iklz67nrbw67x3vjv18nmiqy2730b75kl88v0n6iw"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -16156,12 +16266,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-02-27"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2bb7cdc17c0ac18266e4c96083290956169c1c38"; - sha256 = "06y7hhv86xgms4wli5sqhlsdpcb08lv6yjx0k7y1yp69sfyb2cxp"; + rev = "577f7c59a4c0047ef354eb2f6fef39cbdc9a4556"; + sha256 = "0bglgaqdy6abdf4cnyyqqlh33d9537k1w6jmkzzb90q8mwlvy23k"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16240,12 +16350,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-02-29"; + version = "2024-03-13"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "2f248dceb66b5706b98ee86370eb7673862a3903"; - sha256 = "0261ahb7my88kkw91b0n9y0ss6whsr2gilma6a1rbjpbmymskljv"; + rev = "ea9ff6da3756ab229bcb59aad1ea7749eb15b065"; + sha256 = "1m2zb5wzcdvhir7ijk49r210s7r6j8yzjgx9w60pqjh1pywi423x"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16649,12 +16759,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-02-24"; + version = "2024-03-05"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c0de3b46811fe1ce3912e2245a9dfbea6b41c300"; - sha256 = "12m5jzp2xyv0hyndscnj7708b8rczsmqqr0kd4ng7kh5ll0xr8br"; + rev = "045e3499d9ec8d84635fb08877ae44fd33f6a38d"; + sha256 = "1l86f56lcb0rklg1mipa9ssvgipx02vl5f4d60m5xary72qsgcva"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16745,12 +16855,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-01-30"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "56fe47bd16272d9644fd9946a2596fa2c3905c35"; - sha256 = "075iagcglwl2ggl1p6p0lmkpfrqsr5g48j3pix3xb5sx82697l3j"; + rev = "43ca56b9035be8b276889637c281f4d7d8833e1c"; + sha256 = "1if5l751gym0810ysbls1pp5c9b7il9vzqngzf4936bs9gw7wzql"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -16769,12 +16879,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-02-21"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "7b3225264af17a9e0aff0b4fd2a0fac90b73db53"; - sha256 = "00frh2f0vgz9h3ajbig2df6a6jj1sarbwxnxzr232vi25azysy2z"; + rev = "5a910659cffebf9671d0df1f98fb159c13ee9152"; + sha256 = "10zxpzi2xzniy128f7871dc309flsda69las1ngyv7nclzq5mdwz"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -16817,12 +16927,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-02-14"; + version = "2024-03-15"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "f977eeba34b030b37f93ece2fbd792477606203b"; - sha256 = "1mlpqm0g8nx8pfnn5kgg8scqayjl6n3x4jnnpbb4hharrrp37sb6"; + rev = "c52167563e6aa44b5fa6fe007faa2bcac71050f0"; + sha256 = "1sghyhmr0zsgd4qj1av8hxx9ca5kx9ks2zynrm13bnyr46kci73p"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -16875,5 +16985,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + virt-column-nvim = buildVimPlugin { + pname = "virt-column-nvim"; + version = "2023-11-13"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "virt-column.nvim"; + rev = "b62b4ef0774d19452d4ed18e473e824c7a756f2f"; + sha256 = "sha256-7ljjJ7UwN2U1xPCtsYbrKdnz6SGQGbM/HrxPTxNKlwo="; + }; + meta.homepage = "https://github.com/lukas-reineke/virt-column.nvim/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 7006b2e8064f..518473b45124 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=6d02054"; + version = "0.0.0+rev=62179d7"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "6d02054ae9aa1fedf5097fe6d93dd78f751dff21"; - hash = "sha256-Bm3I9a14WMNqL+nt5qr8Bd0Z4BOTCCF25wFrJ07FCSw="; + rev = "62179d7bbfb5fd8a8f7298495ac654d252a1bd52"; + hash = "sha256-qRsBeJ01kGTKJqFubG1u9SFa1nsDH7ZHKQ0cGwfqi84="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -50,12 +50,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=7722d43"; + version = "0.0.0+rev=e3a0a7f"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "7722d4398d87ea22c4877264f88b45bd7ce0cba5"; - hash = "sha256-pNiJY+KJ8QrL7xXOX/NRIFxIbXmf9DkVC9FUvXlk5qQ="; + rev = "e3a0a7f60e544afc478b72cdda7ffc0f2f889db0"; + hash = "sha256-WdGCnZSMxyNJJYHB5H5Atc9EW2/0oB22/OWyxTrQHT8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -94,23 +94,23 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=207b049"; + version = "0.0.0+rev=ba74721"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "207b04974c83d8d25a947e4d09763675c4617da7"; - hash = "sha256-sW6ix5j9VpeQj7dct9u3cJ8sXgjIQlhQ7Nnh2S8wWbk="; + rev = "ba7472152d79a8c916550c80fdbfd5724d07a0c9"; + hash = "sha256-ywrd9wCdrQ9UZPXvB8fUkelFaZzHxL+hDAPSecMueFs="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=975bc70"; + version = "0.0.0+rev=f3f26f4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "975bc70ad95dbbf2733872bc2e0a059c055db983"; - hash = "sha256-SU5wBy81aANd7oUZvYR14Vd53Ml/cBSwDtO6uG34CaE="; + rev = "f3f26f47a126797c011c311cec9d449d855c3eab"; + hash = "sha256-6Rfxh8Y6dg2wyQ9jYnbOaXm1SVfQDQ1B1tNqgpz6sY4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -127,12 +127,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=1f19abf"; + version = "0.0.0+rev=6c665e7"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "1f19abf1e162e1828013cb5434c6cf30f4054e80"; - hash = "sha256-yb6z5iLMoK1wWCS9laA1muRVLssFwnyAg4SKWVsti0s="; + rev = "6c665e7cf15d76a1687959643868a78fb381458d"; + hash = "sha256-hVFPt+ndXx38SH/e/dORz226SQwDNu1j4cinvJLhkTM="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -182,12 +182,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=652433f"; + version = "0.0.0+rev=371fd0b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "652433fce487d8c3943207da38e3e65e4550e288"; - hash = "sha256-Ld8ufwdOVqRYb9YpOa6z6fWoA+gj0w0nlq3dqhFCap8="; + rev = "371fd0bf0650581b6e49f06f438c88c419859696"; + hash = "sha256-zaH4b5lsOtnl1e07ERU2mP/IFvg90YjsFFhvz+EY/ig="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -248,12 +248,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=f8de25f"; + version = "0.0.0+rev=7dc1582"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "f8de25f30757a2def006a7c144354710fe63dcf3"; - hash = "sha256-J8Ro3J9kkH7k/v+nwekCotoS/l28yInhk9p/xaSbegc="; + rev = "7dc15823107831729c64a917c796a93cf5c6a7e3"; + hash = "sha256-kz/FnQMibzmZ6O/x92q8IfrriO0vUlZhozIzhS0jRyo="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -359,12 +359,12 @@ }; cue = buildGrammar { language = "cue"; - version = "0.0.0+rev=2df92e6"; + version = "0.0.0+rev=8a5f273"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "tree-sitter-cue"; - rev = "2df92e6755337e9234ad18ffef37f35d95e2ba9d"; - hash = "sha256-RsWbGMC2RXfZlZnkXJclMwiGecZ8Sc1OPkG+mmE5r6Q="; + rev = "8a5f273bfa281c66354da562f2307c2d394b6c81"; + hash = "sha256-uV7Tl41PCU+8uJa693km5xvysvbptbT7LvGyYIelspk="; }; meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue"; }; @@ -768,12 +768,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=6bd8196"; + version = "0.0.0+rev=523a1a4"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "6bd81962d1abe309bf5dffde3315e4a5988f35fd"; - hash = "sha256-aSgnTbhpekeDDUzz9hecebW5ejCnmLiE5d1fTTxP19g="; + rev = "523a1a4f0f674eff7fbf46addfa6ef7644151aae"; + hash = "sha256-QWWX/92yOZES1XgcCTu77tgcfeRhaUEJJudCCopMBrk="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -790,12 +790,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=58b7cac"; + version = "0.0.0+rev=2012f29"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "58b7cac8fc14c92b0677c542610d8738c373fa81"; - hash = "sha256-VtuGsa8jKndxlyJKy9UHfZXvAgr63Q0iwceXKfEUAYE="; + rev = "2012f294baacf30e7a62414754021284377366c6"; + hash = "sha256-W+PfxqPUKHhLH5UBATmQ1mlSfLPAWIQyDgiSQBWBtBs="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -887,6 +887,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; }; + gotmpl = buildGrammar { + language = "gotmpl"; + version = "0.0.0+rev=17144a7"; + src = fetchFromGitHub { + owner = "ngalaiko"; + repo = "tree-sitter-go-template"; + rev = "17144a77be0acdecebd9d557398883569fed41de"; + hash = "sha256-aB8MTTKzxV9+66goNfFRI39wzuBiGECAc8HvAQzIv80="; + }; + meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template"; + }; gowork = buildGrammar { language = "gowork"; version = "0.0.0+rev=949a8a4"; @@ -900,12 +911,12 @@ }; gpg = buildGrammar { language = "gpg"; - version = "0.0.0+rev=d4c9cc0"; + version = "0.0.0+rev=f99323f"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gpg-config"; - rev = "d4c9cc0060cd4d1b8ca6d7add9f34352ad310a09"; - hash = "sha256-kV9GN0qdVNA7LFYoCM/ISEW4Mpd5v9+oHV83XgEJTRs="; + rev = "f99323fb8f3f10b6c69db0c2f6d0a14bd7330675"; + hash = "sha256-VJXXpHVMKUNaslsjoKR6XsaUJ8C+0MyidXtRPRywnpg="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config"; }; @@ -988,26 +999,38 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=e135399"; + version = "0.0.0+rev=e936d3f"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "e135399cb31b95fac0760b094556d1d5ce84acf0"; - hash = "sha256-Ylxpj+e9YGhyRRRCCVs0g/zhwHpwGELxG2i+E3SFmpQ="; + rev = "e936d3fef8bac884661472dce71ad82284761eb1"; + hash = "sha256-lcvs4auZrMb1f9ocrAnLVxX8JnvrPT18LsJBqoNG9Oo="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; heex = buildGrammar { language = "heex"; - version = "0.0.0+rev=4a36c9a"; + version = "0.0.0+rev=b5ad6e3"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "4a36c9a388505180da6ee0eda1d8afb8c83481c8"; - hash = "sha256-6gdAxNI81jbN8XZALRw31kFQRZg8ge/O7QRprLZpWOg="; + rev = "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"; + hash = "sha256-o0ArFfBJTrEQVXVet+AIDPCB/b9KKvOYrrtMGyLgtM8="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; + helm = buildGrammar { + language = "helm"; + version = "0.0.0+rev=17144a7"; + src = fetchFromGitHub { + owner = "ngalaiko"; + repo = "tree-sitter-go-template"; + rev = "17144a77be0acdecebd9d557398883569fed41de"; + hash = "sha256-aB8MTTKzxV9+66goNfFRI39wzuBiGECAc8HvAQzIv80="; + }; + location = "dialects/helm"; + meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template"; + }; hjson = buildGrammar { language = "hjson"; version = "0.0.0+rev=02fa3b7"; @@ -1065,12 +1088,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=b5d9758"; + version = "0.0.0+rev=b285e25"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "b5d9758e22b4d3d25704b72526670759a9e4d195"; - hash = "sha256-v3BD36OKkzJ1xqQV87HAyQpnQzi/4+PuyEAM1HfkW3U="; + rev = "b285e25c1ba8729399ce4f15ac5375cf6c3aa5be"; + hash = "sha256-bAFSq2FXtSvFY8FrpeDgXXSq66QZsUrdz1As07B45u0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1153,23 +1176,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=99b29f1"; + version = "0.0.0+rev=5e62fbb"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "99b29f1ed957b3b424b6e21f57bd21a9732a622a"; - hash = "sha256-2A3dXO+N3M7GEiI06Dn28vU73Bow6vK0deC85mY058Q="; + rev = "5e62fbb519b608dfd856000fdc66536304c414de"; + hash = "sha256-Wki+tdLzYINDbZMFd79QIDNK46rtzx25Qy0mB54eWN4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=51aed72"; + version = "0.0.0+rev=de1e682"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "51aed7263d33bee46b0a8a5e165ffcb690d5aca8"; - hash = "sha256-FDnVwYpPgenOTgWaX/VdmtUmmIbCm/TtkiQ3TFoQjYY="; + rev = "de1e682289a417354df5b4437a3e4f92e0722a0f"; + hash = "sha256-HhqYqU1CwPxXMHp21unRekFDzpGVedlgh/4bsplhe9c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1274,12 +1297,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=4e909d6"; + version = "0.0.0+rev=260afd9"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "4e909d6cc9ac96b4eaecb3fb538eaca48e9e9ee9"; - hash = "sha256-Rmq5G+7h/XSNX7JYtpAKcWbOZ1aZpBpe9GpaizK2DRk="; + rev = "260afd9a92bac51b3a4546303103c3d40a430639"; + hash = "sha256-cmtUGmytAgiqBi31CNxEX+vE3YXmH1hphsIHvGRd7SY="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1373,12 +1396,12 @@ }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=04c9579"; + version = "0.0.0+rev=a24dab1"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "04c9579dcb917255b2e5f8199df4ae7f587d472f"; - hash = "sha256-kzyn6XF4/PN8civ/0UV+ancCMkh7DF2B7WUYxix6aaM="; + rev = "a24dab177e58c9c6832f96b9a73102a0cfbced4a"; + hash = "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; @@ -1439,24 +1462,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=2821521"; + version = "0.0.0+rev=b2f0198"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "2821521a4e6eab37b63dff6a8e169cd88554047d"; - hash = "sha256-JoZ/CKIMHVowwqTMFdys+Qu1CHMsP+8Wr2LJo5h30B4="; + rev = "b2f01981a76e3251f5b660378136c248ed106b81"; + hash = "sha256-6gxtiO6Dzo5BELdw/dAaQB90SJYelr/RqvTzNK55caA="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=2821521"; + version = "0.0.0+rev=b2f0198"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "2821521a4e6eab37b63dff6a8e169cd88554047d"; - hash = "sha256-JoZ/CKIMHVowwqTMFdys+Qu1CHMsP+8Wr2LJo5h30B4="; + rev = "b2f01981a76e3251f5b660378136c248ed106b81"; + hash = "sha256-6gxtiO6Dzo5BELdw/dAaQB90SJYelr/RqvTzNK55caA="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1507,12 +1530,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=117cbbc"; + version = "0.0.0+rev=992c756"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "117cbbc46bbf82ae30b24f8939573655017226da"; - hash = "sha256-c0+Pvhe++fHmRL9Ptri+vsdRN3MCb2Z/7EqWmFaK/CE="; + rev = "992c756686eb968af752ce75a874591042a8e24c"; + hash = "sha256-nm7YSwj10p6GKR7lUJZ5SZeiW8fh+5ZI52haeUM3oDE="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1541,12 +1564,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=33a64ec"; + version = "0.0.0+rev=58baf89"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "33a64ec9a27058c52e4195f1030235dcdfc04747"; - hash = "sha256-gTOePRg5ZEXfBL35biG6abpxW2eycgbHIzaL6w4g8rc="; + rev = "58baf89db8fdae54a84bcf22c80ff10ee3f929ed"; + hash = "sha256-WuY6X1mnXdjiy4joIcY8voK2sqICFf0GvudulZ9lwqg="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1640,24 +1663,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=9965d20"; + version = "0.0.0+rev=712d9bf"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677"; - hash = "sha256-9Y/eZNsKkz8RKjMn5RIAPITkDQTWdSc/fBXzxMg1ViQ="; + rev = "712d9bfa1d537c5899dde5538767ed2d8bb37a93"; + hash = "sha256-l4hchr03Jrsat863K8wfBeHo1o9dw0T3RAl4MMWKIHA="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=9965d20"; + version = "0.0.0+rev=712d9bf"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677"; - hash = "sha256-9Y/eZNsKkz8RKjMn5RIAPITkDQTWdSc/fBXzxMg1ViQ="; + rev = "712d9bfa1d537c5899dde5538767ed2d8bb37a93"; + hash = "sha256-l4hchr03Jrsat863K8wfBeHo1o9dw0T3RAl4MMWKIHA="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1742,24 +1765,24 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=78a78df"; + version = "0.0.0+rev=ad414fa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "78a78df5e06b4c13173af2a1f607c9a853d0f240"; - hash = "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw="; + rev = "ad414fa5497328e96ef992d80896f19c77584f7c"; + hash = "sha256-is5jtMg3G4ay+yF1Eti0jDljlB4vmibLPW0qup+8VeU="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=78a78df"; + version = "0.0.0+rev=ad414fa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "78a78df5e06b4c13173af2a1f607c9a853d0f240"; - hash = "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw="; + rev = "ad414fa5497328e96ef992d80896f19c77584f7c"; + hash = "sha256-is5jtMg3G4ay+yF1Eti0jDljlB4vmibLPW0qup+8VeU="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -1921,12 +1944,12 @@ }; puppet = buildGrammar { language = "puppet"; - version = "0.0.0+rev=3641b9e"; + version = "0.0.0+rev=5849f96"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-puppet"; - rev = "3641b9e854ac9c84c7576e71c4c9a357bcfd9550"; - hash = "sha256-J1DBjQRdV4R85NTyg/qmwbjm1bryKe3UOdp4XyH6BQc="; + rev = "5849f9694197a6e822872945b415429c285fdd54"; + hash = "sha256-Lwfiby7amjTIOz8QRoC4RdZyFPfFikmQ2sqta4akyH8="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; @@ -1954,12 +1977,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=22d3f87"; + version = "0.0.0+rev=b8a4c64"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "22d3f87bdafac2782e907330babe4af574f5d0b4"; - hash = "sha256-tyEawslx00ZwohMZo4HBa/INfbS7q6Ob2LO7pvowobk="; + rev = "b8a4c64121ba66b460cb878e934e3157ecbfb124"; + hash = "sha256-ZTqWyr4+pOyXY4X/WnYdn9Sgp7T8FEEUy/TQPuFqb4k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1998,12 +2021,12 @@ }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=a0ccc35"; + version = "0.0.0+rev=176a380"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "a0ccc351e5e868ec1f8135e97aa3b53c663cf2df"; - hash = "sha256-H2QLsjl3/Kh0ojCf2Df38tb9KrM2InphEmtGd0J6+hM="; + rev = "176a380df78800167565118bb0dadfc961abbd43"; + hash = "sha256-b9M213q6dmuK65llDTMW7rksrOyTEzlE0kdAVv0fDnA="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -2020,12 +2043,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=e4ba1a9"; + version = "0.0.0+rev=b5a2fe7"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "e4ba1a9674a3b4dd7905d04f194ae6f8331be342"; - hash = "sha256-4+TRol2i6ibuXqBr6O8jI/4MZq8hnf09eVBtPqaKp8s="; + rev = "b5a2fe74cac87dc5342b366f50db71d421e7cf8f"; + hash = "sha256-TPQw9Yd194tTD2k+qzzGjMInCAJ9WeZuRPRD96zLGzs="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -2108,12 +2131,12 @@ }; rnoweb = buildGrammar { language = "rnoweb"; - version = "0.0.0+rev=502c112"; + version = "0.0.0+rev=1a74dc0"; src = fetchFromGitHub { owner = "bamonroe"; repo = "tree-sitter-rnoweb"; - rev = "502c1126dc6777f09af5bef16e72a42f75bd081e"; - hash = "sha256-aGEhy4uMhKFbL0+JO5rrn3GIe//8PZpDHEMDGHDlBCY="; + rev = "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"; + hash = "sha256-sCjSS6iunij2SXHNzQcTq0HKawH9i5h/vQ6yl77opXw="; }; meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb"; }; @@ -2152,34 +2175,34 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=22a0bb2"; + version = "0.0.0+rev=9d86f37"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "22a0bb2678755a3714e194609862ea7f4516e807"; - hash = "sha256-lD3pRbQZDyqIkiknuXAkXd+6aHqKUY/8SNwQgfnrbBw="; + rev = "9d86f3761bb30e8dcc81e754b81d3ce91848477e"; + hash = "sha256-Ibfu+5NWCkw7jriy1tiMLplpXNZfZf8WP30lDU1//GM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=2d7bac5"; + version = "0.0.0+rev=3a56481"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "2d7bac5164c344c95530c16dd5c8fa1319e34308"; - hash = "sha256-k5/tfG8ONOK8ARgHwpxqB27sJWHioTd5WfCpmMZ1vJY="; + rev = "3a56481f8d13b6874a28752502a58520b9139dc7"; + hash = "sha256-6ROXeKuPehtIOtaI1OJuTtyPfQmZyLzCxv3ZS04yAIk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=e02f003"; + version = "0.0.0+rev=70b4fe6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "e02f003d78dc269fef287b9b7b9963dc1f26bd7e"; - hash = "sha256-LkrZ+y7QSAGe/kkkdUSyFQJFmD/mOI5Ps/wxD3BAkDI="; + rev = "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"; + hash = "sha256-ZwrsEhlZGVJMP+GRIlaxGqS1b7HtiQelg3QBwJT9Igk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2197,12 +2220,12 @@ }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=85b6188"; + version = "0.0.0+rev=6c77a5b"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "85b6188fb77c03dfb01d13e58e2844450506860c"; - hash = "sha256-v+iQpeAeySKPgMu5IQ8vNnUSc2duX1vYvO3qqK1/Pmc="; + rev = "6c77a5bcfb9baceeaa79ef67354b2d501b37b085"; + hash = "sha256-HIZ8j8a5ejB87rTBaMpNGRGL0TGqXiuV/BxfU4aj17s="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -2230,12 +2253,12 @@ }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=3c82235"; + version = "0.0.0+rev=f5fa844"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "3c82235f41b63f35a01ae3888206e93585cbb84a"; - hash = "sha256-D3X2YwvxvseIGnKzaSocr3Ak7qoASZhxyRS+rtpir0g="; + rev = "f5fa844d2adbcfdc7a0ec4daae4539887959d9ff"; + hash = "sha256-MSIQd1Xb4ug4yZk2bQFPHMZxrqe1xke6X7LKsxtkIkc="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2274,12 +2297,12 @@ }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=5cb506a"; + version = "0.0.0+rev=b239a95"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "5cb506ae419c4ad620c77210fd47500d3d169dbc"; - hash = "sha256-3BQuEGrmQD9Va7JpTuKJaZ6VaJ//tfPtjoEDRj/utcU="; + rev = "b239a95f94cfcc6e7b3e961bc73a28d55e214f02"; + hash = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; @@ -2309,12 +2332,12 @@ }; sourcepawn = buildGrammar { language = "sourcepawn"; - version = "0.0.0+rev=39ce73a"; + version = "0.0.0+rev=3ca89fd"; src = fetchFromGitHub { owner = "nilshelmig"; repo = "tree-sitter-sourcepawn"; - rev = "39ce73ad42b2c4f52848d16093c24feddaa7d226"; - hash = "sha256-CyCUGGycWpgQl/BGDjRHwYoa9Mess49jUf9WUkRaliE="; + rev = "3ca89fdf998340a7973e276b39516d8902950f86"; + hash = "sha256-AF7PiM0Tt6wqGdNsfMGSkgWXgZRDZGdKc7DQpUHuGUA="; }; meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn"; }; @@ -2331,12 +2354,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=da2d1ef"; + version = "0.0.0+rev=cdb7cde"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "da2d1eff425b146d3c8cab7be8dfa98b11d896dc"; - hash = "sha256-aNxUvmj4AMO744fsSOsvQcNEtHYuQDephKha/hSphh0="; + rev = "cdb7cde9bf70b194ab8beb5069fbbc3c9640284e"; + hash = "sha256-yxr+AbKp4pkVpjMQXL3P5VEzSo2Ii6yE7ceEBYiDHJA="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2353,12 +2376,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=4fab1c9"; + version = "0.0.0+rev=514695d"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "4fab1c9116cb7890885508e4630cc8e6a8373a41"; - hash = "sha256-cZoRQN3vrOC7xaKeURGeKfQ0xAyRMapbgNQrBTCFoHI="; + rev = "514695df4985f56455b8f139a319453a2325cdcf"; + hash = "sha256-LDqRP8FA5m1tnbGNTxItQlp6B6U+M6gOBlbi4zX0FHI="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2430,12 +2453,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=fc00cbb"; + version = "0.0.0+rev=78a736d"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "fc00cbb460b40228b30f322b5a34ea0e8f35a9f8"; - hash = "sha256-FEac9qZuNAJYn/7mIpRSOy72F3qsiyPHZTn1DUzM2xk="; + rev = "78a736d77094b0b3c35e811e6765c4d38a72724e"; + hash = "sha256-cBUBmXc+mhub5jvGKPcCgHgZPQtxF6OD+dlKQ0ZaxpY="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2464,12 +2487,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=b904af3"; + version = "0.0.0+rev=0a457a5"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "b904af353fb2f1df6ac45d8d3e3a5ee85a6cc306"; - hash = "sha256-MGdwcw9T3hemUHfgQmdTp20MW08AQcVWGRHxkP/6N5Y="; + rev = "0a457a557be7779336bc8ac2b396e73797bc68f7"; + hash = "sha256-ylMJ177FYVcnfaXbnOieNP1Emq8HpeAgEddt96tBJqE="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2520,12 +2543,12 @@ }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=e135399"; + version = "0.0.0+rev=e936d3f"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "e135399cb31b95fac0760b094556d1d5ce84acf0"; - hash = "sha256-Ylxpj+e9YGhyRRRCCVs0g/zhwHpwGELxG2i+E3SFmpQ="; + rev = "e936d3fef8bac884661472dce71ad82284761eb1"; + hash = "sha256-lcvs4auZrMb1f9ocrAnLVxX8JnvrPT18LsJBqoNG9Oo="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -2565,12 +2588,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=aaf5bb5"; + version = "0.0.0+rev=3896a5b"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "aaf5bb5c1df0a6e583bb51efa519a9ac788b2ad8"; - hash = "sha256-p/khQ31bReopPyZ1TvUKI6bnFipWiGrxKO7cAYzeku4="; + rev = "3896a5be761f04ffb22a841b2a0672f7a8a43ef9"; + hash = "sha256-EODxn3ZitUSz8/4XkgMK0dp2T07BwlsXVbFbBQ5xXi4="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2621,12 +2644,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=198e2ea"; + version = "0.0.0+rev=b00b8eb"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "198e2ea43d1c4ddd76ee883f4eae15f4201cd241"; - hash = "sha256-WnVqoshymxZgGC/p5nFX08ypB1VDLIAMjjWN5YC4UT8="; + rev = "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"; + hash = "sha256-uGuwE1eTVEkuosMfTeY2akHB+bJ5npWEwUv+23nhY9M="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2655,12 +2678,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=198e2ea"; + version = "0.0.0+rev=b00b8eb"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "198e2ea43d1c4ddd76ee883f4eae15f4201cd241"; - hash = "sha256-WnVqoshymxZgGC/p5nFX08ypB1VDLIAMjjWN5YC4UT8="; + rev = "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"; + hash = "sha256-uGuwE1eTVEkuosMfTeY2akHB+bJ5npWEwUv+23nhY9M="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2790,34 +2813,34 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=bc1364d"; + version = "0.0.0+rev=052279c"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "bc1364d922952138957a62105171ed68e73fbb6c"; - hash = "sha256-5h1GYjyYMJd5GS0zXh0LP1wBs60fYohpFv89gcdZ4vU="; + rev = "052279cd5e1d73b075640c64cef97e7bdcd32611"; + hash = "sha256-EoiMqMcBl5bC1Irs2flA2F5nHN6VTZdv6hdCrqoTAcY="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=b63be26"; + version = "0.0.0+rev=f431bfa"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "b63be26fa571259b512e1939f01755d9d6e78fbd"; - hash = "sha256-gsjepcw8Y8Vm6GhJRKUJKLsCb+Rd0lNyYfnmWijuiLo="; + rev = "f431bfa7d433f4d629943147817193a4fccbd303"; + hash = "sha256-+SYbYvmVN2U0Q03p0eCj3MViCyzPqUiPG1oMWh7hRyM="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; vue = buildGrammar { language = "vue"; - version = "0.0.0+rev=7e48557"; + version = "0.0.0+rev=3b9d520"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-vue"; - rev = "7e48557b903a9db9c38cea3b7839ef7e1f36c693"; - hash = "sha256-dz9NC+axivAsVJPbt7TNtU89wFyrTBoD2hCBjiXFbgY="; + rev = "3b9d52087100bdfce43dad2ca46d75b0e21613f6"; + hash = "sha256-36MnM1X8uhqCb44oHY0kEKDLpYmU1QL2JfGpdIbb3pc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vue"; }; @@ -2845,12 +2868,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=13b79ea"; + version = "0.0.0+rev=07f6740"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "13b79ea3f343b15f233c6e7ac930797748191615"; - hash = "sha256-2BOPevKjrNoTRNaadwr7erWDBxIDUvU4zLOQgXOB4rE="; + rev = "07f6740ab9f4f74c49413b9056154cac51f4b2d7"; + hash = "sha256-jnDrJhhsfRAqR+83VaGXBKANu5J2Xt7LNUm0VUFEVbY="; }; location = "libs/tree-sitter-wing"; generate = true; @@ -2881,14 +2904,14 @@ }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=0e36bed"; + version = "0.0.0+rev=9e59b9b"; src = fetchFromGitHub { - owner = "ikatyang"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "0e36bed171768908f331ff7dff9d956bae016efb"; - hash = "sha256-bpiT3FraOZhJaoiFWAoVJX1O+plnIi8aXOW2LwyU23M="; + rev = "9e59b9bbf839ba231fbcb953617d8b9b9a059e38"; + hash = "sha256-9YVXErOwUf4hcvugcgtlefyQd4p34u9AT4gUcwc3ZaU="; }; - meta.homepage = "https://github.com/ikatyang/tree-sitter-yaml"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; yang = buildGrammar { language = "yang"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 546f1f6f2cca..0cc3aa2af4f5 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -998,7 +998,7 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-gCGuD5kipgfR0Le8npNmyBxNsUq0PavXvKkxkiPx13E="; + cargoHash = "sha256-VDnrJ2EJ8LDykqxYKD1VR8BkDqzzifazJzL/0UsmSCk="; preCheck = '' @@ -1134,7 +1134,7 @@ pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-nlPSsp/HbS1DxhOHh5+7x1re46oiQa9FQMLClc7TQLg="; + cargoHash = "sha256-iGNLk3ckm90i5m05V/va+hO9RMiOUKL19dkszoUCwlU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch index c6b63682b2a0..82d73809ff79 100644 --- a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch +++ b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch @@ -1,5 +1,5 @@ diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.vim -index 9022d55..30ef53f 100644 +index d6d4b4c..9853877 100644 --- a/autoload/health/openscad_nvim.vim +++ b/autoload/health/openscad_nvim.vim @@ -7,7 +7,7 @@ function! s:check_nvim_version_minimum() abort @@ -8,20 +8,20 @@ index 9022d55..30ef53f 100644 function! s:check_zathura_installed() abort - if !executable('zathura') + if !executable('@zathura@') - call health#report_error('has(zathura)','install zathura') + call v:lua.vim.health.error('has(zathura)','install zathura') else - call health#report_ok("zathura is installed") + call v:lua.vim.health.ok("zathura is installed") @@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort endfunction function! s:check_htop_installed() abort - if !executable('htop') + if !executable('@htop@') - call health#report_error('has(htop)','install htop') + call v:lua.vim.health.error('has(htop)','install htop') else - call health#report_ok("htop is installed") + call v:lua.vim.health.ok("htop is installed") diff --git a/lua/openscad.lua b/lua/openscad.lua -index 7dff2fb..4382003 100644 +index 7475f29..832c895 100644 --- a/lua/openscad.lua +++ b/lua/openscad.lua @@ -101,7 +101,7 @@ end @@ -38,7 +38,7 @@ index 7dff2fb..4382003 100644 else -- TODO: What about Windows? - jobCommand = 'openscad ' .. vim.fn.expand('%:p') -+ jobCommand = '@oepnscad@ ' .. vim.fn.expand('%:p') ++ jobCommand = '@openscad@ ' .. vim.fn.expand('%:p') end vim.fn.jobstart(jobCommand) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 78c923ef87d5..8a8b152607b8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -361,6 +361,7 @@ https://github.com/nvimdev/guard.nvim/,HEAD, https://github.com/nmac427/guess-indent.nvim/,HEAD, https://github.com/sjl/gundo.vim/,, https://github.com/junegunn/gv.vim/,, +https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD, https://github.com/m4xshen/hardtime.nvim/,HEAD, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, https://github.com/ThePrimeagen/harpoon/,master, @@ -548,15 +549,22 @@ https://github.com/Shougo/neosnippet-snippets/,, https://github.com/Shougo/neosnippet.vim/,, https://github.com/kassio/neoterm/,, https://github.com/nvim-neotest/neotest/,HEAD, +https://github.com/rcasia/neotest-bash/,HEAD, https://github.com/sidlatau/neotest-dart/,HEAD, https://github.com/MarkEmmons/neotest-deno/,HEAD, https://github.com/Issafalcon/neotest-dotnet/,HEAD, https://github.com/jfpedroza/neotest-elixir/,HEAD, +https://github.com/llllvvuu/neotest-foundry/,HEAD, https://github.com/nvim-neotest/neotest-go/,HEAD, +https://github.com/weilbith/neotest-gradle/,HEAD, +https://github.com/alfaix/neotest-gtest/,HEAD, https://github.com/MrcJkb/neotest-haskell/,HEAD, +https://github.com/rcasia/neotest-java/,HEAD, https://github.com/haydenmeade/neotest-jest/,HEAD, +https://github.com/zidhuss/neotest-minitest/,HEAD, https://github.com/theutz/neotest-pest/,HEAD, https://github.com/olimorris/neotest-phpunit/,HEAD, +https://github.com/thenbe/neotest-playwright/,HEAD, https://github.com/nvim-neotest/neotest-plenary/,HEAD, https://github.com/nvim-neotest/neotest-python/,HEAD, https://github.com/olimorris/neotest-rspec/,HEAD, @@ -564,6 +572,7 @@ https://github.com/rouge8/neotest-rust/,HEAD, https://github.com/stevanmilic/neotest-scala/,HEAD, https://github.com/shunsambongi/neotest-testthat/,HEAD, https://github.com/marilari88/neotest-vitest/,HEAD, +https://github.com/lawrence-laz/neotest-zig/,HEAD, https://github.com/rose-pine/neovim/,main,rose-pine https://github.com/Shatur/neovim-ayu/,, https://github.com/cloudhead/neovim-fuzzy/,, @@ -1364,6 +1373,7 @@ https://github.com/puremourning/vimspector/,, https://github.com/lervag/vimtex/,, https://github.com/preservim/vimux/,, https://github.com/vimwiki/vimwiki/,, +https://github.com/lukas-reineke/virt-column.nvim/,HEAD, https://github.com/jubnzv/virtual-types.nvim/,HEAD, https://github.com/vim-scripts/vis/,, https://github.com/navicore/vissort.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 530b28f30844..34f892df6c3b 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, vscode-utils, callPackage }: let - version = "1.48.0"; + version = "1.50.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then "linux" @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - sha256 = "sha256-/1nDuj/kSdkV6PlbdlOLfUKQeuvyL2VhPjUAr9kq2NM="; + sha256 = "sha256-Dt7mqZQ/vEUFyUD5SsY6RGzg9kq19/Amksrwtfv0TuE="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index ac72139796d4..04c02c8c0d78 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -98,9 +98,9 @@ in mkDerivation rec { wrapGAppsHook wrapQtAppsHook + bison cmake flex - bison ninja ]; diff --git a/pkgs/applications/graphics/blockbench-electron/default.nix b/pkgs/applications/graphics/blockbench-electron/default.nix deleted file mode 100644 index 50a10310546d..000000000000 --- a/pkgs/applications/graphics/blockbench-electron/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25 }: - -stdenv.mkDerivation rec { - pname = "blockbench-electron"; - version = "4.8.1"; - - src = fetchurl { - url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; - sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA="; - name = "${pname}-${version}.AppImage"; - }; - - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/blockbench.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" - ''; - - meta = with lib; { - description = "A boxy 3D model editor powered by Electron"; - homepage = "https://blockbench.net/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ckie ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 0e3203e4a0b6..5fac61399127 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bemenu"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "Cloudef"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-pXuaNhrXy33rZxk+qisFWpYj6w9QW3p3WmGtE1kHGII="; + hash = "sha256-E/5wN7HpdBt//jFe9yAB8fuHKiFJ7D1UAJEvG8KBJ6k="; }; strictDeps = true; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 986681d5a819..eb24885ca142 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -9,10 +9,27 @@ , enableQt ? true , callPackage , qtwayland +, fetchPypi }: let - version = "4.5.3"; + version = "4.5.4"; + + python = python3.override { + self = python; + packageOverrides = self: super: { + # Pin ledger-bitcoin to 0.2.1 + ledger-bitcoin = super.ledger-bitcoin.overridePythonAttrs (oldAttrs: rec { + version = "0.2.1"; + format = "pyproject"; + src = fetchPypi { + pname = "ledger_bitcoin"; + inherit version; + hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; + }; + }); + }; + }; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.{v}" @@ -29,7 +46,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-Lr6ynHAbyaiaxYAWU5j5Wh5acxO5HkP1/jpnFrL4j68="; + sha256 = "sha256-fDu2PlEQOF7ftlS6dYw15S2XiAx+D/bng4zC9ELj6uk="; postFetch = '' mv $out ./all @@ -39,13 +56,13 @@ let in -python3.pkgs.buildPythonApplication { +python.pkgs.buildPythonApplication { pname = "electrum"; inherit version; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-kej0msc7SB+51ad5xZrT8MMEY5rfYOGqum6RO1gBH5s="; + sha256 = "sha256-lDuwXhOjcbCx8x/oIoigrklDwCbhn1trf5lDf/X/1Qc="; }; postUnpack = '' @@ -56,7 +73,7 @@ python3.pkgs.buildPythonApplication { nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -80,12 +97,15 @@ python3.pkgs.buildPythonApplication { ckcc-protocol keepkey trezor + bitbox02 + cbor + pyserial ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; - checkInputs = with python3.pkgs; lib.optionals enableQt [ + checkInputs = with python.pkgs; lib.optionals enableQt [ pyqt6 ]; @@ -117,7 +137,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "tests" ]; @@ -140,7 +160,7 @@ python3.pkgs.buildPythonApplication { changelog = "https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ joachifm np prusnak ]; + maintainers = with maintainers; [ joachifm np prusnak chewblacka ]; mainProgram = "electrum"; }; } diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/applications/misc/kiwix/tools.nix index 979ce433fb4b..b5e123b41264 100644 --- a/pkgs/applications/misc/kiwix/tools.nix +++ b/pkgs/applications/misc/kiwix/tools.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kiwix-tools"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "kiwix"; repo = "kiwix-tools"; rev = finalAttrs.version; - hash = "sha256-+th86lMAuCcmWj06yQoZ1L7rLZKqNvuTrV+Rra2km44="; + hash = "sha256-JwF4EN5kyHEfNoMhHb9ywe+7pmgQtjEd2FeRUeTjvQw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 7c2d33aebc00..91a2e11b3666 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -23,16 +23,18 @@ stdenv.mkDerivation rec { checkTarget = "test"; nativeCheckInputs = [ which zstd pbzip2 ]; + sharePath = "$out/share/${pname}"; + installPhase = '' runHook preInstall installManPage makeself.1 install -Dm555 makeself.sh $out/bin/makeself - install -Dm444 -t $out/share/${pname}/ makeself.lsm README.md makeself-header.sh + install -Dm444 -t ${sharePath}/ makeself.lsm README.md makeself-header.sh runHook postInstall ''; fixupPhase = '' - sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i $out/bin/makeself + sed -e "s|^HEADER=.*|HEADER=${sharePath}/makeself-header.sh|" -i $out/bin/makeself ''; meta = with lib; { diff --git a/pkgs/applications/misc/revanced-cli/default.nix b/pkgs/applications/misc/revanced-cli/default.nix index 2e770a157398..2d0629f5e171 100644 --- a/pkgs/applications/misc/revanced-cli/default.nix +++ b/pkgs/applications/misc/revanced-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "revanced-cli"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar"; - hash = "sha256-zdkasyYwyPB6mPvRVMP3/UoaXdaRxAI8GyOxsCYBMEE="; + hash = "sha256-I25SmWUVJenFou1fKCd53PojoGt9FAQ7hDpEWweAICQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 665cae9d4bd9..83fcccbf3761 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/opt - cp -r ./dist/linux-unpacked $out/opt/Whalebird + cp -r ./dist/*-unpacked $out/opt/Whalebird # Install icons # Taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=whalebird#n41 @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Single-column Fediverse client for desktop"; homepage = "https://whalebird.social"; - sourceProvenance = with sourceTypes; [ fromSource ]; + changelog = "https://github.com/h3poteto/whalebird-desktop/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang colinsane weathercold ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index ab20b2dc72cc..0daf7ae97ba1 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.5.4"; + version = "7.5.5"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aNzKp7QwyhC/ado0NrCyxrRZu+ePGBNSq31/Iw6k6n0="; + sha256 = "sha256-LjqMCkEIl+0psxIys/tvJPkEQqDRzLOsaFUfAVG+RrE="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 77fd7928d680..b29ba78a4ef1 100644 --- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-mKQuHswnoxgqQOCiQFbibg6MqACOxM73XngQai6s6To="; + hash = "sha256-xR61PYUqiVtPTghEEeSWXs/Apx7VVWDgi6Pgx/EBQzQ="; }; - vendorHash = "sha256-SCeKoxI1zFzSwLAdAa1YI3DiyfK/uOk7CmWwQWVeF7g="; + vendorHash = "sha256-u5ou9rY/JBrV0EF/nJX8u/Fqde/WZe21EcsNLwvtqB0="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index dd0eced01663..caf07b07989e 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-d90xwrMtDK5ibRHIeV6nzv5jqJfaQXpU9xKTH49yiX4="; + hash = "sha256-eGDshnJ26rrRuM9lWwcdRg8udA4uE5ee6c+SYES7qt4="; }; - vendorHash = "sha256-oiBgZQtqFwq189h/Bb4CrFhs4RDYUoEEOjrccujGclU="; + vendorHash = "sha256-GsI695T7nkwwAt78l7mc5JCD9wXAUcTxwsiLLFcANBI="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 64bebc65744a..36ade0527264 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.55.13"; + version = "0.55.15"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qTQ4tmSFFqO2tnp+7fVeXO6dNbPsx37vT6GElz8dLdQ="; + hash = "sha256-luVYnuvsLHfkSZVCjzGB34ffbNzuKjEFmxQfgdY+YpQ="; }; - vendorHash = "sha256-sdEA/5QQ85tGfo7qSCD/lD20uAh045fl3tF9nFfH6x0="; + vendorHash = "sha256-KXAN8WNKFfGbV7YQRhwgFBM0g+rbHe+MIuaR5/7khAs="; doCheck = false; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 1943a395bd7b..418c4f243a00 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "pjsip"; - version = "2.14"; + version = "2.14.1"; src = fetchFromGitHub { owner = finalAttrs.pname; repo = "pjproject"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-PWCeIvnBAOqbcNYPhIY7hykdvLzoD9lssSViCCPNT68="; + hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY="; }; patches = [ diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 19d19310591d..0712e68e324b 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6at0p1Xc25K5l6sq2uMWpaLVvZMNlWC0ybyZyrIw41I="; + hash = "sha256-IGEM212CU91+pT8xq3BzrPrIDUZxZveb2jhatMGJAsw="; }; strictDeps = true; diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 855315143332..6b5b78d31fed 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.99.3"; + version = "1.100.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-SzldiGwcpR+UEQ3imJfu3FlYqGq4evsYtjVLybdjGqc="; + hash = "sha256-wc6oK1zn04/1nwis9ndpkQc8dwY/J85zZbhkwmNFLek="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-mPJVb2/iGbRWDDcfIey3uW/5g2TIIemHR8d/3osMeGA="; + vendorHash = "sha256-84PI1tZFiodnGvMwObELVxXMCgIWINOrO0ISAWRnxRM="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/applications/office/iotas/default.nix index 4b6a251f0460..08a4a1bd3d6e 100644 --- a/pkgs/applications/office/iotas/default.nix +++ b/pkgs/applications/office/iotas/default.nix @@ -19,15 +19,15 @@ python3.pkgs.buildPythonApplication rec { pname = "iotas"; - version = "0.2.7"; - format = "other"; + version = "0.2.10"; + pyproject = false; src = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "cheywood"; - repo = pname; + owner = "World"; + repo = "iotas"; rev = version; - hash = "sha256-k3Qbi/BwkJlQzlyTlo9SjJ1M3zMFHo4669rzd+BBPzQ="; + hash = "sha256-aITt+TJb/LrVOyb/mAC7U6/NJ4stHD76jjBFC7Pt7fU="; }; nativeBuildInputs = [ @@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { markdown-it-py linkify-it-py mdit-py-plugins + pypandoc ]; # prevent double wrapping @@ -67,9 +68,10 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Simple note taking with mobile-first design and Nextcloud sync"; - homepage = "https://gitlab.gnome.org/cheywood/iotas"; + homepage = "https://gitlab.gnome.org/World/iotas"; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "iotas"; maintainers = with maintainers; [ zendo ]; }; } diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 3f5fab53e6df..7ef353dc1cd0 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.68.1"; + version = "0.68.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-ZXtBKc5vQz9fDyiG+DYOx7DsnnsORiltOacdx4AqFjg="; + hash = "sha256-h/WCfF3jK/pkN911vxPe2xzGUfVY2Xy+3yJwoqBQ5mA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index b4d24973908f..272c4d1f1fdf 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.3.1"; + version = "24.3.3"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-9WlpZO/OUSSUxBXXOcB6fLq5t75uryViWsn26C05bVo="; + hash = "sha256-1PnGccbEKkFZGE7mxMD8onMkFd/f9qyvERSu+VL3yUE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index ddade9b4b384..bb1c3243d6db 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.18.3"; + version = "3.18.4"; format = "pyproject"; disabled = python3.pythonOlder "3.8"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8l2nahrYq7GQwajdGwCg0Bfx8D5xk695UEHKds5+N5A="; + hash = "sha256-ODBlNwrvkYnZ+CvKyc5Bic6DK/z8d6/KR3+iarFxduE="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 32872e98bebf..d35947be850b 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.14"; + version = "1.2.15"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; - rev = "d941607f078c72fca104ee1e7916cc0ddcc0acf5"; - sha256 = "sha256-G4KlYAjOT1UV29vcX7Q8dMTj0BX0rsJcLtK2MQag5nU="; + rev = version; + sha256 = "sha256-pfM3o4H3XJ4ZE0FXVR1k8pc7lr7SOQjKEMWuG9YkvvI="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index deea5c1cb493..fba7eb16839e 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -8,34 +8,18 @@ mkDerivation rec { pname = "mythtv"; - version = "32.0"; + version = "34.0"; src = fetchFromGitHub { owner = "MythTV"; repo = "mythtv"; rev = "v${version}"; - sha256 = "0i4fs3rbk1jggh62wflpa2l03na9i1ihpz2vsdic9vfahqqjxff1"; + hash = "sha256-6/TEoyYIRq6pufYzGOmO5DB05JuDo9lqRAYT5N5M/L4="; }; patches = [ # Disable sourcing /etc/os-release ./dont-source-os-release.patch - - # Fix QMake variable substitution syntax - MythTV/mythtv#550 - (fetchpatch { - name = "fix-qmake-var-syntax.patch"; - url = "https://github.com/MythTV/mythtv/commit/a8da7f7e7ec069164adbef65a8104adc9bb52e36.patch"; - stripLen = 1; - hash = "sha256-JfRME00YNNjl6SKs1HBa0wBa/lR/Rt3zbQtWhsC36JM="; - }) - - # Bachport the build against binutils-2.41 - (fetchpatch { - name = "binutils-2.41.patch"; - url = "https://github.com/MythTV/mythtv/commit/f9f9bba62ee2743c816cb2b9634b6b4397e5e2e3.patch"; - stripLen = 1; - hash = "sha256-IcXgBtfqPZ42inYFe7l8mWvKUV13S/YEQAHcOFaDivI="; - }) ]; setSourceRoot = "sourceRoot=$(echo */mythtv)"; diff --git a/pkgs/applications/video/mythtv/dont-source-os-release.patch b/pkgs/applications/video/mythtv/dont-source-os-release.patch index fb4dc686af6a..0ef27450d634 100644 --- a/pkgs/applications/video/mythtv/dont-source-os-release.patch +++ b/pkgs/applications/video/mythtv/dont-source-os-release.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -5894,9 +5894,9 @@ else +@@ -5451,9 +5451,9 @@ else die "ERROR: cannot find soundtouch 1.8.0 or later." fi diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index c0672821558b..a86a1ee02706 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.4.6"; + version = "3.4.12"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-fixkalZAPz0iO1SmshsO0vYc2sksH2lrStsSOEcdZ1g="; + sha256 = "sha256-yc/zWMGzsfZl3n+Qt5Se2duo3jwntCWaYq1yACsrPzM="; rev = "V${version}"; }; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 4d2504f5e5e6..23c6433f9ebb 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-d/Cl0sE4laDdjMhd3xTHcY4OT5tWWCFCvLsNF157+zw="; + sha256 = "sha256-y6b0nOf597uxS9zDh0NQOwLN81nk4U7lHK2CalyVi8s="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index d679d674411c..293b1c00694e 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.24.7"; + version = "2.25.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-r7V9ZqUbtK4PG/NfDTbDljP+xaPJBXZSp1rGY/kgUTA="; + hash = "sha256-QfzFo6VqNK+4GvF2sSVLeDTcoBOG8Jtqs6K5o5bwddA="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-Ec2JRCQvdC2VzkK29GyKS2DTrfHgv4wJc/50fbLVKEY="; + vendorHash = "sha256-zAIf5ljy9trJE27RpsK0atPoqNIDUdTn6ywRo0yk/18="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index ae6e6d19ee79..a74027650960 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "lima"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MeTFATaAGRSaUXmC1fv9/gMFWafvkteKVJS6MHaqt8A="; + sha256 = "sha256-xFiCGuCUJUnWN5DBfwjhBgntDfod4CWpXqJ3dbrDUSQ="; }; vendorHash = "sha256-wd7YiEo4Gy2kHF7aCRoNGlbOQUxqQnKqP3znzMqS2PI="; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 0af274265bff..68815952b17f 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitea , installShellFiles , libX11 , libinput @@ -24,8 +24,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwl"; version = "0.5"; - src = fetchFromGitHub { - owner = "djpohly"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dwl"; repo = "dwl"; rev = "v${finalAttrs.version}"; hash = "sha256-U/vqGE1dJKgEGTfPMw02z5KJbZLWY1vwDJWnJxT8urM="; diff --git a/pkgs/applications/window-managers/wayfire/firedecor.nix b/pkgs/applications/window-managers/wayfire/firedecor.nix new file mode 100644 index 000000000000..ce42f6fc6886 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/firedecor.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, boost +, cairo +, glib +, libGL +, libinput +, librsvg +, libxkbcommon +, pango +, udev +, wayfire +, wayland +, wf-config +, xcbutilwm +, mate +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "firedecor"; + version = "2023-10-23"; + + src = fetchFromGitHub { + owner = "mntmn"; + repo = "Firedecor"; + rev = finalAttrs.version; + hash = "sha256-7or8HkmIZnLpXEZzUhJ3u8SIPfIQFgn32Ju/5OzK06Y="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + boost + cairo + glib + libGL + libinput + librsvg + libxkbcommon + pango + udev + wayfire + wayland + wf-config + xcbutilwm + ]; + + postPatch = '' + substituteInPlace src/firedecor-theme.cpp \ + --replace-fail "/usr/share" "/run/current-system/sw/share" + ''; + + env = { + PKG_CONFIG_WAYFIRE_PLUGINDIR = "${placeholder "out"}/lib/wayfire"; + PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; + }; + + meta = with lib; { + homepage = "https://github.com/mntmn/Firedecor"; + description = "Advanced window decoration plugin for the Wayfire window manager"; + license = licenses.mit; + inherit (mate.mate-wayland-session.meta) maintainers; + inherit (wayfire.meta) platforms; + }; +}) diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index 86f522cdd68d..b8af85aafd0d 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -4,6 +4,7 @@ lib.makeScope pkgs.newScope (self: let inherit (self) callPackage; in { + firedecor = callPackage ./firedecor.nix { }; wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 34532411888c..b4472425324e 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; }; + postPatch = '' + # raise neatvnc version bound to 0.8.0 + # https://gitlab.freedesktop.org/wayland/weston/-/issues/890 + substituteInPlace libweston/backend-vnc/meson.build \ + --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']" + ''; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 66027485ee71..1a32f365bab2 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -325,6 +325,12 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" relro bindnow" '' + + optionalString (libc != null && targetPlatform.isAvr) '' + for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do + echo "-L${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags + done + '' + + optionalString stdenv.targetPlatform.isDarwin '' echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags '' diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index d788076dda51..4e427bedc653 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -668,6 +668,12 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector" '' + + optionalString (libc != null && targetPlatform.isAvr) '' + for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do + echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-crt1-cflags + done + '' + + optionalString stdenv.targetPlatform.isDarwin '' echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags '' diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index fce17264d487..f63227c3292b 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -27,13 +27,13 @@ , dbusSupport ? true }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.10.1"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - hash = "sha256-cVPg8T9sLZd4fXBoI64TtlIBwF2lAXNth9fMiKnk9H4="; + hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo="; }; prePatch = lib.optionalString (!dbusSupport) '' substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' "" diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix new file mode 100644 index 000000000000..fb19793583c4 --- /dev/null +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -0,0 +1,87 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +, imagemagick +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, electron_28 +}: + +let + electron = electron_28; +in +buildNpmPackage rec { + pname = "blockbench"; + version = "4.9.4"; + + src = fetchFromGitHub { + owner = "JannisX11"; + repo = "blockbench"; + rev = "v${version}"; + hash = "sha256-z4hr1pQh7Jp/DB8+pxwuHvi4gvTHHVn0yrruwnXm2iM="; + }; + + nativeBuildInputs = [ + imagemagick # for icon resizing + makeWrapper + copyDesktopItems + ]; + + npmDepsHash = "sha256-onfz+J77jNIgdc7ALiyoXt1CdTyX/C7+bKwtpJm+H+I="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + + npmBuildScript = "bundle"; + + postBuild = '' + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/blockbench + cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench + + for size in 16 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png + done + + makeWrapper ${lib.getExe electron} $out/bin/blockbench \ + --add-flags $out/share/blockbench/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + + runHook postInstall + ''; + + # based on desktop file found in the published AppImage archive + desktopItems = [ + (makeDesktopItem { + name = "blockbench"; + exec = "blockbench %U"; + icon = "blockbench"; + desktopName = "Blockbench"; + comment = meta.description; + categories = [ "3DGraphics" ]; + startupWMClass = "Blockbench"; + terminal = false; + }) + ]; + + meta = { + changelog = "https://github.com/JannisX11/blockbench/releases/tag/${src.rev}"; + description = "Low-poly 3D modeling and animation software"; + homepage = "https://blockbench.net/"; + license = lib.licenses.gpl3Only; + mainProgram = "blockbench"; + maintainers = with lib.maintainers; [ ckie tomasajt ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 067f49573c56..9c4069b41bc8 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -27,20 +27,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-wxQaKewKIfN93Wvb7WmOSuflTgfk1XKvHAA1UIVyMqk="; + hash = "sha256-Urskhzs00OEucoR17NDXNtnrcXk9h75E806Re0HvYyw="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-IXFFOegzJbDcQejqQsAg11jDnhSKi27Olm8m3qr7bqw="; + npmDepsHash = "sha256-48xzx7dTalceXzjFBHIkkUS83pqP/OQ0L2tnMESpHII="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 46ae83705426..063483c0c561 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "312"; + version = "313"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-X3IsUaqXlg/SlqHo9jK+hONY/6LAIAfRO9rAwCQcq64="; + hash = "sha256-k/JbvotOcVs2OXwGOrnjY0xYRRgvk61p0o7VQTTPqz4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix index 59fb07457824..b22a5c2fd8c7 100644 --- a/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/pkgs/by-name/dy/dynamodb-local/package.nix @@ -25,11 +25,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "dynamodb-local"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-01-04.tar.gz"; - hash = "sha256-CbZ9Z9A70JoHu4G6It+7WycaEtzuwjVJ2YrOK+37zYA="; + url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-03-14.tar.gz"; + hash = "sha256-BmLbmT63CaETgu1a/Tcf0KyF+Xwol67yKVwSMa9fJbw="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 5d01ac999406..99e45a9993e1 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.173.0"; + version = "0.174.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-PVBt+AoYd8fMYHzBpgQ261TGlkmyooN7UKX9ooXaRYA="; + hash = "sha256-I3YBKdb53BLZ3wFBu8WGJ1kTkuLucMoHLNchMOTNc2o="; }; - vendorHash = "sha256-5bHZt+Oze7JiaY0dKjoMNDdU6wzMphgZ3W3NveRKGy0="; + vendorHash = "sha256-wdH4+s9SU2WgIy7bJ4YrT53URvHC4vw7RZpllT2DfV8="; doCheck = false; diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index bfd1f2c9685d..311d0ff8ce63 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gatus"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-GG5p2sAIameGo6IFt3IBwFuLfVFRbfHjrQrG6Ei9odA="; + hash = "sha256-FFnrtdJiN7B27sJXzoGsbPKX3NeuHOtA34WQrw6pvEI="; }; - vendorHash = "sha256-VYHBqVFXX7fUuW2UqPOlbRDEfcysYvjSlfm0UJ2mMGM="; + vendorHash = "sha256-VICVo7XYeHs/43knHA4CMSgHloyYSjOFe1TUb4u+egE="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index fdb21f92fac7..639d18343f28 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.46.1"; + version = "4.47.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-0NUmsbuzs004w9ETj4e4nO+sDvYHQh9SwJoRc3+r+j8="; + hash = "sha256-AMqifAdC4aPra/KfM0Z8L1mF6+lA0dv9tt/cXSd3Ov4="; }; - npmDepsHash = "sha256-zCBNUKmLluVCDoPHuKy9KMKCGL8FqopFhKq7QCAUe4U="; + npmDepsHash = "sha256-GVqGA4aMfA08j/+fy+DA6udi52lmfDeAkE59d9CMAqg="; postPatch = '' # remove cleanup which runs git commands diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix index 2fcea6d600c1..eca8847fd49b 100755 --- a/pkgs/by-name/hd/hdrop/package.nix +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -9,17 +9,18 @@ , libnotify , withHyprland ? true , hyprland +, gawk }: stdenvNoCC.mkDerivation rec { pname = "hdrop"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Schweber"; repo = "hdrop"; rev = "v${version}"; - hash = "sha256-eLOu7xmFphTxCtyyXdM9VkNcUpefefuZMAQtOV4FVtU="; + hash = "sha256-iginpMlgANSPWgFxNC2TYMjf2NKSSzzrjIN8lIsAvX8="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenvNoCC.mkDerivation rec { util-linux jq libnotify + gawk ] ++ lib.optional withHyprland hyprland)}" ''; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 5e8c3f1a2663..2bee53688dbf 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "unstable-2024-03-12"; + version = "unstable-2024-03-15"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "a500de54b2e3067201a40cefa5f210f719423ddf"; - hash = "sha256-AfVYEQIhOK6vaYVndgqFV4Vb5REXG9R0ylv83QInsT0="; + rev = "206f457fffdb9a73596a4cb2211a471bd305243d"; + hash = "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hyprdim/default.nix b/pkgs/by-name/hy/hyprdim/package.nix similarity index 73% rename from pkgs/applications/misc/hyprdim/default.nix rename to pkgs/by-name/hy/hyprdim/package.nix index 10938330196a..ee0df4f9fc03 100644 --- a/pkgs/applications/misc/hyprdim/default.nix +++ b/pkgs/by-name/hy/hyprdim/package.nix @@ -1,8 +1,9 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, nix-update-script +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -18,17 +19,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-hgcGzRLB1L3yxJjw1ECDJPmbl1W+2OS4KDojclyVYrc="; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' installManPage target/man/hyprdim.1 installShellCompletion --cmd hyprdim \ - --bash <(cat target/completions/hyprdim.bash) \ - --fish <(cat target/completions/hyprdim.fish) \ - --zsh <(cat target/completions/_hyprdim) + --bash target/completions/hyprdim.bash \ + --fish target/completions/hyprdim.fish \ + --zsh target/completions/_hyprdim ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/misc/hyprnome/default.nix b/pkgs/by-name/hy/hyprnome/package.nix similarity index 73% rename from pkgs/applications/misc/hyprnome/default.nix rename to pkgs/by-name/hy/hyprnome/package.nix index d8d6ba70c8f7..691ebc574a43 100644 --- a/pkgs/applications/misc/hyprnome/default.nix +++ b/pkgs/by-name/hy/hyprnome/package.nix @@ -1,8 +1,9 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, nix-update-script +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -18,17 +19,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DpbRs97sr5wpJSrYF99ZiQ0SZOZdoQjfaLhKIAU95HA="; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' installManPage target/man/hyprnome.1 installShellCompletion --cmd hyprnome \ - --bash <(cat target/completions/hyprnome.bash) \ - --fish <(cat target/completions/hyprnome.fish) \ - --zsh <(cat target/completions/_hyprnome) + --bash target/completions/hyprnome.bash \ + --fish target/completions/hyprnome.fish \ + --zsh target/completions/_hyprnome ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 8b6667867627..6e60df8bde46 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -23,11 +23,11 @@ }: stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2401.21-jammy"; + version = "1.2402.12-jammy"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; - hash = "sha256-BIPTVhOBzaKzZR0WhQOX2W8kDg64UWOgIVvgaw2Gckc="; + hash = "sha256-S5+Ddm13OJ4eQTQ9Q8OgsCqnpM6GxuZ1hEycZCy6//g="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix new file mode 100644 index 000000000000..51ce3ded630e --- /dev/null +++ b/pkgs/by-name/ja/jankyborders/package.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, pkg-config +, pkgs +, overrideSDK +, darwin +, testers +}: +let + stdenv = overrideSDK pkgs.stdenv "11.0"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "JankyBorders"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "FelixKratz"; + repo = "JankyBorders"; + rev = "v${finalAttrs.version}"; + hash = "sha256-DX1d228UCOI+JU+RxenhiGyn3AiqpsGe0aCtr091szs="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = with darwin.apple_sdk.frameworks; [ + AppKit + ApplicationServices + CoreFoundation + CoreGraphics + SkyLight + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ./bin/borders $out/bin/borders + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "borders-v${finalAttrs.version}"; + }; + + meta = { + description = "JankyBorders is a lightweight tool designed to add colored borders to user windows on macOS 14.0+"; + longDescription = "It enhances the user experience by visually highlighting the currently focused window without relying on the accessibility API, thereby being faster than comparable tools."; + homepage = "https://github.com/FelixKratz/JankyBorders"; + license = lib.licenses.gpl3; + mainProgram = "borders"; + maintainers = with lib.maintainers; [ khaneliman ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/applications/file-managers/joshuto/default.nix b/pkgs/by-name/jo/joshuto/package.nix similarity index 86% rename from pkgs/applications/file-managers/joshuto/default.nix rename to pkgs/by-name/jo/joshuto/package.nix index f2bb67292306..08f5429fbb5c 100644 --- a/pkgs/applications/file-managers/joshuto/default.nix +++ b/pkgs/by-name/jo/joshuto/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "kamiyaa"; repo = "joshuto"; rev = "v${version}"; - hash = "sha256-d2r8xPGnH/299wjEijilgqy3u/xJgtRmwzJdHt0sA+o="; + hash = "sha256-8OvaL6HqsJjBAbksR4EpC/ZgvdBSKlB37PP77p3T3PY="; }; - cargoHash = "sha256-amgqoL7NYfl3WzTtgvDoBX46rsL9248rbCis6MHVQhE="; + cargoHash = "sha256-zGqOmebD7kZAsWunWSB2NFOSg0cu8aM1dyhEIQz1j4I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ku/kubectl-validate/package.nix b/pkgs/by-name/ku/kubectl-validate/package.nix index 13ca4998c58d..f01b05b18b21 100644 --- a/pkgs/by-name/ku/kubectl-validate/package.nix +++ b/pkgs/by-name/ku/kubectl-validate/package.nix @@ -4,7 +4,7 @@ , nix-update-script }: let - version = "0.0.1"; + version = "0.0.3"; in buildGoModule { inherit version; @@ -14,7 +14,7 @@ buildGoModule { owner = "kubernetes-sigs"; repo = "kubectl-validate"; rev = "v${version}"; - hash = "sha256-0lwN+3Cy7O9kX9dh8PjxmvdyKSZhBxcxy+b+ZtuDZaw="; + hash = "sha256-k2+2QIPjNw6C/Do1WhPN39VZhZX4PZ6ZsKDKGJ9E5QA="; }; vendorHash = null; diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index 9fb72d1d143b..0853481fe1ed 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-v71qAJSpnbHd+jkPkR34IVNvwWLhm04TrPzduB6ZOgA="; + hash = "sha256-qn5EjddLVRhN90SICa39A28giXQ24Ol1nfbxNH5TXhc="; }; - vendorHash = "sha256-lHV5Ik/L/Svn9AvcKZupq778ektEsbxfOkCts4Ocx9g="; + vendorHash = "sha256-R9qaG19Vp+1a7AL0q8Cl1jN89cbXzLwbnN163WMWAEw="; ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/la/labelife-label-printer/package.nix b/pkgs/by-name/la/labelife-label-printer/package.nix new file mode 100644 index 000000000000..fb73aa24d572 --- /dev/null +++ b/pkgs/by-name/la/labelife-label-printer/package.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchurl +, cups +, autoPatchelfHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "labelife-label-printer"; + version = "1.2.1"; + + arch = + if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" + else if stdenv.hostPlatform.system == "i686-linux" then "i386" + else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + src = fetchurl { + url = "https://oss.saas.aimocloud.com/saas/Lablife/bag/LabelPrinter-${finalAttrs.version}.tar.gz"; + hash = "sha256-twnIFMBMyEM3xGlsuk3763C3emz3mgpEnlfvnL0XRWw="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ cups ]; + + installPhase = + '' + runHook preInstall + # Install the CUPS filter with executable permissions + install -Dm755 ./${finalAttrs.arch}/rastertolabeltspl $out/lib/cups/filter/rastertolabeltspl + + # Install all PPD files with read and write permissions for owner, and read for group and others + for ppd in ./ppds/*.ppd; do + install -Dm644 $ppd $out/share/cups/model/label/$(basename $ppd) + done + runHook postInstall + ''; + + meta = { + description = "CUPS driver for several Labelife-compatible thermal label printers"; + downloadPage = "https://labelife.net/#/chart"; + homepage = "https://labelife.net"; + license = lib.licenses.unfree; + longDescription = '' + Supported printer models include: + - D520 & D520BT + - PM-201 + - PM-241 & PM-241-BT + - PM-246 & PM-246S + + Brands using Labelife drivers include: + - Phomemo + - Itari + - Omezizy + - Aimo + ''; + maintainers = with lib.maintainers; [ daniel-fahey ]; + platforms = with lib; [ "i686-linux" "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix index c14e3065b722..1d84dbd4eeb9 100644 --- a/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-menu-generator"; - version = "unstable-2024-03-11"; + version = "unstable-2024-03-12"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-menu-generator"; - rev = "38d08a6695fe9d3176059dc5c57a9c84f9ef4981"; - hash = "sha256-wB5+VmtxjuWbeuDdtGt0f9u7bc3j1Bb6r5MfmMsmE0M="; + rev = "85a014db7214103c14c2bfbb5fc09a349ad64992"; + hash = "sha256-nt/K00cr1dKEk547J/6w1j6O3WSgGqVt1+Jdw95K28s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix index c74896b88ac8..78779051349e 100644 --- a/pkgs/by-name/lu/lutgen/package.nix +++ b/pkgs/by-name/lu/lutgen/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lutgen"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ozwaldorf"; repo = "lutgen-rs"; rev = "v${version}"; - hash = "sha256-tKSPk0V11pnKFV4E08H4CUnjw9nAonTRI6W3mGipd9I="; + hash = "sha256-O2995+DLiCRDM/+oPTOBiM0L1x0jmbLTlR48+5IfOQw="; }; - cargoHash = "sha256-DiorrgTH9lIdmaZL7451uCXj9X7M6eHf4MQc85MpU7s="; + cargoHash = "sha256-ys4c/YUJJikDEUJjzagZBB+kSy+EFf+PqQdK/h+3gWU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 78f1b3bebc4e..81853d252efa 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -1,6 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script +}: let - version = "0.0.38"; + version = "0.0.42"; in buildGoModule { @@ -12,7 +13,7 @@ buildGoModule { repo = "mcap"; owner = "foxglove"; rev = "releases/mcap-cli/v${version}"; - hash = "sha256-mwKWf0kJ3uMx1cLUac+AqXgQ1Af3tLDOCTFKgq8FtHE="; + hash = "sha256-9fjzMUMWn5j8AJJq+tK+Hq0o8d3HpacitJZ5CfLiaLw="; }; vendorHash = "sha256-Gl0zLBTWscKGtVOS6rPRL/r8KHYHpZwoUDbEyCL4Ijk="; @@ -34,11 +35,16 @@ buildGoModule { "-skip=TestCat|TestInfo" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "MCAP CLI tool to inspect and fix MCAP files"; homepage = "https://github.com/foxglove/mcap"; license = with licenses; [ mit ]; maintainers = with maintainers; [ squalus therishidesai ]; + mainProgram = "mcap"; }; } diff --git a/pkgs/by-name/mk/mkalias/package.nix b/pkgs/by-name/mk/mkalias/package.nix new file mode 100644 index 000000000000..507ce73827e8 --- /dev/null +++ b/pkgs/by-name/mk/mkalias/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, darwin +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mkalias"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "vs49688"; + repo = "mkalias"; + rev = "v${finalAttrs.version}"; + hash = "sha256-L6bgCJ0fdiWmtlgTzDmTenTMP74UFUEqiDmE1+gg3zw="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + darwin.apple_sdk.frameworks.Foundation + ]; + + installPhase = '' + runHook preInstall + + install -D mkalias $out/bin/mkalias + + runHook postInstall + ''; + + meta = { + description = "Quick'n'dirty tool to make APFS aliases"; + homepage = "https://github.com/vs49688/mkalias"; + license = lib.licenses.mit; + mainProgram = "mkalias"; + maintainers = with lib.maintainers; [ zane emilytrau ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock index 8979931acce8..311901f8a242 100644 --- a/pkgs/by-name/my/mycelium/Cargo.lock +++ b/pkgs/by-name/my/mycelium/Cargo.lock @@ -146,18 +146,19 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", "itoa", "matchit", "memchr", @@ -178,17 +179,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", ] @@ -310,6 +314,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "cipher" version = "0.4.4" @@ -504,9 +514,9 @@ dependencies = [ [[package]] name = "etherparse" -version = "0.13.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827292ea592108849932ad8e30218f8b1f21c0dfd0696698a18b5d0aed62d990" +checksum = "24890603eb4b43aa788f02261ce21714449033e3e2ab93692f0ab18480c3c9b1" dependencies = [ "arrayvec", ] @@ -691,7 +701,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", "indexmap", "slab", "tokio", @@ -728,6 +757,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -735,7 +775,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -767,9 +830,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -782,17 +845,39 @@ dependencies = [ ] [[package]] -name = "hyper-rustls" -version = "0.24.2" +name = "hyper" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ + "bytes", + "futures-channel", "futures-util", - "http", - "hyper", - "rustls", + "h2 0.4.2", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2", "tokio", - "tokio-rustls", ] [[package]] @@ -886,9 +971,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -908,9 +993,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "loom" @@ -972,9 +1057,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -983,7 +1068,7 @@ dependencies = [ [[package]] name = "mycelium" -version = "0.4.2" +version = "0.4.3" dependencies = [ "aes-gcm", "axum", @@ -1002,7 +1087,7 @@ dependencies = [ "libc", "log", "network-interface", - "nix 0.27.1", + "nix 0.28.0", "pretty_env_logger", "quinn", "rand", @@ -1119,6 +1204,18 @@ dependencies = [ "bitflags 2.4.2", "cfg-if", "libc", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "cfg_aliases", + "libc", "memoffset", ] @@ -1360,9 +1457,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d918c80c5a4c7560db726763020bd16db179e4d5b828078842274a443addb5d" +checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" dependencies = [ "pem", "ring 0.17.7", @@ -1425,11 +1522,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "ipnet", "js-sys", "log", @@ -1437,20 +1533,16 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", - "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", "winreg", ] @@ -1541,21 +1633,11 @@ version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ - "log", "ring 0.17.7", "rustls-webpki", "sct", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -1602,18 +1684,18 @@ checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -1622,9 +1704,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -1879,16 +1961,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - [[package]] name = "tokio-stream" version = "0.1.14" @@ -1929,9 +2001,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", @@ -1950,9 +2022,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ "indexmap", "serde", @@ -2241,12 +2313,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - [[package]] name = "winapi" version = "0.3.9" @@ -2459,9 +2525,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.34" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -2504,9 +2570,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index d5b66705d15a..b3aee2f9ff3e 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-VWrWg9UpBSug0cvY/zuzGFI6Y0CRFcrh1Cy4mbYtg9Q="; + hash = "sha256-bA3ci+vqXBCPBaxMvfUdFcqdaZbAw/+r5UbH/as/fnc="; }; cargoLock = { @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/threefoldtech/mycelium"; changelog = "https://github.com/threefoldtech/mycelium/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ matthewcroughan ]; + maintainers = with maintainers; [ flokli matthewcroughan ]; mainProgram = "mycelium"; }; } diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 889311564e2f..d74a257db533 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.348"; + version = "0.0.350"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-SEqiW3AdhvsIU9WEEcaRi8paMNgRvnZTFL874mSjUQE="; + hash = "sha256-qMtmB/KMMkMfU2AyE2pcjiy3wUwyQUpcP6rMkZk3SMI="; }; vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE="; diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix index e2c88c4f4efc..fdbc0b6cb1d3 100644 --- a/pkgs/by-name/op/openapi-tui/package.nix +++ b/pkgs/by-name/op/openapi-tui/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "openapi-tui"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zaghaghi"; repo = "openapi-tui"; rev = version; - hash = "sha256-7xkjlX3+/hdVN2PXoiXbouSoMLy0Qe8uMRlPHWJO5Ts="; + hash = "sha256-flxQ5+nLacQAkrxJafw9D3iXYTFpHcmTshEySmFJ0Cc="; }; - cargoHash = "sha256-U8TOms8C7vV64OKKdJhMAoOha9s2lBqfBWU7pyZ0h/s="; + cargoHash = "sha256-vfEDbUrIXc498QnMJJlMGyTUDvlHgquB5GpWTe7yCvM="; meta = with lib; { description = "Terminal UI to list, browse and run APIs defined with openapi spec"; diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix index 6c9f71999588..d647e1a3c74a 100644 --- a/pkgs/by-name/op/openttd-ttf/package.nix +++ b/pkgs/by-name/op/openttd-ttf/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "openttd-ttf"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "zephyris"; repo = "openttd-ttf"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-GjtfwM268i3bUAX8Pw5/Og9029AuD1OZuJ2VIlFTogY="; + hash = "sha256-Nr3oLiCEdpUhB/IczCEoLM8kb1hGDH/d6WYWRbjgOi8="; }; nativeBuildInputs = [ @@ -25,6 +25,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { postPatch = '' chmod a+x build.sh + # Test requires openttd source and an additional python module, doesn't seem worth it + substituteInPlace build.sh \ + --replace-fail "python3 checkOpenTTDStrings.py ../openttd/src/lang" "" patchShebangs --build build.sh ''; diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index 4c1f02149712..77678a2f5229 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "plumber"; - version = "2.5.4"; + version = "2.6.0"; src = fetchFromGitHub { owner = "streamdal"; repo = pname; rev = "v${version}"; - hash = "sha256-6nPH+HQtpFJ4MAtblFWjaQjDSKtpIxW9tGt2o1ICtos="; + hash = "sha256-H1tyMedYKj1bePNcaEWYP3njHw57cJ0jgxwC7zDXQvk="; }; vendorHash = null; diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix new file mode 100644 index 000000000000..952da297900f --- /dev/null +++ b/pkgs/by-name/pr/pretix/package.nix @@ -0,0 +1,264 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, fetchPypi +, fetchpatch2 +, nodejs +, python3 +, gettext +, nixosTests +, plugins ? [ ] +}: + +let + python = python3.override { + packageOverrides = self: super: { + django = super.django_4; + + stripe = super.stripe.overridePythonAttrs rec { + version = "7.9.0"; + + src = fetchPypi { + pname = "stripe"; + inherit version; + hash = "sha256-hOXkMINaSwzU/SpXzjhTJp0ds0OREc2mtu11LjSc9KE="; + }; + }; + + pretix-plugin-build = self.callPackage ./plugin-build.nix { }; + }; + }; + + pname = "pretix"; + version = "2024.2.0"; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "pretix"; + rev = "refs/tags/v${version}"; + hash = "sha256-emtF5dDXEXN8GIucHbjF+m9Vkg1Jj6nmQdHhBOkXMAs="; + }; + + npmDeps = buildNpmPackage { + pname = "pretix-node-modules"; + inherit version src; + + sourceRoot = "${src.name}/src/pretix/static/npm_dir"; + npmDepsHash = "sha256-kE13dcTdWZZNHPMcHEiK0a2dEcu3Z3/q815YhaVkLbQ="; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -R node_modules $out/ + + runHook postInstall + ''; + }; +in +python.pkgs.buildPythonApplication rec { + inherit pname version src; + pyproject = true; + + patches = [ + # Discover pretix.plugin entrypoints during build and add them into + # INSTALLED_APPS, so that their static files are collected. + ./plugin-build.patch + + (fetchpatch2 { + # Allow customization of cache and log directory + # https://github.com/pretix/pretix/pull/3997 + name = "pretix-directory-customization.patch"; + url = "https://github.com/pretix/pretix/commit/e151d1d1f08917e547df49da0779b36bb73b7294.patch"; + hash = "sha256-lO5eCKSqUaCwSm7rouMTFMwauWl9Tz/Yf0JE/IO+bnI="; + }) + ]; + + postPatch = '' + NODE_PREFIX=src/pretix/static.dist/node_prefix + mkdir -p $NODE_PREFIX + cp -R ${npmDeps}/node_modules $NODE_PREFIX/ + chmod -R u+w $NODE_PREFIX/ + + # unused + sed -i "/setuptools-rust/d" pyproject.toml + + substituteInPlace pyproject.toml \ + --replace-fail phonenumberslite phonenumbers \ + --replace-fail psycopg2-binary psycopg2 \ + --replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \ + --replace-fail "bleach==5.0.*" bleach \ + --replace-fail "dnspython==2.5.*" dnspython \ + --replace-fail "importlib_metadata==7.*" importlib_metadata \ + --replace-fail "protobuf==4.25.*" protobuf \ + --replace-fail "pycryptodome==3.20.*" pycryptodome \ + --replace-fail "pypdf==3.9.*" pypdf \ + --replace-fail "python-dateutil==2.8.*" python-dateutil \ + --replace-fail "sentry-sdk==1.40.*" sentry-sdk \ + --replace-fail "stripe==7.9.*" stripe + ''; + + build-system = with python.pkgs; [ + gettext + nodejs + pythonRelaxDepsHook + setuptools + tomli + ]; + + dependencies = with python.pkgs; [ + arabic-reshaper + babel + beautifulsoup4 + bleach + celery + chardet + cryptography + css-inline + defusedcsv + dj-static + django + django-bootstrap3 + django-compressor + django-countries + django-filter + django-formset-js-improved + django-formtools + django-hierarkey + django-hijack + django-i18nfield + django-libsass + django-localflavor + django-markup + django-oauth-toolkit + django-otp + django-phonenumber-field + django-redis + django-scopes + django-statici18n + djangorestframework + dnspython + drf-ujson2 + geoip2 + importlib-metadata + isoweek + jsonschema + kombu + libsass + lxml + markdown + mt-940 + oauthlib + openpyxl + packaging + paypalrestsdk + paypal-checkout-serversdk + pyjwt + phonenumbers + pillow + pretix-plugin-build + protobuf + psycopg2 + pycountry + pycparser + pycryptodome + pypdf + python-bidi + python-dateutil + pytz + pytz-deprecation-shim + pyuca + qrcode + redis + reportlab + requests + sentry-sdk + sepaxml + slimit + static3 + stripe + text-unidecode + tlds + tqdm + vat-moss + vobject + webauthn + zeep + ] ++ plugins; + + optional-dependencies = with python.pkgs; { + memcached = [ + pylibmc + ]; + }; + + postInstall = '' + mkdir -p $out/bin + cp ./src/manage.py $out/bin/pretix-manage + + # Trim packages size + rm -rfv $out/${python.sitePackages}/pretix/static.dist/node_prefix + ''; + + dontStrip = true; # no binaries + + nativeCheckInputs = with python.pkgs; [ + pytestCheckHook + pytest-xdist + pytest-mock + pytest-django + pytest-asyncio + pytest-rerunfailures + freezegun + fakeredis + responses + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + pytestFlagsArray = [ + "--reruns" "3" + + # tests fail when run before 4:30am + # https://github.com/pretix/pretix/pull/3987 + "--deselect=src/tests/base/test_orders.py::PaymentReminderTests::test_sent_days" + "--deselect=src/tests/plugins/sendmail/test_rules.py::test_sendmail_rule_specified_subevent" + ]; + + preCheck = '' + export PYTHONPATH=$(pwd)/src:$PYTHONPATH + export DJANGO_SETTINGS_MODULE=tests.settings + ''; + + passthru = { + inherit + npmDeps + python + ; + plugins = lib.recurseIntoAttrs + (python.pkgs.callPackage ./plugins { + inherit (python.pkgs) callPackage; + } + ); + tests = { + inherit (nixosTests) pretix; + }; + }; + + meta = with lib; { + description = "Ticketing software that cares about your event—all the way"; + homepage = "https://github.com/pretix/pretix"; + license = with licenses; [ + agpl3Only + # 3rd party components below src/pretix/static + bsd2 + isc + mit + ofl # fontawesome + unlicense + # all other files below src/pretix/static and src/pretix/locale and aux scripts + asl20 + ]; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/pr/pretix/plugin-build.nix b/pkgs/by-name/pr/pretix/plugin-build.nix new file mode 100644 index 000000000000..307ff4114eb7 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugin-build.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + django, + gettext, +}: + +buildPythonPackage rec { + pname = "pretix-plugin-build"; + version = "1.0.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-iLbqcCAbeK4PyLXiebpdE27rt6bOP7eXczIG2bdvvYo="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + django + gettext + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = ""; + homepage = "https://github.com/pretix/pretix-plugin-build"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/pr/pretix/plugin-build.patch b/pkgs/by-name/pr/pretix/plugin-build.patch new file mode 100644 index 000000000000..aa935ed28148 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugin-build.patch @@ -0,0 +1,20 @@ +diff --git a/src/pretix/_build_settings.py b/src/pretix/_build_settings.py +index c03f56a1a..d1ea73b84 100644 +--- a/src/pretix/_build_settings.py ++++ b/src/pretix/_build_settings.py +@@ -24,6 +24,8 @@ + This file contains settings that we need at wheel require time. All settings that we only need at runtime are set + in settings.py. + """ ++from importlib_metadata import entry_points ++ + from ._base_settings import * # NOQA + + ENTROPY = { +@@ -47,3 +49,6 @@ HAS_MEMCACHED = False + HAS_CELERY = False + HAS_GEOIP = False + SENTRY_ENABLED = False ++ ++for entry_point in entry_points(group='pretix.plugin'): ++ INSTALLED_APPS.append(entry_point.module) # noqa: F405 diff --git a/pkgs/by-name/pr/pretix/plugins/default.nix b/pkgs/by-name/pr/pretix/plugins/default.nix new file mode 100644 index 000000000000..70e643705c00 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/default.nix @@ -0,0 +1,13 @@ +{ callPackage +, ... +}: + +{ + pages = callPackage ./pages.nix { }; + + passbook = callPackage ./passbook.nix { }; + + reluctant-stripe = callPackage ./reluctant-stripe.nix { }; + + stretchgoals = callPackage ./stretchgoals.nix { }; +} diff --git a/pkgs/by-name/pr/pretix/plugins/pages.nix b/pkgs/by-name/pr/pretix/plugins/pages.nix new file mode 100644 index 000000000000..91f8ef032f77 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/pages.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pretix-plugin-build +, setuptools +}: + +buildPythonPackage rec { + pname = "pretix-pages"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "pretix-pages"; + rev = "v${version}"; + hash = "sha256-cO5tAiOifLpqFEQwYgrGoByUecpzvue8YmChpPwm+y0="; + }; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "pretix_pages" + ]; + + meta = with lib; { + description = "Plugin to add static pages to your pretix event"; + homepage = "https://github.com/pretix/pretix-pages"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch b/pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch new file mode 100644 index 000000000000..44c0d56886af --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch @@ -0,0 +1,33 @@ +diff --git a/pretix_passbook/apps.py b/pretix_passbook/apps.py +index e34eee1..a7ad382 100644 +--- a/pretix_passbook/apps.py ++++ b/pretix_passbook/apps.py +@@ -22,15 +22,6 @@ class PassbookApp(AppConfig): + def ready(self): + from . import signals # NOQA + +- @cached_property +- def compatibility_errors(self): +- import shutil +- +- errs = [] +- if not shutil.which("openssl"): +- errs.append("The OpenSSL binary is not installed or not in the PATH.") +- return errs +- + @cached_property + def compatibility_warnings(self): + errs = [] +diff --git a/pretix_passbook/forms.py b/pretix_passbook/forms.py +index 2a38604..aec38de 100644 +--- a/pretix_passbook/forms.py ++++ b/pretix_passbook/forms.py +@@ -41,7 +41,7 @@ class CertificateFileField(forms.FileField): + return SimpleUploadedFile("cert.pem", content, "text/plain") + + openssl_cmd = [ +- "openssl", ++ "@openssl@", + "x509", + "-inform", + "DER", diff --git a/pkgs/by-name/pr/pretix/plugins/passbook.nix b/pkgs/by-name/pr/pretix/plugins/passbook.nix new file mode 100644 index 000000000000..b7d380aa681d --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/passbook.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll + +# build-system +, pretix-plugin-build +, setuptools + +# runtime +, openssl + +# dependencies +, googlemaps +, wallet-py3k +}: + +buildPythonPackage rec { + pname = "pretix-passbook"; + version = "1.13.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "pretix-passbook"; + rev = "v${version}"; + hash = "sha256-bp64wCEMon05JhOaDr/cVbqUxc+7ndcsSuSesxJt8GE="; + }; + + patches = [ + (substituteAll { + src = ./passbook-openssl.patch; + openssl = lib.getExe openssl; + }) + ]; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + dependencies = [ + googlemaps + wallet-py3k + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "pretix_passbook" + ]; + + meta = with lib; { + description = "Support for Apple Wallet/Passbook files in pretix"; + homepage = "https://github.com/pretix/pretix-passbook"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix b/pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix new file mode 100644 index 000000000000..40ab96a36bca --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pretix-plugin-build +, setuptools +}: + +buildPythonPackage { + pname = "pretix-reluctant-stripe"; + version = "unstable-2023-08-03"; + pyproject = true; + + src = fetchFromGitHub { + owner = "metarheinmain"; + repo = "pretix-reluctant-stripe"; + rev = "ae2d770442553e5fc00815ff4521a8fd2c113fd9"; + hash = "sha256-bw9aDMxl4/uar5KHjj+wwkYkaGMRxHWY/c1N75bxu0o="; + }; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "pretix_reluctant_stripe" + ]; + + meta = with lib; { + description = "Nudge users to not use Stripe as a payment provider"; + homepage = "https://github.com/metarheinmain/pretix-reluctant-stripe"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/pr/pretix/plugins/stretchgoals.nix b/pkgs/by-name/pr/pretix/plugins/stretchgoals.nix new file mode 100644 index 000000000000..4d1cb8d02e84 --- /dev/null +++ b/pkgs/by-name/pr/pretix/plugins/stretchgoals.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pretix-plugin-build +, setuptools +}: + +buildPythonPackage { + pname = "pretix-avgchart"; + version = "unstable-2023-11-27"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rixx"; + repo = "pretix-avgchart"; + rev = "219816c7ec523a5c23778523b2616ac0c835cb3a"; + hash = "sha256-1V/0PUvStgQeBQ0v6GoofAgyPmWs3RD+v5ekmAO9vFU="; + }; + + build-system = [ + pretix-plugin-build + setuptools + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "pretix_stretchgoals" + ]; + + meta = with lib; { + description = "Display the average ticket sales price over time"; + homepage = "https://github.com/rixx/pretix-avgchart"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix new file mode 100644 index 000000000000..68e147ca4f9c --- /dev/null +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenvNoCC +, fetchzip +, writeScript +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "proton-ge-bin"; + version = "GE-Proton9-1"; + + src = fetchzip { + url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; + hash = "sha256-odpzRlzW7MJGRcorRNo784Rh97ssViO70/1azHRggf0="; + }; + + outputs = [ "out" "steamcompattool" ]; + + buildCommand = '' + runHook preBuild + + # Make it impossible to add to an environment. You should use the appropriate NixOS option. + # Also leave some breadcrumbs in the file. + echo "${finalAttrs.pname} should not be installed into environments. Please use programs.steam.extraCompatPackages instead." > $out + + ln -s $src $steamcompattool + + runHook postBuild + ''; + + /* + We use the created releases, and not the tags, for the update script as nix-update loads releases.atom + that contains both. Sometimes upstream pushes the tags but the Github releases don't get created due to + CI errors. Last time this happened was on 8-33, where a tag was created but no releases were created. + As of 2024-03-13, there have been no announcements indicating that the CI has been fixed, and thus + we avoid nix-update-script and use our own update script instead. + See: + */ + passthru.updateScript = writeScript "update-proton-ge" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + repo="https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases" + version="$(curl -sL "$repo" | jq 'map(select(.prerelease == false)) | .[0].tag_name' --raw-output)" + update-source-version proton-ge-bin "$version" + ''; + + meta = { + description = '' + Compatibility tool for Steam Play based on Wine and additional components. + + (This is intended for use in the `programs.steam.extraCompatPackages` option only.) + ''; + homepage = "https://github.com/GloriousEggroll/proton-ge-custom"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ NotAShelf shawn8901 ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index b6af65fa0b38..24736a889e51 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "unstable-2024-02-29"; + version = "unstable-2024-03-12"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "a53f2f01039a462bdd7322d1fb315edd95033b6d"; - hash = "sha256-DsHNS9pZu3ZWM3teG3pUi0EM+8znmCPTSGuzGmJ4IgU="; + rev = "eff98d616e3541e54ca783c84f598c9e348a76a8"; + hash = "sha256-qNHj5WOSca04ceGeRNa60M6cH9/rRHLEF1YX75yYDO8="; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix similarity index 57% rename from pkgs/data/fonts/sarasa-gothic/default.nix rename to pkgs/by-name/sa/sarasa-gothic/package.nix index 35f098442c22..3d91b7ee0f47 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -1,19 +1,24 @@ -{ lib, stdenvNoCC, fetchurl, p7zip }: +{ + lib, + stdenvNoCC, + fetchurl, + unzip, +}: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) - url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/Sarasa-TTC-${version}.7z"; - hash = "sha256-OPoX6GNCilA8Lj9kLO6RHapU7mpZTiNa/8LL72TG1Wk="; + url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}b/Sarasa-TTC-${finalAttrs.version}.zip"; + hash = "sha256-MkbmEn4vV2WEDC8pW+WewPuVhlLPi2iGmhvJW6Szksw="; }; sourceRoot = "."; - nativeBuildInputs = [ p7zip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' runHook preInstall @@ -24,11 +29,14 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "A CJK programming font based on Iosevka and Source Han Sans"; homepage = "https://github.com/be5invis/Sarasa-Gothic"; - license = licenses.ofl; - maintainers = [ maintainers.ChengCat ]; - platforms = platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ + ChengCat + wegank + ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/si/signal-export/package.nix b/pkgs/by-name/si/signal-export/package.nix index 1ec9762d62bc..3f9f9fa54ead 100644 --- a/pkgs/by-name/si/signal-export/package.nix +++ b/pkgs/by-name/si/signal-export/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "signal-export"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-v4civFGu+CLRTGicQAMSei+k6Iyz0GAznTLEr7ylx24="; + sha256 = "sha256-Hm0BVF2RUsxDacsAB3MJtk1t9FYmBPjeb5JzwaLkZ14="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 611ee8b47025..c1e79f9d6d86 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.34.0"; + version = "2.34.1"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-37bR6Tf6vOrrILb9liyyCYiH6VNnGpQ3yUnQcXA8o14="; + hash = "sha256-tVB0dkxp19EpUXN7X2rnnRlYuSc7Ja7sokmN9tNvY2k="; }; vendorHash = "sha256-axE1SY+UW5oddyhOiktq+vNfhw2/SFX4ut4Hivg6TYQ="; diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix new file mode 100644 index 000000000000..9601d99263ac --- /dev/null +++ b/pkgs/by-name/sr/srb2kart/package.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, fetchzip +, fetchFromGitHub +, cmake +, curl +, nasm +, game-music-emu +, libpng +, SDL2 +, SDL2_mixer +, zlib +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "srb2kart"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "STJr"; + repo = "Kart-Public"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0="; + }; + + assets = stdenv.mkDerivation { + pname = "srb2kart-data"; + version = finalAttrs.version; + + src = fetchzip { + url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip"; + hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/srb2kart + cp -r * $out/share/srb2kart + + runHook postInstall + ''; + }; + + nativeBuildInputs = [ + cmake + nasm + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + curl + game-music-emu + libpng + SDL2 + SDL2_mixer + zlib + ]; + + cmakeFlags = [ + "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2kart" + "-DGME_INCLUDE_DIR=${game-music-emu}/include" + "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" + "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" + ]; + + desktopItems = [ + (makeDesktopItem rec { + name = "Sonic Robo Blast 2 Kart"; + exec = finalAttrs.pname; + icon = finalAttrs.pname; + comment = "Kart racing mod based on SRB2"; + desktopName = name; + genericName = name; + startupWMClass = ".srb2kart-wrapped"; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 ../srb2.png $out/share/pixmaps/srb2kart.png + install -Dm644 ../srb2.png $out/share/icons/srb2kart.png + install -Dm755 bin/srb2kart $out/bin/srb2kart + + wrapProgram $out/bin/srb2kart \ + --set SRB2WADDIR "${finalAttrs.assets}/share/srb2kart" + + runHook postInstall + ''; + + meta = with lib; { + description = "SRB2Kart is a classic styled kart racer"; + homepage = "https://mb.srb2.org/threads/srb2kart.25868/"; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric donovanglover ]; + mainProgram = "srb2kart"; + }; +}) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/by-name/sw/swww/package.nix similarity index 83% rename from pkgs/tools/wayland/swww/default.nix rename to pkgs/by-name/sw/swww/package.nix index 9973e6b2fb69..cf9b878a506d 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/by-name/sw/swww/package.nix @@ -14,12 +14,12 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "LGFae"; - repo = pname; + repo = "swww"; rev = "refs/tags/v${version}"; hash = "sha256-n7YdUmIZGu7W7cX6OvVW+wbkKjFvont4hEAhZXYDQd8="; }; - cargoSha256 = "sha256-lZC71M3lbsI+itMydAp5VCz0cpSHo/FpkQFC1NlN4DU="; + cargoHash = "sha256-lZC71M3lbsI+itMydAp5VCz0cpSHo/FpkQFC1NlN4DU="; buildInputs = [ lz4 @@ -42,9 +42,9 @@ rustPlatform.buildRustPackage rec { done installShellCompletion --cmd swww \ - --bash <(cat completions/swww.bash) \ - --fish <(cat completions/swww.fish) \ - --zsh <(cat completions/_swww) + --bash completions/swww.bash \ + --fish completions/swww.fish \ + --zsh completions/_swww ''; meta = with lib; { diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 8b58fef47f57..dc1e3c73d77b 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-VHyEE0SziwDAzlv8VLt08tMXb20sqxTSj64hC+FyjUw=", - "version": "0.2024.03.05.08.02.stable_01" + "hash": "sha256-GgaRlROSWYZgFlH0bH6PTnRE3L/bb0kX0P6m7nmPlsY=", + "version": "0.2024.03.12.08.02.stable_01" }, "linux": { - "hash": "sha256-CI1bzdFles9XNvqmkyNq9zJBf4P6HF8QIo1FsSDydjQ=", - "version": "0.2024.03.05.08.02.stable_01" + "hash": "sha256-9reFBIu32TzxE46c3PBVzkZYaMV4HVDASvTAVQltYN0=", + "version": "0.2024.03.12.08.02.stable_01" } } diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix index 4fab6ae6574e..509845a637ee 100644 --- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix +++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix @@ -6,18 +6,18 @@ , withNativeLibs ? false }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "wl-clipboard-rs"; - version = "0.8.0-unstable-2023-11-27"; + version = "0.8.1"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "wl-clipboard-rs"; - rev = "be851408e0f91edffdc2f1a76805035847f9f8a9"; - hash = "sha256-OfLn7izG1KSUjdd2gO4aaSCDlcaWoFiFmgwwhR1hRsQ="; + rev = "v${version}"; + hash = "sha256-tNmpGBg21IuhKEzY15O2MKVpMB+eCjvRVwVUahADuJU="; }; - cargoHash = "sha256-rYFCPyWTUhyrEcoRM8I+iX7IaY/6i1tBVjhs47m3XY8="; + cargoHash = "sha256-0Ix+fF1QO1KU8FIOb8EV4iYXe4S69sZOxCdxYccL8m0="; cargoBuildFlags = [ "--package=wl-clipboard-rs" @@ -47,14 +47,13 @@ rustPlatform.buildRustPackage { "--skip=tests::copy::copy_test" ]; - meta = { + meta = with lib; { description = "Command-line copy/paste utilities for Wayland, written in Rust"; homepage = "https://github.com/YaLTeR/wl-clipboard-rs"; - # TODO: add `${version}` once we switch to tagged release - changelog = "https://github.com/YaLTeR/wl-clipboard-rs/blob/master/CHANGELOG.md"; - platforms = lib.platforms.linux; - license = with lib.licenses; [ asl20 mit ]; + changelog = "https://github.com/YaLTeR/wl-clipboard-rs/blob/v${version}/CHANGELOG.md"; + platforms = platforms.linux; + license = with licenses; [ asl20 mit ]; mainProgram = "wl-clip"; - maintainers = with lib.maintainers; [ thiagokokada ]; + maintainers = with maintainers; [ thiagokokada donovanglover ]; }; } diff --git a/pkgs/by-name/x5/x509-limbo/package.nix b/pkgs/by-name/x5/x509-limbo/package.nix new file mode 100644 index 000000000000..18fe5778b7c4 --- /dev/null +++ b/pkgs/by-name/x5/x509-limbo/package.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, python3 +, x509-limbo +}: + +python3.pkgs.buildPythonPackage { + pname = "x509-limbo"; + version = "unstable-2024-03-13"; + pyproject = true; + + src = fetchFromGitHub { + owner = "C2SP"; + repo = "x509-limbo"; + rev = "a04fb05cf132e1405f71c12616cf0aead829909a"; + hash = "sha256-TA4ciHkXg/RKzcIs2bwpx7CxsQDyQMG636Rr74xPsBA="; + }; + + dependencies = with python3.pkgs; [ + flit-core + + requests + pydantic + jinja2 + cryptography + pyopenssl + pyyaml + certvalidator + certifi + ]; + + postInstall = '' + mkdir -p $out/share + cp limbo.json $out/share/ + + wrapProgram $out/bin/limbo \ + --append-flags "--limbo $out/share/limbo.json" + ''; + + meta = with lib; { + homepage = "https://x509-limbo.com/"; + description = "A suite of testvectors for X.509 certificate path validation and tools for building them "; + + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ baloo ]; + }; +} diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 294fac1dc861..a7551bd24332 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xiu"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "harlanc"; repo = "xiu"; rev = "v${version}"; - hash = "sha256-tXZCWbqwt3v20rvfre/gAUzs8i78FpbNd5qAGNOX5VE="; + hash = "sha256-JST8nxsT+w524VzNeIW38Oct/n7VJ/nvrmgks2Vff30="; }; - cargoHash = "sha256-6nWnw31A27VWJe8JGM+S05sqcZwQRrb1aanamv6ITZ4="; + cargoHash = "sha256-te60gZdDmbgOF6rLDAnvDx6vUbmCz3pC/wbu/iXgxAw="; nativeBuildInputs = [ cmake diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index 454b35e2bd65..cfc3689d7cc3 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "unstable-2024-03-10"; + version = "unstable-2024-03-13"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "e28f5b8f8cbb7c3213c428667e351114188169ed"; - hash = "sha256-B0Cakf/hLiW/z71BzzVhieJOE2C0jLb9GkDVM4zpICc="; + rev = "573f88083ae759f480860552f66e9951077bc428"; + hash = "sha256-BQPlKcsfhpVTtVrwS9yVpIkujF6vM/ToIDmy9X60Mhs="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 7356d6342c4d..275f3935b41f 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "6.0.9"; + version = "6.0.12"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-QdODR4zmbMuzSVy6eJhwJHNPXkAn6oCLHq+YZEOmtIU="; + hash = "sha256-VAF6Dn9cGmipQhAKhEOLd7lJyYWySOJ+rehc9L8pfL0="; }; cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 29c0e1b824e9..611721da3642 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -3,16 +3,17 @@ , fetchurl , pkg-config , gettext +, caja , gtk3 , glib , libxml2 , libarchive , libsecret , poppler +, mate-desktop , itstool , hicolor-icon-theme , texlive -, mate , wrapGAppsHook , enableEpub ? true , webkitgtk_4_1 @@ -28,11 +29,11 @@ stdenv.mkDerivation rec { pname = "atril"; - version = "1.26.2"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wwW51fVxP0Jiau4DggkTA0IrPXGlbd1lkyzNsjx86SY="; + sha256 = "ztRyX26bccTqY2dr/DzDvgnSnboIqnp6uXlk4LQ1UWI="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + caja gtk3 glib itstool @@ -49,8 +51,7 @@ stdenv.mkDerivation rec { libsecret libxml2 poppler - mate.caja - mate.mate-desktop + mate-desktop hicolor-icon-theme texlive.bin.core # for synctex, used by the pdf back-end ] diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index bb19521e835c..7841d0769a36 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -5,8 +5,8 @@ , pkg-config , gobject-introspection , gdk-pixbuf +, caja , gtk3 -, mate , python3 , dropbox , mateUpdateScript @@ -17,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "caja-dropbox"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16w4r0zjps12lmzwiwpb9qnmbvd0p391q97296sxa8k88b1x14wn"; + sha256 = "t0w4qZQlS9PPfLxxK8LsdRagypQqpleFJs29aqYgGWM="; }; patches = [ @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + caja gtk3 - mate.caja python3 ]; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 1cbbd97cc484..a73b892c5649 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -3,23 +3,24 @@ , fetchurl , pkg-config , gettext +, caja +, glib +, gst_all_1 , gtk3 , gupnp -, mate , imagemagick +, mate-desktop , wrapGAppsHook , mateUpdateScript -, glib -, substituteAll }: stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "WJwZ4/oQJC1iOaXMuVhVmENqVuvpTS6ypQtZUMzh1SA="; + sha256 = "0phsXgdAg1/icc+9WCPu6vAyka8XYyA/RwCruBCeMXU="; }; nativeBuildInputs = [ @@ -29,31 +30,20 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + caja + glib + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gtk3 gupnp - mate.caja - mate.mate-desktop imagemagick - ]; - - patches = [ - (substituteAll { - src = ./hardcode-gsettings.patch; - caja_gsetttings_path = glib.getSchemaPath mate.caja; - desktop_gsetttings_path = glib.getSchemaPath mate.mate-desktop; - }) + mate-desktop ]; postPatch = '' - substituteInPlace open-terminal/caja-open-terminal.c --subst-var-by \ - GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} - substituteInPlace sendto/caja-sendto-command.c --subst-var-by \ - GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} - substituteInPlace wallpaper/caja-wallpaper-extension.c --subst-var-by \ - GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} - for f in image-converter/caja-image-{resizer,rotator}.c; do - substituteInPlace $f --replace "/usr/bin/convert" "${imagemagick}/bin/convert" + substituteInPlace $f --replace-fail 'argv[0] = "convert"' 'argv[0] = "${imagemagick}/bin/convert"' done ''; diff --git a/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch b/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch deleted file mode 100644 index f37124963d0d..000000000000 --- a/pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff --git a/open-terminal/caja-open-terminal.c b/open-terminal/caja-open-terminal.c -index e14a9bf..691afab 100644 ---- a/open-terminal/caja-open-terminal.c -+++ b/open-terminal/caja-open-terminal.c -@@ -135,8 +135,18 @@ desktop_opens_home_dir (void) - { - gboolean result; - GSettings* settings; -- -- settings = g_settings_new (COT_SCHEMA); -+ GSettingsSchemaSource* schema_source; -+ GSettingsSchema* schema; -+ -+ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ COT_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); - result = g_settings_get_boolean (settings, COT_DESKTOP_KEY); - g_object_unref (settings); - return result; -@@ -147,8 +157,18 @@ set_desktop_opens_home_dir (gboolean val) - { - gboolean result; - GSettings* settings; -- -- settings = g_settings_new (COT_SCHEMA); -+ GSettingsSchemaSource* schema_source; -+ GSettingsSchema* schema; -+ -+ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ COT_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); - result = g_settings_set_boolean (settings, COT_DESKTOP_KEY, val); - g_object_unref (settings); - return result; -@@ -159,8 +179,18 @@ desktop_is_home_dir (void) - { - gboolean result; - GSettings* settings; -- -- settings = g_settings_new (CAJA_SCHEMA); -+ GSettingsSchemaSource* schema_source; -+ GSettingsSchema* schema; -+ -+ schema_source = g_settings_schema_source_new_from_directory("@caja_gsetttings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ CAJA_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); - result = g_settings_get_boolean (settings, CAJA_DESKTOP_KEY); - g_object_unref (settings); - return result; -@@ -171,8 +201,18 @@ default_terminal_application (void) - { - gchar *result; - GSettings* settings; -- -- settings = g_settings_new (TERM_SCHEMA); -+ GSettingsSchemaSource* schema_source; -+ GSettingsSchema* schema; -+ -+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ TERM_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); - result = g_settings_get_string (settings, TERM_EXEC_KEY); - g_object_unref (settings); - -@@ -189,8 +229,18 @@ set_default_terminal_application (const gchar* exec) - { - gboolean result; - GSettings* settings; -- -- settings = g_settings_new (TERM_SCHEMA); -+ GSettingsSchemaSource* schema_source; -+ GSettingsSchema* schema; -+ -+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ TERM_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); - result = g_settings_set_string (settings, TERM_EXEC_KEY, exec); - g_object_unref (settings); - return result; -diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c -index 8181db6..579dc81 100644 ---- a/sendto/caja-sendto-command.c -+++ b/sendto/caja-sendto-command.c -@@ -801,6 +801,8 @@ caja_sendto_init (void) - int main (int argc, char **argv) - { - GOptionContext *context; -+ GSettingsSchemaSource* schema_source; -+ GSettingsSchema* schema; - GError *error = NULL; - - #ifdef ENABLE_NLS -@@ -818,7 +820,15 @@ int main (int argc, char **argv) - return 1; - } - -- settings = g_settings_new ("org.mate.Caja.Sendto"); -+ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.mate.Caja.Sendto", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); - caja_sendto_init (); - if (caja_sendto_plugin_init () == FALSE) { - GtkWidget *error_dialog; -diff --git a/wallpaper/caja-wallpaper-extension.c b/wallpaper/caja-wallpaper-extension.c -index 3119e9f..4f80c88 100644 ---- a/wallpaper/caja-wallpaper-extension.c -+++ b/wallpaper/caja-wallpaper-extension.c -@@ -47,6 +47,8 @@ set_wallpaper_callback (CajaMenuItem *item, - { - GList *files; - GSettings *settings; -+ GSettingsSchemaSource* schema_source; -+ GSettingsSchema* schema; - CajaFileInfo *file; - gchar *uri; - gchar *filename; -@@ -57,7 +59,15 @@ set_wallpaper_callback (CajaMenuItem *item, - uri = caja_file_info_get_uri (file); - filename = g_filename_from_uri(uri, NULL, NULL); - -- settings = g_settings_new (WP_SCHEMA); -+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ WP_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); - - g_settings_set_string (settings, WP_FILE_KEY, filename); - diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix deleted file mode 100644 index 4de6d5d6d760..000000000000 --- a/pkgs/desktops/mate/caja-with-extensions/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv -, lib -, makeWrapper -, caja-extensions -, caja -, extensions ? [ caja-extensions ] -, mateUpdateScript -}: - -stdenv.mkDerivation { - pname = "${caja.pname}-with-extensions"; - version = caja.version; - - dontUnpack = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - inherit caja; - - installPhase = '' - mkdir -p $out/bin - makeWrapper $caja/bin/caja $out/bin/caja \ - --set CAJA_EXTENSION_DIRS ${lib.concatMapStringsSep ":" (x: "${x.outPath}/lib/caja/extensions-2.0") extensions} - ''; - - inherit (caja.meta); -} diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index fc5a8e93d9b9..a09cef4621a8 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -3,24 +3,26 @@ , fetchurl , pkg-config , gettext +, gtk-layer-shell , gtk3 , libnotify , libxml2 , libexif , exempi -, mate +, mate-desktop , hicolor-icon-theme +, wayland , wrapGAppsHook , mateUpdateScript }: stdenv.mkDerivation rec { pname = "caja"; - version = "1.26.3"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "gT7fCKNvmV7DwVBBMf+K+70CH24VhmQ/5dztXnPleQ0="; + sha256 = "HjAUzhRVgX7C73TQnv37aDXYo3LtmhbvtZGe97ghlXo="; }; nativeBuildInputs = [ @@ -30,13 +32,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gtk-layer-shell gtk3 libnotify libxml2 libexif exempi - mate.mate-desktop + mate-desktop hicolor-icon-theme + wayland ]; configureFlags = [ "--disable-update-mimedb" ]; diff --git a/pkgs/desktops/mate/caja/with-extensions.nix b/pkgs/desktops/mate/caja/with-extensions.nix new file mode 100644 index 000000000000..b9a55b4b9209 --- /dev/null +++ b/pkgs/desktops/mate/caja/with-extensions.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, glib +, wrapGAppsHook +, xorg +, caja +, cajaExtensions +, extensions ? [ ] +, useDefaultExtensions ? true +}: + +let + selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions cajaExtensions); +in +stdenv.mkDerivation { + pname = "${caja.pname}-with-extensions"; + version = caja.version; + + src = null; + + nativeBuildInputs = [ + glib + wrapGAppsHook + ]; + + buildInputs = lib.forEach selectedExtensions (x: x.buildInputs) ++ selectedExtensions + ++ [ caja ] ++ caja.buildInputs; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + preferLocalBuild = true; + allowSubstitutes = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ${xorg.lndir}/bin/lndir -silent ${caja} $out + + dbus_service_path="share/dbus-1/services/org.mate.freedesktop.FileManager1.service" + rm -f $out/share/applications/* "$out/$dbus_service_path" + for file in ${caja}/share/applications/*; do + substitute "$file" "$out/share/applications/$(basename $file)" \ + --replace-fail "${caja}" "$out" + done + substitute "${caja}/$dbus_service_path" "$out/$dbus_service_path" \ + --replace-fail "${caja}" "$out" + + runHook postInstall + ''; + + preFixup = lib.optionalString (selectedExtensions != [ ]) '' + gappsWrapperArgs+=( + --set CAJA_EXTENSION_DIRS ${lib.concatMapStringsSep ":" (x: "${x.outPath}/lib/caja/extensions-2.0") selectedExtensions} + ) + ''; + + inherit (caja.meta); +} diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 8604c0f5ee90..da8c8e065789 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -14,7 +14,7 @@ let caja = callPackage ./caja { }; caja-dropbox = callPackage ./caja-dropbox { }; caja-extensions = callPackage ./caja-extensions { }; - caja-with-extensions = callPackage ./caja-with-extensions { }; + caja-with-extensions = callPackage ./caja/with-extensions.nix { }; engrampa = callPackage ./engrampa { }; eom = callPackage ./eom { }; libmatekbd = callPackage ./libmatekbd { }; @@ -27,6 +27,7 @@ let mate-common = callPackage ./mate-common { }; mate-control-center = callPackage ./mate-control-center { }; mate-desktop = callPackage ./mate-desktop { }; + mate-gsettings-overrides = callPackage ./mate-gsettings-overrides { }; mate-icon-theme = callPackage ./mate-icon-theme { }; mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { }; mate-indicator-applet = callPackage ./mate-indicator-applet { }; @@ -35,6 +36,7 @@ let mate-netbook = callPackage ./mate-netbook { }; mate-notification-daemon = callPackage ./mate-notification-daemon { }; mate-panel = callPackage ./mate-panel { }; + mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { }; mate-polkit = callPackage ./mate-polkit { }; mate-power-manager = callPackage ./mate-power-manager { }; mate-sensors-applet = callPackage ./mate-sensors-applet { }; @@ -49,12 +51,13 @@ let mate-user-guide = callPackage ./mate-user-guide { }; mate-user-share = callPackage ./mate-user-share { }; mate-utils = callPackage ./mate-utils { }; + mate-wayland-session = callPackage ./mate-wayland-session { }; mozo = callPackage ./mozo { }; - pluma = callPackage ./pluma { inherit (pkgs.gnome) adwaita-icon-theme; }; + pluma = callPackage ./pluma { }; python-caja = callPackage ./python-caja { }; + # Caja and mate-panel are managed in NixOS module. basePackages = [ - caja libmatekbd libmatemixer libmateweather @@ -65,7 +68,6 @@ let mate-icon-theme mate-menus mate-notification-daemon - mate-panel mate-polkit mate-session-manager mate-settings-daemon @@ -75,7 +77,7 @@ let extraPackages = [ atril - caja-extensions + caja-extensions # for caja-sendto engrampa eom mate-applets @@ -86,7 +88,6 @@ let mate-netbook mate-power-manager mate-screensaver - mate-sensors-applet mate-system-monitor mate-terminal mate-user-guide @@ -96,6 +97,20 @@ let pluma ]; + cajaExtensions = [ + caja-extensions + ]; + + panelApplets = [ + mate-applets + mate-indicator-applet + mate-netbook + mate-notification-daemon + mate-media + mate-power-manager + mate-sensors-applet + mate-utils + ]; }; in lib.makeScope pkgs.newScope packages diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 8ed6f37fc4d6..d8ec65de6b9d 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -5,22 +5,24 @@ , gettext , itstool , libxml2 +, caja , gtk3 -, mate , hicolor-icon-theme +, json-glib +, mate-desktop , wrapGAppsHook , mateUpdateScript -# can be defaulted to true once engrampa builds with meson (version > 1.27.0) +# can be defaulted to true once switch to meson , withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, file }: stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.26.2"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cx9cR7UfNvyMiWUrbnfbT7K0Zjid6ZkMmFUpo9T/iEw="; + sha256 = "nFxMm8+LCO6qjydVONJLTJVQidWK7AMx6JwCuE2FOGo="; }; nativeBuildInputs = [ @@ -32,10 +34,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + caja gtk3 - mate.caja hicolor-icon-theme - mate.mate-desktop + json-glib + mate-desktop ] ++ lib.optionals withMagic [ file ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 765d10dd9d68..0ca00c27b92b 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -13,7 +13,7 @@ , libpeas , shared-mime-info , gtk3 -, mate +, mate-desktop , hicolor-icon-theme , wrapGAppsHook , mateUpdateScript @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "eom"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "tSUSKUlPfmxi4J+yEeQzCN9PB0xVG6CiM9ws1oZLmWA="; + sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { shared-mime-info gtk3 libpeas - mate.mate-desktop + mate-desktop hicolor-icon-theme ]; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 901d1c6bfffa..918e28f255aa 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libmatekbd"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Y5ONkSUpRe7qiP2DdNEjG9g9As2WXGu6F8GF7bOXvO0="; + sha256 = "XS5YSDwrI9M1A9JMiPi5CijMAYnX5AAbPic6YE9v6A4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 310bfb96a7d9..ebdd3eb07dda 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -7,6 +7,7 @@ , glib , alsaSupport ? stdenv.isLinux , alsa-lib +, udev , pulseaudioSupport ? config.pulseaudio or true , libpulseaudio , ossSupport ? false @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "libmatemixer"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "SWD1mmufr4KgHUpLjMJgtIaN2ZHv1Kmxe10KFaHToa4="; + sha256 = "XXO5Ijl/YGiOPJUw61MrzkbDDiYtsbU1L6MsQNhwoMc="; }; nativeBuildInputs = [ @@ -29,9 +30,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib - ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio; + ] ++ lib.optionals alsaSupport [ + alsa-lib + udev + ] ++ lib.optionals pulseaudioSupport [ + libpulseaudio + ]; configureFlags = lib.optional ossSupport "--enable-oss"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4c7e6eb6c023..4c003c4a9873 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.26.3"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XmzSRBiEfLRazxfaW0NacTHLTsKs/2joKPNCob8T70o="; + sha256 = "VUNz3rWzk7nYSydd0spmyaSi0ObskgRPq4qlPjAy0rU="; }; strictDeps = true; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 0e71a9a86fd6..598cc51eca46 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -14,6 +14,7 @@ , gnome , glib , gtk3 +, mate-desktop , mate-settings-daemon , wrapGAppsHook , mateUpdateScript @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "marco"; - version = "1.26.2"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EvGiVP4QcvAwSIRxHgiaVoJ4CgEVk0Au043muUgOB6M="; + sha256 = "JJbl5A7pgM1oSUk6w+D4/Q3si4HGdNqNm6GaV38KwuE="; }; nativeBuildInputs = [ @@ -45,9 +46,15 @@ stdenv.mkDerivation rec { libstartup_notification gtk3 gnome.zenity + mate-desktop mate-settings-daemon ]; + postPatch = '' + substituteInPlace src/core/util.c \ + --replace-fail 'argvl[i++] = "zenity"' 'argvl[i++] = "${gnome.zenity}/bin/zenity"' + ''; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index dfb4e4620c51..3e20dc74da43 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -7,7 +7,7 @@ , dbus-glib , glib , gtk3 -, gtksourceview3 +, gtksourceview4 , gucharmap , libmateweather , libnl @@ -20,7 +20,6 @@ , polkit , upower , wirelesstools -, mate , hicolor-icon-theme , wrapGAppsHook , mateUpdateScript @@ -28,11 +27,11 @@ stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Orj2HbN23DM85MGHIsY6B/qz6OEnK34OCXrUWXsXwsI="; + sha256 = "G2vva9XTJvudyCj/kQ5LG5KUtGYMMR3ByQMQ/Zw1ZoY="; }; nativeBuildInputs = [ @@ -45,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus-glib gtk3 - gtksourceview3 + gtksourceview4 gucharmap hicolor-icon-theme libgtop @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { wirelesstools ]; - configureFlags = [ "--enable-suid=no" ]; + configureFlags = [ "--enable-suid=no" "--enable-in-process" ]; env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 639f156c8ac7..0d512260d303 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,31 +1,21 @@ { lib -, stdenv +, stdenvNoCC , fetchurl -, fetchpatch , meson , ninja , gettext , mateUpdateScript }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mate-backgrounds"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d"; + sha256 = "UNGv0CSGvQesIqWmtu+jAxFI8NSKguSI2QmtVwA6aUM="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next update. - # https://github.com/mate-desktop/mate-backgrounds/pull/39 - (fetchpatch { - url = "https://github.com/mate-desktop/mate-backgrounds/commit/0096e237d420e6247a75a1c6940a818e309ac2a7.patch"; - sha256 = "HEF8VWunFO+NCG18fZA7lbE2l8pc6Z3jcD+rSZ1Jsqg="; - }) - ]; - nativeBuildInputs = [ gettext meson diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index cdb743cac665..4a4d6db2a3b3 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mddfh9ixhh60nfgx5kcprcl9liavwqyina11q3pnpfs3n02df3y"; + sha256 = "gEsSXR4oZLHnSvgW2psquLGUcrmvl0Q37nNVraXmKPU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 0f4a1901932b..fac27474e32a 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,16 +1,16 @@ { lib -, stdenv +, stdenvNoCC , fetchurl , mateUpdateScript }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mate-common"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "014wpfqpqmfkzv81paap4fz15mj1gsyvaxlrfqsp9a3yxw4f7jaf"; + sha256 = "QrfCzuJo9x1+HBrU9pvNoOzWVXipZyIYfGt2N40mugo="; }; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 8e2e3ea621c2..8305601204e2 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -5,17 +5,27 @@ , gettext , itstool , libxml2 +, accountsservice +, caja , dbus-glib , libxklavier , libcanberra-gtk3 +, libgtop +, libmatekbd , librsvg -, libappindicator-gtk3 +, libayatana-appindicator , glib , desktop-file-utils , dconf , gtk3 , polkit -, mate +, marco +, mate-desktop +, mate-menus +, mate-panel +, mate-settings-daemon +, udisks2 +, systemd , hicolor-icon-theme , wrapGAppsHook , mateUpdateScript @@ -23,11 +33,11 @@ stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "4F9JKjtleqVvxY989xvIyA344lNR/eTbT1I6uNtbVgg="; + sha256 = "6/LHBP1SSNwvmDb/KQKIae8p1QVJB8xhVzS2ODp5FLw="; }; nativeBuildInputs = [ @@ -39,32 +49,41 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + accountsservice libxml2 dbus-glib libxklavier libcanberra-gtk3 + libgtop + libmatekbd librsvg - libappindicator-gtk3 + libayatana-appindicator gtk3 dconf polkit hicolor-icon-theme - mate.mate-desktop - mate.libmatekbd - mate.mate-menus - mate.mate-panel # for org.mate.panel schema, see m-c-c#678 - mate.marco - mate.mate-settings-daemon + marco + mate-desktop + mate-menus + mate-panel # for org.mate.panel schema, see m-c-c#678 + mate-settings-daemon + udisks2 + systemd ]; + postPatch = '' + substituteInPlace capplets/system-info/mate-system-info.c \ + --replace-fail "/usr/bin/mate-about" "${mate-desktop}/bin/mate-about" + ''; + configureFlags = [ "--disable-update-mimedb" ]; preFixup = '' gappsWrapperArgs+=( # WM keyboard shortcuts - --prefix XDG_DATA_DIRS : "${mate.marco}/share" + --prefix XDG_DATA_DIRS : "${marco}/share" # Desktop font, works only when passed after gtk3 schemas in the wrapper for some reason - --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath mate.caja}" + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath caja}" ) ''; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index d7c052ae3c24..4f917028bd80 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -4,7 +4,7 @@ , pkg-config , gettext , isocodes -, gnome +, libstartup_notification , gtk3 , dconf , wrapGAppsHook @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { pname = "mate-desktop"; - version = "1.26.2"; + version = "1.28.2"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XtA/fFLXt+zknKHnNqp2au/rXGOeqz5oxwkMUw0CN2o="; + sha256 = "MrtLeSAUs5HB4biunBioK01EdlCYS0y6fSjpVWSWSqI="; }; nativeBuildInputs = [ @@ -28,10 +30,14 @@ stdenv.mkDerivation rec { buildInputs = [ dconf - gtk3 isocodes ]; + propagatedBuildInputs = [ + gtk3 + libstartup_notification + ]; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/desktops/mate/mate-gsettings-overrides/default.nix b/pkgs/desktops/mate/mate-gsettings-overrides/default.nix new file mode 100644 index 000000000000..e9e2c3c3b0b9 --- /dev/null +++ b/pkgs/desktops/mate/mate-gsettings-overrides/default.nix @@ -0,0 +1,24 @@ +{ lib +, runCommand +, gsettings-desktop-schemas +, mate-wayland-session +, glib +}: + +let + gsettingsOverridePackages = [ + gsettings-desktop-schemas + mate-wayland-session + ]; +in +runCommand "mate-gsettings-overrides" { preferLocalBuild = true; } '' + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" + mkdir -p "$schema_dir" + + ${lib.concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages} + + chmod -R a+w "$data_dir" + + ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir" +'' diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 1f874fa6f16e..b951d929bb06 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "mate-icon-theme"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"; + sha256 = "lNYHkGDKXfdFQpId5O6ji30C0HVhyRk1bZXeh2+abTo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index b6445151f594..0a915625958b 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -5,7 +5,7 @@ , gettext , gtk3 , libayatana-indicator -, mate +, mate-panel , hicolor-icon-theme , wrapGAppsHook , mateUpdateScript @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { pname = "mate-indicator-applet"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "144fh9f3lag2cqnmb6zxlh8k83ya8kha6rmd7r8gg3z5w3nzpyz4"; + sha256 = "zrPXA5cKPlWNfNffCxwhceOvdSolSVrO0uIiwemtSc0="; }; postPatch = '' # Find installed Unity & Ayatana (new-style) indicators substituteInPlace src/applet-main.c \ - --replace '/usr/share' '/run/current-system/sw/share' + --replace-fail '/usr/share' '/run/current-system/sw/share' ''; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libayatana-indicator - mate.mate-panel + mate-panel hicolor-icon-theme ]; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 0b5eae0172e0..4b2590088e1d 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -4,32 +4,27 @@ , pkg-config , gettext , libtool -, libxml2 -, libcanberra-gtk3 +, gtk-layer-shell , gtk3 -, mate +, libcanberra-gtk3 +, libmatemixer +, libxml2 +, mate-desktop +, mate-panel +, wayland , wrapGAppsHook , mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-media"; - version = "1.26.2"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "r0ZjlXTMOIUTCJyhC7FB/8Pm0awz5zDkII21dZZChQ8="; + sha256 = "vNwQLiL2P1XmMWbVxwjpHBE1cOajCodDRaiGCeg6mRI="; }; - buildInputs = [ - libxml2 - libcanberra-gtk3 - gtk3 - mate.libmatemixer - mate.mate-panel - mate.mate-desktop - ]; - nativeBuildInputs = [ pkg-config gettext @@ -37,6 +32,19 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; + buildInputs = [ + gtk-layer-shell + gtk3 + libcanberra-gtk3 + libmatemixer + libxml2 + mate-desktop + mate-panel + wayland + ]; + + configureFlags = [ "--enable-in-process" ]; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 9d879340ce1e..9328147e642c 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mate-menus"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RY1ZmuW2UMfSF0D5/pVMSoOL5F7WKrQOIOMG+vXdHYw="; + sha256 = "z0DHXH1vCq0dSWmCj8YgJcYiK8aoTwu51urX5FlwUI0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 7569a676db11..ca1fa2e17289 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -7,6 +7,7 @@ , libcanberra-gtk3 , libnotify , libwnck +, gtk-layer-shell , gtk3 , libxml2 , mate-desktop @@ -17,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Dq6SlsSKPHH9VvGTGWH5LSnkWgRf5fGgX4PHQAwxmSQ="; + sha256 = "pDEDSOrYZsvLm0xGP00mXMapahp4KpQRoIsjvWXbsuA="; }; nativeBuildInputs = [ @@ -35,11 +36,14 @@ stdenv.mkDerivation rec { libcanberra-gtk3 libnotify libwnck + gtk-layer-shell gtk3 mate-desktop mate-panel ]; + configureFlags = [ "--enable-in-process" ]; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 214e1767f25b..75340bf4dc96 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -5,25 +5,31 @@ , gettext , itstool , glib +, gnome +, gtk-layer-shell +, gtk3 +, libmateweather , libwnck , librsvg , libxml2 , dconf -, gtk3 -, mate +, mate-desktop +, mate-menus , hicolor-icon-theme +, wayland , gobject-introspection , wrapGAppsHook +, marco , mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.26.4"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IHD51RVlfl3c2g2H73KXE9upy3sq0GIjvWdKIcxrPa8="; + sha256 = "s70EoJTQ61vX3DOA728MSdmp1SCXM9fM17RtBmogjLo="; }; nativeBuildInputs = [ @@ -35,18 +41,29 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib + gtk-layer-shell + libmateweather libwnck librsvg libxml2 - gtk3 dconf - mate.libmateweather - mate.mate-desktop - mate.mate-menus + mate-desktop + mate-menus hicolor-icon-theme + wayland ]; + propagatedBuildInputs = [ + glib + gtk3 + # See https://github.com/mate-desktop/mate-panel/issues/1402 + # This is propagated for mate_panel_applet_settings_new and applet's wrapGAppsHook + gnome.dconf-editor + ]; + + # Needed for Wayland support. + configureFlags = [ "--with-in-process-applets=all" ]; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; makeFlags = [ @@ -57,7 +74,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( # Workspace switcher settings, works only when passed after gtk3 schemas in the wrapper for some reason - --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath mate.marco}" + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath marco}" ) ''; diff --git a/pkgs/desktops/mate/mate-panel/with-applets.nix b/pkgs/desktops/mate/mate-panel/with-applets.nix new file mode 100644 index 000000000000..e3f76645aa7c --- /dev/null +++ b/pkgs/desktops/mate/mate-panel/with-applets.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, glib +, wrapGAppsHook +, xorg +, marco +, mate-panel +, panelApplets +, applets ? [ ] +, useDefaultApplets ? true +}: + +let + selectedApplets = applets ++ (lib.optionals useDefaultApplets panelApplets); +in +stdenv.mkDerivation { + pname = "${mate-panel.pname}-with-applets"; + version = mate-panel.version; + + src = null; + + paths = [ mate-panel ] ++ selectedApplets; + passAsFile = [ "paths" ]; + + nativeBuildInputs = [ + glib + wrapGAppsHook + ]; + + buildInputs = lib.forEach selectedApplets (x: x.buildInputs) ++ selectedApplets + ++ [ mate-panel ] ++ mate-panel.buildInputs ++ mate-panel.propagatedBuildInputs; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + preferLocalBuild = true; + allowSubstitutes = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out + for i in $(cat $pathsPath); do + ${xorg.lndir}/bin/lndir -silent $i $out + done + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set MATE_PANEL_APPLETS_DIR "$out/share/mate-panel/applets" + --set MATE_PANEL_EXTRA_MODULES "$out/lib/mate-panel/applets" + # Workspace switcher settings + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath marco}" + ) + ''; + + inherit (mate-panel.meta); +} diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 1adee4c01b0f..827a641d3967 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -5,19 +5,18 @@ , gettext , gtk3 , gobject-introspection -, libappindicator-gtk3 -, libindicator-gtk3 +, libayatana-appindicator , polkit , mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-polkit"; - version = "1.26.1"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "9bewtd/FMwLEBAMkWZjrkSGvP1DnFmagmrc7slRSA1c="; + sha256 = "NQod0KjtaiycGDz/KiHzlCmelo/MauLoyTxWXa5gSug="; }; nativeBuildInputs = [ @@ -28,8 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - libappindicator-gtk3 - libindicator-gtk3 + libayatana-appindicator polkit ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 1bf511d5073f..1eaff61fc1b2 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -6,6 +6,7 @@ , glib , itstool , libxml2 +, mate-desktop , mate-panel , libnotify , libcanberra-gtk3 @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.26.1"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IM2dIu0Eur+Yu1DnGg7F14qKR2KHcjJ4+H2nbKv7EEI="; + sha256 = "jr3LdLYH6Ggza6moFGze+Pl7zlNcKwyzv2UMWPce7iE="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { dbus-glib upower polkit + mate-desktop mate-panel ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 37cf461b78a5..2d2c9bfaf952 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -8,20 +8,22 @@ , libXScrnSaver , libnotify , libxml2 +, mate-desktop +, mate-menus +, mate-panel , pam , systemd -, mate , wrapGAppsHook , mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.26.2"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2pcAziQUW9VdJJJ+7P5tMdClLq6G5WOyxlBUs1al/34="; + sha256 = "ag8kqPhKL5XhARSrU+Y/1KymiKVf3FA+1lDgpBDj6nA="; }; nativeBuildInputs = [ @@ -36,11 +38,11 @@ stdenv.mkDerivation rec { dbus-glib libXScrnSaver libnotify + mate-desktop + mate-menus + mate-panel pam systemd - mate.mate-desktop - mate.mate-menus - mate.mate-panel ]; configureFlags = [ "--without-console-kit" ]; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 7c5988e34503..88fc966edb56 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -10,29 +10,26 @@ , libatasmart , libnotify , lm_sensors -, mate +, mate-panel , hicolor-icon-theme -, wrapGAppsHook , mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0s19r30fsicqvvcnz57lv158pi35w9zn5i7h5hz59224y0zpqhsc"; + sha256 = "1GU2ZoKvj+uGGCg8l4notw22/RfKj6lQrG9xAQIxWoE="; }; nativeBuildInputs = [ pkg-config gettext itstool - wrapGAppsHook ]; - # maybe add nvidia-settings later on buildInputs = [ gtk3 libxml2 @@ -40,10 +37,12 @@ stdenv.mkDerivation rec { libatasmart libnotify lm_sensors - mate.mate-panel + mate-panel hicolor-icon-theme ]; + configureFlags = [ "--enable-in-process" ]; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 443339388f17..c8b0c94f888e 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -8,11 +8,13 @@ , systemd , libSM , libXtst +, glib , gtk3 , libepoxy , polkit , hicolor-icon-theme -, mate +, mate-desktop +, mate-screensaver , wrapGAppsHook , fetchpatch , mateUpdateScript @@ -20,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "W4x9ZEH9nCk8hjiCq2enSTxTzfZOqyfAlFdfQj69Qng="; + sha256 = "0yzkWVuh2mUpB3cgPyvIK9lzshSjoECAoe9caJkKLXs="; }; patches = [ @@ -48,7 +50,8 @@ stdenv.mkDerivation rec { libSM libXtst gtk3 - mate.mate-desktop + mate-desktop + mate-screensaver # for gsm_manager_init hicolor-icon-theme libepoxy polkit @@ -56,9 +59,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + postFixup = '' substituteInPlace $out/share/xsessions/mate.desktop \ - --replace "Exec=mate-session" "Exec=$out/bin/mate-session" + --replace-fail "Exec=mate-session" "Exec=$out/bin/mate-session" ''; passthru.providedSessions = [ "mate" ]; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 6d245add0df3..09085ed04869 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,15 +4,16 @@ , pkg-config , gettext , glib -, dbus-glib , libxklavier , libcanberra-gtk3 , libnotify +, libmatekbd +, libmatemixer , nss , polkit , dconf , gtk3 -, mate +, mate-desktop , pulseaudioSupport ? stdenv.config.pulseaudio or true , libpulseaudio , wrapGAppsHook @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "aX6mW1QpIcK3ZhRSktJo0wCcwtqDFtKnhphpBV5LGFk="; + sha256 = "TtfNraqkyZ7//AKCuEEXA7t24HLEHEtXmJ+MW0BhGjo="; }; nativeBuildInputs = [ @@ -35,17 +36,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus-glib libxklavier libcanberra-gtk3 libnotify + libmatekbd + libmatemixer nss polkit gtk3 dconf - mate.mate-desktop - mate.libmatekbd - mate.libmatemixer + mate-desktop ] ++ lib.optional pulseaudioSupport libpulseaudio; configureFlags = lib.optional pulseaudioSupport "--enable-pulse"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index a29cc7c18ec7..9408e6529365 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -7,21 +7,21 @@ , gtkmm3 , libxml2 , libgtop -, libwnck , librsvg , polkit , systemd , wrapGAppsHook +, mate-desktop , mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.26.3"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "WFthNBX3bucDt7XlK1WWKUKVB+A8kwVKSq3Pb5xlIkk="; + sha256 = "QtZj1rkPtTYevBP2VHmD1vHirHXcKuTxysbqYymWWiU="; }; nativeBuildInputs = [ @@ -35,13 +35,16 @@ stdenv.mkDerivation rec { gtkmm3 libxml2 libgtop - libwnck librsvg polkit systemd ]; - configureFlags = [ "--enable-systemd" ]; + postPatch = '' + # This package does not provide mate-version.xml. + substituteInPlace src/sysinfo.cpp \ + --replace-fail 'DATADIR "/mate-about/mate-version.xml"' '"${mate-desktop}/share/mate-about/mate-version.xml"' + ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index e2406789df43..76c002c9299d 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "mate-terminal"; - version = "1.26.1"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "fBMCBvC0eIfoySdOc/jBn65RETRXKGmnwjERt4nh4dA="; + sha256 = "8TXrGp4q4ieY7LLcGRT9tM/XdOa7ZcAVK+N8xslGnpI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 5b894c40340c..7dc2e9ad4221 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "mate-user-guide"; - version = "1.26.2"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "TTK241ZKyPTqqysVSC33+XaXUN+IEavtg30KLn7jgIs="; + sha256 = "U+8IFPUGVEYU7WGre+UiHMjTqfFPfvlpjJD+fkYBS54="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace mate-user-guide.desktop.in.in \ - --replace "Exec=yelp" "Exec=${yelp}/bin/yelp" + --replace-fail "Exec=yelp" "Exec=${yelp}/bin/yelp" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 84204e3e34be..3e33e4fd47a4 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -5,6 +5,7 @@ , gettext , itstool , gtk3 +, caja , dbus-glib , libnotify , libxml2 @@ -21,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "mate-user-share"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wh0b4qw5wzpl7sg44lpwjb9r6xllch3xfz8c2cchl8rcgbh2kph"; + sha256 = "iYVgmZkXllE0jkl+8I81C4YIG5expKcwQHfurlc5rjg="; }; nativeBuildInputs = [ @@ -38,10 +39,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 + caja dbus-glib libnotify libcanberra-gtk3 - mate.caja hicolor-icon-theme # Should mod_dnssd and apacheHttpd be runtime dependencies? # In gnome-user-share they are not. diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index cfe24a4888a0..35ce76d7c0fa 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,43 +1,34 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , gettext , itstool , glib +, gtk-layer-shell , gtk3 , libxml2 , libgtop , libcanberra-gtk3 , inkscape , udisks2 -, mate +, mate-desktop +, mate-panel , hicolor-icon-theme +, wayland , wrapGAppsHook , mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-utils"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "L1NHWxoJkd1ak9ndpY/KTkFvJZJTWG2UpbEQjxI3BiA="; + sha256 = "WESdeg0dkA/wO3jKn36Ywh6X9H/Ca+5/8cYYNPIviNM="; }; - patches = [ - # Hopefully helps "libxml2.treeError: xmlSetProp() failed" - # This patch is not part of upstream yet. - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919058 - # https://github.com/mate-desktop/mate-utils/issues/210 - (fetchpatch { - url = "https://salsa.debian.org/debian-mate-team/mate-utils/-/raw/2b43d78f3fdbf0aa50716b62bcada2ef015957c6/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch"; - sha256 = "SZVpdup/bNv+3hEGQ0L13mgXyNm+wRcL53t9/Oi24wA="; - }) - ]; - nativeBuildInputs = [ pkg-config gettext @@ -47,15 +38,28 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gtk-layer-shell gtk3 libgtop libcanberra-gtk3 libxml2 udisks2 - mate.mate-panel + mate-desktop + mate-panel hicolor-icon-theme + wayland ]; + postPatch = '' + # Workaround undefined version requirements + # https://github.com/mate-desktop/mate-utils/issues/361 + substituteInPlace configure \ + --replace-fail '>= $GTK_LAYER_SHELL_REQUIRED_VERSION' "" \ + --replace-fail '>= $GDK_WAYLAND_REQUIRED_VERSION' "" + ''; + + configureFlags = [ "--enable-wayland" ]; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-wayland-session/default.nix b/pkgs/desktops/mate/mate-wayland-session/default.nix new file mode 100644 index 000000000000..b803caa7048f --- /dev/null +++ b/pkgs/desktops/mate/mate-wayland-session/default.nix @@ -0,0 +1,58 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, meson +, ninja +, glib +, mate-polkit +, mate-notification-daemon +, wayfire +, wayfirePlugins +, gitUpdater +}: + +stdenvNoCC.mkDerivation rec { + pname = "mate-wayland-session"; + version = "1.28.3"; + + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "mate-wayland-session"; + rev = "v${version}"; + hash = "sha256-sUAq2BylsvjYn8Lt+nm4yIfVhzIEefxKZYnhJnuxjs0="; + }; + + nativeBuildInputs = [ + meson + ninja + glib + ]; + + postPatch = '' + substituteInPlace session/mate-wayland-components.sh \ + --replace-fail "polkit-mate-authentication-agent-1" "${mate-polkit}/libexec/polkit-mate-authentication-agent-1" \ + --replace-fail "mate-notification-daemon" "${mate-notification-daemon}/libexec/mate-notification-daemon" \ + --replace-fail "cat /usr/bin/blueman-applet" "command -v blueman-applet" \ + --replace-fail "cat /usr/bin/gnome-keyring-daemon" "command -v gnome-keyring-daemon" + + # Ensure wayfire.ini is writable, as this script tries to modify it later. + substituteInPlace session/mate-wayland.sh \ + --replace-fail "cp /usr/share/doc/wayfire/examples/wayfire.ini" "cp --no-preserve=mode,ownership ${wayfire.src}/wayfire.ini" \ + --replace-fail "/usr/share/doc/wayfire/examples/wayfire.ini" "${wayfire.src}/wayfire.ini" \ + --replace-fail "/usr/lib/x86_64-linux-gnu/wayfire/libfiredecor.so" "${wayfirePlugins.firedecor}/lib/wayfire/libfiredecor.so" \ + --replace-fail "/usr/share/doc/firedecor/firedecor.config" "$out/share/doc/firedecor/firedecor.config" + ''; + + passthru = { + providedSessions = [ "MATE" ]; + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Wayland session using Wayfire for the MATE desktop"; + homepage = "https://mate-desktop.org"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = teams.mate.members; + }; +} diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 3b0618bc41ac..94426da24178 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , gettext -, mate +, mate-menus , gtk3 , glib , wrapGAppsHook @@ -13,14 +13,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.26.2"; + version = "1.28.0"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RyxILg7y+xYp5h4X2qoaSH9kOSsCmEncmkCCr7OLye4="; + sha256 = "/piYT/1qqMNtBZS879ugPeObQtQeAHJRaAOE8870SSQ="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = [ - mate.mate-menus + mate-menus python3.pkgs.pygobject3 ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index ed7d54e9469b..98985a28564f 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -9,7 +9,6 @@ , enchant , libxml2 , python3 -, adwaita-icon-theme , gtksourceview4 , libpeas , mate-desktop @@ -19,11 +18,11 @@ stdenv.mkDerivation rec { pname = "pluma"; - version = "1.26.1"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "WVns49cRjhBmWfZNIC0O0XY60Qu7ul0qzYy/ui45lPE="; + sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ="; }; nativeBuildInputs = [ @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - adwaita-icon-theme enchant gtksourceview4 libpeas diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index b9c58d8d9268..7f668cdde996 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -3,19 +3,19 @@ , fetchurl , pkg-config , gettext +, caja , gtk3 -, mate , python3Packages , mateUpdateScript }: stdenv.mkDerivation rec { pname = "python-caja"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "181zcs1pi3762chm4xraqs8048jm7jzwnvgwla1v3z2nqzpp3xr1"; + sha256 = "sFbCOdvf4z7QzIQx+zUAqTj3h7Weh19f+TV4umb2gNY="; }; nativeBuildInputs = [ @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + caja gtk3 - mate.caja python3Packages.python python3Packages.pygobject3 ]; diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index cf35e8536118..80a696179693 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.616"; + version = "0.617"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-MmyVBriesSXxMw1KLvRbNhTUKZFCCV3BawAKmGMnhfs="; + hash = "sha256-5lWEihumXSyBsEOOb/oIz7NTgbdcI9C58m9h/d0MPRk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index d97170bae7a6..ce3dc313621f 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.16"; - hash = "sha256-JljBuJNatrU6fyCTVGAnYasHBm5mkgvEcriBX9G0P3E="; + version = "8.2.17"; + hash = "sha256-GRMWwgMmfZYWC0fSL5VdTcEXk96KXzJ+DCp2J1polOo="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 8c8a587ed548..833e3ae95e4e 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for reading and writing gif images"; homepage = "https://giflib.sourceforge.net/"; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix ++ lib.platforms.windows; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; branch = "5.2"; diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/development/libraries/libajantv2/default.nix index d0d94c2d125a..89d609b327ab 100644 --- a/pkgs/development/libraries/libajantv2/default.nix +++ b/pkgs/development/libraries/libajantv2/default.nix @@ -6,6 +6,9 @@ , pkg-config }: +# Warning: We are aware that the upstream changed and there are new releases, +# this got initally packaged for obs-studio which appears to fail to build even upstream with the new version. +# https://github.com/NixOS/nixpkgs/pull/296191 / https://github.com/obsproject/obs-studio/pull/10037 stdenv.mkDerivation rec { pname = "libajantv2"; version = "16.2-bugfix5"; @@ -29,7 +32,7 @@ stdenv.mkDerivation rec { description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against"; homepage = "https://github.com/aja-video/ntv2"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ sebtm ]; + maintainers = with maintainers; []; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 7aa0cef5a81d..52bf3a272bab 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; homepage = "https://github.com/ebiggers/libdeflate"; changelog = "https://github.com/ebiggers/libdeflate/blob/v${finalAttrs.version}/NEWS.md"; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ orivej kaction ]; pkgConfigModules = [ "libdeflate" ]; }; diff --git a/pkgs/development/libraries/libei/default.nix b/pkgs/development/libraries/libei/default.nix index 688d0448861c..09eb921d6ecf 100644 --- a/pkgs/development/libraries/libei/default.nix +++ b/pkgs/development/libraries/libei/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , fetchFromGitLab -, attr , libevdev , libxkbcommon , meson @@ -10,8 +9,8 @@ , pkg-config , protobuf , protobufc -, python3 , systemd +, buildPackages }: let munit = fetchFromGitHub { @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - (python3.withPackages(ps: with ps; [ + (buildPackages.python3.withPackages (ps: with ps; [ attrs jinja2 pytest diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 15a68bdce589..19896b13998d 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://www.libmng.com"; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index af9e10a6b8f5..80b5f411e663 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libtiff.gitlab.io/libtiff"; changelog = "https://libtiff.gitlab.io/libtiff/v${finalAttrs.version}.html"; license = licenses.libtiff; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "libtiff-4" ]; }; }) diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 281689c60b67..2680dbd1ae92 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S2LMD15MYd/t/Z8B1OQ0hVrZQLR6Gf4LB45mhmDwblg="; + hash = "sha256-BArEaQa+CNGzIoENsZSj9seFx9qdCLWiejh6EvpTch8="; }; strictDeps = true; diff --git a/pkgs/development/libraries/qt-6/modules/qtshadertools.nix b/pkgs/development/libraries/qt-6/modules/qtshadertools.nix index 5a4b894b9abd..b87b22fad321 100644 --- a/pkgs/development/libraries/qt-6/modules/qtshadertools.nix +++ b/pkgs/development/libraries/qt-6/modules/qtshadertools.nix @@ -1,8 +1,14 @@ { qtModule , qtbase +, stdenv +, lib +, pkgsBuildBuild }: qtModule { pname = "qtshadertools"; propagatedBuildInputs = [ qtbase ]; + cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderToolsTools" + ]; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index c25a349ba32d..6c2aaaa8815a 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -39,20 +39,9 @@ stdenv.mkDerivation (finalAttrs: { "tools" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - "-Wno-error=deprecated-copy" - "-Wno-error=pessimizing-move" - # Needed with GCC 12 - "-Wno-error=format-truncation" - "-Wno-error=maybe-uninitialized" - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=unused-private-field" - "-faligned-allocation" - ] ++ lib.optionals (lib.versionOlder finalAttrs.version "8") [ - "-Wno-error=unused-but-set-variable" - ] ++ lib.optionals (lib.versionOlder finalAttrs.version "7") [ - "-Wno-error=deprecated-copy" - ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-faligned-allocation" + ]); cmakeFlags = [ "-DPORTABLE=1" @@ -71,12 +60,25 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_RTTI=1" "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere (lib.optional sse42Support "-DFORCE_SSE42=1") - "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}" + "-DFAIL_ON_WARNINGS=NO" ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; + postPatch = lib.optionalString (lib.versionOlder finalAttrs.version "8") '' + # Fix gcc-13 build failures due to missing and + # includes, fixed upstyream sice 8.x + sed -e '1i #include ' -i db/compaction/compaction_iteration_stats.h + sed -e '1i #include ' -i table/block_based/data_block_hash_index.h + sed -e '1i #include ' -i util/string_util.h + sed -e '1i #include ' -i include/rocksdb/utilities/checkpoint.h + '' + lib.optionalString (lib.versionOlder finalAttrs.version "7") '' + # Fix gcc-13 build failures due to missing and + # includes, fixed upstyream sice 7.x + sed -e '1i #include ' -i third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h + ''; + preInstall = '' mkdir -p $tools/bin cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/ diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 1c63fa8a908c..a2ccc2e1c5b5 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -8,11 +8,11 @@ { autoPatchelfHook , blas , cmake +, cudaPackages_11 ? null , cudaPackages , cudaSupport ? config.cudaSupport , fetchurl , gfortran -, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , gpuTargets ? [ ] # Non-CUDA targets, that is HIP , rocmPackages , lapack @@ -32,9 +32,18 @@ let inherit (lib) lists strings trivial; - inherit (cudaPackages) cudaAtLeast cudaFlags cudaOlder; inherit (magmaRelease) version hash supportedGpuTargets; + # Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1. + # If we're building a version prior to that, use the latest release of the 11.x series. + effectiveCudaPackages = + if strings.versionOlder version "2.7.1" + then cudaPackages_11 + else cudaPackages; + + inherit (effectiveCudaPackages) cudaAtLeast cudaFlags cudaOlder; + inherit (cudaFlags) cudaCapabilities; + # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements # of the first list *from* the second list. That means: # lists.subtractLists a b = b - a @@ -115,7 +124,7 @@ stdenv.mkDerivation { ninja gfortran ] ++ lists.optionals cudaSupport [ - cudaPackages.cuda_nvcc + effectiveCudaPackages.cuda_nvcc ]; buildInputs = [ @@ -123,7 +132,7 @@ stdenv.mkDerivation { lapack blas python3 - ] ++ lists.optionals cudaSupport (with cudaPackages; [ + ] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [ cuda_cudart.dev # cuda_runtime.h cuda_cudart.lib # cudart cuda_cudart.static # cudart_static @@ -173,6 +182,7 @@ stdenv.mkDerivation { # TODO(@connorbaker): This should be handled by having CMakeLists.txt install them, but such a patch is # out of the scope of the PR which introduces the `test` output: https://github.com/NixOS/nixpkgs/pull/283777. # See https://github.com/NixOS/nixpkgs/pull/283777#discussion_r1482125034 for more information. + # Such work is tracked by https://github.com/NixOS/nixpkgs/issues/296286. '' install -Dm755 ../testing/run_{tests,summarize}.py -t "$test/bin/" '' @@ -182,7 +192,7 @@ stdenv.mkDerivation { # because it has no files to install. + '' install -Dm755 ./testing/testing_* ./sparse/testing/testing_* -t "$test/bin/" - install -Dm755 ./lib/libtester.so ./lib/liblapacktest.so -t "$test/lib/" + install -Dm755 ./lib/lib*test*.* -t "$test/lib/" '' # All of the test executables and libraries will have a reference to the build directory in their RPATH, which we # must remove. We do this by shrinking the RPATH to only include the Nix store. The autoPatchelfHook will take care @@ -196,7 +206,8 @@ stdenv.mkDerivation { ''; passthru = { - inherit cudaPackages cudaSupport rocmSupport gpuTargets; + inherit cudaSupport rocmSupport gpuTargets; + cudaPackages = effectiveCudaPackages; }; meta = with lib; { @@ -210,6 +221,7 @@ stdenv.mkDerivation { broken = !(cudaSupport || rocmSupport) # At least one back-end enabled || (cudaSupport && rocmSupport) # Mutually exclusive - || (cudaSupport && cudaOlder "9.0"); + || (cudaSupport && cudaOlder "9.0") + || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null); }; } diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index d7e9f0efe999..9b3ac75d1104 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { passthru = { incdir = "/avr/include"; - libdir = "/avr/lib"; }; meta = with lib; { diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 4402ecda0a8f..e3f79cee61f1 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -15,13 +15,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-7JzFls5cMzlA2aEM7M4+Dg4yIJNzz/vNOXNEITejePk="; + hash = "sha256-5luaCrrnL7l9zhbxYUMSlID7Sx0MQhgFKgl8F6GkGsE="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index dc19f1506958..b2b5a03beac4 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "a2wsgi"; - version = "1.10.2"; + version = "1.10.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RrLKQnz5rVOMFF4y6zaFfhy/R3ty/h7Q49NemMBgYbk="; + hash = "sha256-UOgaxVqmCfosZm5CuswlxCTIiEzmBy8afpAhFLfuXWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 2dfef5a251ad..55c60d8e921a 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-i2dlcparDQlwM7Wk/HwlBz0mmI38ZRwxVM6jLY0rI+0="; + hash = "sha256-ZJ6lb3pd8DhNagaVq1uFwadtviuHCg44YZkh29ipu5U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index edd555a96b16..56298852a377 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.17.0"; + version = "0.17.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-DqVwbiNJHdRxK3Ppfa6sqPJzDqMaj1mtlAJHFq09u2Y="; + hash = "sha256-V0/yboKpK/4QuCOzKDiyFpu/J2JLu0aQxRZ+rpMS9eY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index 261d1b5ab5cd..2a5210c69317 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "axis"; - version = "54"; + version = "55"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-Atx9Lg0WgKcdnXqHieJFadjMPhK1F2qifSa89XxT8J8="; + hash = "sha256-WId4+xLr6VD79r5K+fgrxfyJGWmobTMpYGGNkFrlerQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index a3588cbe9874..91c140dc7fb8 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.17.0"; + version = "4.18.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6/bqxCAvewKR5lI6ulFpP3THu9DH1rDEFwsRynDJ6+k="; + hash = "sha256-OQ6Aet78NorIz1TlPdv5pW5ImDINLwH+ZQCk52Y+tJM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index f1a22d6e9126..25df5a011451 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.62"; + version = "1.34.64"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0ms6qz8xFWwDST6cMbf1SRVJyasMuqV+Cgnjifscipo="; + hash = "sha256-h/fZOx5z46enQ+553+aUXC/KkYaQ84JxfjJ8tESvlq0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 6dd67db97630..76d166fbd75b 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.62"; + version = "1.34.64"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-i0iPzIqL0zsA08frxJB65Eys6o/qk6Tf2sf6tfBlAMg="; + hash = "sha256-FcqR6qKL2AFL0xaoXt8J0WTpN5oSjLptpHLoNNct4u0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 323efb118503..0383e7d0f9cf 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "4.52"; + version = "4.56"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C2w447+hxsFrjLpV3wrSzptuVb1JTyppq+NUzMCU+Iw="; + hash = "sha256-rOAQzT1A/q74WnfazCMDtou7SnP0h+UGCyBxihqLmzc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 44c142b89308..41caa34dedac 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -9,6 +9,7 @@ # native darwin dependencies , libiconv , Security +, SystemConfiguration # tests , pytestCheckHook @@ -52,6 +53,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security + SystemConfiguration ]; pythonImportsCheck = [ @@ -66,6 +68,9 @@ buildPythonPackage rec { disabledTests = [ # fails to connect to local server "test_remote_stylesheet" + ] ++ lib.optionals (stdenv.isDarwin) [ + # pyo3_runtime.PanicException: event loop thread panicked + "test_invalid_href" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index a8d367e854af..543c483023df 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook + +# build-system +, setuptools + +# dependencies +, calmjs +, django-appconf +, jinja2 , rcssmin , rjsmin -, django-appconf + +# tests , beautifulsoup4 , brotli -, pytestCheckHook -, django-sekizai -, pytest-django , csscompressor -, calmjs -, jinja2 -, python +, django-sekizai +, pytestCheckHook +, pytest-django + }: buildPythonPackage rec { pname = "django-compressor"; version = "4.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "django_compressor"; @@ -26,7 +34,17 @@ buildPythonPackage rec { hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "rcssmin" + "rjsmin" + ]; + + dependencies = [ beautifulsoup4 calmjs django-appconf @@ -35,7 +53,9 @@ buildPythonPackage rec { rjsmin ]; - checkInputs = [ + env.DJANGO_SETTINGS_MODULE = "compressor.test_settings"; + + nativeCheckInputs = [ beautifulsoup4 brotli csscompressor @@ -53,8 +73,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "compressor" ]; - DJANGO_SETTINGS_MODULE = "compressor.test_settings"; - meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; homepage = "https://django-compressor.readthedocs.org/"; diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index 216b24e3c0c0..c1078160b6eb 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -1,46 +1,63 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , django , freezegun -, pythonOlder , qrcode +, pytest +, python }: buildPythonPackage rec { pname = "django-otp"; - version = "1.1.3"; - format = "setuptools"; - disabled = pythonOlder "3"; + version = "1.3.0post1"; + pyproject = true; src = fetchFromGitHub { owner = "django-otp"; repo = "django-otp"; rev = "v${version}"; - hash = "sha256-Ac9p7q9yaUr3WTTGxCY16Yo/Z8i1RtnD2g0Aj2pqSXY="; + hash = "sha256-Q8YTCYERyoAXenSiDabxuxaWiD6ZeJKKKgaR/Rg3y20="; }; - postPatch = '' - patchShebangs manage.py - ''; + build-system = [ + hatchling + ]; - propagatedBuildInputs = [ + dependencies = [ django qrcode ]; + env.DJANGO_SETTINGS_MODUOLE = "test.test_project.settings"; + nativeCheckInputs = [ freezegun + pytest ]; checkPhase = '' - ./manage.py test django_otp + runHook preCheck + + export PYTHONPATH=$PYTHONPATH:test + export DJANGO_SETTINGS_MODULE=test_project.settings + ${python.interpreter} -m django test django_otp + + runHook postCheck ''; - pythonImportsCheck = [ "django_otp" ]; + pytestFlagsArray = [ + "src/django_otp/test.py" + ]; + + pythonImportsCheck = [ + "django_otp" + ]; meta = with lib; { - homepage = "https://github.com/jazzband/django-model-utils"; + homepage = "https://github.com/django-otp/django-otp"; + changelog = "https://github.com/django-otp/django-otp/blob/${src.rev}/CHANGES.rst"; description = "Pluggable framework for adding two-factor authentication to Django using one-time passwords"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 9fc04339c226..8ce7bc0340a9 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -1,25 +1,37 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , django , django-appconf + +# tests , pytest-django , pytestCheckHook }: buildPythonPackage rec { pname = "django-statici18n"; - version = "2.3.1"; - format = "setuptools"; + version = "2.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "zyegfryed"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-2fFJJNdF0jspS7djDL8sToPTetzNR6pfNp5ohCNa30I="; + repo = "django-statici18n"; + # https://github.com/zyegfryed/django-statici18n/issues/59 + rev = "9b83a8f0f2e625dd5f56d53cfe4e07aca9479ab6"; + hash = "sha256-KrIlWmN7um9ad2avfANOza579bjYkxTo9F0UFpvLu3A="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ django django-appconf ]; @@ -28,7 +40,7 @@ buildPythonPackage rec { "statici18n" ]; - DJANGO_SETTINGS_MODULE = "tests.test_project.project.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.test_project.project.settings"; nativeCheckInputs = [ pytest-django diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix index 1505103146ad..ccc280040651 100644 --- a/pkgs/development/python-modules/dronecan/default.nix +++ b/pkgs/development/python-modules/dronecan/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "dronecan"; - version = "1.0.25"; + version = "1.0.26"; format = "setuptools"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - hash = "sha256-0WKmVZwE6OgBckWWvPcn5BYqXMEt6Mr1P68UMHfRp4I="; + hash = "sha256-D2odxa9ADswrg6rgKLTyQulHpGec1r0lWRUZDV5YvyE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 42363ecdcdd4..861e2e788994 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.13"; + version = "0.2.14"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-9At9v+7jOt43qPOhZpFYBEXA2zUfp8MAGO4/676kcBU="; + hash = "sha256-FytgckIu99ZKfmxJ0KU+fpbBEgszdp8iwK3SFCL9Ejs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 5c4ce89104c2..93edd623b485 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.20.1"; + version = "2.20.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ttBvGCeWgnPEK1egn2QkYmSclQTcD4dW+Zdw9OPnVa0="; + hash = "sha256-I2BG6oYCMMeI5NTqLQ8SKZzfHZSscexC7RoM4boo1m8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 27794f0cc958..c8c055555d3f 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.43.0"; + version = "3.44.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BmLpX+MUZ0o7iy+jwZ6B5UTZT1hMppZbmMlQg6iGQiI="; + hash = "sha256-NTzAsG/UVn2BxPwUxE/ZnXqkCA9LwhmDRoq3LdstLIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 43b810c1d552..fa904248f3e6 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ical"; - version = "7.0.1"; + version = "7.0.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-kvZZfmrE42uoB9v0PuXopH3g9Cf0hwLkCvaNi6CGX8M="; + hash = "sha256-RiwWnRSe0HdeGVo592A+Rk+IvA1Lfp6mY+/ZEyqJBDU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix new file mode 100644 index 000000000000..476741835116 --- /dev/null +++ b/pkgs/development/python-modules/instructor/default.nix @@ -0,0 +1,41 @@ +{ lib +, python3 +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "instructor"; + version = "0.6.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Af52TGnkqY/t0cPkHoRfhFqa/tuOpQXAI/fFfMTcM4Y="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + docstring-parser + openai + pydantic + rich + tenacity + typer + ]; + + pythonImportsCheck = [ "instructor" ]; + + meta = with lib; { + description = "Structured outputs for llm"; + homepage = "https://github.com/jxnl/instructor"; + changelog = "https://github.com/jxnl/instructor/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + mainProgram = "instructor"; + }; +} diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 23a4200500a4..04b290ff5507 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.27.5"; + version = "4.27.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-MSvgOF/5X78HSSRvv1TBmaYZgcUVMKGaHfzXu3lIGVY="; + hash = "sha256-N34DRWty3QiXDPpHGUvLpQXtU4TQHxI32rizcwQdHBU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index ad212e915681..350e9a903690 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.31"; + version = "0.1.32"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-1mDPIJu2zmHLHIUxB7CRqqgJAVpV3Ongzhm1HUyPKnA="; + hash = "sha256-1iaDvsvyD1HxKHV5GgQjIPReqgyHomfTC8A7waB/XsI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 5ab6970da9fb..d89584de366d 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.23"; + version = "0.1.26"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-AiXTIk20T9symFUenCxnOUXhyNAkffbEt8acEU0EMBg="; + hash = "sha256-bvG4B7xUESbj3iX/SjsManv4itR2kkfixzxkKuZgPfw="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 8f33fcdce4e1..f0358d979103 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.31.6"; + version = "1.31.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-OwIOggEfhvGKVTNiVWAt2osGk3R80U0wmcU6KAshpGw="; + hash = "sha256-/K8LhKr7TpOPk1CMqNoFJCF+C0N6A8pDkBmS6JZ0sb0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index fae1981b1a86..e0101a6672aa 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.4"; + version = "1.5"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-ETvsxUKAP0xiFqpVO921Rup+1/A2DKyaK/oBr1K315I="; + hash = "sha256-a3v2WfJ42bh2LlAsH9ekpLFsAlOiTTLGNknTW2mTxCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index fd96cc0aa78a..f5ddd8f64369 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -59,7 +59,7 @@ rec { mypy-boto3-amp = buildMypyBoto3Package "amp" "1.34.39" "sha256-XOousDfEQsZ9z48iH2wVHuUaIwoECwbkHvIAlV3+zu4="; - mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.34.45" "sha256-hV0fg6Y39NkZ6Qa6GyIYicMERjCBAjZYcSsJ+1jXAfA="; + mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.34.63" "sha256-alOtCCZwBcx6g3lm80AzI5aF8WbEABd44A0e6gfZ42o="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.34.0" "sha256-wP6fOHAUg4dvrlQ2rUNk/lgIr6JnpWu/0Tr2prTckOk="; @@ -105,7 +105,7 @@ rec { mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.34.0" "sha256-16siojcxNe5MuSZSRJXPAz2UudJozEEyCYUrsGNDAM8="; - mypy-boto3-backup = buildMypyBoto3Package "backup" "1.34.0" "sha256-H4wIDyA+/6sH6X5zp/HGP2vfWIY5HzgTfa1ThXfXwYM="; + mypy-boto3-backup = buildMypyBoto3Package "backup" "1.34.64" "sha256-RvxhEmrOtkvagjaj8x2H7AAp+uK9qDIDe7T9p52rKRc="; mypy-boto3-backup-gateway = buildMypyBoto3Package "backup-gateway" "1.34.0" "sha256-nSIEEDKJfI852/WBQ7OuDPuVijEiMr1vhpkzODbhRRc="; @@ -161,7 +161,7 @@ rec { mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.0" "sha256-iUgoanqMSyxRopVctyFLiu+otFSgRvdgQPw4mKX3QIk="; - mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.59" "sha256-dkX5QeHjfBrY8mU+/5tKVkJlqAodBYqkW8oei1iqTl0="; + mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.64" "sha256-ZsTKKDanTLB4jFOGLQTLPEterhabpShrchHvvWcUBMo="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.34.0" "sha256-TsXVy8bx6kaj84PJiNNU+075Tx3WW0mrtZFOyLx9yT4="; @@ -197,7 +197,7 @@ rec { mypy-boto3-config = buildMypyBoto3Package "config" "1.34.45" "sha256-LN1CcIOj9cgzSNCvnUVwLRNPXlitHAlt+5jj6wu6i8E="; - mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.61" "sha256-LbiRcZWmULytWtEy0J2mXqQtHofbbfbRV2PyvEFcRfA="; + mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.64" "sha256-ijgvxHI9taQXYZa1d4yLMp63bCrEFfE0Ug/vmKUGaNM="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.34.0" "sha256-Wx9vcjlgXdWZ2qP3Y/hTY2LAeTd+hyyV5JSIuKQ5I5k="; @@ -251,9 +251,9 @@ rec { mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.34.0" "sha256-xIrrXOayZed+Jcn4CFXXNgKz/G+RdiuwA04wq+Ry/fs="; - mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.61" "sha256-rRK8Q3zUJuelfYvaUhrqxbsFUn1Xl6oxCahaRhI3+W8="; + mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.64" "sha256-fDsnEbTo5UAgPGCoUqGbvk68+9RNN8qZpScW7t/Bq+Q="; - mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.34.0" "sha256-95TXW9HJHciM+lZCdlUYOwcLhkKE8RJpRx9/dEnu3FU="; + mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.34.63" "sha256-kExmGXEJ5jrvOewmWx7AjVb3boD5GU0cEUp/2PQhzlw="; mypy-boto3-ecr = buildMypyBoto3Package "ecr" "1.34.0" "sha256-uD+wMR6WikLUyoIbAGwY1KPj42S4zr7nWOpPqXxaw0U="; @@ -275,7 +275,7 @@ rec { mypy-boto3-elb = buildMypyBoto3Package "elb" "1.34.0" "sha256-5Eh5D872pVDd7Q+DDh3zpGMVgS8fUJsV+63H1fet73s="; - mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.34.32" "sha256-jDrQb4A0PVBSxH7vuPXehpEYdU8Hwgv2Sc2+j0OGVJg="; + mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.34.63" "sha256-snXMLMHLEpJjfX1GJp6FfYgIjkS8vkbf/hESBdhxIfk="; mypy-boto3-emr = buildMypyBoto3Package "emr" "1.34.44" "sha256-zM1VpAaBSxqdZiSrNiaAKfvliNRXMLEmvFvXcFmkZO0="; @@ -297,7 +297,7 @@ rec { mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.46" "sha256-Fgs7wrwKPK79cYduCR/RYQ2FEZvghDuWI1hXKzFLfJo="; - mypy-boto3-fis = buildMypyBoto3Package "fis" "1.34.0" "sha256-0TJ7iAF9hTOiKoW305p8a5fE0lZrdtoFDj/jjZzfdf0="; + mypy-boto3-fis = buildMypyBoto3Package "fis" "1.34.63" "sha256-TJnzgQGDcybpVqg+p7Tuvw/RoY79cQPPChyHWlMxhiY="; mypy-boto3-fms = buildMypyBoto3Package "fms" "1.34.0" "sha256-tzaSecIXzkC+Zr5MGpU7GaoiGHGsywEglZ8+Ja0XDDo="; @@ -411,7 +411,7 @@ rec { mypy-boto3-kinesisanalytics = buildMypyBoto3Package "kinesisanalytics" "1.34.0" "sha256-eEoSmwMTa/hsbKbuKuzAZv4jHljGKq3b5Rw7K2Pgc50="; - mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.34.62" "sha256-bL6EKRjfIIUUIMSpoE0BWeAg3xb2xbKi8NBpHSaEEFg="; + mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.34.64" "sha256-7sJyrWtBcbrWlCjR7pLdBLgW7sXcRazDPBW+OGwh4Xg="; mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.34.48" "sha256-uYSkwOuYKF3B+sj5IWbDL789Xue2yNY9g14j/2b6k6w="; @@ -581,7 +581,7 @@ rec { mypy-boto3-rbin = buildMypyBoto3Package "rbin" "1.34.0" "sha256-Y+a/p3r5IgWk4oH6MOeq0e7rMiNvLCqoz1ZE+xXNtOw="; - mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.58" "sha256-P3s5qNAV9UG6fMSxvkUevKACU3FGjhOne1D0LRi/eMk="; + mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.63" "sha256-1JsO69vElUUgZlDNejuZz8x7bPCtHkZAG1qEtvg+O5E="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.34.6" "sha256-d+WXt3cSUe5ZxynSjPSJxXgv6evP/rhZrX1ua9rtSx8="; @@ -619,13 +619,13 @@ rec { mypy-boto3-rum = buildMypyBoto3Package "rum" "1.34.49" "sha256-Mq2H+13cjxYRwFfxJpWTAb+W5bx+Vew+jl+zbreRIkQ="; - mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.62" "sha256-HWDLEJB667VrTYZYircK5C23oRSGnwWLu7tNWG6yLm0="; + mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.64" "sha256-6yjHKgKA6lOpr4yEmjm2RR2At+YQwfrhWR7o79OhkNM="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.34.18" "sha256-53s5ii1gFX9toigiazEtS5Jogg3VFFr+1/uiLzoU7Uo="; mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.34.0" "sha256-xLuGP9Fe0S7zRimt1AKd9KOrytmNd/GTRg5OVi5Xpos="; - mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.53" "sha256-IgZzJstoOg1wzucKqPBx47baLbagrUk1kW4P8cI++cg="; + mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.64" "sha256-Sf1T1aqRMIEZmuA2KH5tzuhTDN8yfFID/+h0DCWxws0="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.34.0" "sha256-jMZ3aWKQPhNec4A/02S1waQi6Mx9JVdENc3kblhsKjA="; @@ -647,7 +647,7 @@ rec { mypy-boto3-sdb = buildMypyBoto3Package "sdb" "1.34.0" "sha256-13BuAQD8uDwwDhCw+8O3V882H6/oor5Z8mBmjb7HHAU="; - mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.43" "sha256-q79WB3XC/g3Dg7f3DBahv3U9mz/8DKpeNUR+aFeDpos="; + mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.63" "sha256-oZM3PXGPdH1Th4tcx/7y6bj944kuR4isaQ/SsWo1Vkw="; mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.20" "sha256-EcLY5SXSN2kJEuo8s2sYJJfq/X78BM1msyI9TfYD7Xw="; diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index f5fb0ad6e6bf..bc9cbace9515 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { full = with optional-dependencies; ( vllm # use absolute path to disambiguate with derivbation argument - ++ passthru.optional-dependencies.bentoml + ++ optional-dependencies.bentoml ++ fine-tune ); }; diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix new file mode 100644 index 000000000000..43061b4eeab2 --- /dev/null +++ b/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, fetchPypi + +# build-system +, setuptools + +# dependencies +, pyopenssl +, requests +, six +}: + +buildPythonPackage rec { + pname = "paypalrestsdk"; + version = "1.13.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-kZUfNtsw1oW5ceFASYSRo1bPHfjv9xZWYDrKTtcs81o="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + pyopenssl + requests + six + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "paypalrestsdk" + ]; + + meta = { + homepage = "https://developer.paypal.com/"; + description = "Python APIs to create, process and manage payment"; + license = "PayPal SDK License"; + }; +} diff --git a/pkgs/development/python-modules/pcbnew-transition/default.nix b/pkgs/development/python-modules/pcbnew-transition/default.nix index 2f42e00a0847..bf9c6ae6430f 100644 --- a/pkgs/development/python-modules/pcbnew-transition/default.nix +++ b/pkgs/development/python-modules/pcbnew-transition/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "pcbnewTransition"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M4r6IeARVZq+KO7Q0tbHFD/BMeLN6vmuxfnstmMPgdg="; + hash = "sha256-+mRExuDuEYxSSlrkEjSyPK+RRJZo+YJH7WnUVfjblRQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 0df1538c9ced..8a8eaa4c4fc2 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyfxa"; - version = "0.7.7"; + version = "0.7.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyFxA"; inherit version; - hash = "sha256-bIXNCM8F9xON7hzyqKHWj9Qot7WtSIkXxwoqdj1lHNs="; + hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index aab318a38178..115e0c284a2a 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readchar"; - version = "4.0.5"; + version = "4.0.6"; pyproject = true; # Don't use wheels on PyPI @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "magmax"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-Ru18lh+9tXtvttypnob0HNPKBiGF7E9HDL21l1AAGa8="; + hash = "sha256-XowLJ9YAHhP9nInFVYtoLEOmlWBRWQX259vwm9SVVZU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 0fa0e03b030b..89a2b814bedb 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.3.5"; + version = "2.3.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - hash = "sha256-5TbwenEe3vMJovwKYfkvkXMRex0KgaXpsd4iCEk7uWE="; + hash = "sha256-gn+X0DZnox4mkJwDVgwNXae63iGbiqPIO15UV5pDwuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 851a613d8740..cbceaf476ccf 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.32.1"; + version = "1.32.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7GQASW9niFIUPLwjxMQ4ifeLbJPC4nVv2OBgzM3kuP0="; + hash = "sha256-Eli5y8P/lXv30Jsb/IXO3DCPEGWzB0hUUpWpr41Vd6s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stupidartnet/default.nix b/pkgs/development/python-modules/stupidartnet/default.nix index 6092682d2afe..6ed5783f13d2 100644 --- a/pkgs/development/python-modules/stupidartnet/default.nix +++ b/pkgs/development/python-modules/stupidartnet/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "stupidartnet"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cpvalente"; repo = "stupidArtnet"; rev = "refs/tags/${version}"; - hash = "sha256-2LfK63FJcdnXfDLuUzYNlspj1jmtw00S6el49cH+RRM="; + hash = "sha256-6vEzInt1ofVVjTZAOH0Zw3BdwpX//1ZWwJqWPP5fIC8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index a470b090a178..e62ee37e4024 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.0.1"; + version = "9.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-fOtNzyeE0Ijr2HvxuG5+01I1VBbX4io8OqGEjNcxAgk="; + hash = "sha256-xFl+Ucu7ve7She8zUaW5YdK0gE733NNadDka4NeJ8Tg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 4744ffd95da5..94e2ef266047 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240314"; + version = "0.20.0.20240315"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Lq158JJnPILx+3u4yHugGrrVTbZlB2QsBAseaE4j7Ug="; + hash = "sha256-VAOK6SqOG8r2IHCWdsP3HqwuNYau0xbmCAvG3X/Us5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix index edfa253da75f..3ea38cde3d83 100644 --- a/pkgs/development/python-modules/types-markdown/default.nix +++ b/pkgs/development/python-modules/types-markdown/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-markdown"; - version = "3.5.0.20240311"; + version = "3.6.0.20240316"; pyproject = true; src = fetchPypi { pname = "types-Markdown"; inherit version; - hash = "sha256-TFjvM+4ngYPFQKWOWZy+lwkPZVMCtu9loQhMSzLXSKQ="; + hash = "sha256-3p+4SGC1W2R7FwyldolfzKYbk0puzcZcMZMsZ5W0QLg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wallet-py3k/default.nix b/pkgs/development/python-modules/wallet-py3k/default.nix new file mode 100644 index 000000000000..f78463e6748a --- /dev/null +++ b/pkgs/development/python-modules/wallet-py3k/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, substituteAll +, openssl +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "wallet-py3k"; + version = "0.0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kyHSh8qHbzK6gFLGnL6dUJ/GLJHTNC86jjXa/APqIzI="; + }; + + patches = [ + (substituteAll { + src = ./openssl-path.patch; + openssl = lib.getExe openssl; + }) + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + six + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "wallet" + ]; + + meta = with lib; { + description = "Passbook file generator"; + homepage = "https://pypi.org/project/wallet-py3k"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/wallet-py3k/openssl-path.patch b/pkgs/development/python-modules/wallet-py3k/openssl-path.patch new file mode 100644 index 000000000000..8864818b13f7 --- /dev/null +++ b/pkgs/development/python-modules/wallet-py3k/openssl-path.patch @@ -0,0 +1,13 @@ +diff --git a/wallet/models.py b/wallet/models.py +index 1b75402..ad115de 100644 +--- a/wallet/models.py ++++ b/wallet/models.py +@@ -320,7 +320,7 @@ class Pass(object): + def _createSignature(self, manifest, certificate, key, + wwdr_certificate, password): + openssl_cmd = [ +- 'openssl', ++ '@openssl@', + 'smime', + '-binary', + '-sign', diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 01c701048783..e8d1d45069f3 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.14.0"; + version = "10.14.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-suPuRdKIXP9gzPKkIWku6P+QAQOts781wQRoz1FKs58="; + sha256 = "sha256-XgA8qzLBmvhbYq6c6WB8Yj9yudtKrFS3whbmobVAs2A="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 4e01fba57798..06fe22a42abd 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage rec { ''; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ leenaars ]; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); + broken = true; # Added 2024-03-16 }; } diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix index 3ec69aabf8d2..64a44b18fe29 100644 --- a/pkgs/development/tools/analysis/rr/zen_workaround.nix +++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix @@ -6,11 +6,11 @@ */ stdenv.mkDerivation rec { pname = "rr-zen_workaround"; - version = "2020-09-22"; + version = "2023-11-23"; src = fetchzip { - url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/2f430f0c136a69b0886281d0c76708997d8878af.zip"; - sha256 = "1mbmbyymgl75wparv3rgnyxnc44rd6n935jziz9anl9apy031ryi"; + url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/f9d2070a7d87388da39acd157e0e53666a7d6ee0.zip"; + sha256 = "sha256-VqqKYjd8J7Uh5ea+PjLT93cNdQFvGIwGu4bzx+weSvo="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 077eac32aa20..f1d67bddc66f 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -20,5 +20,7 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.unix; maintainers = [lib.maintainers.nthorne]; mainProgram = "clog"; + # error: could not compile `rustc-serialize` + broken = true; # Added 2024-03-16 }; } diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 9a39ce282f2f..df123a100f8d 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.112.2"; + version = "0.112.3"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VUqAcHv9bQTl2QSgVyCHZkq2jKUAmPYgy4iEDeV7W1A="; + sha256 = "sha256-jQ+ke42H55n/ssWFVCWouojSOd/hvkDcmlGUb/a9thQ="; }; vendorHash = "sha256-tHEbHExdbWeZm3+rwRYpRILyPYEYdeVJ91Qr/yNIKV8="; diff --git a/pkgs/development/tools/darklua/default.nix b/pkgs/development/tools/darklua/default.nix index 06679211bdee..4cea370a6f1e 100644 --- a/pkgs/development/tools/darklua/default.nix +++ b/pkgs/development/tools/darklua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "darklua"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "seaofvoices"; repo = "darklua"; rev = "v${version}"; - hash = "sha256-hCyTsXSeingVRrohAGTzzcHoYv+hqOXPpWhBrbA70CA="; + hash = "sha256-FF0UEvylHFrGYgE3ASs0IwnYrh7gIClZUREtXjyVsPM="; }; - cargoHash = "sha256-D274Dx3ad14VnJxQMhf//NEA7EIZZ1RFzFITI4YoJTc="; + cargoHash = "sha256-XrWhOosQM+BaqViIju7urCi1B8+6kq8Taxe5T8LFzVE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index 0cdb42a3a0b8..a9fbf9d1de3d 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -184,4 +184,13 @@ rec { aarch64-darwin = "d64947fee370a3b111f170399969977959848f2a2f544a1ae5dc081fc2df75cf"; headers = "1lrwc03ffrf4bi2faampkx7yg0iqsrcp86znp9fw6ajwdwgqsc81"; }; + + electron_29-bin = mkElectron "29.1.4" { + armv7l-linux = "12a7e6a8ef214d104ee72eb6636a055c9c6d41bcc58f31a8dc48b9bc8fd0fcb5"; + aarch64-linux = "0d41a51d45712d0312dd24d79a395e80280bd8365ebb8e46c252cadcb780354b"; + x86_64-linux = "83a37103b67378a9073898541cfc4af8b5de708da15135f060bf26993ab426b5"; + x86_64-darwin = "e7887396018840ca482eb481edbff2e9a5580998412ffd217f70fad02f23969d"; + aarch64-darwin = "7ad63253fd6de9dbb337efbf4a6d0161f0e4c5953243bec27de488db98ef8a6c"; + headers = "0plc831v1fva2yrwg1zal5n9wkgy0f6v1by6b3jh8wjgrsrkhk00"; + }; } diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 6e9b01efa575..7304aa9e3ddb 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.3.5"; + version = "4.3.6"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-95VcZ5Bjruj5WMkCW0qh1nE25a5E+RJxOZv/lJvrbjk="; + sha256 = "sha256-iwV+yo9NkQr78ZMFiUAnFXPdK4ItB4o+75HNFpd7wpU="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index a146011bdaad..2fb1cfa5244a 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-tNCR9bQp/6Gw+Ser4TEJ60sp8uHStmFVJjQA0wRFWtU="; + hash = "sha256-1mq6tH3jFzyzQ0nsen9r08RrXMn16O7gOz7GS3nr10I="; }; - cargoHash = "sha256-37bjpI8iB3xg1aWCNBaU+XQkP5qsl7DIRqRwrJfeQLY="; + cargoHash = "sha256-BtdMsJqAU9Y1QntUBymlYLJdfx9aP7hf/Za8G8D6w54="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-graph/default.nix b/pkgs/development/tools/rust/cargo-graph/default.nix deleted file mode 100644 index 81416af36cfc..000000000000 --- a/pkgs/development/tools/rust/cargo-graph/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: -rustPlatform.buildRustPackage rec { - pname = "cargo-graph"; - version = "0.2.0-d895af1"; - - src = fetchFromGitHub { - owner = "kbknapp"; - repo = "cargo-graph"; - # The last release (v0.2.0) is from 2015. Since then there have been some - # bug fixes committed that would be good to have. - rev = "d895af1b7840c7ae8eddaf4e990bfa594c22ba01"; - sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5"; - }; - - cargoSha256 = "0wyvly7aq4njlxnmgpfgbh08fxgqh85kw7d938pm6qxmj27zn4p2"; - - meta = with lib; { - description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ basvandijk matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 7afeb6313946..85efeb925b50 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-js1Y7EGXinzOMMX9LjsG6D57UhGtZcvesOw/JDEKvoU="; + hash = "sha256-GMZjmKM2bFv57b2u7VjiA2OF6gD7vtoQ3ofS2rQfNrk="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 9ac438f36df2..9f195aee427f 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-0eihk5zekp7sJ8fj1P0FT/JXWZ79j0U/hw5fjlbAJEo="; + hash = "sha256-FdAUcKey3FamMWKKVDCL+ndXC4bBZHo1om9IUeLMZkA="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-pSFeBA3ux90bCX9iIW6aTGMCytWW/euYHpYppIJoYGc="; + cargoHash = "sha256-+zlRLs/m9ThiBgzKWkIpUIL3jWMz/o+hD0m0Vks4HzY="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index d4617f72980c..f2bcfb2b97c3 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-d2xAM2TpnAow9n+eolEbSiKFhWRj69jHf5R+aUyoipI="; + hash = "sha256-6OVigI2eHE8qFC5nmH67NcKkDD0iFXl3ynYJyFcpmGw="; }; - vendorHash = "sha256-uzPEBz0LGJwHjq3yrirfp6qm8Aa94+wFSohlgBB2rEk="; + vendorHash = "sha256-MDzYiLMYoR9qOTPVnlzTDbgVvg72HDP2DpM6NKUFNdg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index d4ba0ad404df..ef291d6fee82 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.41.2"; + version = "1.41.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-l8He7EM9n8r7OTC6jN6F8ldf3INXxEeaUI1u6AfR7RI="; + hash = "sha256-Urcy3kvwBz5Ey0LnoT6/N7V/QJg2SIBHVmWa12WOTKw="; }; - cargoHash = "sha256-T+6b4bGx7y/7E0CIacKFQ32DCAiNFXFi15ibq7rDfI4="; + cargoHash = "sha256-NhJ3Uldncjx/KHAMVCd6U4Q0fbmc+u4E7JNZHcy/zQY="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 7e8f9eafc498..4ced5309ffda 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -10,11 +10,11 @@ let }; in fetch_librusty_v8 { - version = "0.83.2"; + version = "0.85.0"; shas = { - x86_64-linux = "sha256-RJNdy5jRZK3dTgrHsWuZZAHUyy1EogyNNuBekZ3Arrk="; - aarch64-linux = "sha256-mpOmuqtd7ob6xvrgH4P/6GLa/hXTS/ok0WOYo7+7ZhI="; - x86_64-darwin = "sha256-2o8CvJ3r5+4PLNGTySqPPDTqbU0piX4D1UtZMscMdHU="; - aarch64-darwin = "sha256-WHeITWSHjZxfQJndxcjsp4yIERKrKXSHFZ0UBc43p8o="; + x86_64-linux = "sha256-Ma6JewYaHuPLihKnwwq8pAo+6sraXMghnl+wMvRfP1Y="; + aarch64-linux = "sha256-Y55ZXuyB2kq2a/cJwIo7DxClg2juAsGYpyTmwYE2W3Q="; + x86_64-darwin = "sha256-njP3obzJxr8I4G3jhDNbiVL8Cxa9D4KPGXW7VFrAZQY="; + aarch64-darwin = "sha256-/8UFpUgdSKihxd4qsBoxYFrjEKUG3cDSkwJ5NSdmSQs="; }; } diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 878737ce706f..13caf0e781fc 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }: + stdenv.mkDerivation rec { pname = "kore"; version = "4.2.3"; @@ -27,9 +28,14 @@ stdenv.mkDerivation rec { make platform.h ''; - # added to fix build w/gcc7 and clang5 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" - + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error=deprecated-declarations" + ] ++ lib.optionals stdenv.cc.isGNU [ + "-Wno-error=pointer-compare" + "-Wno-error=discarded-qualifiers" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-pointer-types-discards-qualifiers" + ]); enableParallelBuilding = true; diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 8c2c4ef86a08..204223e6094d 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "freeorion"; - version = "0.5"; + version = "0.5.0.1"; src = fetchFromGitHub { owner = "freeorion"; repo = "freeorion"; rev = "v${version}"; - sha256 = "sha256-uJRDU0Xd+sHL2IDvMiElUSOhvchVMW9wYMSLSN7pYtQ="; + sha256 = "sha256-VvTq6TcLc5BMvRTjVsZ2HA9ug3WAqFuTHIoFQ/9/zWc="; }; buildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { makeWrapper ]; - # as of 0.5 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND" + # as of 0.5.0.1 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND" cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=LEGACY" ]; postInstall = '' diff --git a/pkgs/games/srb2kart/default.nix b/pkgs/games/srb2kart/default.nix deleted file mode 100644 index 441ffd284a0d..000000000000 --- a/pkgs/games/srb2kart/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, substituteAll -, cmake -, curl -, nasm -, unzip -, game-music-emu -, libpng -, SDL2 -, SDL2_mixer -, zlib -}: - -let - - release_tag = "v1.6"; - - assets = fetchurl { - url = "https://github.com/STJr/Kart-Public/releases/download/${release_tag}/AssetsLinuxOnly.zip"; - sha256 = "sha256-ejhPuZ1C8M9B0S4+2HN1T5pbormT1eVL3nlivqOszdE="; - }; - -in stdenv.mkDerivation { - pname = "srb2kart"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "STJr"; - repo = "Kart-Public"; - rev = release_tag; - sha256 = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0="; - }; - - nativeBuildInputs = [ - cmake - nasm - unzip - ]; - - buildInputs = [ - curl - game-music-emu - libpng - SDL2 - SDL2_mixer - zlib - ]; - - cmakeFlags = [ - "-DGME_INCLUDE_DIR=${game-music-emu}/include" - "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" - "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" - ]; - - patches = [ - ./wadlocation.patch - ]; - - postPatch = '' - substituteInPlace src/sdl/i_system.c \ - --replace '@wadlocation@' $out - ''; - - preConfigure = '' - mkdir assets/installer - pushd assets/installer - unzip ${assets} "*.kart" srb2.srb - popd - ''; - - postInstall = '' - mkdir -p $out/bin $out/share/games/SRB2Kart - mv $out/srb2kart* $out/bin/ - mv $out/*.kart $out/share/games/SRB2Kart - ''; - - meta = with lib; { - description = "SRB2Kart is a classic styled kart racer"; - homepage = "https://mb.srb2.org/threads/srb2kart.25868/"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; - }; -} diff --git a/pkgs/games/srb2kart/wadlocation.patch b/pkgs/games/srb2kart/wadlocation.patch deleted file mode 100644 index 1923cda041d2..000000000000 --- a/pkgs/games/srb2kart/wadlocation.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c -index 51f708d0..c4d971f7 100644 ---- a/src/sdl/i_system.c -+++ b/src/sdl/i_system.c -@@ -139,7 +139,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); - - // Locations for searching the srb2.srb - #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) --#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart" -+#define DEFAULTWADLOCATION1 "@wadlocation@" - #define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart" - #define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart" - #define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart" -@@ -3646,47 +3646,6 @@ static const char *locateWad(void) - if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr)) - return envstr; - --#ifndef NOCWD -- I_OutputMsg(",."); -- // examine current dir -- strcpy(returnWadPath, "."); -- if (isWadPathOk(returnWadPath)) -- return NULL; --#endif -- -- --#ifdef DEFAULTDIR -- I_OutputMsg(",HOME/" DEFAULTDIR); -- // examine user jart directory -- if ((envstr = I_GetEnv("HOME")) != NULL) -- { -- sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr); -- if (isWadPathOk(returnWadPath)) -- return returnWadPath; -- } --#endif -- -- --#ifdef CMAKECONFIG --#ifndef NDEBUG -- I_OutputMsg(","CMAKE_ASSETS_DIR); -- strcpy(returnWadPath, CMAKE_ASSETS_DIR); -- if (isWadPathOk(returnWadPath)) -- { -- return returnWadPath; -- } --#endif --#endif -- --#ifdef __APPLE__ -- OSX_GetResourcesPath(returnWadPath); -- I_OutputMsg(",%s", returnWadPath); -- if (isWadPathOk(returnWadPath)) -- { -- return returnWadPath; -- } --#endif -- - // examine default dirs - #ifdef DEFAULTWADLOCATION1 - I_OutputMsg(","DEFAULTWADLOCATION1); diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 9c68f241a7fe..4a1cdb93fc06 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -309,6 +309,7 @@ in buildFHSEnv rec { description = "Steam dependencies (dummy package, do not use)"; }; + passthru.steamargs = args; passthru.run = buildFHSEnv { name = "steam-run"; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 9376fc070162..447f582cb011 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.8.5"; + version = "10.8.8"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-OzJWDdGPgJ4Af8Pe5YE7i7DQyvcw/YjjCrptjhH64cg="; + hash = "sha256-GdreswHR+avk5AYJwcoxqF/MlrcHX9NLNpgST5+0kVc="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-raoWG+qFeDD5BKbbWq0NdBEL8ts6TsgBp/MnBzco27g="; + vendorHash = "sha256-irBqINffT7aMOn4NyuYmSuo+E4Rw7ifAIMV0QpKm0So="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 2345c3bf9872..79b4adae6eb2 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.75"; + version = "5.76"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-ldDfx1w+RO2CjowSqTiS6JU28dtIr0+4thZon2hIBrg="; + sha256 = "sha256-gnn7crvjflmW05+J8EIg0pbK11IGlXz/EbCqc7gFvfM="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index cdae949ba982..fa8067d8d478 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -17,7 +17,7 @@ let pname = "yabai"; - version = "6.0.15"; + version = "7.0.2"; test-version = testers.testVersion { package = yabai; @@ -53,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-L82N0IaC2OAZVhmu9NALencK78FeCZI2cWJyNkGH2vQ="; + hash = "sha256-FeNiJJM5vdzFT9s7N9cTjLYxKEfzZnKE9br13lkQhJo="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-buX6FRIXdM5VmYpA80eESDMPf+xeMfJJj0ulyx2g94M="; + hash = "sha256-/MOAKsY7MlRWdvUQwHeITTeGJbCUdX7blZZAl2zXuic="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index c92f40e3935f..5c20e45ec354 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -2,7 +2,7 @@ , kernel , fetchurl , pkg-config, meson, ninja, makeWrapper -, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core +, libbsd, numactl, libbpf, zlib, elfutils, jansson, openssl, libpcap, rdma-core , doxygen, python3, pciutils , withExamples ? [] , shared ? false @@ -38,7 +38,7 @@ in stdenv.mkDerivation { buildInputs = [ jansson libbpf - libelf + elfutils libpcap numactl openssl.dev diff --git a/pkgs/os-specific/linux/ipp-usb/default.nix b/pkgs/os-specific/linux/ipp-usb/default.nix index 38d9afddaca6..decdea12ee3d 100644 --- a/pkgs/os-specific/linux/ipp-usb/default.nix +++ b/pkgs/os-specific/linux/ipp-usb/default.nix @@ -1,13 +1,13 @@ { buildGoModule, avahi, libusb1, pkg-config, lib, fetchFromGitHub, ronn }: buildGoModule rec { pname = "ipp-usb"; - version = "0.9.24"; + version = "0.9.25"; src = fetchFromGitHub { owner = "openprinting"; repo = "ipp-usb"; rev = version; - sha256 = "sha256-06Kb4s9oN53llz/Yya45ig5rd86VvlcK+vRh3bL/MAw="; + sha256 = "sha256-ryKQDzb31JA192lbCYkwJrXgwErViqIzP4mD2NmWdgA="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 14c863b459b1..9c1f5a86f37e 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -12,8 +12,10 @@ , rustc , rustPlatform , rust-bindgen +, nixosTests +}: -, # The kernel source tarball. +{ # The kernel source tarball. src , # The kernel version. @@ -66,7 +68,6 @@ , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false , kernelArch ? stdenv.hostPlatform.linuxArch , kernelTests ? [] -, nixosTests , ... }@args: diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cb825a1adbac..21772b2e03eb 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,52 +2,52 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.307-hardened1.patch", - "sha256": "01i15w3qzwag2v4r5r5bqyk337pidhmcfif228f286cnjnqz5d7h", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.307-hardened1/linux-hardened-4.19.307-hardened1.patch" + "name": "linux-hardened-4.19.309-hardened1.patch", + "sha256": "1hww72w5anmfr9czqbl31glzl70s34492k9qz9zax141zg1sf6sp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.309-hardened1/linux-hardened-4.19.309-hardened1.patch" }, - "sha256": "0lp3fc7sqy48vpcl2g0n1bz7i1hp9k0nlz3i1xfh9l056ihzzvl3", - "version": "4.19.307" + "sha256": "1yc45kfiwdqsqa11sxafs82b0day6qvgjcll8rx9vipidsmagbcm", + "version": "4.19.309" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.210-hardened1.patch", - "sha256": "1fdkkl303kvw9sg9lpzg83157xrl9jcl4jjli1gi2a4j0yz2479n", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.210-hardened1/linux-hardened-5.10.210-hardened1.patch" + "name": "linux-hardened-5.10.212-hardened1.patch", + "sha256": "0h04i94vshhcli5m4qpnqg4vsi5v1ifvdhhklk7c0bvkfk35cbml", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.212-hardened1/linux-hardened-5.10.212-hardened1.patch" }, - "sha256": "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf", - "version": "5.10.210" + "sha256": "14vll2bghd52wngjxy78hgglydcxka59yziji0w56dcdpmky9wqc", + "version": "5.10.212" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.149-hardened1.patch", - "sha256": "1y56l5l50h673a4n2pb3i3wh494lpnlw9vvdfr6m0jr0vymldb57", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.149-hardened1/linux-hardened-5.15.149-hardened1.patch" + "name": "linux-hardened-5.15.151-hardened1.patch", + "sha256": "040jc5n9qsdz2wv5ksfvc28vd72nmya2i2f0ps0jiras6l2wlhjz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.151-hardened1/linux-hardened-5.15.151-hardened1.patch" }, - "sha256": "1c01fnaghj55mkgsgddznq1zq4mswsa05rz00kmh1d3y6sd8115x", - "version": "5.15.149" + "sha256": "0jby224ncdardjwmf8c59s5j71inpvdlzah984ilf2b6y85pc7la", + "version": "5.15.151" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.269-hardened1.patch", - "sha256": "06vf0mlp822i4bkpsxbyk1xjlbzabqpncy8qw9zajpjajwv87d7x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.269-hardened1/linux-hardened-5.4.269-hardened1.patch" + "name": "linux-hardened-5.4.271-hardened1.patch", + "sha256": "0rw5il7885d0d3k2hmh46541svib6rp32g00fcl5bw37ydmq3z8b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.271-hardened1/linux-hardened-5.4.271-hardened1.patch" }, - "sha256": "1kqqm4hpif3jy2ycnb0dfjgzyn18vqhm1i5q7d7rkisks33bwm7z", - "version": "5.4.269" + "sha256": "0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d", + "version": "5.4.271" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.79-hardened1.patch", - "sha256": "0inip6pmlwrj75vwjimkjgvh4jn6ldrq5312r02xh1i95qb0sg3a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.79-hardened1/linux-hardened-6.1.79-hardened1.patch" + "name": "linux-hardened-6.1.81-hardened1.patch", + "sha256": "0af9dxdsa858zyqc0vsrzg098afhg5vpb2wpr6gj2ykwc13iaf07", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.81-hardened1/linux-hardened-6.1.81-hardened1.patch" }, - "sha256": "16xkd0hcslqlcf55d4ivzhf1fkhfs5yy0m9arbax8pmm5yi9r97s", - "version": "6.1.79" + "sha256": "0arl96yrqplbmp2gjyqcfma1lgc30kbn95m0sflv0yyldwf8dg8f", + "version": "6.1.81" }, "6.5": { "patch": { @@ -62,12 +62,12 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.6.18-hardened1.patch", - "sha256": "0svlck53b7bd38b9b0hzgppmhm59d35r2vqv30ga85ghkvc61byn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.18-hardened1/linux-hardened-6.6.18-hardened1.patch" + "name": "linux-hardened-6.6.21-hardened1.patch", + "sha256": "0k35s5pj92lvfp6kw3isg78zc3gijsg0xbzcyvxdkmhzaq8j6i1i", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.21-hardened1/linux-hardened-6.6.21-hardened1.patch" }, - "sha256": "07cv97l5jiakmmv35n0ganvqfr0590b02f3qb617qkx1zg2xhhsf", - "version": "6.6.18" + "sha256": "0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf", + "version": "6.6.21" }, "6.7": { "patch": { diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c838d6371b6a..b9207f0ac2f5 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,35 +4,35 @@ "hash": "sha256:0q9isgv6lxzrmb4idl0spxv2l7fsk3nn4cdq0vdw9c8lyzrh5yy0" }, "6.1": { - "version": "6.1.81", - "hash": "sha256:0arl96yrqplbmp2gjyqcfma1lgc30kbn95m0sflv0yyldwf8dg8f" + "version": "6.1.82", + "hash": "sha256:01pcrcjp5mifjjmfz7j1jb8nhq8nkxspavxmv1l7d1qnskcx4l6i" }, "5.15": { - "version": "5.15.151", - "hash": "sha256:0jby224ncdardjwmf8c59s5j71inpvdlzah984ilf2b6y85pc7la" + "version": "5.15.152", + "hash": "sha256:0zm4wkryj4mim4fr7pf5g9rlzh31yb1c40lkp85lvcm5yhjm507h" }, "5.10": { - "version": "5.10.212", - "hash": "sha256:14vll2bghd52wngjxy78hgglydcxka59yziji0w56dcdpmky9wqc" + "version": "5.10.213", + "hash": "sha256:105df7w6m5a3fngi6ajqs5qblaq4lbxsgcppllrk7v1r68i31kw4" }, "5.4": { - "version": "5.4.271", - "hash": "sha256:0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d" + "version": "5.4.272", + "hash": "sha256:0rp3waqrm489crcrms2ls7fxcw5jdkjhazvx82z68gj0kaaxb69m" }, "4.19": { - "version": "4.19.309", - "hash": "sha256:1yc45kfiwdqsqa11sxafs82b0day6qvgjcll8rx9vipidsmagbcm" + "version": "4.19.310", + "hash": "sha256:0sfy2g9jzxd8ia0idll72l7npi2kssdkz29h8jjxhilgmg299v4m" }, "6.6": { - "version": "6.6.21", - "hash": "sha256:0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf" + "version": "6.6.22", + "hash": "sha256:1x52c6ywmspp3naishzsknhy7i0b7mv9baxx25a0y987cjsygqr3" }, "6.7": { - "version": "6.7.9", - "hash": "sha256:0inkvyrvq60j9lxgivkivq3qh94lsfc1dpv6vwgxmy3q0zy37mqg" + "version": "6.7.10", + "hash": "sha256:00vw90mypcliq0d72jdh1ql2dfmm7gpswln2qycxdz7rfsrrzfd9" }, "6.8": { - "version": "6.8", - "hash": "sha256:1wv5x7qhcd05m8m0myyqm2il6mha1sx11h7ppf8yjsxvx2jdwsf9" + "version": "6.8.1", + "hash": "sha256:0s7zgk9m545v8y7qjhv7cprrh58j46gpmb8iynyhy2hlwcv8j34d" } } diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index afdc6bb5fd01..01daee4015f0 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19500"; - sha256 = "1xlicxwb1j5m4yjyw9ybyffmilzg7xh847jxfl4jy318vjpkmffr"; + rev = "19509"; + sha256 = "0dkjvpb075jdasvic8sfpy0dj48fsxgj2yl0zrply7gkaahgns8q"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 747d5aec7790..188ca24100b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.210-rt102"; # updated by ./update-rt.sh + version = "5.10.211-rt103"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf"; + sha256 = "1cir36s369fl6s46x16xnjg0wdlnkipsp2zhz11m9d3z205hly1s"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1q4365ix990iw33a63cpn61qvgf8rkzf658xyi0hnr6292hlvajj"; + sha256 = "07br63p90gwmijxq8ad7iyi4d3fkm6jwwl2s2k1549bbaldchbk6"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index cd2f60d3921d..463385036292 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.264-rt88"; # updated by ./update-rt.sh + version = "5.4.271-rt89"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1c5n47dq9khb15hz24a000k3hj913vv1dda6famnm8wpjbfr176k"; + sha256 = "0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1yzdiip1fm9szx2hhvq9ph7jq00qglb1skis6gv0184g0ls2qddg"; + sha256 = "15k9jja5yd9zf5yhd7hhydwh4hksg2mybk66jhdjsryh4w9jav7z"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index 514baa0ca598..4ff7e1c54b04 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.20-rt25"; # updated by ./update-rt.sh + version = "6.6.21-rt26"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "08nxv2240d2ak6p2vsbjasnp7askamswby3h6cclhhihkgrwgxp2"; + sha256 = "0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1sfalbcfzzjmskxpix1850cypg4zixwzbd9rmpg37n8lclivn2gv"; + sha256 = "1sh2jkm3h52a5dkc72xgrw1kz1faw1kzhpbqg64gsxbivmxfvf21"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 7ac560824db8..bc8bf488def9 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -10,8 +10,9 @@ , numactl , openssl , zlib +, zstd , libbsd -, libelf +, elfutils , jansson , libnl }: @@ -37,8 +38,9 @@ stdenv.mkDerivation rec { numactl openssl zlib + zstd libbsd - libelf + elfutils jansson libbpf libnl diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/os-specific/linux/rasdaemon/default.nix index c65a11fe8525..35478732fb8c 100644 --- a/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/pkgs/os-specific/linux/rasdaemon/default.nix @@ -2,6 +2,7 @@ , autoreconfHook, pkg-config , glibcLocales, kmod, coreutils, perl , dmidecode, hwdata, sqlite, libtraceevent +, fetchpatch , nixosTests }: @@ -16,6 +17,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-BX3kc629FOh5cnD6Sa/69wKdhmhT3Rpz5ZvhnD4MclQ="; }; + patches = [ + (fetchpatch { # fix #295002 (segfault on AMD), will be in the release after 0.8.0 + name = "fix crash on AMD"; + url = "https://github.com/mchehab/rasdaemon/commit/f1ea76375281001cdf4a048c1a4a24d86c6fbe48.patch"; + hash = "sha256-1VPDTrAsvZGiGbh52EUdG6tYV/n6wUS0mphOSXzran0="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index 4c379717ebe2..d4c664802aa3 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.8.4"; + version = "4.9.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-f0DIy8RlDQb+Sau6eZAuurs4Q2Pau9XO8nGWSgfDZFw="; + hash = "sha256-/h1UM8iERu1w2TFgXG7Dd9qZg5xOFRuQtxqiEb1u6pI="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index a87554e02eb1..8bb7f9e0dfbf 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -10,6 +10,8 @@ emporia_vue = callPackage ./emporia_vue {}; + epex_spot = callPackage ./epex_spot {}; + govee-lan = callPackage ./govee-lan {}; gpio = callPackage ./gpio {}; @@ -18,6 +20,8 @@ miele = callPackage ./miele {}; + moonraker = callPackage ./moonraker {}; + omnik_inverter = callPackage ./omnik_inverter {}; prometheus_sensor = callPackage ./prometheus_sensor {}; diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix new file mode 100644 index 000000000000..e655a0d788d9 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, beautifulsoup4 +}: + +buildHomeAssistantComponent rec { + owner = "mampfes"; + domain = "epex_spot"; + version = "2.3.5"; + + src = fetchFromGitHub { + owner = "mampfes"; + repo = "ha_epex_spot"; + rev = "refs/tags/${version}"; + hash = "sha256-WmPsFfQm8ChEr41XVgKi2BGwta5aKH9GDz4iIfTAPK4="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + ]; + + postPatch = '' + substituteInPlace custom_components/epex_spot/manifest.json --replace-fail 'bs4' 'beautifulsoup4' + ''; + + #skip phases without activity + dontConfigure = true; + doCheck = false; + dontBuild = true; + + meta = with lib; { + changelog = "https://github.com/mampfes/ha_epex_spot/releases/tag/${version}"; + description = "This component adds electricity prices from stock exchange EPEX Spot to Home Assistant"; + homepage = "https://github.com/mampfes/ha_epex_spot"; + maintainers = with maintainers; [ _9R ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix new file mode 100644 index 000000000000..660847ddd2e3 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, moonraker-api +}: + +buildHomeAssistantComponent rec { + owner = "marcolivierarsenault"; + domain = "moonraker"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "marcolivierarsenault"; + repo = "moonraker-home-assistant"; + rev = "refs/tags/${version}"; + hash = "sha256-jxMi4hmSVBU9ztoHxFINoJo8klirfo6j7gWty7FXFkQ="; + }; + + propagatedBuildInputs = [ + moonraker-api + ]; + + #skip phases with nothing to do + dontConfigure = true; + dontBuild = true; + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/marcolivierarsenault/moonraker-home-assistant/releases/tag/${version}"; + description = "Custom integration for Moonraker and Klipper in Home Assistant"; + homepage = "https://github.com/marcolivierarsenault/moonraker-home-assistant"; + maintainers = with maintainers; [ _9R ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index f1553889e4de..e36a1662907d 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-03-07T00-43-48Z"; + version = "2024-03-10T02-53-48Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-W82479M4Bgq1ERpiAR6Zc5YDr8vADOtQThV6lSlDuTs="; + hash = "sha256-XcJm5FcX0NNjjY/WDQyR2RF8J3GkqEvpAhFDZj9ztks="; }; - vendorHash = "sha256-VHokz58pSZd2Tt3hG8MgpeilEMFGjOZ/y6YKt9Fe5xw="; + vendorHash = "sha256-0W2D5CQkrZMPlehvmExeQ6txwEyRe3XZl0Bv0Ww5COs="; doCheck = false; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 20f8dcf5b113..789847770c55 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -18,29 +18,18 @@ let done rm -r packages/grafana-e2e ''; - - # Injects a `t.Skip()` into a given test since - # there's apparently no other way to skip tests here. - skipTest = lineOffset: testCase: file: - let - jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); - in '' - sed -i -e '/${testCase}/{ - ${jumpAndAppend} t.Skip(); - }' ${file} - ''; in buildGoModule rec { pname = "grafana"; - version = "10.3.4"; + version = "10.4.0"; - excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; + subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; src = fetchFromGitHub { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-zogjS8ywNVYF5W2/jCpBXmCu1MEqPbt2e6mCFborP7o="; + hash = "sha256-Rp2jGspbmqJFzSbiVy2/5oqQJnAdGG/T+VNBHVsHSwg="; }; offlineCache = stdenv.mkDerivation { @@ -48,7 +37,7 @@ buildGoModule rec { inherit src; nativeBuildInputs = [ yarn nodejs cacert - jq moreutils + jq moreutils python3 ]; postPatch = '' ${patchAwayGrafanaE2E} @@ -67,12 +56,12 @@ buildGoModule rec { dontInstall = true; dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-70eMa8E483f/Bz7iy+4Seap1EfIdjD5krnt6W9CUows="; + outputHash = "sha256-QdyXSPshzugkDTJoUrJlHNuhPAyR9gae5Cbk8Q8FSl4="; }; disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-PEPk3T/tCfJNZKOn3tL6p8Bnpc5wZMduNeHrv+l8mmU="; + vendorHash = "sha256-cNkMVLXp3hPMcW0ilOM0VlrrDX/IsZaze+/6qlTfmRs="; nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ]; @@ -90,35 +79,6 @@ buildGoModule rec { GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go GOARCH= CGO_ENABLED=0 go generate ./pkg/kindsys/report.go - - # Work around `main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/pkg/util/xorm`. - # Apparently these files confuse the dependency resolution for the go builder implemented here. - rm pkg/util/xorm/go.{mod,sum} - - # The testcase makes an API call against grafana.com: - # - # [...] - # grafana> t=2021-12-02T14:24:58+0000 lvl=dbug msg="Failed to get latest.json repo from github.com" logger=update.checker error="Get \"https://raw.githubusercontent.com/grafana/grafana/main/latest.json\": dial tcp: lookup raw.githubusercontent.com on [::1]:53: read udp [::1]:36391->[::1]:53: read: connection refused" - # grafana> t=2021-12-02T14:24:58+0000 lvl=dbug msg="Failed to get plugins repo from grafana.com" logger=plugin.manager error="Get \"https://grafana.com/api/plugins/versioncheck?slugIn=&grafanaVersion=\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:41796->[::1]:53: read: connection refused" - ${skipTest 1 "Request is not forbidden if from an admin" "pkg/tests/api/plugins/api_plugins_test.go"} - - # Skip a flaky test (https://github.com/NixOS/nixpkgs/pull/126928#issuecomment-861424128) - ${skipTest 2 "it should change folder successfully and return correct result" "pkg/services/libraryelements/libraryelements_patch_test.go"} - - # Skip flaky tests (https://logs.ofborg.org/?key=nixos/nixpkgs.263185&attempt_id=5b056a17-67a7-4b74-9dc7-888eb1d6c2dd) - ${skipTest 1 "TestIntegrationRulerAccess" "pkg/tests/api/alerting/api_alertmanager_test.go"} - ${skipTest 1 "TestIntegrationRulePause" "pkg/tests/api/alerting/api_ruler_test.go"} - - # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go - rm -r scripts/go - - # Requires making API calls against storage.googleapis.com: - # - # [...] - # grafana> 2023/08/24 08:30:23 failed to copy objects, err: Post "https://storage.googleapis.com/upload/storage/v1/b/grafana-testing-repo/o?alt=json&name=test-path%2Fbuild%2FTestCopyLocalDir2194093976%2F001%2Ffile2.txt&prettyPrint=false&projection=full&uploadType=multipart": dial tcp: lookup storage.googleapis.com on [::1]:53: read udp [::1]:36436->[::1]:53: read: connection refused - # grafana> panic: test timed out after 10m0s - rm pkg/build/gcloud/storage/gsutil_test.go - # Setup node_modules export HOME="$(mktemp -d)" diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index a667d1d442b1..22de6d4ebb6f 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -1,33 +1,21 @@ { acl , fetchFromGitHub -, fetchpatch , lib , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "threathunters-io"; repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-lWVrp0ytomrQBSDuQCMFJpSuAuwjSYPwoE4yh/WO2ls="; + hash = "sha256-dGgBcugIQ3ZPnqyTw6wRMN2PZLm6GqobeFZ1/uzMKbs="; }; - cargoHash = "sha256-GY7vpst+Epsy/x/ths6pwtGQgM6Bx0KI+NsCMFCBujE="; - - cargoPatches = [ - # Upstream forgot to bump the Cargo.lock before tagging the release. - # This patch is the first commit immediately after the tag fixing this mistake. - # Needs to be removed next release. - (fetchpatch { - name = "Cargo-lock-version-bump.patch"; - url = "https://github.com/threathunters-io/laurel/commit/f38393d1098e8f75394f83ad3da5c1160fb96652.patch"; - hash = "sha256-x+7p21X38KYqLclFtGnLO5nOHz819+XTaSPMvDbSo/I="; - }) - ]; + cargoHash = "sha256-8JNLssWTCfwrfQ/jg/rj7BUo9bCNCsM2RDwPI7cacRw="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix index 2e916367c924..9b2f145f0f35 100644 --- a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "smartctl_exporter"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oUdMsUAlN/4uRSzxQrO0TOVRgyEdxYkGtf3VoNbxdhw="; + hash = "sha256-QQoWAsnE/7ifvgEfQJ6cbzmwOrE7oe2zalTbu/P7r18="; }; - vendorHash = "sha256-0WLI+nLhRkf1CGhSer1Jkv1nUho5sxIbTE/Mf5JmX7U="; + vendorHash = "sha256-WUB2FgBl4Tybz7T0yvcSYIlG75NEhXpn1F0yuB9F21g="; ldflags = [ "-X github.com/prometheus/common/version.Version=${version}" diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index e593b2f57307..017356ed5efe 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.3.7"; + version = "23.3.8"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-z5V9u81skkCBDoYGyC3ThGKI4KhQEdtmBqJSEbBHPF0="; + sha256 = "sha256-a5V9kvRm7Np0pE/gMHtlkgbIlKfY9ehFVU35QDwpHh0="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-dSCF44F+2GjWD/IcdA4fsfHsjVnX0bCXsG7r6C6ECak="; + vendorHash = "sha256-qjX0DVAZqr7Ec1dFs4zBlDpu69IkhgLkvy4FA7br7bk="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index cf56476719a1..f0a85b251db0 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-9YNhyhxnnn2CesXLJH5Cs7yB9w23YUAZPrk9vEHvevk="; - arm64-linux_hash = "sha256-RBCyfozmBpWrmsfMcdb1BqcBXj64CMDrgpMZTzj85ZQ="; - x64-osx_hash = "sha256-+AKENBZohBUEKQEM3L69EzC84MhCX3fGvsNFn5p2v84="; - arm64-osx_hash = "sha256-Arx8usecAN+d0NGL7Hv+rB4GG7p/KLAaqpJFgNg7C2Y="; + x64-linux_hash = "sha256-S9j6zXEJM963tki88awPW0uK0fQd1bBwBcsHBlDSg/E="; + arm64-linux_hash = "sha256-73FkmdliX5SNrQRRZeAkU0G96ehCd9mT8NVyJoZiA38="; + x64-osx_hash = "sha256-XZ4ITJtc2ENw7IAYrBZF0N/NCjUVve+SkWhu6kfQIQA="; + arm64-osx_hash = "sha256-2tA17mDuCX5X0U96Rp6QUQOVWvu9sPMOimD6kks+S00="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "sonarr"; - version = "4.0.1.929"; + version = "4.0.2.1183"; src = fetchurl { url = "https://github.com/Sonarr/Sonarr/releases/download/v${version}/Sonarr.main.${version}.${os}-${arch}.tar.gz"; diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index e5e226665989..920eb5be382e 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "24.03.1"; + version = "24.03.2"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-DIaoD6o+oY+/FnwQadQh0XqMVP4xbE8gAPtWrvwsG+c="; + hash = "sha256-DnGQHWx3uFHFEI1kMTB6hfmaE4tY4O/hesPKj5s4uwQ="; }; postInstall = '' diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index ac5cbd5a885e..4afbe7c06be1 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -18,16 +18,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "18.0.4"; + version = "18.1.5"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-uFh82QGEHrjTLZhEHCZxFIo8D5kmlRJgODExxKNMMwM="; + hash = "sha256-VlNhW5fxljj/nu04jnbs03DrOMBTf11YMoRxoJ8jBpE="; }; - npmDepsHash = "sha256-AwaPURbwC2++G8ujtaJezgERWWthHSYNMS2pebIGvkQ="; + npmDepsHash = "sha256-0WyjWsoeOo0jnIh6tTFNGDtS5mo1sgfSxM6840kMFBE="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index f7a0eb41a3df..7d8ebca61f16 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.84.3"; + version = "0.84.4"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-rDQFt5P+Clp0JCCTG/2r69ZGiXXk3OM+rJfJ6HSKOBo="; + hash = "sha256-Er7rmIo/7B4cVNVCg04ILjVajwtwlZM386V+MiCf0ok="; }; - vendorHash = "sha256-XG0dOEpu+NoQmklsukxev1gc2OsZc7fLEkv0AGwkh7o="; + vendorHash = "sha256-YcLgmGCmOEawgTh0CvwmvOg3NAQxvA5Q9SJcH5dpwyQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/tools/audio/dl-librescore/default.nix index a84f12e8fa53..75a35a02beb2 100644 --- a/pkgs/tools/audio/dl-librescore/default.nix +++ b/pkgs/tools/audio/dl-librescore/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dl-librescore"; - version = "0.34.59"; + version = "0.35.1"; src = fetchFromGitHub { owner = "LibreScore"; repo = "dl-librescore"; rev = "v${version}"; - hash = "sha256-ZpY+cWtNf/s4Aw42eDc9/0jXzVHugEmU91Qgu9p1f0w="; + hash = "sha256-W/55Bbq5yiocNLOU1+j1TwkGawyF8sObtMmPW3ph35A="; }; - npmDepsHash = "sha256-DX3to2SNYhNWIJqcz5Mberuk/HSpCO538CjsvvALgkI="; + npmDepsHash = "sha256-Boa/WnptJYJNRdcLgua5GmLT2H9tBpZR+vvAFZC1s4k="; # see https://github.com/LibreScore/dl-librescore/pull/32 # TODO can be removed with next update diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 17bc6c6e419f..64535fd3e5a1 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "mpd-discord-rpc"; rev = "v${version}"; - hash = "sha256-fJHBQGc0+HjEALWuAWSts1l6NMookkut3Cm4e541iGw="; + hash = "sha256-Sdvrq9ChaSwjQDVjHVzcVLYbzyCHXsta1/Jo9hVkcDw="; }; - cargoHash = "sha256-v5JN0Nqp/fGjjJaKrMWt2HWzxAnA1URf0P2Xq9lHNVQ="; + cargoHash = "sha256-w3ulSCbQBkDATe4yfgGSl7WMrUk3sYlS08UbgvGY/5s="; nativeBuildInputs = [ pkg-config @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index eb75513f4a21..1fcb2dbccc85 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iUl8JLNmwzhoBAbL0Fa4BYW0lZA6CMzR5vGEGCgrP1E="; + sha256 = "sha256-e/OBu1tcIxr/ddKhbFyOtvU8Oqr0gpBRNpHRyoFKw6M="; }; vendorHash = "sha256-K3+5DRXcx56sJ4XHikVtmoxmpJbBeAgPkN9KtHVgvYA="; diff --git a/pkgs/tools/llm/shell_gpt/default.nix b/pkgs/tools/llm/shell_gpt/default.nix index ed3f27633e81..99ef7b3bf899 100644 --- a/pkgs/tools/llm/shell_gpt/default.nix +++ b/pkgs/tools/llm/shell_gpt/default.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "shell_gpt"; - version = "1.0.1"; - format = "pyproject"; + version = "1.4.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-/rBD2n5IZzSeC5dmVQRZY8UrzUOkAEVHp8KwIfV1hec="; + sha256 = "sha256-r/xQRqnLJhGZORjYUaYWKjqY4fQCW4WKkE+n8k0VMbA="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,6 +27,8 @@ python3.pkgs.buildPythonApplication rec { typer requests hatchling + openai + instructor ]; pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5e71e81d7d0f..4a2470e86ffa 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.36.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-nHEGvd9v0SuA3JsTOA2LTB+IDwbo5sBM1+j+K/ktDAc="; + hash = "sha256-mwccjsrveqoepBaCeQaija3DsXcuMtCK5PyoghtAJ9w="; }; - cargoHash = "sha256-LKBxN4SPkm2atOqQlZJfkt1ak4fMXQX1xR85q+8Ch8I="; + cargoHash = "sha256-GykLzXKFtebFuOWLtZ2Qj5OrZXiSrfEJ98cog5PwCfQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index ce28107d9f4a..54c1bb587fce 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-IvAUlCDtrtBiaKZbhAiXqQXbpKiqIaKwMVC3NxaAqtw="; + hash = "sha256-UvAIIkH9PNlvLzlh0jm1kG+4OfWsWtt2LSFbFPm7Yv4="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 7ba0165b0e01..0bdbd91a1dc6 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.26.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - hash = "sha256-f+k7ONX9bDrkyIhFxxaJvZYH2WBxYwCssbfM2fBPtRk="; + hash = "sha256-aqsEJJSb5dL7wEdDXiKEyqwCpg0O2Ld5jT+Hjdptha4="; }; - cargoHash = "sha256-Omxd0ZgvtEiciFnKWkYupyts2QT9LUTXxaTdfu0Jnx8="; + cargoHash = "sha256-pQVvL9pUK9QTIDG4axuKyYQ4NKO8M4M38ajYDSHFxew="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index db9ec4cc40ba..f720edd67db6 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.3.1"; + version = "2024.3.2"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-Pcchyc7LuHOyDEfZj5QSb7nVhMjO9iIV2uQEJocfLic="; + hash = "sha256-o8oYfah5Vveup9qdxl+Uzl+j4Sqoj+C6BA3c5kpofXo="; }; - cargoHash = "sha256-aKzl6yrsEi0DF0tsXB1eqTAar33FlJfRyYUKAi76o+c="; + cargoHash = "sha256-c6hN9JuMuUp1jl5wXf4N5S3hzyQeeLKAb56H9cLBAIY="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index 8730fe0d0782..0facac21e5be 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -132,8 +132,11 @@ goBuild ((lib.optionalAttrs enableRocm { # ollama's patches of llama.cpp's example server # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" - (preparePatch "01-cache.diff" "sha256-MTTln2G0G8dntihUzEjPM1ruTsApb4ZToBczJb8EG68=") - (preparePatch "02-cudaleaks.diff" "sha256-Cu7E9iEcvddPL9mPPI5Z96qmwWigi3f0WgSpPRjGc88=") + (preparePatch "01-cache.diff" "sha256-VDwu/iK6taBCyscpndQiOJ3eGqonnLVwmS2rJNMBVGU=") + (preparePatch "02-cudaleaks.diff" "sha256-nxsWgrePUMsZBWWQAjqVHWMJPzr1owH1zSJvUU7Q5pA=") + (preparePatch "03-load_exception.diff" "sha256-1DfNahFYYxqlx4E4pwMKQpL+XR0bibYnDFGt6dCL4TM=") + (preparePatch "04-locale.diff" "sha256-r5nHiP6yN/rQObRu2FZIPBKpKP9yByyZ6sSI2SKj6Do=") + (preparePatch "05-fix-clip-free.diff" "sha256-EFZ+QTtZCvstVxYgVdFKHsQqdkL98T0eXOEBOqCrlL4=") ]; postPatch = '' # use a patch from the nix store in the `go generate` script diff --git a/pkgs/tools/misc/pricehist/default.nix b/pkgs/tools/misc/pricehist/default.nix index 04333a290731..d195cb42a147 100644 --- a/pkgs/tools/misc/pricehist/default.nix +++ b/pkgs/tools/misc/pricehist/default.nix @@ -9,6 +9,7 @@ , pytest-mock , responses , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonApplication rec { @@ -31,11 +32,20 @@ buildPythonApplication rec { poetry-core ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + nativeCheckInputs = [ responses pytest-mock pytestCheckHook ]; + + pythonRelaxDeps = [ + # https://gitlab.com/chrisberkhout/pricehist/-/issues/6 + "lxml" + ]; meta = with lib; { description = "A command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats"; homepage = "https://gitlab.com/chrisberkhout/pricehist"; diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index 8f244839803c..03c0fb176d79 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-IWfYjn8CCgYK2hna59Awr5tzWnXCtR6c1XpV5fCiSE4="; + sha256 = "sha256-sFOvkr6WbiP99GNAttK9ZmRg+O/hoUQDCnW7vq9s/vo="; }; passthru = { diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 7d0921abb8d0..4672adfc97c9 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.73.2"; + version = "1.73.3"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-UXvUewArdClOolWFgN4Ta11vzq9C9zBjEzVGTtWSjiA="; + hash = "sha256-mAGEJ+FISPRrIz3dWwuf9EYbTNdaMj7tbHgthSYBiIU="; }; - vendorHash = "sha256-zNQADZkAaohTZReD8qTnNJsfy58NXdQjUdd5j8KcOyY="; + vendorHash = "sha256-oMGAsVRSyndCJ3QXfrI02XrsOXkzljTNro6ygal6mDk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 1a3340fcdb14..bb0ac8f32176 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "sha256-cBP4jJhnIx+UwcbuQ3xbpImkLX4jSnsyvwfOEs31On4="; + hash = "sha256-vIKmE9Lq8We7BTMUHIgnOU370ZnNW7YG75WALWdG+4A="; }; - vendorHash = "sha256-RkwfHjWu40AW+7zLc+sY5p2nyy3YPHk5sjt6foC103k="; + vendorHash = "sha256-dsqFleXpL8yAcdigqxJsk/Sxvp9OTqbGK3xDEiHkM8A="; # Since the tarball pulled from GitHub doesn't contain git tag information, # we fetch the expected tag's timestamp from a file in the root of the @@ -33,7 +33,7 @@ buildGoModule rec { homepage = "https://github.com/mdlayher/corerad"; description = "Extensible and observable IPv6 NDP RA daemon"; license = licenses.asl20; - maintainers = with maintainers; [ mdlayher ]; + maintainers = with maintainers; [ mdlayher jmbaur ]; platforms = platforms.linux; mainProgram = "corerad"; }; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 882d1258a1b8..68e67d88ba03 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-03-09T06-43-06Z"; + version = "2024-03-13T23-51-57Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-ptXqO5/HNniTIsoDFwxx9NivutCe4wz9VBx5jJSsxGU="; + sha256 = "sha256-aLIK7N7Xz39GnqhyaCzTx+UHnMN9/oIikxGlPeqM6XE="; }; - vendorHash = "sha256-pab2UY7fvclley/cuwX9cTNXIf6bvoZUAl3VQBXMmEc="; + vendorHash = "sha256-DCjjHriD/J/MGcksJX3fn9wSaf+lXX73Dm5K1VU/2B8="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index dee829021ae8..d7e456f3efff 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-HbfN9H6mYRZkD1f5CmDSORP29I00u0Ye8l77wrswTE0="; + hash = "sha256-8t+AOTlX34BIftRTZgHwUW3nCPxy8NtbIIocT9YlLbU="; }; - vendorHash = "sha256-tOUzshNU6TIjhWVWmlVcw/Ct/V52b+WIJHqs3+weCc0="; + vendorHash = "sha256-7FHosBMB5pzsvpHXhWEo8fgD4Rn6+CFoBNFHA+V1e6o="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index a3d087bbd644..aa398dfcb9f3 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.14.1"; + version = "5.15.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-fa8bgI1xpxunAr69xz2CPmo7XWoCODlBAnlb7fQg43U="; + hash = "sha256-XxmzJfZa05Kf32Lh6FapYpQZProJyzlXoXKnDPiWqMQ="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-PPytLBW+dvZW/TWjTpqkP1zPwgh1Ji58BHzBUY9wRW8="; + vendorHash = "sha256-SQ7DcrKYf4Wclp/HG8e7q5YPvVNj/kHV/pGmEyOU/BY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py index b9227814dea2..3ee10a60568d 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py @@ -163,7 +163,7 @@ class HTMLRenderer(Renderer): # keycap-styled spans. (id_part, class_part) = ("", "") if s := token.attrs.get('id'): - id_part = f'' + id_part = f'' if s := token.attrs.get('class'): if s == 'keycap': class_part = '' @@ -181,7 +181,7 @@ class HTMLRenderer(Renderer): if hstyle: hstyle = f'style="{escape(hstyle, True)}"' if anchor := cast(str, token.attrs.get('id', '')): - anchor = f'' + anchor = f'' result = self._close_headings(hlevel) tag = self._heading_tag(token, tokens, i) toc_fragment = self._build_toc(tokens, i) @@ -220,7 +220,7 @@ class HTMLRenderer(Renderer): def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: if id := cast(str, token.attrs.get('id', '')): id = f'id="{escape(id, True)}"' if id else '' - return f'
' + return f'
' def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return '

' def example_title_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: @@ -239,7 +239,7 @@ class HTMLRenderer(Renderer): ) def figure_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: if anchor := cast(str, token.attrs.get('id', '')): - anchor = f'' + anchor = f'' return f'
{anchor}' def figure_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return ( diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py index fba0ce2679a4..9a3e07cb24c7 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py @@ -167,7 +167,7 @@ def test_full() -> None: man(1) reference

-

some nested anchors

+

some nested anchors

emph␣ strong␣ diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index b73e64924a6d..cf3b9c3dc9e4 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-x2HVm2vcEFHDrCQLIp5QzNsDARcbBfPdaIMLWVNfi4c="; + hash = "sha256-PW9OS/ccRxigP0ikk1XR4QhQX4j9+ALQz0FMKXF3yRA="; }; - cargoHash = "sha256-N6Bc0+m0Qz1c/80oLvQTj8gvMusPXIriegNlRYWWStU="; + cargoHash = "sha256-lNz4E+dcJ6ACkNraM4DUR4yFbkWgAZ4ngbAML8JYVtE="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index fc22001a5192..39c2b0cb329b 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.14"; + version = "5.1.15"; outputs = [ "out" "man" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-LVemkL3Ysv2hS0/c+ZTqzEKq3kFu+T1rEBwZpjssE2k="; + hash = "sha256-IDF/jRnPpGbHk5bY7plkCO1x/i10H+HCcU88JI4EHvs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix index b4ede0bdedaa..36929abc9f41 100644 --- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "poetry-plugin-export"; - version = "1.6.0"; + version = "1.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6U96O0mCQpviBr4I67ZfHytsooXG4oCNTx8YqrrIzYo="; + hash = "sha256-fmgX1/dVH0e3d7FYhOdOnLtjp0mkkaSZm1YW4gxZr74="; }; postPatch = '' diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index 48d28257d9f4..85777c91be09 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.13.3"; + version = "1.13.4"; src = fetchFromGitHub { owner = "BishopFox"; - repo = pname; + repo = "cloudfox"; rev = "refs/tags/v${version}"; - hash = "sha256-Sq3ARcAK1EFbK6Y+pSCg8ayhVmnEmVQWF0eAiVhJNPs="; + hash = "sha256-nN/gSvAwKjfZulqH4caGoJmzlY0ik8JrFReuvYWwZTE="; }; - vendorHash = "sha256-qPIMmyKTmZEmxlLLftRMnBXvo22WFROYlCAAsAb7jDg="; + vendorHash = "sha256-aRbGBEci3QT1mH+yaOUVynPysJ1za6CaoLGppJaa94c="; ldflags = [ "-w" diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 38c8813a301c..b02e670666bf 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cnspec"; - version = "10.7.1"; + version = "10.7.3"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-i7XZXZuEZasW00HMpwyyS7pxI8hMrx6DZmp39sj1IyI="; + hash = "sha256-TFwMquMyHnUGyHGKBrialsDKL5Mubsop1Sudyu/IGjE="; }; proxyVendor = true; - vendorHash = "sha256-B5wwA2S6LiMRBpM6fWaPVubKuOjkdYcffAssSbpLs48="; + vendorHash = "sha256-+hlJqcX3cGo/ej5HPPZBZCTUHvB9+/iPTebNKdokLQ0="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index fdf461a59d3b..e803aa746521 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-03-13"; + version = "2024-03-15"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Lp69o/Cn2T410vpvfaF/SF8Kf6ehjLP3tcwuqIv7guM="; + hash = "sha256-5PUgea2Gz0qtHp+O31fxYTTWIc19Z0ZwVB7XqyFAxNU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 1f2c8a4100c4..e5c600b9ad7a 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.59" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.60" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 32d72fae3760..d0d57f703aec 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: b6a03cb5f17b5c714fad8741c1812be542dd2087 - ref: refs/tags/6.3.59 + revision: 5df84967c30bc92484c217aa70754596ff358ad0 + ref: refs/tags/6.3.60 specs: - metasploit-framework (6.3.59) + metasploit-framework (6.3.60) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 195edfcbc635..cb3db6d932d3 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.59"; + version = "6.3.60"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-pGYEx5Ac4vEW5rsKI4iAMGXB2zHMS2AD6jIVEWHQn6g="; + hash = "sha256-K4NBMaoWpxbyKCtkHYzPJSIM27yY8MZZDXAuJM9T1ZE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index a00226e532dd..bdbc5917777a 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -674,12 +674,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "b6a03cb5f17b5c714fad8741c1812be542dd2087"; - sha256 = "1a4zs1hi259jx81n0jyc67dw2r9hh24262mvwqbg3qhwj33h8rm4"; + rev = "5df84967c30bc92484c217aa70754596ff358ad0"; + sha256 = "14fmag7j8bkh1mcwdw4qpkdhq8i5ry61sr1b53r1d9qnm8ql30rb"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.59"; + version = "6.3.60"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index fcf9026f215c..01137be20460 100644 --- a/pkgs/tools/security/munge/default.nix +++ b/pkgs/tools/security/munge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "munge"; - version = "0.5.15"; + version = "0.5.16"; src = fetchFromGitHub { owner = "dun"; repo = "munge"; rev = "${pname}-${version}"; - sha256 = "sha256-Ot/oH/RdfPAzoi3P7EYkxS0Fr24KRWfBJxBEWRF0ctI="; + sha256 = "sha256-fv42RMUAP8Os33/iHXr70i5Pt2JWZK71DN5vFI3q7Ak="; }; strictDeps = true; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 5b6868fcc6c8..7486ce9bc099 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.69.0"; + version = "3.70.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-1O1iwZQdC4Vf/mGRauZwg6U52bF28IqCUw8Ugt3USFI="; + hash = "sha256-KcJhnev2j4Y7jlIZe2cUgkiJEz5V+oG69SURs5tXCVU="; }; - vendorHash = "sha256-c9CkQMTH2mRpKjlyV7lnNyKQYgPxEP9adHcSh9qsWYk="; + vendorHash = "sha256-oJ5aPffmBDCJ6cD2nG1Q5w+R6LV6oDf4v9hIWN9jNdc="; ldflags = [ "-s" diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index 72b3dfc14a1a..a15644d59111 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-lS7+sLA/6ZxieodvSPuEzawxQb2vWdNCkGy1RTbg4dY="; + hash = "sha256-MHsbwtoiaMBWZi/UHbuhG3VuSSvuQtvxPB9EMMti80A="; }; - cargoHash = "sha256-hGy0B2uLT37wKOvC4/wc8i+v1vEQ3bzrgm/yqRCAx3s="; + cargoHash = "sha256-pEXGUIrWZGJoYdNoufXEJ+eeIEhm5JhIUlHRisD4qWc="; meta = with lib; { description = "A diff filter highlighting which line parts have changed"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index f5e02eef3924..cbc2893b1304 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -30,6 +30,7 @@ buildGoModule rec { description = "A syntax-aware linter for prose built with speed and extensibility in mind"; homepage = "https://vale.sh/"; changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}"; + mainProgram = "vale"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index def4ad4e0bd3..72134d422457 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -111,6 +111,7 @@ mapAliases ({ lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 + blockbench-electron = blockbench; # Added 2024-03-16 bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01 boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 @@ -149,6 +150,7 @@ mapAliases ({ cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-espflash = espflash; cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 + cargo-graph = throw "cargo-graph has been removed as it is broken and archived upstream"; # Added 2024-03-16 catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f043595e2cd..ef898e8bd8c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2934,8 +2934,6 @@ with pkgs; felix-fm = callPackage ../applications/file-managers/felix-fm { }; - joshuto = callPackage ../applications/file-managers/joshuto { }; - krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; lesscpy = callPackage ../development/compilers/lesscpy { }; @@ -3555,8 +3553,6 @@ with pkgs; blackmagic-desktop-video = callPackage ../tools/video/blackmagic-desktop-video { }; - blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; bmap-tools = callPackage ../tools/misc/bmap-tools { }; @@ -4778,8 +4774,6 @@ with pkgs; swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; - swww = callPackage ../tools/wayland/swww { }; - wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { @@ -5633,8 +5627,6 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; - hyprdim = callPackage ../applications/misc/hyprdim { }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; @@ -5646,8 +5638,6 @@ with pkgs; hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { }; - hyprnome = callPackage ../applications/misc/hyprnome { }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { @@ -9757,9 +9747,7 @@ with pkgs; kool = callPackage ../development/tools/misc/kool { }; - kore = callPackage ../development/web/kore { - openssl = openssl_1_1; - }; + kore = callPackage ../development/web/kore { }; krakenx = callPackage ../tools/system/krakenx { }; @@ -16841,7 +16829,6 @@ with pkgs; }; cargo-leptos = callPackage ../development/tools/rust/cargo-leptos { }; cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; - cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; cargo-guppy = callPackage ../development/tools/rust/cargo-guppy { }; cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; cargo-license = callPackage ../development/tools/rust/cargo-license { }; @@ -18274,7 +18261,8 @@ with pkgs; electron_25-bin electron_26-bin electron_27-bin - electron_28-bin; + electron_28-bin + electron_29-bin; electron_10 = electron_10-bin; electron_11 = electron_11-bin; @@ -18295,7 +18283,7 @@ with pkgs; electron_26 = electron_26-bin; electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; - electron_29 = electron-source.electron_29; + electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; electron = electron_29; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -24469,7 +24457,7 @@ with pkgs; rlottie = callPackage ../development/libraries/rlottie { }; - rocksdb = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/rocksdb { }); + rocksdb = callPackage ../development/libraries/rocksdb { }; rocksdb_7_10 = rocksdb.overrideAttrs rec { pname = "rocksdb"; @@ -29531,8 +29519,6 @@ with pkgs; sarabun-font = callPackage ../data/fonts/sarabun { }; - sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; - savepagenow = callPackage ../tools/misc/savepagenow { }; scheme-manpages = callPackage ../data/documentation/scheme-manpages { }; @@ -37838,8 +37824,6 @@ with pkgs; srb2 = callPackage ../games/srb2 { }; - srb2kart = callPackage ../games/srb2kart { }; - ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { }; stardust = callPackage ../games/stardust { }; @@ -38667,7 +38651,9 @@ with pkgs; getdp = callPackage ../applications/science/math/getdp { }; - gurobi = callPackage ../applications/science/math/gurobi { }; + gurobi = callPackage ../applications/science/math/gurobi { + python3 = python310; + }; jags = callPackage ../applications/science/math/jags { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 1a040f052c71..afcec5061a36 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -713,6 +713,5 @@ in { ''; }; - buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; - + buildLinux = callPackage ../os-specific/linux/kernel/generic.nix {}; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c10b48c8421a..96fccb3f3ecc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -302,7 +302,6 @@ mapAliases ({ pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 - paypalrestsdk = throw "paypalrestsdk was removed, the upstream repo was archived back in 2020"; # Added 2023-11-25 pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29 pdfminer = pdfminer-six; # added 2022-05-25 pep257 = pydocstyle; # added 2022-04-12 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b2fc2b9df41..49bf6892a03f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2527,7 +2527,7 @@ self: super: with self; { css-inline = callPackage ../development/python-modules/css-inline { inherit (pkgs.darwin) libiconv; - inherit (pkgs.darwin.apple_sdk.frameworks) Security; + inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration; }; css-parser = callPackage ../development/python-modules/css-parser { }; @@ -5682,6 +5682,8 @@ self: super: with self; { insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { }; + instructor = callPackage ../development/python-modules/instructor { }; + intake = callPackage ../development/python-modules/intake { }; intake-parquet = callPackage ../development/python-modules/intake-parquet { }; @@ -9290,6 +9292,8 @@ self: super: with self; { paypalhttp = callPackage ../development/python-modules/paypalhttp { }; + paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; + pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; pbr = callPackage ../development/python-modules/pbr { }; @@ -16347,6 +16351,8 @@ self: super: with self; { wallbox = callPackage ../development/python-modules/wallbox { }; + wallet-py3k = callPackage ../development/python-modules/wallet-py3k { }; + walrus = callPackage ../development/python-modules/walrus { }; wand = callPackage ../development/python-modules/wand { };