Merge staging-next into staging

.github/workflows/eval-lib-tests.yml

@@ -0,0 +1,30 @@
+name: "Building Nixpkgs lib-tests"
+
+permissions:
+  contents: read
+
+on:
+  pull_request_target:
+    paths:
+      - 'lib/**'
+jobs:
+  get-merge-commit:
+    uses: ./.github/workflows/get-merge-commit.yml
+
+  nixpkgs-lib-tests:
+    name: nixpkgs-lib-tests
+    runs-on: ubuntu-latest
+    needs: get-merge-commit
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        if: needs.get-merge-commit.outputs.mergedSha
+        with:
+          # pull_request_target checks out the base branch by default
+          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
+      - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
+        with:
+          # explicitly enable sandbox
+          extra_nix_config: sandbox = true
+      - name: Building Nixpkgs lib-tests
+        run: |
+          nix-build --arg pkgs "(import ./ci/. {}).pkgs" ./lib/tests/release.nix

.mergify.yml

@@ -0,0 +1,22 @@
+queue_rules:
+  # This rule is for https://docs.mergify.com/commands/queue/
+  # and can be triggered with: @mergifyio queue
+  - name: default
+    merge_conditions:
+      # all github action checks in this list are required to merge a pull request
+      - check-success=Attributes
+      - check-success=Check
+      - check-success=Outpaths (aarch64-darwin)
+      - check-success=Outpaths (aarch64-linux)
+      - check-success=Outpaths (x86_64-darwin)
+      - check-success=Outpaths (x86_64-linux)
+      - check-success=Process
+      - check-success=Request
+      - check-success=Tag
+      - check-success=editorconfig-check
+      - check-success=label-pr
+      - check-success=nix-files-parseable-check
+      - check-success=nixfmt-check
+      - check-success=nixpkgs-vet
+    # queue up to 5 pull requests at a time
+    batch_size: 5

ci/OWNERS

@@ -157,6 +157,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 # Python-related code and docs
 /doc/languages-frameworks/python.section.md   @mweinelt @natsukium
 /maintainers/scripts/update-python-libraries  @mweinelt @natsukium
+/pkgs/by-name/up/update-python-libraries      @mweinelt @natsukium
 /pkgs/development/interpreters/python         @mweinelt @natsukium
 /pkgs/top-level/python-packages.nix                     @natsukium
 /pkgs/top-level/release-python.nix                      @natsukium

maintainers/maintainer-list.nix

@@ -85,7 +85,7 @@
   };
   _0qq = {
     email = "0qqw0qqw@gmail.com";
-    github = "0qq";
+    github = "0xKDI";
     githubId = 64707304;
     name = "Dmitry Kulikov";
   };
@@ -155,7 +155,7 @@
   };
   _1000teslas = {
     name = "Kevin Tran";
-    github = "1000teslas";
+    github = "sledgehammervampire";
     githubId = 47207223;
   };
   _13r0ck = {
@@ -219,7 +219,7 @@
   };
   _404wolf = {
     email = "wolfmermelstein@gmail.com";
-    github = "404wolf";
+    github = "404Wolf";
     githubId = 108041238;
     name = "Wolf Mermelstein";
   };
@@ -799,7 +799,7 @@
   };
   ajgrf = {
     email = "a@ajgrf.com";
-    github = "ajgrf";
+    github = "axgfn";
     githubId = 10733175;
     name = "Alex Griffin";
   };
@@ -812,7 +812,7 @@
   };
   ajwhouse = {
     email = "adam@ajwh.chat";
-    github = "ajwhouse";
+    github = "adam-dakota";
     githubId = 56616368;
     name = "Adam House";
   };
@@ -1236,7 +1236,7 @@
   };
   amanse = {
     email = "amansetiarjp@gmail.com";
-    github = "amanse";
+    github = "Amanse";
     githubId = 13214574;
     name = "Aman Setia";
   };
@@ -1402,7 +1402,7 @@
   };
   andreasfelix = {
     email = "fandreas@physik.hu-berlin.de";
-    github = "andreasfelix";
+    github = "felix-andreas";
     githubId = 24651767;
     name = "Felix Andreas";
   };
@@ -1718,7 +1718,7 @@
   };
   aprl = {
     email = "aprl@acab.dev";
-    github = "cutestnekoaqua";
+    github = "CutestNekoAqua";
     githubId = 30842467;
     name = "April John";
   };
@@ -1795,13 +1795,13 @@
   };
   argrat = {
     email = "n.bertazzo@protonmail.com";
-    github = "argrat";
+    github = "argo-v5";
     githubId = 98821629;
     name = "Nicolò Bertazzo";
   };
   arian-d = {
     email = "arianxdehghani@gmail.com";
-    github = "arian-d";
+    github = "Arian-D";
     githubId = 40076285;
     name = "Arian Dehghani";
   };
@@ -2030,7 +2030,7 @@
   };
   aspulse = {
     email = "contact@aspulse.dev";
-    github = "aspulse";
+    github = "AsPulse";
     githubId = 84216737;
     name = "AsPulse / あすぱる";
     keys = [ { fingerprint = "C919 E69E A7C0 E147 9E0F  C26E 1EDA D0C6 70BD 062D"; } ];
@@ -2044,7 +2044,7 @@
   };
   astavie = {
     email = "astavie@pm.me";
-    github = "astavie";
+    github = "Astavie";
     githubId = 7745457;
     name = "Astavie";
   };
@@ -2300,7 +2300,7 @@
   };
   axertheaxe = {
     email = "axertheaxe@proton.me";
-    github = "axertheaxe";
+    github = "AxerTheAxe";
     githubId = 99703210;
     name = "Katherine Jamison";
   };
@@ -2433,7 +2433,7 @@
   };
   balssh = {
     email = "george.bals25@gmail.com";
-    github = "balssh";
+    github = "Balssh";
     githubId = 82440615;
     name = "George Bals";
   };
@@ -2669,7 +2669,7 @@
   ben9986 = {
     name = "Ben Carmichael";
     email = "ben9986.unvmn@passinbox.com";
-    github = "ben9986";
+    github = "Ben9986";
     githubId = 38633150;
     keys = [ { fingerprint = "03C7 A587 74B3 F0E8 CE1F  4F8E ABBC DD77 69BC D3B0"; } ];
   };
@@ -2878,7 +2878,7 @@
   };
   bhasherbel = {
     email = "nixos.maintainer@bhasher.com";
-    github = "bhasherbel";
+    github = "BhasherBEL";
     githubId = 45831883;
     name = "Brieuc Dubois";
   };
@@ -3032,7 +3032,7 @@
   };
   blusk = {
     email = "bluskript@gmail.com";
-    github = "Bluskript";
+    github = "bluskript";
     githubId = 52386117;
     name = "Blusk";
   };
@@ -3388,7 +3388,7 @@
   };
   ByteSudoer = {
     email = "bytesudoer@gmail.com";
-    github = "bytesudoer";
+    github = "ByteSudoer";
     githubId = 88513682;
     name = "ByteSudoer";
   };
@@ -3564,7 +3564,7 @@
   };
   campadrenalin = {
     email = "campadrenalin@gmail.com";
-    github = "campadrenalin";
+    github = "MaddieM4";
     githubId = 289492;
     name = "Philip Horger";
   };
@@ -3902,7 +3902,7 @@
   };
   cherrykitten = {
     email = "contact@cherrykitten.dev";
-    github = "cherrykitten";
+    github = "CherryKitten";
     githubId = 20300586;
     matrix = "@sammy:cherrykitten.dev";
     name = "CherryKitten";
@@ -4033,7 +4033,7 @@
   };
   chrispwill = {
     email = "chris@chrispwill.com";
-    github = "chrispwill";
+    github = "ChrisPWill";
     githubId = 271099;
     name = "Chris Williams";
   };
@@ -4125,7 +4125,7 @@
   };
   citadelcore = {
     email = "alex@arctarus.co.uk";
-    github = "VertexA115";
+    github = "RealityAnomaly";
     githubId = 5567402;
     name = "Alex Zero";
     keys = [ { fingerprint = "A0AA 4646 B8F6 9D45 4553  5A88 A515 50ED B450 302C"; } ];
@@ -4391,7 +4391,7 @@
   colamaroro = {
     name = "Corentin Rondier";
     email = "github@rondier.io";
-    github = "colamaroro";
+    github = "COLAMAroro";
     githubId = 12484955;
     matrix = "@colamaroro:lovelyrad.io";
   };
@@ -4431,7 +4431,7 @@
   };
   coloquinte = {
     email = "gabriel.gouvine_nix@m4x.org";
-    github = "coloquinte";
+    github = "Coloquinte";
     githubId = 4102525;
     name = "Gabriel Gouvine";
   };
@@ -4487,7 +4487,7 @@
   connorbaker = {
     email = "connor.baker@tweag.io";
     matrix = "@connorbaker:matrix.org";
-    github = "connorbaker";
+    github = "ConnorBaker";
     name = "Connor Baker";
     githubId = 3880346;
   };
@@ -4612,7 +4612,7 @@
   };
   crem = {
     email = "max@alstercaminer.com";
-    github = "MaxCaminer";
+    github = "ItsCrem";
     githubId = 16345077;
     name = "crem";
   };
@@ -4650,7 +4650,7 @@
   croissong = {
     email = "jan.moeller0@pm.me";
     name = "Jan Möller";
-    github = "Croissong";
+    github = "croissong";
     githubId = 4162215;
     keys = [ { fingerprint = "CE97 9DEE 904C 26AA 3716  78C2 96A4 38F9 EE72 572F"; } ];
   };
@@ -5147,7 +5147,7 @@
   };
   dawoox = {
     email = "contact@antoinebellanger.fr";
-    github = "dawoox";
+    github = "Dawoox";
     githubId = 48325941;
     name = "Dawoox";
   };
@@ -5245,7 +5245,7 @@
   declan = {
     name = "Declan Rixon";
     email = "declan.fraser.rixon@gmail.com";
-    github = "DeclanRixon";
+    github = "DeclanBaggins";
     githubId = 57464835;
   };
   deeengan = {
@@ -5263,7 +5263,7 @@
   };
   deekahy = {
     email = "Lennart.Diego.Kahn@gmail.com";
-    github = "deekahy";
+    github = "DeeKahy";
     githubId = 97156953;
     name = "Lennart Diego Kahn";
   };
@@ -5364,7 +5364,7 @@
   };
   demine = {
     email = "riches_tweaks0o@icloud.com";
-    github = "demine0";
+    github = "Demine0";
     githubId = 51992962;
     name = "Nikita Demin";
   };
@@ -5382,7 +5382,7 @@
   };
   denperidge = {
     email = "contact@denperidge.com";
-    github = "denperidge";
+    github = "Denperidge";
     githubId = 27348469;
     name = "Cat";
   };
@@ -5394,7 +5394,7 @@
   };
   derdennisop = {
     email = "dennish@wuitz.de";
-    github = "derdennisop";
+    github = "DerDennisOP";
     githubId = 52411861;
     name = "Dennis";
   };
@@ -5560,13 +5560,13 @@
   };
   dgollings = {
     email = "daniel.gollings+nixpkgs@gmail.com";
-    github = "dgollings";
+    github = "DGollings";
     githubId = 2032823;
     name = "Daniel Gollings";
   };
   dgonyeo = {
     email = "derek@gonyeo.com";
-    github = "dgonyeo";
+    github = "cgonyeo";
     githubId = 2439413;
     name = "Derek Gonyeo";
   };
@@ -6120,7 +6120,7 @@
   };
   dwrege = {
     email = "email@dwrege.de";
-    github = "dominicwrege";
+    github = "DominicWrege";
     githubId = 7389000;
     name = "Dominic Wrege";
   };
@@ -6263,7 +6263,7 @@
   };
   edeneast = {
     email = "edenofest@gmail.com";
-    github = "edeneast";
+    github = "EdenEast";
     githubId = 2746374;
     name = "edeneast";
   };
@@ -6696,7 +6696,7 @@
   };
   ercao = {
     email = "vip@ercao.cn";
-    github = "ercao";
+    github = "O8888";
     githubId = 51725284;
     name = "ercao";
     keys = [ { fingerprint = "F3B0 36F7 B0CB 0964 3C12  D3C7 FFAB D125 7ECF 0889"; } ];
@@ -6718,7 +6718,7 @@
   erethon = {
     email = "dgrig@erethon.com";
     matrix = "@dgrig:erethon.com";
-    github = "erethon";
+    github = "Erethon";
     githubId = 1254842;
     name = "Dionysis Grigoropoulos";
   };
@@ -6952,7 +6952,7 @@
   };
   eveeifyeve = {
     name = "Eveeifyeve";
-    github = "eveeifyeve";
+    github = "Eveeifyeve";
     githubId = 88671402;
     matrix = "@eveeifyeve:matrix.org";
     email = "eveeg1971@gmail.com";
@@ -7003,7 +7003,7 @@
   };
   ewuuwe = {
     email = "ewu.uweq@pm.me";
-    github = "ewuuwe";
+    github = "EwuUwe";
     githubId = 63652646;
     name = "Xaver Oswald";
   };
@@ -7097,7 +7097,7 @@
   };
   fabianrig = {
     email = "fabianrig@posteo.de";
-    github = "fabianrig";
+    github = "FabianRig";
     githubId = 88741530;
     name = "Fabian Rigoll";
   };
@@ -7639,7 +7639,7 @@
     name = "Christian Friedow";
   };
   friedrichaltheide = {
-    github = "friedrichaltheide";
+    github = "FriedrichAltheide";
     githubId = 11352905;
     name = "Friedrich Altheide";
   };
@@ -8085,7 +8085,7 @@
     name = "Priyanshu Tripathi";
     email = "nixos@getpsyched.dev";
     matrix = "@getpsyched:matrix.org";
-    github = "getpsyched";
+    github = "GetPsyched";
     githubId = 43472218;
   };
   getreu = {
@@ -8148,7 +8148,7 @@
   };
   gigglesquid = {
     email = "jack.connors@protonmail.com";
-    github = "gigglesquid";
+    github = "GiggleSquid";
     githubId = 3685154;
     name = "Jack connors";
     keys = [ { fingerprint = "21DF 8034 B212 EDFF 9F19  9C19 F65B 7583 7ABF D019"; } ];
@@ -8558,6 +8558,12 @@
     githubId = 6578603;
     name = "Jonas Rembser";
   };
+  gurjaka = {
+    name = "Gurami Esartia";
+    email = "esartia.gurika@gmail.com";
+    github = "Gurjaka";
+    githubId = 143032436;
+  };
   guserav = {
     github = "guserav";
     githubId = 28863828;
@@ -8660,7 +8666,7 @@
   };
   hannesgith = {
     email = "nix@h-h.win";
-    github = "hannesgith";
+    github = "HannesGitH";
     githubId = 33062605;
     name = "Hannes Hattenbach";
   };
@@ -8699,7 +8705,7 @@
   harbiinger = {
     email = "theo.godin@protonmail.com";
     matrix = "@hrbgr:matrix.org";
-    github = "harbiinger";
+    github = "Harbiinger";
     githubId = 55398594;
     name = "Theo Godin";
   };
@@ -8983,7 +8989,7 @@
   };
   hhydraa = {
     email = "hcurfman@keemail.me";
-    github = "hhydraa";
+    github = "hcur";
     githubId = 58676303;
     name = "hhydraa";
   };
@@ -9118,7 +9124,7 @@
   };
   hornwall = {
     email = "hannes@hornwall.me";
-    github = "hornwall";
+    github = "Hornwall";
     githubId = 1064477;
     name = "Hannes Hornwall";
   };
@@ -9224,7 +9230,7 @@
   };
   humancalico = {
     email = "humancalico@disroot.org";
-    github = "humancalico";
+    github = "akshatagarwl";
     githubId = 51334444;
     name = "Akshat Agarwal";
   };
@@ -9649,7 +9655,7 @@
   iogamaster = {
     email = "iogamastercode+nixpkgs@gmail.com";
     name = "IogaMaster";
-    github = "iogamaster";
+    github = "IogaMaster";
     githubId = 67164465;
   };
   ionutnechita = {
@@ -9717,7 +9723,7 @@
   istoph = {
     email = "chr@istoph.de";
     name = "Christoph Hüffelmann";
-    github = "istoph";
+    github = "istof";
     githubId = 114227790;
   };
   istudyatuni = {
@@ -10032,7 +10038,7 @@
   janlikar = {
     name = "Jan Likar";
     email = "jan.likar@protonmail.com";
-    github = "janlikar";
+    github = "JanLikar";
     githubId = 4228250;
   };
   jansol = {
@@ -10091,7 +10097,7 @@
   jayesh-bhoot = {
     name = "Jayesh Bhoot";
     email = "jb@jayeshbhoot.com";
-    github = "jyssh";
+    github = "jbhoot";
     githubId = 1915507;
   };
   jayman2000 = {
@@ -10269,7 +10275,7 @@
   };
   jedsek = {
     email = "jedsek@qq.com";
-    github = "jedsek";
+    github = "Jedsek";
     githubId = 63626406;
     name = "Jedsek";
   };
@@ -11862,7 +11868,7 @@
   knarkzel = {
     email = "knarkzel@gmail.com";
     name = "Knarkzel";
-    github = "Knarkzel";
+    github = "svelterust";
     githubId = 85593302;
   };
   knedlsepp = {
@@ -12414,7 +12420,7 @@
     name = "Jacob LeCoq";
     email = "lecoqjacob@gmail.com";
     githubId = 9278174;
-    github = "lecoqjacob";
+    github = "bayou-brogrammer";
     keys = [ { fingerprint = "C505 1E8B 06AC 1776 6875  1B60 93AF DAD0 10B3 CB8D"; } ];
   };
   ledif = {
@@ -12506,7 +12512,7 @@
   };
   leonid = {
     email = "belyaev.l@northeastern.edu";
-    github = "leonidbelyaev";
+    github = "aeblyve";
     githubId = 77865363;
     name = "Leonid Belyaev";
   };
@@ -12612,7 +12618,7 @@
   };
   libjared = {
     email = "jared@perrycode.com";
-    github = "libjared";
+    github = "hypevhs";
     githubId = 3746656;
     matrix = "@libjared:matrix.org";
     name = "Jared Perry";
@@ -12669,7 +12675,7 @@
   };
   lillycham = {
     email = "lillycat332@gmail.com";
-    github = "lillycat332";
+    github = "lillycham";
     githubId = 54189319;
     name = "Lilly Cham";
   };
@@ -12822,7 +12828,7 @@
   logo = {
     email = "logo4poop@protonmail.com";
     matrix = "@logo4poop:matrix.org";
-    github = "logo4poop";
+    github = "l0go";
     githubId = 24994565;
     name = "Isaac Silverstein";
   };
@@ -12995,7 +13001,7 @@
   };
   lu15w1r7h = {
     email = "lwirth2000@gmail.com";
-    github = "LU15W1R7H";
+    github = "luiswirth";
     githubId = 37505890;
     name = "Luis Wirth";
   };
@@ -14840,7 +14846,7 @@
   };
   modderme123 = {
     email = "modderme123@gmail.com";
-    github = "modderme123";
+    github = "milomg";
     githubId = 14153763;
     name = "modderme123";
   };
@@ -15186,7 +15192,7 @@
   };
   mtrsk = {
     email = "marcos.schonfinkel@protonmail.com";
-    github = "mtrsk";
+    github = "schonfinkel";
     githubId = 16356569;
     name = "Marcos Benevides";
   };
@@ -15385,7 +15391,7 @@
   Name = {
     name = "Name";
     email = "lasagna@garfunkles.space";
-    github = "namescode";
+    github = "NamesCode";
     githubId = 86119896;
   };
   name-snrl = {
@@ -15440,7 +15446,7 @@
     name = "Nathan Bijnens";
   };
   nathanielbrough = {
-    github = "silvergasp";
+    github = "nathaniel-brough";
     githubId = 7277663;
     email = "nathaniel.brough@gmail.com";
     name = "Nathaniel Brough";
@@ -15506,7 +15512,7 @@
   nbsp = {
     email = "aoife@enby.space";
     matrix = "@nbsp:enby.space";
-    github = "enbyspace";
+    github = "nbsp";
     githubId = 57151943;
     name = "aoife cassidy";
   };
@@ -15611,7 +15617,7 @@
   };
   nerdypepper = {
     email = "nerdy@peppe.rs";
-    github = "nerdypepper";
+    github = "oppiliappan";
     githubId = 23743547;
     name = "Akshay Oppiliappan";
   };
@@ -16619,7 +16625,7 @@
   };
   osener = {
     email = "ozan@ozansener.com";
-    github = "osener";
+    github = "ozanmakes";
     githubId = 111265;
     name = "Ozan Sener";
   };
@@ -16682,7 +16688,7 @@
   };
   oxapentane = {
     email = "blame@oxapentane.com";
-    github = "oxapentane";
+    github = "gshipunov";
     githubId = 1297357;
     name = "Grigory Shipunov";
     keys = [ { fingerprint = "DD09 98E6 CDF2 9453 7FC6  04F9 91FA 5E5B F9AA 901C"; } ];
@@ -16758,7 +16764,7 @@
   };
   paddygord = {
     email = "pgpatrickgordon@gmail.com";
-    github = "avaunit02";
+    github = "avagordon01";
     githubId = 10776658;
     name = "Patrick Gordon";
   };
@@ -16926,7 +16932,7 @@
   };
   patricksjackson = {
     email = "patrick@jackson.dev";
-    github = "patricksjackson";
+    github = "arcuru";
     githubId = 160646;
     name = "Patrick Jackson";
   };
@@ -16980,7 +16986,7 @@
   };
   pawelpacana = {
     email = "pawel.pacana@gmail.com";
-    github = "pawelpacana";
+    github = "mostlyobvious";
     githubId = 116740;
     name = "Paweł Pacana";
   };
@@ -17143,7 +17149,7 @@
   };
   petercommand = {
     email = "petercommand@gmail.com";
-    github = "petercommand";
+    github = "ptrcmd";
     githubId = 1260660;
     name = "petercommand";
   };
@@ -17230,7 +17236,7 @@
     name = "Léo Lavaur";
     email = "phdcybersec@pm.me";
 
-    github = "phdcybersec";
+    github = "leolavaur";
     githubId = 82591009;
     keys = [ { fingerprint = "7756 E88F 3C6A 47A5 C5F0  CDFB AB54 6777 F93E 20BF"; } ];
   };
@@ -18558,7 +18564,7 @@
   realsnick = {
     name = "Ido Samuelson";
     email = "ido.samuelson@gmail.com";
-    github = "realsnick";
+    github = "i-am-logger";
     githubId = 1440852;
   };
   reckenrode = {
@@ -19712,7 +19718,7 @@
   };
   sanana = {
     email = "asya@waifu.club";
-    github = "AsyaTheAbove";
+    github = "lunabunja";
     githubId = 40492846;
     keys = [ { fingerprint = "B766 7717 1644 5ABC DE82  94AA 4679 BF7D CC04 4783"; } ];
     name = "sanana the skenana";
@@ -19852,7 +19858,7 @@
   };
   schinmai-akamai = {
     email = "schinmai@akamai.com";
-    github = "schinmai-akamai";
+    github = "tchinmai7";
     githubId = 70169773;
     name = "Tarun Chinmai Sekar";
   };
@@ -19925,7 +19931,7 @@
   };
   scoder12 = {
     name = "Spencer Pogorzelski";
-    github = "Scoder12";
+    github = "spencerpogo";
     githubId = 34356756;
   };
   scolobb = {
@@ -20769,7 +20775,7 @@
   };
   smironov = {
     email = "grrwlf@gmail.com";
-    github = "grwlf";
+    github = "sergei-mironov";
     githubId = 4477729;
     name = "Sergey Mironov";
   };
@@ -22164,7 +22170,7 @@
   };
   therealr5 = {
     email = "rouven@rfive.de";
-    github = "therealr5";
+    github = "rouven0";
     githubId = 72568063;
     name = "Rouven Seifert";
     keys = [ { fingerprint = "1169 87A8 DD3F 78FF 8601  BF4D B95E 8FE6 B11C 4D09"; } ];
@@ -22601,7 +22607,7 @@
   tomsiewert = {
     email = "tom@siewert.io";
     matrix = "@tom:frickel.earth";
-    github = "tomsiewert";
+    github = "sinuscosinustan";
     githubId = 8794235;
     name = "Tom Siewert";
   };
@@ -23510,7 +23516,7 @@
   };
   voidless = {
     email = "julius.schmitt@yahoo.de";
-    github = "voidIess";
+    github = "bratorange";
     githubId = 45292658;
     name = "Julius Schmitt";
   };

maintainers/scripts/check-maintainer-usernames/.gitignore

@@ -0,0 +1 @@
+/target

maintainers/scripts/check-maintainer-usernames/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "check-maintainers"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+octocrab = "0.42.1"
+serde_json = "1.0.133"
+tokio = { version = "1.41.1", features = ["fs", "macros", "rt-multi-thread"] }

maintainers/scripts/check-maintainer-usernames/src/main.rs

@@ -0,0 +1,42 @@
+use std::{env, error::Error, io::{self, Write}};
+
+use tokio::fs;
+
+#[tokio::main]
+async fn main() {
+    real_main().await.unwrap();
+}
+
+async fn real_main() -> Result<(), Box<dyn Error>> {
+    let gh = octocrab::OctocrabBuilder::default()
+        .personal_token(env::var("GITHUB_PAT").expect("no GITHUB_PAT configured"))
+        .build()?;
+
+    // first run: nix-instantiate -A lib.maintainers --eval --strict --json > maintainers.json
+    let data: serde_json::Value = serde_json::from_str(&fs::read_to_string("maintainers.json").await?)?;
+
+    let data = data.as_object().unwrap();
+    let total = data.len();
+    for (i, (maintainer_name, v)) in data.iter().enumerate() {
+        print!("\r{i}/{total}");
+        io::stdout().flush()?;
+        let Some(github_id) = v.get("githubId") else {
+            println!("\rWARN: no id for {maintainer_name}");
+            continue;
+        };
+        let Some(github) = v.get("github") else {
+            println!("\rWARN: no username for {maintainer_name}");
+            continue;
+        };
+        let Ok(name) = gh.users_by_id(github_id.as_u64().unwrap()).profile().await else {
+            println!("\rWARN: error fetching {maintainer_name}");
+            continue;
+        };
+        let name = name.login;
+        if name.to_ascii_lowercase() != github.as_str().unwrap().to_ascii_lowercase() {
+            println!("\rERR: {maintainer_name} has github = {github}, but username really is '{name}'");
+        }
+    }
+
+    Ok(())
+}

maintainers/scripts/update-python-libraries

@@ -1,3 +1,3 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p "python3.withPackages (ps: with ps; [ packaging requests ])" -p nix-prefetch-git
-exec python3 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@
+exec python3 pkgs/by-name/up/update-python-libraries/update-python-libraries.py $@

nixos/doc/manual/release-notes/rl-2505.section.md

@@ -33,6 +33,8 @@
 
 - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).
 
+- [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
@@ -59,6 +61,10 @@
 
 - `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead.
 
+- `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.
+
+- `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years.
+
 - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses.
 
 - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel.

nixos/lib/qemu-common.nix

@@ -30,14 +30,14 @@ rec {
       guestSystem = pkgs.stdenv.hostPlatform.system;
 
       linuxHostGuestMatrix = {
-        x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
+        x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine accel=kvm:tcg -cpu max";
         armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -machine virt,accel=kvm:tcg -cpu max";
         aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max";
         powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
         powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
         riscv32-linux = "${qemuPkg}/bin/qemu-system-riscv32 -machine virt";
         riscv64-linux = "${qemuPkg}/bin/qemu-system-riscv64 -machine virt";
-        x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max";
+        x86_64-darwin = "${qemuPkg}/bin/qemu-system-x86_64 -machine accel=kvm:tcg -cpu max";
       };
       otherHostGuestMatrix = {
         aarch64-darwin = {

nixos/modules/misc/locate.nix

@@ -278,11 +278,23 @@ in
         PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no";
       };
       serviceConfig = {
+        CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_CHOWN";
         Nice = 19;
         IOSchedulingClass = "idle";
+        IPAddressDeny = "any";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
         PrivateTmp = "yes";
+        PrivateDevices = true;
         PrivateNetwork = "yes";
-        NoNewPrivileges = "yes";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHostname = true;
+        RestrictAddressFamilies = "AF_UNIX";
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
         ReadOnlyPaths = "/";
         # Use dirOf cfg.output because mlocate creates temporary files next to
         # the actual database. We could specify and create them as well,
@@ -290,6 +302,8 @@ in
         # NOTE: If /var/cache does not exist, this leads to the misleading error message:
         # update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory
         ReadWritePaths = dirOf cfg.output;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = "@system-service @chown";
       };
     };
 

nixos/modules/services/desktop-managers/lomiri.nix

@@ -90,6 +90,7 @@ in
             lomiri-filemanager-app
             lomiri-gallery-app
             lomiri-history-service
+            lomiri-mediaplayer-app
             lomiri-polkit-agent
             lomiri-schemas # exposes some required dbus interfaces
             lomiri-session # wrappers to properly launch the session

nixos/modules/services/monitoring/prometheus/exporters.nix

@@ -58,6 +58,7 @@ let
     "mikrotik"
     "modemmanager"
     "mongodb"
+    "mqtt"
     "mysqld"
     "nats"
     "nextcloud"

nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix

@@ -0,0 +1,140 @@
+{
+  config,
+  lib,
+  pkgs,
+  options,
+  utils,
+}:
+
+let
+  inherit (lib)
+    mkIf
+    mkEnableOption
+    mkOption
+    types
+    ;
+  cfg = config.services.prometheus.exporters.mqtt;
+  toConfigBoolean = x: if x then "True" else "False";
+  toConfigList = builtins.concatStringsSep ",";
+in
+{
+  # https://github.com/kpetremann/mqtt-exporter/tree/master?tab=readme-ov-file#configuration
+  port = 9000;
+  extraOpts = {
+    keepFullTopic = mkEnableOption "Keep entire topic instead of the first two elements only. Usecase: Shelly 3EM";
+    logLevel = mkOption {
+      type = types.enum [
+        "CRITICAL"
+        "ERROR"
+        "WARNING"
+        "INFO"
+        "DEBUG"
+      ];
+      default = "INFO";
+      example = "DEBUG";
+      description = "Logging level";
+    };
+    logMqttMessage = mkEnableOption "Log MQTT original message, only if `LOG_LEVEL` is set to DEBUG.";
+    mqttIgnoredTopics = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = "Lists of topics to ignore. Accepts wildcards.";
+    };
+    mqttAddress = mkOption {
+      type = types.str;
+      default = "127.0.0.1";
+      description = "IP or hostname of MQTT broker.";
+    };
+    mqttPort = mkOption {
+      type = types.port;
+      default = 1883;
+      description = "TCP port of MQTT broker.";
+    };
+    mqttTopic = mkOption {
+      type = types.str;
+      default = "#";
+      description = "Topic path to subscribe to.";
+    };
+    mqttKeepAlive = mkOption {
+      type = types.int;
+      default = 60;
+      example = 30;
+      description = "Keep alive interval to maintain connection with MQTT broker.";
+    };
+    mqttUsername = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "mqttexporter";
+      description = "Username which should be used to authenticate against the MQTT broker.";
+    };
+    mqttV5Protocol = mkEnableOption "Force to use MQTT protocol v5 instead of 3.1.1.";
+    mqttClientId = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Set client ID manually for MQTT connection";
+    };
+    mqttExposeClientId = mkEnableOption "Expose the client ID as a label in Prometheus metrics.";
+    prometheusPrefix = mkOption {
+      type = types.str;
+      default = "mqtt_";
+      description = "Prefix added to the metric name.";
+    };
+    topicLabel = mkOption {
+      type = types.str;
+      default = "topic";
+      description = "Define the Prometheus label for the topic.";
+    };
+    zigbee2MqttAvailability = mkEnableOption "Normalize sensor name for device availability metric added by Zigbee2MQTT.";
+    zwaveTopicPrefix = mkOption {
+      type = types.str;
+      default = "zwave/";
+      description = "MQTT topic used for Zwavejs2Mqtt messages.";
+    };
+    esphomeTopicPrefixes = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = "MQTT topic used for ESPHome messages.";
+    };
+    hubitatTopicPrefixes = mkOption {
+      type = types.listOf types.str;
+      default = [ "hubitat/" ];
+      description = "MQTT topic used for Hubitat messages.";
+    };
+    environmentFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      example = [ "/run/secrets/mqtt-exporter" ];
+      description = ''
+        File to load as environment file. Useful for e.g. setting `MQTT_PASSWORD`
+        without putting any secrets into the Nix store.
+      '';
+    };
+  };
+  serviceOpts = {
+    environment = {
+      KEEP_FULL_TOPIC = toConfigBoolean cfg.keepFullTopic;
+      LOG_LEVEL = cfg.logLevel;
+      LOG_MQTT_MESSAGE = toConfigBoolean cfg.logMqttMessage;
+      MQTT_IGNORED_TOPIC = toConfigList cfg.mqttIgnoredTopics;
+      MQTT_ADDRESS = cfg.mqttAddress;
+      MQTT_PORT = toString cfg.mqttPort;
+      MQTT_TOPIC = cfg.mqttTopic;
+      MQTT_KEEPALIVE = toString cfg.mqttKeepAlive;
+      MQTT_USERNAME = cfg.mqttUsername;
+      MQTT_V5_PROTOCOL = toConfigBoolean cfg.mqttV5Protocol;
+      MQTT_CLIENT_ID = mkIf (cfg.mqttClientId != null) cfg.mqttClientId;
+      PROMETHEUS_ADDRESS = cfg.listenAddress;
+      PROMETHEUS_PORT = toString cfg.port;
+      PROMETHEUS_PREFIX = cfg.prometheusPrefix;
+      TOPIC_LABEL = cfg.topicLabel;
+      ZIGBEE2MQTT_AVAILABILITY = toConfigBoolean cfg.zigbee2MqttAvailability;
+      ZWAVE_TOPIC_PREFIX = cfg.zwaveTopicPrefix;
+      ESPHOME_TOPIC_PREFIXES = toConfigList cfg.esphomeTopicPrefixes;
+      HUBITAT_TOPIC_PREFIXES = toConfigList cfg.hubitatTopicPrefixes;
+    };
+    serviceConfig = {
+      EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
+      ExecStart = lib.getExe pkgs.mqtt-exporter;
+    };
+  };
+}

nixos/modules/services/security/vault-agent.nix

@@ -46,8 +46,8 @@ let
               };
 
               template = mkOption {
-                default = [ ];
-                type = with types; listOf (attrsOf anything);
+                default = null;
+                type = with types; nullOr (listOf (attrsOf anything));
                 description =
                   let upstreamDocs =
                     if flavour == "vault-agent"

nixos/modules/services/system/nscd.nix

@@ -134,6 +134,8 @@ in
             Group = cfg.group;
             RemoveIPC = true;
             PrivateTmp = true;
+            # https://github.com/twosigma/nsncd/pull/33/files#r1496927653
+            Environment = [ "NSNCD_HANDOFF_TIMEOUT=10" ];
             NoNewPrivileges = true;
             RestrictSUIDSGID = true;
             ProtectSystem = "strict";

nixos/modules/services/wayland/cage.nix

@@ -41,6 +41,8 @@ in {
     '';
   };
 
+  options.services.cage.package = mkPackageOption pkgs "cage" { };
+
   config = mkIf cfg.enable {
 
     # The service is partially based off of the one provided in the
@@ -64,7 +66,7 @@ in {
       unitConfig.ConditionPathExists = "/dev/tty1";
       serviceConfig = {
         ExecStart = ''
-          ${pkgs.cage}/bin/cage \
+          ${cfg.package}/bin/cage \
             ${escapeShellArgs cfg.extraArguments} \
             -- ${cfg.program}
         '';

nixos/modules/services/web-apps/firefly-iii.nix

@@ -185,7 +185,7 @@ in
           DB_PORT = 3306;
           DB_DATABASE = "firefly";
           DB_USERNAME = "firefly";
-          DB_PASSWORD_FILE = "/var/secrets/firefly-iii-mysql-password.txt;
+          DB_PASSWORD_FILE = "/var/secrets/firefly-iii-mysql-password.txt";
         }
       '';
       type = lib.types.submodule {

nixos/tests/all-tests.nix

@@ -563,6 +563,7 @@ in {
   lomiri-clock-app = runTest ./lomiri-clock-app.nix;
   lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
   lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
+  lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix;
   lomiri-gallery-app = runTest ./lomiri-gallery-app.nix;
   lomiri-system-settings = handleTest ./lomiri-system-settings.nix {};
   lorri = handleTest ./lorri/default.nix {};

nixos/tests/lomiri-mediaplayer-app.nix

@@ -0,0 +1,77 @@
+{ lib, ... }:
+let
+  ocrContent = "Video Test";
+  videoFile = "test.webm";
+in
+{
+  name = "lomiri-mediaplayer-app-standalone";
+  meta.maintainers = lib.teams.lomiri.members;
+
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
+      imports = [ ./common/x11.nix ];
+
+      services.xserver.enable = true;
+
+      environment = {
+        # Setup video
+        etc."${videoFile}".source =
+          pkgs.runCommand videoFile
+            {
+              nativeBuildInputs = with pkgs; [
+                ffmpeg # produce video for OCR
+                (imagemagick.override { ghostscriptSupport = true; }) # produce OCR-able image
+              ];
+            }
+            ''
+              magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png
+              ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 100K -t 120 $out -loglevel fatal
+            '';
+        systemPackages = with pkgs.lomiri; [
+          suru-icon-theme
+          lomiri-mediaplayer-app
+        ];
+        variables = {
+          UITK_ICON_THEME = "suru";
+        };
+      };
+
+      i18n.supportedLocales = [ "all" ];
+
+      fonts = {
+        packages = with pkgs; [
+          # Intended font & helps with OCR
+          ubuntu-classic
+        ];
+      };
+    };
+
+  enableOCR = true;
+
+  testScript = ''
+    machine.wait_for_x()
+
+    with subtest("lomiri mediaplayer launches"):
+        machine.succeed("lomiri-mediaplayer-app >&2 &")
+        machine.wait_for_text("Choose from")
+        machine.screenshot("lomiri-mediaplayer_open")
+
+    machine.succeed("pkill -f lomiri-mediaplayer-app")
+
+    with subtest("lomiri mediaplayer plays video"):
+        machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &")
+        machine.wait_for_text("${ocrContent}")
+        machine.screenshot("lomiri-mediaplayer_playback")
+
+    machine.succeed("pkill -f lomiri-mediaplayer-app")
+
+    with subtest("lomiri mediaplayer localisation works"):
+        # OCR struggles with finding identifying the translated window title, and lomiri-content-hub QML isn't translated
+        # Cause an error, and look for the error popup
+        machine.succeed("touch invalid.mp4")
+        machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &")
+        machine.wait_for_text("Fehler")
+        machine.screenshot("lomiri-mediaplayer_localised")
+  '';
+}

nixos/tests/prometheus-exporters.nix

@@ -804,6 +804,38 @@ let
       '';
     };
 
+    mqtt = {
+      exporterConfig = {
+        enable = true;
+        environmentFile = pkgs.writeText "mqtt-exporter-envfile" ''
+          MQTT_PASSWORD=testpassword
+        '';
+      };
+      metricProvider = {
+        services.mosquitto = {
+          enable = true;
+          listeners = [{
+            users.exporter = {
+              acl = [ "read #" ];
+              passwordFile = pkgs.writeText "mosquitto-password" "testpassword";
+            };
+          }];
+        };
+        systemd.services.prometheus-mqtt-exporter ={
+          wants = [ "mosquitto.service" ];
+          after = [ "mosquitto.service" ];
+        };
+      };
+      exporterTest = ''
+        wait_for_unit("mosquitto.service")
+        wait_for_unit("prometheus-mqtt-exporter.service")
+        wait_for_open_port(9000)
+        succeed(
+          "curl -sSf http://localhost:9000/metrics | grep '^python_info'"
+        )
+      '';
+    };
+
     mysqld = {
       exporterConfig = {
         enable = true;

pkgs/applications/backup/timeshift/default.nix

@@ -25,8 +25,8 @@ in
   meta = oldAttrs.meta // {
     description = oldAttrs.meta.description;
     longDescription = oldAttrs.meta.longDescription + ''
-      This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and (optionally) btrfs.
-      If you want to use the commands provided by the system, override the propagatedBuildInputs or use timeshift-minimal instead
+      This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs.
+      If you want to use the commands provided by the system, use timeshift-minimal instead.
     '';
   };
 })

pkgs/applications/backup/timeshift/unwrapped.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "timeshift";
-  version = "24.06.3";
+  version = "24.06.5";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "timeshift";
     rev = version;
-    hash = "sha256-npYiUSAPzr6g29ilQ1JELxqR1VbOR7TNMkdx37n92kk=";
+    hash = "sha256-2qNLgUZLMcfoemdLvvjdkR7Ln5loSKGqbd402y5Id8k=";
   };
 
   patches = [

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix

@@ -6,11 +6,11 @@
 
 melpaBuild rec {
   pname = "ebuild-mode";
-  version = "1.75";
+  version = "1.76";
 
   src = fetchzip {
     url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2";
-    hash = "sha256-zEJCjSL90Ok2bUbLNcEK3vWcQSOyfrWvctHqZACfdIc=";
+    hash = "sha256-o964/Sk33PzyNm2+yoz7oAhw1M0gYwggaYSukuo9ALg=";
   };
 
   meta = {

pkgs/applications/editors/vim/plugins/blink-cmp/default.nix

@@ -7,12 +7,12 @@
   nix-update-script,
 }:
 let
-  version = "0.7.1";
+  version = "0.7.3";
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-IHl+XIldo2kculpbiOuLIJ6RJbFODiRlQU4x8hvE7pI=";
+    hash = "sha256-nxiODLKgGeXzN5sqkLWU0PcsuSSB1scSzTC5qyCxLCI=";
   };
   libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
   blink-fuzzy-lib = rustPlatform.buildRustPackage {

pkgs/applications/editors/vim/plugins/generated.nix

@@ -185,12 +185,12 @@ final: prev:
 
   LazyVim = buildVimPlugin {
     pname = "LazyVim";
-    version = "2024-12-02";
+    version = "2024-12-05";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "4a626a81372df74c3ea33b435e91b127ef55a796";
-      sha256 = "0y0569j9yiqk08paa5ic58r2gvk06iy3211sgl41fkfg00dk362v";
+      rev = "b2f750558a3737879f8151e741e7a3988886e37f";
+      sha256 = "0jz611zvsvilvf8gb9wky70jcp7pnla5yf48qfcn9sa3arm7666h";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
   };
@@ -5764,12 +5764,12 @@ final: prev:
 
   lazy-nvim = buildVimPlugin {
     pname = "lazy.nvim";
-    version = "2024-11-20";
+    version = "2024-12-05";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "56ead98e05bb37a4ec28930a54d836d033cf00f2";
-      sha256 = "0fcb6zrxbrj0nnkbb7cilqsjr500rv43r5w9nbk9apvjcjx8rkg0";
+      rev = "3388a26417c48b15d5266d954f62a4d47fe99490";
+      sha256 = "15is61zfs4nkhjcdcg036fvv6rdd1kgyr6k704rcn77717m6ix6s";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
   };

pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix

@@ -48,7 +48,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     + lib.optionalString pythonUseFixed ''
       # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`.
       substituteInPlace "./package.json" \
-        --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\""
+        --replace-fail "\"default\":\"python\"" "\"default\":\"${python3.interpreter}\""
     '';
 
   passthru.updateScript = writeScript "update" ''

pkgs/applications/graphics/xournalpp/default.nix

@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xournalpp";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
     rev = "v${version}";
-    hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk=";
+    hash = "sha256-Hm3NDVELOnwjg6NiV5VBbt/15slHAgOVZLTV3zBMkLI=";
   };
 
   postPatch = ''

pkgs/applications/misc/edgetx/default.nix

@@ -39,6 +39,7 @@ mkDerivation rec {
       firmware to the radio, backing up model settings, editing settings and
       running radio simulators.
     '';
+    mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion version));
     homepage = "https://edgetx.org/";
     license = licenses.gpl2Only;
     platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];

pkgs/applications/misc/opentx/default.nix

@@ -42,6 +42,7 @@ mkDerivation rec {
       firmware to the radio, backing up model settings, editing settings and
       running radio simulators.
     '';
+    mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion version));
     homepage = "https://www.open-tx.org/";
     license = licenses.gpl2Only;
     platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];

pkgs/applications/misc/osmscout-server/default.nix

@@ -30,13 +30,13 @@ let
 in
 mkDerivation rec {
   pname = "osmscout-server";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "rinigus";
     repo = "osmscout-server";
     rev = version;
-    hash = "sha256-jcg/0SKeLviEC+vszh5DployKDAI7N+a8lzvImzFTvY=";
+    hash = "sha256-GqUXHn3ZK8gdDlm3TitEp/jhBpQoVeQZUCfAyiyrDEg=";
     fetchSubmodules = true;
   };
 
@@ -47,19 +47,6 @@ mkDerivation rec {
     libpostal sqlite marisa kyotocabinet boost protobuf date
   ];
 
-  patches = [
-    # Valhalla 3.2.1 support. Only required for next patch to apply cleanly
-    (fetchpatch {
-      url = "https://github.com/rinigus/osmscout-server/commit/1df9d383e61dd14cbe9e5b52412a2e951cee2ee4.patch";
-      hash = "sha256-h+YTyHr4RYgwH5bfVgyujSekbL2LfV8vJgVkjXT0I10=";
-    })
-    # Valhalla 3.4.0 support
-    (fetchpatch {
-      url = "https://github.com/rinigus/osmscout-server/commit/fe6562a4c3ba5da2735232ea8fdc7f71d7e7e714.patch";
-      hash = "sha256-wibLTFk3cFS5mcC71TgMA9ZAAHS3mbjboFHqax6nCxs=";
-    })
-  ];
-
   qmakeFlags = [
     "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant
     "CONFIG+=disable_mapnik" # Disable the optional mapnik backend

pkgs/applications/networking/browsers/chromium/common.nix

@@ -37,7 +37,7 @@
 , bison, gperf, libkrb5
 , glib, gtk3, dbus-glib
 , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL
-, libgbm
+, dri-pkgconfig-stub, libgbm
 , pciutils, protobuf, speechd-minimal, libXdamage, at-spi2-core
 , pipewire
 , libva
@@ -273,7 +273,7 @@ let
       util-linux alsa-lib
       libkrb5
       glib gtk3 dbus-glib
-      libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL libgbm
+      libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL dri-pkgconfig-stub libgbm
       pciutils protobuf speechd-minimal libXdamage at-spi2-core
       pipewire
       libva

pkgs/applications/networking/browsers/palemoon/bin.nix

@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.4.1";
+  version = "33.5.0";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: {
     in {
       gtk3 = fetchzip {
         urls = urlRegionVariants "gtk3";
-        hash = "sha256-pjOzU8atFNzYujxxoVihn0Cvq4Xvh7U2auSznE29Wpc=";
+        hash = "sha256-TlmDsZKHolTS+y+1BymyY49+AvqUv8zmUXCGNHCRPL0=";
       };
       gtk2 = fetchzip {
         urls = urlRegionVariants "gtk2";
-        hash = "sha256-ikgO0vVTySw3I6gdSu5k2e35xZ95bJY4f18Fjh+c0rA=";
+        hash = "sha256-f6vLHbpmvVfkjZr7x0DiCFoGGvfxHfFZ3KTagq2Mwp4=";
       };
     };
 

pkgs/applications/networking/cluster/cni/plugins.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cni-plugins";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "plugins";
     rev = "v${version}";
-    hash = "sha256-7jl8c/191KiQSzixDXMcSFCrSqZFs4F7ZCe9BwrFqQ8=";
+    hash = "sha256-thtN7po5SToM0ZFYIbycaPJTafLvk9hFV4XFGOpWmpg=";
   };
 
   vendorHash = null;

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -552,13 +552,13 @@
     "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI="
   },
   "hcloud": {
-    "hash": "sha256-td1R2Xeo1QfsNJOwE7cCuzF5OjW4XUQJOVd0LPAXfuE=",
+    "hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=",
     "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
     "owner": "hetznercloud",
     "repo": "terraform-provider-hcloud",
-    "rev": "v1.48.1",
+    "rev": "v1.49.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w="
+    "vendorHash": "sha256-TFH5tHOTRNPUMGYeYQ1ZbM6FjcojYnkB2NwnQOacTvg="
   },
   "helm": {
     "hash": "sha256-8cYhbxbjTfloDd3cLYNPv98TzeC0XVrb4DQ2ScZDYvI=",
@@ -651,13 +651,13 @@
     "vendorHash": null
   },
   "incus": {
-    "hash": "sha256-VHoEUcFwsERC3EKfobTEoWOxuiOEBzEaWXL+mzlTe44=",
+    "hash": "sha256-Dva5bFyJpxifsQl62xnjvqEQ5SknUmCLfGX4fFx5FAE=",
     "homepage": "https://registry.terraform.io/providers/lxc/incus",
     "owner": "lxc",
     "repo": "terraform-provider-incus",
-    "rev": "v0.1.4",
+    "rev": "v0.2.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-7MQi9gJU0RAm9jTiY/YjkEU5QsxSX2lbUC7qvT20mes="
+    "vendorHash": "sha256-xr54yCVGOJbj0612wiljUkx1wEOSuXB1qrGbF/vCwN8="
   },
   "infoblox": {
     "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=",
@@ -1174,13 +1174,13 @@
     "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo="
   },
   "spacelift": {
-    "hash": "sha256-HJ+QlbmMvn45l9KjmVzoK/jETIosOSlcLtw4B1kdEIo=",
+    "hash": "sha256-RWrhVeXPEgFYFGh34vFargTrZH+3CxY36+i0lmFSjXg=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.16.1",
+    "rev": "v1.19.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U="
+    "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs="
   },
   "spotinst": {
     "hash": "sha256-Yq52eCxT+XWoTONcLTDlIpy/jnU76JajsoqKYXFK8AM=",

pkgs/applications/networking/protonvpn-gui/default.nix

@@ -21,14 +21,14 @@
 
 buildPythonApplication rec {
   pname = "protonvpn-gui";
-  version = "4.7.4";
+  version = "4.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "proton-vpn-gtk-app";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qF6rLCF4Lfzdr2I2jmhLJzhYYstncnQVdyHOn2ajCyg=";
+    hash = "sha256-KNMlDjL4SosHZ6ol2jpC1K7F6VuCa1O2EkQtl8uwnig=";
   };
 
   nativeBuildInputs = [

pkgs/applications/office/mendeley/default.nix

@@ -7,13 +7,13 @@
 
 let
   pname = "mendeley";
-  version = "2.122.1";
+  version = "2.127.1";
 
   executableName = "${pname}-reference-manager";
 
   src = fetchurl {
     url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
-    hash = "sha256-9/QGBUcMjZaV/R9Ox0RaNsLChICoMG9qdFRXM9XCF2w=";
+    hash = "sha256-VtGtv9orfOn/DLIrnUdV/fGZeP1ZpC6b5h/IG8RzaOg=";
   };
 
   appimageContents = appimageTools.extractType2 {

pkgs/applications/office/treesheets/default.nix

@@ -5,20 +5,19 @@
 , ninja
 , wrapGAppsHook3
 , makeWrapper
-, wxGTK
-, Cocoa
+, wxGTK32
 , unstableGitUpdater
 }:
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "0-unstable-2024-09-08";
+  version = "0-unstable-2024-11-24";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "8db448f67710194d64211ac467ffd2d456854432";
-    hash = "sha256-SM62ymN5HXRiyXayoWQaGXLCGEDbHcKMJdPLXDv5dv8=";
+    rev = "4b27fa43bbd5db0c2a5db2a942002f71d6fdc752";
+    hash = "sha256-uKFh4sdcp6CsgJQrX6H9NQhPvOQ3U2PeS+xyDTqwkvo=";
   };
 
   nativeBuildInputs = [
@@ -29,19 +28,15 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    wxGTK
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Cocoa
+    wxGTK32
   ];
 
   env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\"";
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shopt -s extglob
-    mkdir -p $out/{share/treesheets,bin}
-    mv $out/!(share) $out/share/treesheets
-    makeWrapper $out/{share/treesheets,bin}/treesheets \
-      --chdir $out/share/treesheets
+    mkdir -p $out/{Applications,bin}
+    mv $out/TreeSheets.app $out/Applications
+    makeWrapper $out/Applications/TreeSheets.app/Contents/MacOS/TreeSheets $out/bin/TreeSheets
   '';
 
   passthru = {
@@ -52,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Free Form Data Organizer";
-    mainProgram = "treesheets";
+    mainProgram = "TreeSheets";
 
     longDescription = ''
       The ultimate replacement for spreadsheets, mind mappers, outliners,

pkgs/applications/science/electronics/simulide/default.nix

@@ -1,137 +0,0 @@
-{
-  lib,
-  fetchbzr,
-  mkDerivation,
-  qmake,
-  qtserialport,
-  qtmultimedia,
-  qttools,
-  qtscript,
-}:
-
-let
-  generic =
-    {
-      version,
-      release,
-      rev,
-      src,
-      extraPostPatch ? "",
-      extraBuildInputs ? [ ],
-      iconPath ? "resources/icons/simulide.png",
-      installFiles ? ''
-        cp -r data examples $out/share/simulide
-        cp simulide $out/bin/simulide
-      '',
-    }:
-    mkDerivation {
-      pname = "simulide";
-      version = "${version}-${release}";
-      inherit src;
-
-      postPatch = ''
-        sed -i resources/simulide.desktop \
-          -e "s|^Exec=.*$|Exec=simulide|" \
-          -e "s|^Icon=.*$|Icon=simulide|"
-
-        # Note: older versions don't have REV_NO
-        sed -i SimulIDE.pro \
-          -e "s|^VERSION = .*$|VERSION = ${version}|" \
-          -e "s|^RELEASE = .*$|RELEASE = -${release}|" \
-          -e "s|^REV_NO = .*$|REV_NO = ${rev}|" \
-          -e "s|^BUILD_DATE = .*$|BUILD_DATE = ??-??-??|"
-
-        ${extraPostPatch}
-      '';
-
-      preConfigure = ''
-        cd build_XX
-      '';
-
-      nativeBuildInputs = [ qmake ];
-
-      buildInputs = [
-        qtserialport
-        qtmultimedia
-        qttools
-      ] ++ extraBuildInputs;
-
-      installPhase = ''
-        runHook preInstall
-
-        install -Dm644 ../resources/simulide.desktop $out/share/applications/simulide.desktop
-        install -Dm644 ../${iconPath} $out/share/icons/hicolor/256x256/apps/simulide.png
-
-        mkdir -p $out/share/simulide $out/bin
-        pushd executables/SimulIDE_*
-        ${installFiles}
-        popd
-
-        runHook postInstall
-      '';
-
-      meta = {
-        description = "Simple real time electronic circuit simulator";
-        longDescription = ''
-          SimulIDE is a simple real time electronic circuit simulator, intended for hobbyist or students
-          to learn and experiment with analog and digital electronic circuits and microcontrollers.
-          It supports PIC, AVR, Arduino and other MCUs and MPUs.
-        '';
-        homepage = "https://simulide.com/";
-        license = lib.licenses.gpl3Only;
-        mainProgram = "simulide";
-        maintainers = with lib.maintainers; [
-          carloscraveiro
-          tomasajt
-        ];
-        platforms = [ "x86_64-linux" ];
-      };
-    };
-in
-{
-  simulide_0_4_15 = generic rec {
-    version = "0.4.15";
-    release = "SR10";
-    rev = "291";
-    src = fetchbzr {
-      # the branch name does not mach the version for some reason
-      url = "https://code.launchpad.net/~arcachofo/simulide/simulide_0.4.14";
-      sha256 = "sha256-BBoZr/S2pif0Jft5wrem8y00dXl08jq3kFiIUtOr3LM=";
-      inherit rev;
-    };
-    extraPostPatch = ''
-      # GCC 13 needs the <cstdint> header explicitly included
-      sed -i src/gpsim/value.h -e '1i #include <cstdint>'
-      sed -i src/gpsim/modules/watchdog.h -e '1i #include <cstdint>'
-    '';
-    extraBuildInputs = [ qtscript ];
-    iconPath = "resources/icons/hicolor/256x256/simulide.png"; # upstream had a messed up icon path in this release
-    installFiles = ''
-      cp -r share/simulide/* $out/share/simulide
-      cp bin/simulide $out/bin/simulide
-    '';
-  };
-
-  simulide_1_0_0 = generic rec {
-    version = "1.0.0";
-    release = "SR2";
-    rev = "1449";
-    src = fetchbzr {
-      url = "https://code.launchpad.net/~arcachofo/simulide/1.0.0";
-      sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g=";
-      inherit rev;
-    };
-    extraBuildInputs = [ qtscript ];
-  };
-
-  simulide_1_1_0 = generic rec {
-    version = "1.1.0";
-    release = "SR0";
-    rev = "1917";
-    src = fetchbzr {
-      url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0";
-      sha256 = "sha256-qNBaGWl89Le9uC1VFK+xYhrLzIvOIWjkQbutnrAmZ2M=";
-      inherit rev;
-    };
-  };
-}

pkgs/applications/virtualization/singularity/generic.nix

@@ -14,8 +14,9 @@
 }:
 
 let
-  # Workaround for vendor-related attributes not overridable (#86349)
-  # should be removed when the issue is resolved
+  # Backward compatibility layer for the obsolete workaround of
+  # the "vendor-related attributes not overridable" issue (#86349),
+  # whose solution is merged and released.
   _defaultGoVendorArgs = {
     inherit vendorHash deleteVendor proxyVendor;
   };

pkgs/applications/virtualization/singularity/packages.nix

@@ -19,9 +19,8 @@ let
           hash = "sha256-ZdSo9bKZ7Q1xwMe4SR840U3+fVpKwtiZQA5KDM5qF9M=";
         };
 
-        # Update by running
-        # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules"
-        # at the root directory of the Nixpkgs repository
+        # Override vendorHash with overrideAttrs.
+        # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash
         vendorHash = "sha256-W853++SSvkAYYUczbl8vnoBQZnimUdsAEXp4MCkLPBU=";
 
         extraDescription = " (previously known as Singularity)";
@@ -57,9 +56,8 @@ let
           hash = "sha256-Go4um/bIgq2lCZvjJ2GR81XpA/JvjPholi1PzNG9Hz8=";
         };
 
-        # Update by running
-        # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules"
-        # at the root directory of the Nixpkgs repository
+        # Override vendorHash with overrideAttrs.
+        # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash
         vendorHash = "sha256-CRZ42NdmJhAkV6bkl5n7rEV4Tu/h65qF5qaQ4W5wQ3w=";
 
         # Do not build conmon and squashfuse from the Git submodule sources,

pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix

@@ -52,8 +52,7 @@
     {
       name = "dotnet-fixup-hook";
       substitutions = {
-        # this is used for DOTNET_ROOT, so we need unwrapped
-        dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime.unwrapped else null;
+        dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null;
         wrapperPath = lib.makeBinPath [ which coreutils ];
       };
     }

pkgs/build-support/rust/fetch-cargo-tarball/default.nix

@@ -79,6 +79,7 @@ stdenv.mkDerivation (
       cargo
     ] ++ nativeBuildInputs;
 
+    dontConfigure = true;
     buildPhase = ''
       runHook preBuild
 

pkgs/by-name/am/amdvlk/package.nix

@@ -23,19 +23,17 @@
 let
 
   suffix = if stdenv.system == "x86_64-linux" then "64" else "32";
-  # Fix https://github.com/NixOS/nixpkgs/issues/348903 until the glslang update to 15.0.0 is merged into master
-  glslang_fixed = glslang.overrideAttrs (finalAttrs: oldAttrs: { cmakeFlags = [ ]; });
 
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amdvlk";
-  version = "2024.Q3.3";
+  version = "2024.Q4.2";
 
   src = fetchRepoProject {
     name = "amdvlk-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${finalAttrs.version}";
-    hash = "sha256-wIPubMsSaNGTykD/K0gxdba128TqW5nu4CjXoLkprc0=";
+    hash = "sha256-16eHtdxoSCVEPQNvi7Kuo7CP4yddMsZqpuRsWobEOnw=";
   };
 
   buildInputs =
@@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     [
       cmake
       directx-shader-compiler
-      glslang_fixed
+      glslang
       ninja
       patchelf
       perl

pkgs/by-name/bu/bulky/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bulky";
-  version = "3.4";
+  version = "3.5";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "bulky";
     rev = version;
-    hash = "sha256-YByzRDL/LuI/VwBHLRZ3+S2VnttYeuMgJpRLPhR/NCA=";
+    hash = "sha256-yGW2vEYGmd0FawbgB0lJoi5sId8MG9gNQa71wF1XupQ=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ]))
+    (python3.withPackages (p: with p; [ pygobject3 magic setproctitle unidecode ]))
     gsettings-desktop-schemas
     gtk3
     glib

pkgs/by-name/ca/cargo-deb/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deb";
-  version = "2.7.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ReXDrbFY2qY/0TUYD+EiP9Qa9KwMGb9iLL+tdfDLSpc=";
+    hash = "sha256-2Eq3gSvIBBVjsOjJPxrFLq1jgwFU2OHzKGV63SwDVTQ=";
   };
 
-  cargoHash = "sha256-yBMeiYWsb+D8WzWRDDi9JFZTFvQAQ7QUeGDb6yFelD8=";
+  cargoHash = "sha256-NqTZ+WCDWyPE3x8oiwb1EMxigIk3AIPfoQF49Cy/DFI=";
 
   nativeBuildInputs = [
     makeWrapper

pkgs/by-name/ca/cargo-sort/package.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-sort";
-  version = "1.0.9";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "devinr528";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw=";
+    sha256 = "sha256-AUtue1xkhrhlF7PtqsCQ9rdhV0/0i85DWrp7YL9SAYk=";
   };
 
-  cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU=";
+  cargoHash = "sha256-y6lLwk40hmFQKDU7sYz3+QQzdn5eGoEX7izmloK22dg=";
 
   meta = with lib; {
     description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically";

pkgs/by-name/ch/chocolate-doom/package.nix

@@ -1,31 +1,29 @@
-{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net
-, fetchFromGitHub, fetchpatch, python3 }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  libpng,
+  libsamplerate,
+  pkg-config,
+  python3,
+  SDL2,
+  SDL2_mixer,
+  SDL2_net,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "chocolate-doom";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "chocolate-doom";
-    repo = pname;
-    rev = "${pname}-${version}";
-    sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp";
+    repo = "chocolate-doom";
+    rev = "refs/tags/chocolate-doom-${finalAttrs.version}";
+    hash = "sha256-yDPfqCuzRbDhOQisIDAGo2bmmMjT+0lds5xc9C2pqoU=";
   };
 
-  patches = [
-    # Pull upstream patch to fix builx against gcc-10:
-    #   https://github.com/chocolate-doom/chocolate-doom/pull/1257
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2.patch";
-      sha256 = "1dmbygn952sy5n8qqp0asg11pmygwgygl17lrj7i0fxa0nrhixhj";
-    })
-  ];
-
-  outputs = [ "out" "man" ];
-
   postPatch = ''
-    sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
     patchShebangs --build man/{simplecpp,docgen}
   '';
 
@@ -35,15 +33,31 @@ stdenv.mkDerivation rec {
     # for documentation
     python3
   ];
-  buildInputs = [ SDL2 SDL2_mixer SDL2_net ];
+
+  buildInputs = [
+    libpng
+    libsamplerate
+    SDL2
+    SDL2_mixer
+    SDL2_net
+  ];
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
   enableParallelBuilding = true;
 
+  strictDeps = true;
+
   meta = {
-    homepage = "http://chocolate-doom.org/";
+    homepage = "https://www.chocolate-doom.org";
+    changelog = "https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-${finalAttrs.version}";
     description = "Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s";
+    mainProgram = "chocolate-doom";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    hydraPlatforms = lib.platforms.linux; # darwin times out
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ Gliczy ];
   };
-}
+})

pkgs/by-name/ci/cinnamon-common/package.nix

@@ -73,13 +73,13 @@ in
 # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
 stdenv.mkDerivation rec {
   pname = "cinnamon-common";
-  version = "6.4.1";
+  version = "6.4.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     rev = version;
-    hash = "sha256-xkM6t1AiFpfAJOUEP2eeWBtYLQa36FNxrpPiRgHot3w=";
+    hash = "sha256-r5cSm/a+xtHwwAHQmdgviDAN3nnMAnXGY/p+ER1/gbk=";
   };
 
   patches = [

pkgs/by-name/ci/cinnamon-control-center/package.nix

@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-control-center";
-  version = "6.4.0";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-hS1vFrwMYUinFLWx33nnlcXwcMkqDCivElI1HaZsSSE=";
+    hash = "sha256-1Z+kXvBmENNXIqdZgPDx7ZSwJMFAm2oMih6eFFAsA/A=";
   };
 
   buildInputs = [

pkgs/by-name/ci/cinnamon-translations/package.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-translations";
-  version = "6.4.0";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-aR1O/NaEJcu4W3bGMWVeaIVGeuMYTrQrPfeS1V+4Nmk=";
+    hash = "sha256-MMUXh8HFvISPZzu6+m/rm0/svLLml4OweZ7c4H9IHco=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/cl/clash-rs/package.nix

@@ -34,8 +34,12 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false; # test failed
 
-  doInstallCheck = true;
+  postInstall = ''
+    # Align with upstream
+    ln -s "$out/bin/clash-rs" "$out/bin/clash"
+  '';
 
+  doInstallCheck = true;
   versionCheckProgramArg = "--version";
 
   nativeInstallCheckInputs = [
@@ -45,7 +49,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Custom protocol, rule based network proxy software";
     homepage = "https://github.com/Watfaq/clash-rs";
-    mainProgram = "clash-rs";
+    mainProgram = "clash";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aucub ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;

pkgs/by-name/co/codeberg-cli/package.nix

@@ -10,17 +10,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "codeberg-cli";
-  version = "0.4.3";
+  version = "0.4.6";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "Aviac";
     repo = "codeberg-cli";
     rev = "v${version}";
-    hash = "sha256-95vjfjXKLXyg0d8FNAszBKwNVm9g8wRKzzHzxhTS8Bs=";
+    hash = "sha256-BkWI4FbacgFrbSLNSqe7vdzdLvrrgX1528qFaKCd5tY=";
   };
 
-  cargoHash = "sha256-IQTT7YylByGJhFV6sLSDmVhFahkByY2S4+IE7cNxLjg=";
+  cargoHash = "sha256-eFS16QzPMLhoVb+hqt/p3ka58rwP5WTgHas2PZT5c/U=";
   nativeBuildInputs = [
     pkg-config
     installShellFiles

pkgs/by-name/co/containerlab/package.nix

@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "containerlab";
-  version = "0.59.0";
+  version = "0.60.0";
 
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
     rev = "v${version}";
-    hash = "sha256-4YSnAoQkjDpSRBMqYW8D3TzipE5Co892y5PXkcz+8xA=";
+    hash = "sha256-+Xq4/cRtTYqbexajHtILAZvy0NWLn9UMxR1ksg0/JuY=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-PJQrQn7QPtUSzdlf2BYY8ARcmH6pzZgpl1oQbc98M4Y=";
+  vendorHash = "sha256-YX2JDDZ1jx32zfFj/2fY61zqxPIzmwntN+7kiGDxxV4=";
 
   ldflags = [
     "-s"

pkgs/by-name/cr/crowdsec/package.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "crowdsec";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "crowdsecurity";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-JN2siYUUFPSz+SyQwkX6DZ9k82SGHEQ1QHBEIfEV4EM=";
+    hash = "sha256-U3YnLjsD+Kl/6HD+RPP0gWa4N96X5wkbdCmIrxas1I8=";
   };
 
-  vendorHash = "sha256-fl5LkRz69QOq4aPyAhMFxw1FWozLzofDBUGvRptuyZY=";
+  vendorHash = "sha256-PtBVXPbLNdJyS8v8H9eRB6sTPaiseg18+eXToHvH7tw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/da/dafny/package.nix

@@ -42,7 +42,7 @@ buildDotnetModule rec {
     '';
 
   dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  buildInputs = [ jdk11 ];
+  nativeBuildInputs = [ jdk11 ];
   nugetDeps = ./deps.nix;
 
   # Build just these projects. Building Source/Dafny.sln includes a bunch of

pkgs/by-name/de/delly/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "delly";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "dellytools";
     repo = "delly";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RqiZzbFsj8g6kptpztW7EsYYzIyHgM9kOCIsq1PiPD8=";
+    hash = "sha256-nMMEQwsaRidv5MMbGF2s1wuRQX2COvWsJA67N8HiCZA=";
   };
 
   postPatch = lib.optionalString stdenv.cc.isClang ''

pkgs/by-name/di/di/package.nix

@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "di";
-  version = "4.54";
+  version = "4.54.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/diskinfo-di/${pname}-${version}.tar.gz";
-    sha256 = "sha256-9QD8H+J1hnOOEtdz2rya8Qj+RpDWu8giCpw8P3dPh0g=";
+    sha256 = "sha256-tAHmR+zDyKaXZRvSmtHMauMZ9poki03E068HQvZLT/s=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

pkgs/by-name/do/docker-init/package.nix

@@ -6,8 +6,8 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "docker-init";
-  version = "v1.3.0";
-  tag = "157355";
+  version = "v1.4.0";
+  tag = "175267";
 
   src = fetchurl {
     url = "https://desktop.docker.com/linux/main/amd64/${finalAttrs.tag}/docker-desktop-x86_64.pkg.tar.zst";
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "docker-init";
     license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    badPlatforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ BastianAsmussen ];
   };

pkgs/by-name/dr/dri-pkgconfig-stub/package.nix

@@ -0,0 +1,20 @@
+{
+  lib,
+  writeTextFile,
+  mesa,
+}:
+writeTextFile {
+  name = "dri-pkgconfig-stub";
+
+  text = ''
+    dridriverdir=${mesa.driverLink}/lib/dri
+
+    Name: dri
+    Version: ${mesa.version}
+    Description: Nixpkgs graphics driver path stub
+  '';
+
+  destination = "/lib/pkgconfig/dri.pc";
+
+  meta.badPlatforms = lib.platforms.darwin;
+}

pkgs/by-name/dy/dyalog/package.nix

@@ -32,7 +32,7 @@
 let
   dyalogHome = "$out/lib/dyalog";
 
-  makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8.unwrapped}/share/dotnet";
+  makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8}/share/dotnet";
 
   licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf";
 

pkgs/by-name/fl/flexget/package.nix

@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.11.49";
+  version = "3.12.1";
   pyproject = true;
 
   # Fetch from GitHub in order to use `requirements.in`
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "Flexget";
     repo = "Flexget";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/c6nJNIo6gqeANftbtuOatU+JGYXdMQgrPI0/EdH9LI=";
+    hash = "sha256-rW5ZFxpVoRTy257mo2LoX5Af12ZMyIGVzFCPwF5OF/c=";
   };
 
   # relax dep constrains, keep environment constraints

pkgs/by-name/fl/fluxus/fix-build.patch

@@ -1,100 +0,0 @@
-scons does not use os environment by default:
-  https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html
-
-nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables
-to be passed through like NIX_CFLAGS_COMPILE_BEFORE.
-
-While at it ported to python3-style print().
---- a/SConstruct
-+++ b/SConstruct
-@@ -6,7 +6,7 @@
- # application, then calls the sconscripts for libfluxus and
- # the fluxus Racket modules
- 
--import os, os.path, sys, commands, subprocess
-+import os, os.path, sys, subprocess
- 
- MajorVersion = "0"
- MinorVersion = "19"
-@@ -100,6 +100,7 @@ IncludePaths = [
- paranoid = ' -W -Wcast-qual -Wwrite-strings -Wcast-align -Wpointer-arith -Wconversion -Wredundant-decls -Wunreachable-code -Winline -Wlarger-than-256'
- 
- env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC -pthread',
-+                  ENV = os.environ,
-                   VERSION_NUM = FluxusVersion)
- env.MergeFlags(ARGUMENTS.get('CCFLAGS', '').split())
- env.MergeFlags(ARGUMENTS.get('LDFLAGS', '').split())
-@@ -229,9 +230,9 @@ if env['PLATFORM'] == 'posix':
- # Make sure we have these libraries availible
- 
- if not GetOption('clean'):
--        print '--------------------------------------------------------'
--        print 'Fluxus: Configuring Build Environment'
--        print '--------------------------------------------------------'
-+        print('--------------------------------------------------------')
-+        print('Fluxus: Configuring Build Environment')
-+        print('--------------------------------------------------------')
-         # detect ode precision
-         if not GetOption('clean'):
-           try:
-@@ -240,27 +241,27 @@ if not GetOption('clean'):
-             if isinstance(ode_str[0], str):
-               env.MergeFlags(ode_str[0])
-           except:
--            print 'WARNING: unable to run ode-config, cannot detect ODE precision'
-+            print('WARNING: unable to run ode-config, cannot detect ODE precision')
- 
-         conf = Configure(env)
- 
-         # check Racket and OpenAL frameworks on osx
-         if env['PLATFORM'] == 'darwin':
-                 if not conf.CheckHeader('scheme.h'):
--                        print "ERROR: 'racket3m' must be installed!"
-+                        print("ERROR: 'racket3m' must be installed!")
-                         Exit(1)
-                 if racket_framework:
-                   LibList = filter(lambda x: x[0] != 'racket3m', LibList)
-                 # OpenAL should be installed everywhere
-                 if not conf.CheckHeader('OpenAL/al.h'):
--                        print "ERROR: 'OpenAL' must be installed!"
-+                        print("ERROR: 'OpenAL' must be installed!")
-                         Exit(1)
- 
-         # all libraries are required, and some of them require each other,
-         # hence the order is important, and autoadd=1
-         for (lib,headers) in LibList:
-                 if not conf.CheckLibWithHeader(lib, headers, 'C', autoadd = 1):
--                        print "ERROR: '%s' must be installed!" % (lib)
-+                        print("ERROR: '%s' must be installed!" % (lib))
-                         Exit(1)
- 
-         if not conf.CheckFunc("dInitODE2"):
-@@ -334,7 +335,7 @@ if not GetOption('clean'):
- 			])
- 
- 	if raco_status != 0:
--		print "ERROR: Failed to run command 'raco'"
-+		print("ERROR: Failed to run command 'raco'")
- 		Exit(1)
- 
- 
-@@ -377,8 +378,8 @@ if not GetOption('clean') and static_modules:
- 
- 		app_env['LIBS'].remove("pthread")
- 		app_env['LIBS'].remove("dl")
--                app_env['LIBS'].remove("ode")
--                app_env['LIBS'].remove("sndfile")
-+		app_env['LIBS'].remove("ode")
-+		app_env['LIBS'].remove("sndfile")
- 
- 		# now go through the rest of the libs, removing them from
- 		# the environment at the same time
-@@ -425,7 +426,7 @@ SConscript(dirs = build_dirs,
- if not GetOption('clean'):
-     helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap")
-     if helpmap_status != 0:
--        print "ERROR: Failed to build 'docs/helpmap'"
-+        print("ERROR: Failed to build 'docs/helpmap'")
-         Exit(1)
- 
- ################################################################################

pkgs/by-name/fl/fluxus/package.nix

@@ -1,75 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, alsa-lib
-, fftw
-, libglut
-, freetype
-, glew
-, libjack2
-, libjpeg
-, liblo
-, libsndfile
-, libtiff
-, ode
-, openal
-, openssl
-, racket_7_9
-, scons
-}:
-let
-  racket = racket_7_9;
-in
-stdenv.mkDerivation {
-  pname = "fluxus";
-  version = "0.19";
-  src = fetchFromGitLab {
-    owner = "nebogeo";
-    repo = "fluxus";
-    rev = "ba9aee218dd4a9cfab914ad78bdb6d59e9a37400";
-    sha256 = "0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28";
-  };
-
-  buildInputs = [
-    alsa-lib
-    fftw
-    libglut
-    freetype
-    glew
-    libjack2
-    libjpeg
-    liblo
-    libsndfile
-    libtiff
-    ode
-    openal
-    openssl
-    racket_7_9
-  ];
-  nativeBuildInputs = [ scons ];
-
-  patches = [ ./fix-build.patch ];
-  postPatch = ''
-    substituteInPlace src/Unicode.cpp \
-      --replace "(byte)" "(unsigned char)"
-  '';
-  sconsFlags = [
-    "RacketPrefix=${racket}"
-    "RacketInclude=${racket}/include/racket"
-    "RacketLib=${racket}/lib/racket"
-    "DESTDIR=build"
-    "Prefix=${placeholder "out"}"
-  ];
-  installPhase = ''
-    mkdir -p $out
-    cp -r build$out/* $out/
-  '';
-
-  meta = with lib; {
-    description = "Livecoding environment for 3D graphics, sound, and games";
-    license = licenses.gpl2;
-    homepage = "http://www.pawfal.org/fluxus/";
-    maintainers = [ maintainers.brainrape ];
-    platforms = platforms.linux;
-  };
-}

pkgs/by-name/fo/folder-color-switcher/package.nix

@@ -7,14 +7,14 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "folder-color-switcher";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     # They don't really do tags, this is just a named commit.
-    rev = "ba8ea15a48a1a31f318676f4079789af20bdf099";
-    hash = "sha256-jbfc831wTA3NMa905ZzMnV0dyzzqZxOzrRPdgS7E2ZU=";
+    rev = "208e66285ec33a078205a221af579c79bc8cad01";
+    hash = "sha256-t38eEFgbrFsZ+vy+axIeL8j6todPLg4NqS6DM20iIxQ=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/fw/fwupd/package.nix

@@ -5,7 +5,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   gi-docgen,
   pkg-config,
   gobject-introspection,
@@ -118,7 +117,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.0.2";
+  version = "2.0.3";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -135,8 +134,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fwupd";
     repo = "fwupd";
-    rev = finalAttrs.version;
-    hash = "sha256-rmMb109SJVWDGT4z5GOA4V9O0cDMptTpwx0TXdGWjvk=";
+    tag = finalAttrs.version;
+    hash = "sha256-M0FZ5fyufm6h+/IyhajxpcjrGANKkyFzWKmn4EzLxKY=";
   };
 
   patches = [

pkgs/by-name/ga/garnet/package.nix

@@ -8,24 +8,19 @@
 
 buildDotnetModule rec {
   pname = "garnet";
-  version = "1.0.39";
+  version = "1.0.46";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2GX6iaDSYBRozHoBxtI7XrSrpYQ0Hcdr+Psn4uXRzAM=";
+    hash = "sha256-WXHtb4wDQxJ5n7/zbEGIrsfP0/dxV+ruYqcPFu1upho=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";
   nugetDeps = ./deps.nix;
 
-  dotnet-sdk =
-    with dotnetCorePackages;
-    combinePackages [
-      sdk_6_0
-      sdk_8_0
-    ];
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
   dotnetBuildFlags = [

pkgs/by-name/gc/gcalcli/package.nix

@@ -2,49 +2,47 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  nix-update-script,
   python3Packages,
   libnotify,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "gcalcli";
-  version = "4.4.0";
+  version = "4.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "insanum";
     repo = "gcalcli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-X9sgnujHMbmrt7cpcBOvTycIKFz3G2QzNDt3me5GUrQ=";
+    hash = "sha256-FU1EHLQ+/2sOGeeGwONsrV786kHTFfMel7ocBcCe+rI=";
   };
 
-  postPatch =
-    ''
-      # dev dependencies
-      substituteInPlace pyproject.toml \
-        --replace-fail "\"google-api-python-client-stubs\"," "" \
-        --replace-fail "\"types-python-dateutil\"," "" \
-        --replace-fail "\"types-requests\"," "" \
-        --replace-fail "\"types-vobject\"," ""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace gcalcli/argparsers.py \
-        --replace-fail "'notify-send" "'${lib.getExe libnotify}"
-    '';
+  updateScript = nix-update-script { };
 
-  build-system = with python3Packages; [ setuptools ];
+  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace gcalcli/argparsers.py \
+      --replace-fail "'notify-send" "'${lib.getExe libnotify}"
+  '';
+
+  build-system = with python3Packages; [ setuptools-scm ];
 
   dependencies = with python3Packages; [
     argcomplete
-    python-dateutil
+    babel
     gflags
-    httplib2
-    parsedatetime
-    vobject
     google-api-python-client
     google-auth-oauthlib
-    uritemplate
+    httplib2
     libnotify
+    parsedatetime
+    platformdirs
+    pydantic
+    python-dateutil
+    truststore
+    uritemplate
+    vobject
   ];
 
   nativeCheckInputs = with python3Packages; [ pytestCheckHook ];

pkgs/by-name/gi/gifski/package.nix

@@ -1,8 +1,9 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, ffmpeg
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  ffmpeg_6,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -16,12 +17,8 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Sl8HRc5tfRcYxXsXmvZ3M+f7PU7+1jz+IKWPhWWQ/us=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "ffmpeg-sys-next-6.1.0" = "sha256-RB9sDQoP68Dzqk8tIuYlOX3dZcS64hKI5KpTGq/7xbM=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-iWH0lXHolLpNVE/pgy1cOwiTMNRVy2JrruhQ/S4tp8M=";
 
   nativeBuildInputs = [
     pkg-config
@@ -29,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = [
-    ffmpeg
+    ffmpeg_6
   ];
 
   buildFeatures = [ "video" ];
@@ -44,12 +41,12 @@ rustPlatform.buildRustPackage rec {
   #
   checkType = "debug";
 
-  meta = with lib; {
+  meta = {
     description = "GIF encoder based on libimagequant (pngquant)";
     homepage = "https://gif.ski/";
     changelog = "https://github.com/ImageOptim/gifski/releases/tag/${src.rev}";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "gifski";
   };
 }

pkgs/by-name/gi/github-runner/package.nix

@@ -1,5 +1,7 @@
 {
+  bash,
   buildDotnetModule,
+  coreutils,
   darwin,
   dotnetCorePackages,
   fetchFromGitHub,
@@ -111,12 +113,17 @@ buildDotnetModule rec {
     [
       which
       git
+      # needed for `uname`
+      coreutils
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
       darwin.autoSignDarwinBinariesHook
     ];
 
-  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    bash
+  ];
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
   dotnet-runtime = dotnetCorePackages.runtime_8_0;

pkgs/by-name/gi/gitlab-release-cli/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gitlab-release-cli";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "release-cli";
     rev = "v${version}";
-    hash = "sha256-AEDao1tehg15SmluHlivG/I+Y9Gcxjj7KUEGAmOZ1aY=";
+    hash = "sha256-6h9hVk1x3zkhvZrEu5XUjLRIFj+VXF8qtd3AAdVmyE0=";
   };
 
   vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU=";

pkgs/by-name/gi/gitu/package.nix

@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitu";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "altsem";
     repo = "gitu";
     rev = "v${version}";
-    hash = "sha256-rHlehYdyBYyhP/kFciFW0vmaewtXYuypaHMzqyMDXYA=";
+    hash = "sha256-/g+hjQQhu771yqLhx4THaNCJKShXB7RoxiS9bQDUijU=";
   };
 
-  cargoHash = "sha256-b0Z1SOprsVe8Sg4X0ooOahE9yrP65CV1otZ3nXFvPHo=";
+  cargoHash = "sha256-cK7TjrP2KW3w7UFr+6pUIjeesPaJKs4lXorw98zwuD4=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/go/google-chrome/package.nix

@@ -166,11 +166,11 @@ let
 
   linux = stdenv.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "131.0.6778.85";
+    version = "131.0.6778.108";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-Cn0fg6WI1kFdk8s0LCksMCMLSDkPImXBDNK+hNMlMpQ=";
+      hash = "sha256-DU9qaMnn7gM/8VR4lsetWlkYu/Gs5+i/9JPYY2sbCi0=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -266,11 +266,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "131.0.6778.86";
+    version = "131.0.6778.109";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/neljlxhync4hvd3scdidzwcaj4_131.0.6778.86/GoogleChrome-131.0.6778.86.dmg";
-      hash = "sha256-EIX74r86/J8dgz585O7dcx0pv/OlR3ZNLiUe6E/V2C8=";
+      url = "http://dl.google.com/release2/chrome/adhpt2otqvd2vrh5vbgwgtydt7gq_131.0.6778.109/GoogleChrome-131.0.6778.109.dmg";
+      hash = "sha256-9pKGJa7UiDx1QPnWk0ONDQukUdRAPGz1PeYd7UoReoQ=";
     };
 
     dontPatch = true;

pkgs/by-name/go/gotemplate/package.nix

@@ -1,18 +1,18 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
 }:
-buildGo123Module rec {
+buildGoModule rec {
 
   pname = "gotemplate";
-  version = "3.11.0";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "coveooss";
     repo = "gotemplate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ohF9NemIXTTzguQ2VfqFt9zeiE4Co+dVux9Kw5cDobs=";
+    hash = "sha256-XcSlQ0Gw+EW2sJK+M2Sp9pcSSy2wsdRZ3MeFewhx7nw=";
   };
 
   vendorHash = "sha256-iNH0YmmZ/Qlc7WDoIbORd+uVg0rbQVKL6hX7YvbL0BE=";
@@ -21,12 +21,12 @@ buildGo123Module rec {
   # see https://github.com/coveooss/gotemplate/issues/262
   ldflags = [ "-X main.version=${version}" ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI for go text/template";
     mainProgram = "gotemplate";
     changelog = "https://github.com/coveooss/gotemplate/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ giorgiga ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.giorgiga ];
   };
 
 }

pkgs/by-name/gp/gpxlab/package.nix

@@ -1,8 +1,11 @@
-{ stdenv, mkDerivation, lib, fetchFromGitHub
-, qmake, qttools
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "gpxlab";
   version = "0.7.0";
 
@@ -13,7 +16,11 @@ mkDerivation rec {
     sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84";
   };
 
-  nativeBuildInputs = [ qmake qttools ];
+  nativeBuildInputs = [
+    qt5.qmake
+    qt5.qttools
+    qt5.wrapQtAppsHook
+  ];
 
   preConfigure = ''
     lrelease GPXLab/locale/*.ts
@@ -22,6 +29,9 @@ mkDerivation rec {
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/Applications
     mv GPXLab/GPXLab.app $out/Applications
+
+    mkdir -p $out/bin
+    ln -s $out/Applications/GPXLab.app/Contents/MacOS/GPXLab $out/bin/gpxlab
   '';
 
   meta = with lib; {

pkgs/by-name/hf/hfst-ospell/package.nix

@@ -2,7 +2,6 @@
 , stdenv
 , autoreconfHook
 , fetchFromGitHub
-, fetchpatch
 , icu
 , libarchive
 , pkg-config
@@ -10,24 +9,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hfst-ospell";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "hfst";
     repo = "hfst-ospell";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k=";
+    hash = "sha256-BmM0acqPL8qPOJ0KEkcI264xj89v+VaItZ0yS8QLF3o=";
   };
 
-  patches = [
-    # Pull upstream fix for gcc-13
-    (fetchpatch {
-      name = "cstdint.patch";
-      url = "https://github.com/hfst/hfst-ospell/commit/7481bffbf622bc9aee3547183fbe8db9cf8b22ce.patch";
-      hash = "sha256-q/B5mLx8Oc0nIRe3n3gl0OTyjIaEMCBsPc1GvpE226c=";
-    })
-  ];
-
   buildInputs = [
     icu
     libarchive

pkgs/by-name/ht/httping/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "httping";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "folkertvanheusden";
     repo = "HTTPing";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-JtsPtrj/ZineBokEytbkZdAfjVLTkiaNcGtKVJlKm38=";
+    hash = "sha256-6PXus8lg+2L9RoRe4nPI1+2iYDKKEhVfJJZMoKWSCb0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/hu/hurl/package.nix

@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hurl";
-  version = "5.0.1";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "Orange-OpenSource";
     repo = "hurl";
     rev = "refs/tags/${version}";
-    hash = "sha256-+GmIKxD5wHovhKXuV2IbDX43gbD8OxJzWvH3Z0MwwV4=";
+    hash = "sha256-zrZWYnXUuzf2cS3n56/hWDvyXVM4Y/34SOlMPrtAhJo=";
   };
 
-  cargoHash = "sha256-exAEJhHm7zTzXykkLyz46C0GJ7/7HYEwdfCd8zUDZ/A=";
+  cargoHash = "sha256-IuxTuIU9/6BpAXXunJ1Jjz3FPYRVPFNQhBqVAzMjNro=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/hy/hypnotix/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hypnotix";
-  version = "4.6";
+  version = "4.7";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "hypnotix";
     rev = version;
-    hash = "sha256-wDzHCrZTbfIb9dpRoh5qYKQNjONOv34FYdOr4svOLEw=";
+    hash = "sha256-e5vz5bCypzbofps+VW2UrKMsRBl7edeF8Ky00muCub4=";
   };
 
   patches = [

pkgs/by-name/in/intel-compute-runtime/package.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-compute-runtime";
-  version = "24.39.31294.12";
+  version = "24.45.31740.9";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     rev = version;
-    hash = "sha256-7GNtAo20DgxAxYSPt6Nh92nuuaS9tzsQGH+sLnsvBKU=";
+    hash = "sha256-b7mHIet+zgbS0JfJLKvt9+xILWeuA2rvTAeXetlFz/w=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

pkgs/by-name/ju/jujutsu/package.nix

@@ -21,7 +21,7 @@
 }:
 
 let
-  version = "0.23.0";
+  version = "0.24.0";
 in
 
 rustPlatform.buildRustPackage {
@@ -32,10 +32,10 @@ rustPlatform.buildRustPackage {
     owner = "martinvonz";
     repo = "jj";
     rev = "v${version}";
-    hash = "sha256-NCeD+WA3uVl4l/KKFDtdG8+vpm10Y3rEAf8kY6SP0yo=";
+    hash = "sha256-XsD4P2UygZFcnlV2o3E/hRRgsGjwKw1r9zniEeAk758";
   };
 
-  cargoHash = "sha256-lnfh9zMMZfHhYY7kgmxuqZwoEQxiInjmHjzLabbUijU=";
+  cargoHash = "sha256-9JwRdeHo8JkwRQwPA+UsIEWar4gYQS4SIM/uj1TU2yg";
 
   nativeBuildInputs = [
     installShellFiles
@@ -77,14 +77,6 @@ rustPlatform.buildRustPackage {
     "jj-cli"
   ];
 
-  checkFlags = [
-    # flaky test fixed upstream in 0.24+; the actual feature works reliably,
-    # it's just a false caching issue inside the test. skip it to allow the
-    # binary cache to be populated. https://github.com/martinvonz/jj/issues/4784
-    "--skip"
-    "test_shallow_commits_lack_parents"
-  ];
-
   env = {
     # Disable vendored libraries.
     ZSTD_SYS_USE_PKG_CONFIG = "1";
@@ -101,9 +93,9 @@ rustPlatform.buildRustPackage {
       installManPage ./jj.1
 
       installShellCompletion --cmd jj \
-        --bash <(${jj} util completion bash) \
-        --fish <(${jj} util completion fish) \
-        --zsh <(${jj} util completion zsh)
+        --bash <(COMPLETE=bash ${jj}) \
+        --fish <(COMPLETE=fish ${jj}) \
+        --zsh <(COMPLETE=zsh ${jj})
     '';
 
   passthru = {

pkgs/by-name/k0/k0sctl/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "k0sctl";
-  version = "0.19.2";
+  version = "0.19.4";
 
   src = fetchFromGitHub {
     owner = "k0sproject";
     repo = "k0sctl";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TdnZZ27j++o9I4Zup4PmM2VAHwn8BPBG/CwxTUy0BWU=";
+    hash = "sha256-6zh5zd+EJpG7A4PLepBrzQKJekInkXq64XGnZS1xE7s=";
   };
 
-  vendorHash = "sha256-Hl/eSFbwFiuSaaPh5blWFfz6m4VNrS5mYL8ehQlb90I=";
+  vendorHash = "sha256-EZ3TljEPpbpi9MZQWhmKYujXARAXawGAXez4KtRWYao=";
 
   ldflags = [
     "-s"

pkgs/by-name/k9/k9s/package.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.32.6";
+  version = "0.32.7";
 
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
     rev = "v${version}";
-    hash = "sha256-jJHlFrnyvGZ0/ykmZRbSAFwzvN0j2dqddLEQoiv3oys=";
+    hash = "sha256-0S6FomP1WVqYl5nP0FcaElgghMcZmE0V8iLhghERF6A=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-/DVQghwfiPKLO0LFPFmHFO5jfActoEnlMuQP2i60R9o=";
+  vendorHash = "sha256-ENn2BpGFEpiTNZbnNVt4hv4R6NTT3GivFd3rTy3xEH8=";
 
   # TODO investigate why some config tests are failing
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);

pkgs/by-name/kn/knot-dns/package.nix

@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "d835285c1057d45effa1479cfe1f107a50e83d11c1c6d36f270deda88799883e";
+    sha256 = "sha256-+xU/B4BfRnnoNvFDp09c0gSuccOsvqerBe+OASxukFw=";
   };
 
   outputs = [ "bin" "out" "dev" ];
@@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Authoritative-only DNS server from .cz domain registry";
     homepage = "https://knot-dns.cz";
+    changelog = "https://gitlab.nic.cz/knot/knot-dns/-/releases/v${version}";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.vcunat ];

pkgs/by-name/ko/komikku/package.nix

@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.64.0";
+  version = "1.65.0";
 
   format = "other";
 
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     rev = "v${version}";
-    hash = "sha256-EpKLez5gTHCSJYGvDqmzj6YO1dIugZKrEP4zE2G5TxA=";
+    hash = "sha256-U+ekx6ON3mLaTqaQ6PYe9bGVWMyq9PXZyv+rQ1cd1n0=";
   };
 
   nativeBuildInputs = [
@@ -112,7 +112,7 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://codeberg.org/valos/Komikku/releases/tag/v${version}";
     maintainers = with lib.maintainers; [
       chuangzhu
-      infinitivewitch
+      Gliczy
     ];
   };
 }

pkgs/by-name/ks/ksmbd-tools/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ksmbd-tools";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchFromGitHub {
     owner = "cifsd-team";
     repo = pname;
     rev = version;
-    sha256 = "sha256-QE/Pnba4zgeInlVqOEjT3EqV6NPkQTp6xeYU3dsIl4M=";
+    sha256 = "sha256-f2B+24AboAWLIrtuHWn8YMEPzWahIafc3kfx0zKyz8g=";
   };
 
   buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5;

pkgs/by-name/li/libratbag/package.nix

@@ -1,36 +1,72 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsNoGuiHook, gobject-introspection
-, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3
-, json-glib, libunistring }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsNoGuiHook,
+  gobject-introspection,
+  glib,
+  systemd,
+  udev,
+  libevdev,
+  gitMinimal,
+  check,
+  valgrind,
+  swig,
+  python3,
+  json-glib,
+  libunistring,
+}:
 
 stdenv.mkDerivation rec {
   pname = "libratbag";
-  version = "0.17";
+  version = "0.18";
 
   src = fetchFromGitHub {
-    owner  = "libratbag";
-    repo   = "libratbag";
-    rev    = "v${version}";
-    sha256 = "sha256-TQ8DVj4yqq3IA0oGnLDz+QNTyNRmGqspEjkPeBmXNew=";
+    owner = "libratbag";
+    repo = "libratbag";
+    rev = "v${version}";
+    hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc=";
   };
 
   nativeBuildInputs = [
-    meson ninja pkg-config gitMinimal swig check valgrind wrapGAppsNoGuiHook gobject-introspection
+    meson
+    ninja
+    pkg-config
+    gitMinimal
+    swig
+    check
+    valgrind
+    wrapGAppsNoGuiHook
+    gobject-introspection
   ];
 
   buildInputs = [
-    glib systemd udev libevdev json-glib libunistring
-    (python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
+    glib
+    systemd
+    udev
+    libevdev
+    json-glib
+    libunistring
+    (python3.withPackages (
+      ps: with ps; [
+        evdev
+        pygobject3
+      ]
+    ))
   ];
 
   mesonFlags = [
     "-Dsystemd-unit-dir=./lib/systemd/system/"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Configuration library for gaming mice";
-    homepage    = "https://github.com/libratbag/libratbag";
-    license     = licenses.mit;
-    maintainers = with maintainers; [ mvnetbiz ];
-    platforms   = platforms.linux;
+    homepage = "https://github.com/libratbag/libratbag";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mvnetbiz ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/li/lightdm-slick-greeter/package.nix

@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lightdm-slick-greeter";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "slick-greeter";
     rev = version;
-    sha256 = "sha256-ZsbX4xB6sLpZH6vaVFlkC7hAhPLZa1T+FlPANqBQTOg=";
+    sha256 = "sha256-NkQ2oPtTN/x5uCGubcBOwOXZCwzW1RRbBwdmeytqaF4=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/lo/lock/package.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-eBOENp6qjHtNGRCV+n2IbH0BSgGZje1aT/0iaDsZz+4=";
+    hash = "sha256-RDFFI7NKGs1LXNEYWgv1JBE00yjmcH4hrHebAIY85EA=";
   };
 
   strictDeps = true;

pkgs/by-name/lu/lua-language-server/package.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lua-language-server";
-  version = "3.13.2";
+  version = "3.13.3";
 
   src = fetchFromGitHub {
     owner = "luals";
     repo = "lua-language-server";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-JOIlEBNEXzYFO2gC3s9R2Y5aK0av6Kl0gQDWN7Kw7uk=";
+    hash = "sha256-pAmNzc9GlkUB3FxYXiBqbS9Ym2wg3lBLbBKio6WezyQ=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/me/mediainfo-gui/package.nix

@@ -1,37 +1,58 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK32
-, desktop-file-utils, libSM, imagemagick, darwin }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoreconfHook,
+  pkg-config,
+  libmediainfo,
+  wxGTK32,
+  desktop-file-utils,
+  libSM,
+  imagemagick,
+  darwin,
+  wrapGAppsHook3,
+}:
 
 let
   inherit (darwin.apple_sdk.frameworks) Cocoa;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mediainfo-gui";
   version = "24.06";
 
   src = fetchurl {
-    url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
+    url = "https://mediaarea.net/download/source/mediainfo/${finalAttrs.version}/mediainfo_${finalAttrs.version}.tar.xz";
     hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    wrapGAppsHook3
+  ];
 
-  buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
+  buildInputs = [
+    libmediainfo
+    wxGTK32
+    desktop-file-utils
+    libSM
+    imagemagick
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
 
   sourceRoot = "MediaInfo/Project/GNU/GUI";
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Supplies technical and tag information about a video or audio file (GUI version)";
     longDescription = ''
       MediaInfo is a convenient unified display of the most relevant technical
       and tag data for video and audio files.
     '';
-    homepage = "https://mediaarea.net/";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.devhell ];
+    homepage = "https://mediaarea.net";
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ devhell ];
     mainProgram = "mediainfo-gui";
   };
-}
+})

pkgs/by-name/mi/minio-warp/package.nix

@@ -0,0 +1,47 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "minio-warp";
+  version = "1.0.6";
+
+  src = fetchFromGitHub {
+    owner = "minio";
+    repo = "warp";
+    rev = "v${version}";
+    hash = "sha256-Zfjj/cYxucjuJRzER6MczQFqu8kdfUUXqC0mcQFbk0Q=";
+  };
+
+  vendorHash = "sha256-GD9Om5jymrRbeCVGNXtaam5Dmfg99CtEeiAFENhwyyY=";
+
+  # See .goreleaser.yml
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/minio/warp/pkg.ReleaseTag=v${version}"
+    "-X github.com/minio/warp/pkg.CommitID=${src.rev}"
+    "-X github.com/minio/warp/pkg.Version=${version}"
+    "-X github.com/minio/warp/pkg.ShortCommitID=${src.rev}"
+    "-X github.com/minio/warp/pkg.ReleaseTime=1970-01-01T00:00:00Z"
+  ];
+
+  postInstall = ''
+    mv $out/bin/warp $out/bin/minio-warp
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    description = "S3 benchmarking tool";
+    homepage = "https://github.com/minio/warp";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ christoph-heiss ];
+    mainProgram = "minio-warp";
+  };
+}

pkgs/by-name/ne/nemo/package.nix

@@ -32,13 +32,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "6.4.2";
+  version = "6.4.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-J7GQV+T5Lsmu1eELQJE9C3uLI6SoTJNPp648MYqEHvo=";
+    hash = "sha256-3FALXfW0PzWuirX7bxP8BFkIRyQzvg3xBQCdddSpmOg=";
   };
 
   patches = [

pkgs/by-name/ne/netcoredbg/package.nix

@@ -36,7 +36,7 @@ let
 
     cmakeFlags = [
       "-DCORECLR_DIR=${coreclr-src}/src/coreclr"
-      "-DDOTNET_DIR=${dotnet-sdk.unwrapped}/share/dotnet"
+      "-DDOTNET_DIR=${dotnet-sdk}/share/dotnet"
       "-DBUILD_MANAGED=0"
     ];
   };

pkgs/by-name/nu/nuclei-templates/package.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.0.4";
+  version = "10.1.0";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1kz48njrg5wumrMb2bYs1IYziYKDLkxM3G8TKfjtv2A=";
+    hash = "sha256-QQPsj6s1CuEBfUI5L3gV8v2d4CxgoCOlsXe8FIkSJjU=";
   };
 
   installPhase = ''

pkgs/by-name/op/opengist/package.nix

@@ -3,39 +3,36 @@
   buildGoModule,
   buildNpmPackage,
   fetchFromGitHub,
+  fetchpatch,
   moreutils,
-  npm-lockfile-fix,
   jq,
   git,
 }:
 let
   # finalAttrs when 🥺 (buildGoModule does not support them)
   # https://github.com/NixOS/nixpkgs/issues/273815
-  version = "1.7.5";
+  version = "1.8.3";
   src = fetchFromGitHub {
     owner = "thomiceli";
     repo = "opengist";
     rev = "v${version}";
-    hash = "sha256-mZ4j9UWdKa3nygcRO5ceyONetkks3ZGWxvzD34eOXew=";
-
-    # follow https://github.com/thomiceli/opengist/pull/350 and remove here
-    postFetch = ''
-      ${lib.getExe npm-lockfile-fix} $out/package-lock.json
-    '';
+    hash = "sha256-Wpn9rqOUwbwi6pbPTnVzHb+ip3ay9WykEZDyHNdXYJU=";
   };
 
   frontend = buildNpmPackage {
     pname = "opengist-frontend";
     inherit version src;
-
-    nativeBuildInputs = [
-      moreutils
-      jq
+    patches = [
+      # fix lock file
+      # https://github.com/thomiceli/opengist/pull/395
+      (fetchpatch {
+        url = "https://github.com/thomiceli/opengist/pull/395/commits/f77c624f73f18010c7e4360287d0a3c013c21c9d.patch";
+        hash = "sha256-oCMt1HptH0jsi2cvv8wEP0+bpujx1jBxCjw0KMDGFfk=";
+      })
     ];
-
     # npm complains of "invalid package". shrug. we can give it a version.
-    preBuild = ''
-      jq '.version = "${version}"' package.json | sponge package.json
+    postPatch = ''
+      ${lib.getExe jq} '.version = "${version}"' package.json | ${lib.getExe' moreutils "sponge"} package.json
     '';
 
     # copy pasta from the Makefile upstream, seems to be a workaround of sass
@@ -50,13 +47,13 @@ let
       cp -R public $out
     '';
 
-    npmDepsHash = "sha256-cITkgRvWOml6uH77WkiNgFedEuPNze63Gntet09uS5w=";
+    npmDepsHash = "sha256-fj2U8oRNfdIEnRkAOQQGiPyQFuWltLGkMzT2IQO60v0=";
   };
 in
 buildGoModule {
   pname = "opengist";
   inherit version src;
-  vendorHash = "sha256-6PpS/dsonc/akBn8NwUIVFNe2FjynAhF1TYIYT9K/ws=";
+  vendorHash = "sha256-mLFjRL4spAWuPLVOtt88KH+p2g9lGCYzaHokVxdrLOw=";
   tags = [ "fs_embed" ];
   ldflags = [
     "-s"
@@ -73,11 +70,20 @@ buildGoModule {
     export OG_OPENGIST_HOME=$(mktemp -d)
   '';
 
+  checkPhase = ''
+    runHook preCheck
+    make test
+    runHook postCheck
+  '';
+
   postPatch = ''
     cp -R ${frontend}/public/{manifest.json,assets} public/
   '';
 
-  passthru.frontend = frontend;
+  passthru = {
+    inherit frontend;
+    updateScript = ./update.sh;
+  };
 
   meta = {
     description = "Self-hosted pastebin powered by Git";

pkgs/by-name/op/opengist/update.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts common-updater-scripts
+
+# shellcheck shell=bash
+
+set -eou pipefail
+
+NIXPKGS_DIR="$PWD"
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+
+# Get latest release
+OPENGIST_RELEASE=$(
+    curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
+        https://api.github.com/repos/thomiceli/opengist/releases/latest
+)
+
+# Get release information
+latestVersion=$(echo "$OPENGIST_RELEASE" | jq -r ".tag_name")
+latestVersion="${latestVersion:1}" # remove first char 'v'
+
+oldVersion=$(nix eval --raw -f "$NIXPKGS_DIR" opengist.version)
+
+if [[ "$oldVersion" == "$latestVersion" ]]; then
+    echo "opengist is up-to-date: ${oldVersion}"
+    exit 0
+fi
+
+echo "Updating opengist $oldVersion -> $latestVersion"
+
+update-source-version opengist "${latestVersion}"
+
+pushd "$SCRIPT_DIR" >/dev/null || exit 1
+
+## npm hash
+rm -f package{,-lock}.json
+curl -sLO "https://raw.githubusercontent.com/thomiceli/opengist/refs/tags/v$latestVersion/package-lock.json"
+
+npmDepsHash="$(prefetch-npm-deps package-lock.json)"
+sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' --in-place package.nix
+
+popd >/dev/null
+
+# nix-prefetch broken due to ninja finalAttrs.src.rev
+# nix-update with goModules broken for this package
+
+setKV () {
+    sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${SCRIPT_DIR}/package.nix"
+}
+
+setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash
+
+set +e
+VENDOR_HASH=$(nix-build --no-out-link -A opengist "$NIXPKGS_DIR" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
+set -e
+
+if [ -n "${VENDOR_HASH:-}" ]; then
+    setKV vendorHash "${VENDOR_HASH}"
+else
+    echo "Update failed. VENDOR_HASH is empty."
+    exit 1
+fi

pkgs/by-name/or/oras/package.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "oras";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "oras-project";
     repo = "oras";
     rev = "v${version}";
-    hash = "sha256-uqbHyp7eB7uttBlWpWxkCDGHtLkViYPEsIXuMGZ6LuM=";
+    hash = "sha256-M9YQUQHMt+CsTp/zDsPM2mwaUGYwjgBW1RY6j5jpYDk=";
   };
 
-  vendorHash = "sha256-QGh3utM+9yPRGN/6IrPbXzyXA6yUNKQuOdVWglFeySw=";
+  vendorHash = "sha256-I1iFayzNcU2K8YMTfMFU0PEZAjKGhCuJLEi7cwy/XW0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/or/orbiton/package.nix

@@ -4,13 +4,13 @@
 
 buildGoModule rec {
   pname = "orbiton";
-  version = "2.68.2";
+  version = "2.68.4";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "orbiton";
     rev = "v${version}";
-    hash = "sha256-aCGdBG3AqD8PJHIHhie0KELQNRcD8JQfmjM2bDEjFbo=";
+    hash = "sha256-VEYeC3gtjBxkDYH/fEsdKtIInB8E2pcHokinspdj10Q=";
   };
 
   vendorHash = null;

pkgs/by-name/ox/oxker/package.nix

@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oxker";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-5FZDHKYv3/ZEzb0tsI7wxydDU0p7zwfhSG2i4UScf6s=";
+    hash = "sha256-XY3LwDagxSi1yeAfqhnbtNRBqJxp0BkhaYZM/T59tGw=";
   };
 
-  cargoHash = "sha256-7SMIN6Nu9W6t27+YoCbJt0HCkNhw/ZU6pn6qRYvrgT8=";
+  cargoHash = "sha256-SeNrVw1m0B9CV31Pa41YinviWbEdiw50sdcrQpndiCI=";
 
   meta = with lib; {
     description = "Simple tui to view & control docker containers";