diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml new file mode 100644 index 0000000000000..3ca5707e09b4c --- /dev/null +++ b/.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 diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000000000..761678fd3fa03 --- /dev/null +++ b/.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 diff --git a/ci/OWNERS b/ci/OWNERS index 5cc815b326c24..b8699826ebd76 100644 --- a/ci/OWNERS +++ b/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 diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8fc5cee4b939b..0b75edb135a30 100644 --- a/maintainers/maintainer-list.nix +++ b/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"; }; diff --git a/maintainers/scripts/check-maintainer-usernames/.gitignore b/maintainers/scripts/check-maintainer-usernames/.gitignore new file mode 100644 index 0000000000000..ea8c4bf7f35f6 --- /dev/null +++ b/maintainers/scripts/check-maintainer-usernames/.gitignore @@ -0,0 +1 @@ +/target diff --git a/maintainers/scripts/check-maintainer-usernames/Cargo.toml b/maintainers/scripts/check-maintainer-usernames/Cargo.toml new file mode 100644 index 0000000000000..9edbb3281c00e --- /dev/null +++ b/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"] } diff --git a/maintainers/scripts/check-maintainer-usernames/src/main.rs b/maintainers/scripts/check-maintainer-usernames/src/main.rs new file mode 100644 index 0000000000000..02058ab008c70 --- /dev/null +++ b/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> { + 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(()) +} diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 8717808daaf04..272b55e33d8f8 100755 --- a/maintainers/scripts/update-python-libraries +++ b/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 $@ diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 2677007fa186b..237198db076a5 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -59,6 +59,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. diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 30d2d095aa278..5dcdc1c46c8a7 100644 --- a/nixos/lib/qemu-common.nix +++ b/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 = { diff --git a/nixos/modules/services/security/vault-agent.nix b/nixos/modules/services/security/vault-agent.nix index fd3e39fb65981..04fb08b8f9b88 100644 --- a/nixos/modules/services/security/vault-agent.nix +++ b/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" diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 1bf3583336e2e..4b28f8100225b 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/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"; diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index 870ae58f8646e..c96bc5adf1cf0 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/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} ''; diff --git a/nixos/modules/services/web-apps/firefly-iii.nix b/nixos/modules/services/web-apps/firefly-iii.nix index bc1fcdfc9c0fe..92b4cb2268857 100644 --- a/nixos/modules/services/web-apps/firefly-iii.nix +++ b/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 { diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 85a3295fb064f..53bcc5a373bf9 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/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. ''; }; }) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 534145c19cbe5..86d6794051efa 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/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 = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index 9eaca7d967f3b..51adea4e5e580 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/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 = { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 87de33eff6ef3..a6b06aa7dc536 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/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/"; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index c27830e2cac33..19f8a59e37ec5 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/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" '' diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix index 186ad4be05c11..36626903b4c8b 100644 --- a/pkgs/applications/misc/edgetx/default.nix +++ b/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" ]; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 0634c03e7bd7f..52d53c44cf3a8 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/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" ]; diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index 05688d22bd181..4772ac454fc68 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/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 diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 5785c614260f3..417bf7fb69015 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/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; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index a2d98b63ee521..f9bae10230665 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/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 = [ diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index ebf251849ed1d..25ee02de209fd 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/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 { diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index a696ab5412808..90df4c1342f5c 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/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, diff --git a/pkgs/applications/science/electronics/simulide/default.nix b/pkgs/applications/science/electronics/simulide/default.nix deleted file mode 100644 index 717f7b57de74c..0000000000000 --- a/pkgs/applications/science/electronics/simulide/default.nix +++ /dev/null @@ -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 header explicitly included - sed -i src/gpsim/value.h -e '1i #include ' - sed -i src/gpsim/modules/watchdog.h -e '1i #include ' - ''; - 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; - }; - }; -} diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index a84cc4ad540e8..1ebe650c11ebe 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/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; }; diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 9a0b1aac44069..d2190fccc6cd1 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/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, diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index 973c13c6f476a..0821592e1fe1a 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation ( cargo ] ++ nativeBuildInputs; + dontConfigure = true; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/bu/bulky/package.nix b/pkgs/by-name/bu/bulky/package.nix index df9c7bb5d16f2..a9510f37b9167 100644 --- a/pkgs/by-name/bu/bulky/package.nix +++ b/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 diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index 59ecbd5bfdc61..cbe9114990749 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/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 diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix index 53f941e788d0e..51994805f3dd8 100644 --- a/pkgs/by-name/ca/cargo-sort/package.nix +++ b/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"; diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 0c0d726406c36..cec743af0846e 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index f18f5329679a1..34ca22fab3af8 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/ci/cinnamon-translations/package.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix index 66fd9e8fa2b74..d00203246da87 100644 --- a/pkgs/by-name/ci/cinnamon-translations/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index cfec62f8a8c73..ec2edfa543b97 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/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; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index ccf0d49d0cff9..d3f6955c2cd22 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/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 diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 567caef0558e2..5729969a9cd96 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/de/delly/package.nix b/pkgs/by-name/de/delly/package.nix index 7c6445bcfd025..bb6845b30a12d 100644 --- a/pkgs/by-name/de/delly/package.nix +++ b/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 '' diff --git a/pkgs/by-name/di/di/package.nix b/pkgs/by-name/di/di/package.nix index 2aa69399b5758..460f2d6fd3d13 100644 --- a/pkgs/by-name/di/di/package.nix +++ b/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)" ]; diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index aa2c9a0d32882..853e3565abbcc 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/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 diff --git a/pkgs/by-name/fl/fluxus/fix-build.patch b/pkgs/by-name/fl/fluxus/fix-build.patch deleted file mode 100644 index b44327520e654..0000000000000 --- a/pkgs/by-name/fl/fluxus/fix-build.patch +++ /dev/null @@ -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) - - ################################################################################ diff --git a/pkgs/by-name/fl/fluxus/package.nix b/pkgs/by-name/fl/fluxus/package.nix deleted file mode 100644 index ef3bdce4407ce..0000000000000 --- a/pkgs/by-name/fl/fluxus/package.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/by-name/fo/folder-color-switcher/package.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix index c219574fb1c28..aa3bfe245317b 100644 --- a/pkgs/by-name/fo/folder-color-switcher/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 941ee4dfc9b4b..27a6c479d394f 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index e1850133807c3..2107ffb9d5e48 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/gc/gcalcli/package.nix b/pkgs/by-name/gc/gcalcli/package.nix index c9c29cd8e007f..e1f51abd82f7e 100644 --- a/pkgs/by-name/gc/gcalcli/package.nix +++ b/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}" - ''; - - build-system = with python3Packages; [ setuptools ]; + updateScript = nix-update-script { }; + + 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 ]; diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/by-name/gi/gifski/package.nix similarity index 73% rename from pkgs/tools/graphics/gifski/default.nix rename to pkgs/by-name/gi/gifski/package.nix index 843916e743105..fc3ffaab18864 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/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"; }; } diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix index 61e2d5d84161b..7c96905353b00 100644 --- a/pkgs/by-name/gi/gitlab-release-cli/package.nix +++ b/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="; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 9ee43d84994f2..d9d1fd9190dd7 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/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; diff --git a/pkgs/by-name/go/gotemplate/package.nix b/pkgs/by-name/go/gotemplate/package.nix index 5e7fa9f94d311..0ab99a16e3791 100644 --- a/pkgs/by-name/go/gotemplate/package.nix +++ b/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 ]; }; } diff --git a/pkgs/by-name/hf/hfst-ospell/package.nix b/pkgs/by-name/hf/hfst-ospell/package.nix index 823bcbbe8c08e..eda613aede61d 100644 --- a/pkgs/by-name/hf/hfst-ospell/package.nix +++ b/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 diff --git a/pkgs/by-name/ht/httping/package.nix b/pkgs/by-name/ht/httping/package.nix index 1318c5d236142..ff034a6d62d8e 100644 --- a/pkgs/by-name/ht/httping/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index 7132d2f9ed0f2..335ba94b01203 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/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 diff --git a/pkgs/by-name/hy/hypnotix/package.nix b/pkgs/by-name/hy/hypnotix/package.nix index c38b2f5c703f9..7b616ff539812 100644 --- a/pkgs/by-name/hy/hypnotix/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index 872281f6c9d08..0eb33e124569e 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 7c9d024cecd3a..9e51be4359884 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/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 = { diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index f22d0b97e5f56..8ce83a38f217d 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/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" diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index db7c852048b09..79898bbab6384 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/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); diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 301841747bf85..6412fd6a35c4b 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/ks/ksmbd-tools/package.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix index fa4bdbd9e66d5..cb6d637e50119 100644 --- a/pkgs/by-name/ks/ksmbd-tools/package.nix +++ b/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; diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index 77e3a449ba4e1..0b5b307625d5a 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index a2dc9e94bbb75..c12d70d0378ae 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/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; diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 6ff338eb8a80f..3a6abac16f2ba 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/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; }; diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index b649afd83abe1..cb4f5a8b01006 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/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"; }; -} +}) diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix new file mode 100644 index 0000000000000..67a77b6e00b3b --- /dev/null +++ b/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"; + }; +} diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index a73b9e60aaecc..52da8ee3e867c 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 2a7c699e1aecd..f5334c6801f89 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/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 = '' diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index ef8c6f5b82325..9c5fc9bd96526 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/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"; diff --git a/pkgs/by-name/op/opengist/update.sh b/pkgs/by-name/op/opengist/update.sh new file mode 100755 index 0000000000000..ad3ac9ca639ae --- /dev/null +++ b/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 diff --git a/pkgs/by-name/or/oras/package.nix b/pkgs/by-name/or/oras/package.nix index add83c4480a1d..eb9279d845ea4 100644 --- a/pkgs/by-name/or/oras/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index fba55f73ca7cc..8204fb59fab3b 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/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"; diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix index 854b4559165ad..e1fe6e7f2e769 100644 --- a/pkgs/by-name/pi/pix/package.nix +++ b/pkgs/by-name/pi/pix/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-WL9EW7oKeQwufw1VYDigbqAt52GQTpc5RgDEmnKO6vc="; + hash = "sha256-BasS0Z8fj7vxFnMZ6KOd5LkvSvTaw6+DDfcRFrdus7A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 520b7753d3f0f..ab3bf1e8e6918 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -90,15 +90,12 @@ stdenv.mkDerivation (finalAttrs: { substituteAllInPlace src/utils/file.cpp ''; - postInstall = - lib.optionalString i3Support '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3}/bin" - ''; - - postFixup = '' + postInstall = '' remove-references-to -t ${stdenv.cc} $out/bin/polybar - ''; + '' + (lib.optionalString i3Support '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3}/bin" + ''); meta = with lib; { homepage = "https://polybar.github.io/"; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 598bf37a6435e..c92a2c09b4e7d 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-NtSZ3TSF3nBD+mEU6+uW2x8nqv0dz3jpankyTjJ8xvE="; + hash = "sha256-gilHkk9vVxnYJKy79lDrlMd8uWys50TEUbGaHVr958o="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix index 665d032b1ac8b..28447625151cb 100644 --- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix +++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "proton-vpn-local-agent"; - version = "1.0.0"; - cargoHash = "sha256-TE2iqxTC6UH7pCM1wKEwaujMenNIp4LE+oy545tGmL0="; + version = "1.2.0"; + cargoHash = "sha256-qxNbHM6KmBmLbruOhbFIp3klz6RuKWBLioVsBPDQiLI="; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-local-agent"; rev = version; - hash = "sha256-I+tbVQzD4xJUsoRF8TU/2EMldVqtfxY3E7PQN3ks0mA="; + hash = "sha256-1iUeAWojIcXbvO6YoPEh//dbVdl90cUocyO3nfDtUEM"; }; sourceRoot = "${src.name}/python-proton-vpn-local-agent"; diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 35656cc84bf8f..70ec5ecc1707a 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -1,80 +1,58 @@ { + asar, lib, stdenv, fetchurl, makeWrapper, dpkg, electron, - unzip, }: - let mainProgram = "proton-mail"; - srcHashes = { - # Upstream info: It's intended to stay like this in further releases - # https://github.com/NixOS/nixpkgs/pull/326152#discussion_r1679558135 - universal-darwin = "sha256-6b+CNCvrkIA1CvSohSJZq/veZZNsA3lyhVv5SsBlJlw="; - x86_64-linux = "sha256-v8ufnQQEqTT5cr7fq8Fozje/NDlBzaCeKIzE6yU/biE="; - }; + version = "1.5.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protonmail-desktop"; - # Upstream info: "v"-prefix got dropped - version = "1.0.6"; + inherit version; src = fetchurl { - url = - if stdenv.hostPlatform.isDarwin then - "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/Proton.Mail-darwin-universal-${version}.zip" - else - "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/proton-mail_${version}_amd64.deb"; - sha256 = - { - x86_64-linux = srcHashes.x86_64-linux; - x86_64-darwin = srcHashes.universal-darwin; - aarch64-darwin = srcHashes.universal-darwin; - } - .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb"; + sha256 = "sha256-PkxJUzSmSeIf/WjXCj5Pne5DHrXnTRib1IqHtbe3lNA="; }; - sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "."; - dontConfigure = true; dontBuild = true; - nativeBuildInputs = - [ - makeWrapper - ] - ++ lib.optional stdenv.hostPlatform.isLinux dpkg ++ lib.optional stdenv.hostPlatform.isDarwin unzip; + nativeBuildInputs = [ + dpkg + makeWrapper + asar + ]; - installPhase = - let - darwin = '' - mkdir -p $out/{Applications,bin} - cp -r "Proton Mail.app" $out/Applications/ - makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop - ''; - linux = '' - runHook preInstall - mkdir -p $out - cp -r usr/share/ $out/ - cp -r usr/lib/proton-mail/resources/app.asar $out/share/ - ''; + # Rebuild the ASAR archive, hardcoding the resourcesPath + preInstall = '' + asar extract usr/lib/proton-mail/resources/app.asar tmp + rm usr/lib/proton-mail/resources/app.asar + substituteInPlace tmp/.webpack/main/index.js \ + --replace-fail "process.resourcesPath" "'$out/share/proton-mail'" + asar pack tmp/ usr/lib/proton-mail/resources/app.asar + rm -fr tmp + ''; - in - '' - runHook preInstall + installPhase = '' + runHook preInstall - ${if stdenv.hostPlatform.isDarwin then darwin else linux} + mkdir -p $out/share/proton-mail + cp -r usr/share/ $out/ + cp -r usr/lib/proton-mail/resources/* $out/share/proton-mail/ - runHook postInstall - ''; + runHook postInstall + ''; preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ - --add-flags $out/share/app.asar \ + --add-flags $out/share/proton-mail/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ @@ -85,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "Desktop application for Mail and Calendar, made with Electron"; - homepage = "https://github.com/ProtonMail/inbox-desktop"; + homepage = "https://github.com/ProtonMail/WebClients"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ rsniezek @@ -94,10 +72,9 @@ stdenv.mkDerivation rec { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" - "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + inherit mainProgram; }; } diff --git a/pkgs/by-name/pr/protonmail-desktop/update.sh b/pkgs/by-name/pr/protonmail-desktop/update.sh index 4b1a10f177386..bd197203b8bcf 100755 --- a/pkgs/by-name/pr/protonmail-desktop/update.sh +++ b/pkgs/by-name/pr/protonmail-desktop/update.sh @@ -5,25 +5,7 @@ set -eu -o pipefail -latestVersion=$(curl https://api.github.com/repos/ProtonMail/inbox-desktop/releases/latest | jq -r '.tag_name') - -declare -A platforms -platforms[x86_64-linux]="amd64" -platforms[x86_64-darwin]="universal" - -for platform in "${!platforms[@]}" -do - arch=${platforms[$platform]} - os=$(echo "$platform" | cut -d "-" -f2) - - if [[ "$os" == "linux" ]]; then - downloadUrl="https://github.com/ProtonMail/inbox-desktop/releases/download/${latestVersion}/proton-mail_${latestVersion}_${arch}.deb" - else - downloadUrl="https://github.com/ProtonMail/inbox-desktop/releases/download/${latestVersion}/Proton.Mail-${os}-${arch}-${latestVersion}.zip" - fi - echo "$downloadUrl" - - latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash') - - update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --system="$platform" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix -done +latestVersion=$(curl https://proton.me/download/mail/linux/version.json | jq -r 'first(.Releases[])|.Version') +downloadUrl="https://proton.me/download/mail/linux/${latestVersion}/ProtonMail-desktop-beta.deb" +latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash') +update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 567298b1b34fb..68372a983a35a 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "4.6.1"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; rev = "refs/tags/${version}"; - hash = "sha256-lEoUZQh5wnfX6J5ZbpCM+ZwJyyw/Ex6LNTTT9ZXw2Z4="; + hash = "sha256-RrVmM9j+eApmTT3ufatpQ1CeQT7bart/ESs75THU574="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index d1986ae940ae9..a0cf3d87c4bbb 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.25.9"; + version = "1.25.11"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-QOD1EqigHa/daanwajoiQAy0fJRi8yWJKj41k0SZyJo="; + hash = "sha256-mZrD+ex1AZfQopnroA9gu7z5DeuC79k90KIWGhgAgrQ="; }; - npmDepsHash = "sha256-Bo8Zdft+AfjSXDnxXvKq+AEpU4vtB+XBkmzqLRuHLrw="; + npmDepsHash = "sha256-pavWVmCOM40eaYgIcese/XTumV8Jsb8nKU86AyNdsz4="; npmBuildScript = "prepare"; diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 87e43d32bb1cc..adf9b4ac077a3 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.98"; + version = "0.3.110"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-DSEtku9Xyp8MRibO8VPeRlc9CnPupAqQRFXMJD2yNA8="; + hash = "sha256-BDlLvOW13Z6jE9OVC6QskVzXONkYKjXouPzedaPDmi0="; }; - cargoHash = "sha256-66P9ShtMZM5XcH8Q9ifw92VCDcwKPhZOywj3Acbhf9o="; + cargoHash = "sha256-GptaDa8NjCcWg5OsyujIgxGH4egWGBVVTLaYp4fqP3Q="; nativeBuildInputs = [ installShellFiles pkg-config perl ]; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/by-name/ro/rosegarden/package.nix similarity index 60% rename from pkgs/applications/audio/rosegarden/default.nix rename to pkgs/by-name/ro/rosegarden/package.nix index 57a7ca82254ab..9acf3eec527d3 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/by-name/ro/rosegarden/package.nix @@ -1,54 +1,82 @@ -{ lib -, stdenv -, fetchurl -, cmake -, makedepend -, perl -, pkg-config -, qttools -, wrapQtAppsHook -, dssi -, fftwSinglePrec -, ladspaH -, ladspaPlugins -, libjack2 -, alsa-lib -, liblo -, libsamplerate -, libsndfile -, lirc -, lrdf -, qtbase +{ + lib, + stdenv, + fetchurl, + cmake, + makedepend, + perl, + pkg-config, + qt5, + alsa-lib, + dssi, + fftwSinglePrec, + flac, + glib, + ladspaH, + ladspaPlugins, + libjack2, + liblo, + libmpg123, + libopus, + libsamplerate, + libsndfile, + libsysprof-capture, + libvorbis, + lilv, + lv2, + lirc, + lrdf, + libogg, }: stdenv.mkDerivation rec { pname = "rosegarden"; - version = "22.12.1"; + version = "24.12"; src = fetchurl { - url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY="; + url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.xz"; + sha256 = "sha256-fz9mE2sJrxS9mZjkreTWIE1Fiv0WlHiP1tyzqW6/Fcw="; }; postPhase = '' substituteInPlace src/CMakeLists.txt --replace svnheader svnversion ''; - nativeBuildInputs = [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + makedepend + perl + pkg-config + qt5.qttools + qt5.wrapQtAppsHook + ]; buildInputs = [ + alsa-lib dssi fftwSinglePrec + flac + glib ladspaH ladspaPlugins libjack2 liblo + libmpg123 + libogg + libopus libsamplerate libsndfile + libsysprof-capture + libvorbis + lilv + lv2 lirc lrdf - qtbase - alsa-lib + qt5.qtbase + ]; + + cmakeFlags = [ + "-DLILV_INCLUDE_DIR=${lilv.dev}/include/lilv-0" ]; meta = with lib; { diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 94da18d768917..3b58082dd422a 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -14,31 +14,22 @@ ncurses, openssl, pkg-config, - xmlrpc_c, zlib, nixosTests, - gitUpdater, + unstableGitUpdater, }: stdenv.mkDerivation rec { pname = "rakshasa-rtorrent"; - version = "0.10.0"; + version = "0.10.0-unstable-2024-12-06"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "v${version}"; - hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8="; + rev = "5a200f5d8f8bc8ed28dfc948321451585f724b15"; + hash = "sha256-RLFOHJLpt7xkrEvYwEBWs5wQRThrK1N2olI64p2TPeA="; }; - patches = [ - # fix: use fsync for osx builds - (fetchpatch { - url = "https://github.com/rakshasa/rtorrent/commit/5ce84929e44fbe3f8d6cf142e3133f43afa4071f.patch"; - hash = "sha256-bFDxbpkTZ6nIUT2zMxKMgV94vWlVNzBbIbhx4Bpr8gw="; - }) - ]; - outputs = [ "out" "man" @@ -63,17 +54,16 @@ stdenv.mkDerivation rec { libtorrent ncurses openssl - xmlrpc_c zlib ]; configureFlags = [ - "--with-xmlrpc-c" + "--with-xmlrpc-tinyxml2" "--with-posix-fallocate" ]; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = unstableGitUpdater { rev-prefix = "v"; }; tests = { inherit (nixosTests) rtorrent; }; diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index ef80b1b35a39d..ecb63fe7a9ce4 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -12,7 +12,9 @@ libxslt, gobject-introspection, wrapGAppsHook3, + wrapGAppsNoGuiHook, python3, + gdk-pixbuf, glib, gssdp_1_6, gupnp_1_6, @@ -21,6 +23,8 @@ gst_all_1, libgee, libsoup_3, + libX11, + withGtk ? true, gtk3, libmediaart, pipewire, @@ -29,6 +33,7 @@ tinysparql, shared-mime-info, gnome, + rygel, }: stdenv.mkDerivation (finalAttrs: { @@ -60,12 +65,13 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libxslt # for xsltproc gobject-introspection - wrapGAppsHook3 + (if withGtk then wrapGAppsHook3 else wrapGAppsNoGuiHook) python3 ]; buildInputs = [ + gdk-pixbuf glib gssdp_1_6 gupnp_1_6 @@ -73,14 +79,18 @@ stdenv.mkDerivation (finalAttrs: { gupnp-dlna libgee libsoup_3 - gtk3 libmediaart pipewire + # Move this to withGtk when it's not unconditionally included + # https://gitlab.gnome.org/GNOME/rygel/-/issues/221 + # https://gitlab.gnome.org/GNOME/rygel/-/merge_requests/27 + libX11 sqlite systemd tinysparql shared-mime-info ] + ++ lib.optionals withGtk [ gtk3 ] ++ (with gst_all_1; [ gstreamer gst-editing-services @@ -95,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dapi-docs=false" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + (lib.mesonEnable "gtk" withGtk) ]; doCheck = true; @@ -108,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { packageName = "rygel"; versionPolicy = "odd-unstable"; }; + noGtk = rygel.override { withGtk = false; }; }; meta = with lib; { diff --git a/pkgs/by-name/s2/s2geometry/package.nix b/pkgs/by-name/s2/s2geometry/package.nix index 6fe6f47eb065e..a037c7b68a617 100644 --- a/pkgs/by-name/s2/s2geometry/package.nix +++ b/pkgs/by-name/s2/s2geometry/package.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://s2geometry.io/"; license = licenses.asl20; maintainers = [ maintainers.Thra11 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/sb/sbctl/fix-go-module.patch b/pkgs/by-name/sb/sbctl/fix-go-module.patch deleted file mode 100644 index 7e160aa34157b..0000000000000 --- a/pkgs/by-name/sb/sbctl/fix-go-module.patch +++ /dev/null @@ -1,108 +0,0 @@ -From cf12e591c6007c6e32bd86167816e316f5b70c26 Mon Sep 17 00:00:00 2001 -From: Sefa Eyeoglu -Date: Sat, 25 May 2024 15:38:41 +0200 -Subject: [PATCH] Fix go module - -Signed-off-by: Sefa Eyeoglu ---- - go.mod | 4 +++- - go.sum | 10 ++++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/go.mod b/go.mod -index 2e23dd6..7668f57 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,8 @@ - module github.com/foxboron/sbctl - --go 1.20 -+go 1.21 -+ -+toolchain go1.22.3 - - require ( - github.com/fatih/color v1.13.0 -diff --git a/go.sum b/go.sum -index 9f29d75..d3f4af4 100644 ---- a/go.sum -+++ b/go.sum -@@ -314,6 +314,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ - github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= - github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= - github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M= - github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -@@ -322,9 +323,11 @@ github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwG - github.com/google/go-tpm v0.9.0 h1:sQF6YqWMi+SCXpsmS3fd21oPy/vSddwZry4JnmltHVk= - github.com/google/go-tpm v0.9.0/go.mod h1:FkNVkc6C+IsvDI9Jw1OveJmxGZUUaKxtrpOS47QWKfU= - github.com/google/go-tpm-tools v0.4.2 h1:iyaCPKt2N5Rd0yz0G8ANa022SgCNZkMpp+db6QELtvI= -+github.com/google/go-tpm-tools v0.4.2/go.mod h1:fGUDZu4tw3V4hUVuFHmiYgRd0c58/IXivn9v3Ea/ck4= - github.com/google/go-tspi v0.3.0 h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus= - github.com/google/go-tspi v0.3.0/go.mod h1:xfMGI3G0PhxCdNVcYr1C4C+EizojDg/TXuX5by8CiHI= - github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f h1:7MmqygqdeJtziBUpm4Z9ThROFZUaVGaePMfcDnluf1E= -+github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f/go.mod h1:n1ej5+FqyEytMt/mugVDZLIiqTMO+vsrgY+kM6ohzN0= - github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= - github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 h1:CVuJwN34x4xM2aT4sIKhmeib40NeBPhRihNjQmpJsA4= - github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4= -@@ -422,6 +425,7 @@ github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbc - github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= - github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= - github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8= -+github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= - github.com/hugelgupf/vmtest v0.0.0-20240110072021-f6f07acb7aa1 h1:aa9+0fjwoGotyC8A3QjdITMAX89g/+qvDAhKPrK1NKE= - github.com/hugelgupf/vmtest v0.0.0-20240110072021-f6f07acb7aa1/go.mod h1:a4SVM0HTMEt2IqrtCMOF44++nnzhrkHmQpkpw6Yrpso= - github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -@@ -554,6 +558,7 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi - github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= - github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= - github.com/ncruces/go-fs v0.2.2 h1:ak7h7jdihotXtXqjrBb2YZViJ+n41tLIqMG9ZY7bJMQ= -+github.com/ncruces/go-fs v0.2.2/go.mod h1:07xkoGj//ID8iICNv3rcD2PtMjia3mABv1yZzdq7qZ8= - github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= - github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= - github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -@@ -641,6 +646,7 @@ github.com/pseudomuto/protoc-gen-doc v1.5.0/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr - github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= - github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= - github.com/rekby/gpt v0.0.0-20200219180433-a930afbc6edc h1:goZGTwEEn8mWLcY012VouWZWkJ8GrXm9tS3VORMxT90= -+github.com/rekby/gpt v0.0.0-20200219180433-a930afbc6edc/go.mod h1:scrOqOnnHVKCHENvFw8k9ajCb88uqLQDA4BvuJNJ2ew= - github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= - github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= - github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -@@ -705,6 +711,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 - github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= - github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= - github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= -@@ -774,6 +781,7 @@ go.etcd.io/etcd/tests/v3 v3.5.0/go.mod h1:f+mtZ1bE1YPvgKdOJV2BKy4JQW0nAFnQehgOE7 - go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod h1:JZ79d3LV6NUfPjUxXrpiFAYcjhT+06qqw+i28snx8To= - go.etcd.io/etcd/v3 v3.5.0/go.mod h1:FldM0/VzcxYWLvWx1sdA7ghKw7C3L2DvUTzGrcEtsC4= - go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 h1:A/5uWzF44DlIgdm/PQFwfMkW0JX+cIcQi/SwLAmZP5M= -+go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= - go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= - go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= - go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -@@ -1277,6 +1285,7 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD - google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= - google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= - google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -+google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= - google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= - google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -@@ -1328,6 +1337,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= -+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= - honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= - honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --- -2.44.1 - diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix index 75c752cc88496..79b858eb49edf 100644 --- a/pkgs/by-name/sb/sbctl/package.nix +++ b/pkgs/by-name/sb/sbctl/package.nix @@ -1,45 +1,59 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, asciidoc -, databasePath ? "/etc/secureboot" -, nix-update-script +{ + lib, + buildGoModule, + stdenv, + fetchFromGitHub, + installShellFiles, + asciidoc, + databasePath ? "/etc/secureboot", + nix-update-script, }: buildGoModule rec { pname = "sbctl"; - version = "0.14"; + version = "0.16"; src = fetchFromGitHub { owner = "Foxboron"; - repo = pname; - rev = version; - hash = "sha256-1TprUr+bLPOlMpe4ReV1S/QbVsA8Q7QIOcLczEaSyAQ="; + repo = "sbctl"; + rev = "refs/tags/${version}"; + hash = "sha256-BLSvjo6GCqpECJPJtQ6C2zEz1p03uyvxTYa+DoxZ78s="; }; - patches = [ - ./fix-go-module.patch - ]; - - vendorHash = "sha256-LuSewWK/sxaHibJ6a05PM9CPen8J+MJD6lwk4SNOWSA="; + vendorHash = "sha256-srfZ+TD93szabegwtzLTjB+uo8aj8mB4ecQ9m8er00A="; - ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" + "-X github.com/foxboron/sbctl.Version=${version}" + ]; - nativeBuildInputs = [ installShellFiles asciidoc ]; + nativeBuildInputs = [ + installShellFiles + asciidoc + ]; postBuild = '' - make docs/sbctl.8 + make docs/sbctl.conf.5 docs/sbctl.8 ''; - postInstall = '' - installManPage docs/sbctl.8 + checkFlags = [ + # https://github.com/Foxboron/sbctl/issues/343 + "-skip" + "github.com/google/go-tpm-tools/.*" + ]; - installShellCompletion --cmd sbctl \ - --bash <($out/bin/sbctl completion bash) \ - --fish <($out/bin/sbctl completion fish) \ - --zsh <($out/bin/sbctl completion zsh) - ''; + postInstall = + '' + installManPage docs/sbctl.conf.5 docs/sbctl.8 + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd sbctl \ + --bash <($out/bin/sbctl completion bash) \ + --fish <($out/bin/sbctl completion fish) \ + --zsh <($out/bin/sbctl completion zsh) + ''; passthru.updateScript = nix-update-script { }; @@ -48,7 +62,10 @@ buildGoModule rec { mainProgram = "sbctl"; homepage = "https://github.com/Foxboron/sbctl"; license = licenses.mit; - maintainers = with maintainers; [ raitobezarius ]; + maintainers = with maintainers; [ + raitobezarius + Scrumplex + ]; # go-uefi do not support darwin at the moment: # see upstream on https://github.com/Foxboron/go-uefi/issues/13 platforms = platforms.linux; diff --git a/pkgs/by-name/sc/screenfetch/package.nix b/pkgs/by-name/sc/screenfetch/package.nix index c4eb669875d62..0be861492826c 100644 --- a/pkgs/by-name/sc/screenfetch/package.nix +++ b/pkgs/by-name/sc/screenfetch/package.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "screenfetch"; - version = "3.9.1"; + version = "3.9.9"; src = fetchFromGitHub { owner = "KittyKatt"; repo = "screenFetch"; rev = "v${version}"; - sha256 = "04l8aqr474pb115nagn9f6y48jw92n1qfszgw7dbhgl4mpn95lcr"; + sha256 = "sha256-UNZMCLXhH4wDV0/fGWsB+KAi6aJVuPs6zpWXIQAqnjo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 8541b9fd668a6..ab9d020996280 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20241119"; + version = "20241205"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-HZNjkOuJOoOSPmJHu6QTYzyxgS4dSC6lWB++xF4rRnI="; + hash = "sha256-e6T40FMM24wsVOZDE8lFeE5WKjpAFoG0M05E8oHiZeo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix new file mode 100644 index 0000000000000..1f82243942f91 --- /dev/null +++ b/pkgs/by-name/si/simulide/package.nix @@ -0,0 +1,142 @@ +{ + lib, + stdenv, + fetchbzr, + libsForQt5, + versionNum ? "1.0.0", +}: + +let + versionInfo = { + "0.4.15" = rec { + 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; + }; + }; + "1.0.0" = rec { + release = "SR2"; + rev = "1449"; + src = fetchbzr { + url = "https://code.launchpad.net/~arcachofo/simulide/1.0.0"; + sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g="; + inherit rev; + }; + }; + "1.1.0" = rec { + release = "SR0"; + rev = "1917"; + src = fetchbzr { + url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0"; + sha256 = "sha256-qNBaGWl89Le9uC1VFK+xYhrLzIvOIWjkQbutnrAmZ2M="; + inherit rev; + }; + }; + }; +in + +let + inherit (versionInfo.${versionNum} or (throw "Unsupported versionNum")) release rev src; + + extraPostPatch = lib.optionalString (lib.versionOlder versionNum "1.0.0") '' + # GCC 13 needs the header explicitly included + sed -i src/gpsim/value.h -e '1i #include ' + sed -i src/gpsim/modules/watchdog.h -e '1i #include ' + ''; + + extraBuildInputs = lib.optionals (lib.versionOlder versionNum "1.1.0") [ + libsForQt5.qtscript + ]; + + iconPath = + if lib.versionOlder versionNum "1.0.0" then + "resources/icons/hicolor/256x256/simulide.png" # upstream had a messed up icon path in this release + else + "resources/icons/simulide.png"; + + installFiles = + if lib.versionOlder versionNum "1.0.0" then + '' + cp -r share/simulide/* $out/share/simulide + cp bin/simulide $out/bin/simulide + '' + else + '' + cp -r data examples $out/share/simulide + cp simulide $out/bin/simulide + ''; + +in + +stdenv.mkDerivation { + pname = "simulide"; + version = "${versionNum}-${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 = ${versionNum}|" \ + -e "s|^RELEASE = .*$|RELEASE = -${release}|" \ + -e "s|^REV_NO = .*$|REV_NO = ${rev}|" \ + -e "s|^BUILD_DATE = .*$|BUILD_DATE = ??-??-??|" + + ${extraPostPatch} + ''; + + preConfigure = '' + cd build_XX + ''; + + nativeBuildInputs = with libsForQt5; [ + qmake + wrapQtAppsHook + ]; + + buildInputs = + (with libsForQt5; [ + 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" ]; + }; +} diff --git a/pkgs/by-name/sq/sqlline/package.nix b/pkgs/by-name/sq/sqlline/package.nix new file mode 100644 index 0000000000000..440187d1f0601 --- /dev/null +++ b/pkgs/by-name/sq/sqlline/package.nix @@ -0,0 +1,55 @@ +{ + lib, + maven, + fetchFromGitHub, + makeWrapper, + jre, + docbook_xml_dtd_42, +}: + +maven.buildMavenPackage rec { + pname = "sqlline"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "julianhyde"; + repo = "sqlline"; + tag = "sqlline-${version}"; + hash = "sha256-rUlGtMgTfhciQVif0KaUcuY28wh+PrHsKen8qODom24="; + }; + + mvnHash = "sha256-9qDzc6TRn9Yv3/nTATZgP6J+PTZEZCN1et/3GrRb7X4="; + + nativeBuildInputs = [ + makeWrapper + docbook_xml_dtd_42 + ]; + + mvnParameters = "-DskipTests"; + + # Patch the DOCTYPE declaration in manual.xml + postPatch = '' + substituteInPlace src/docbkx/manual.xml \ + --replace-fail "https://docbook.org/xml/4.2/docbookx.dtd" "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd" \ + --replace-fail 'PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"' 'PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"' + ''; + + buildOffline = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D target/sqlline-${version}-jar-with-dependencies.jar $out/share/java/sqlline-${version}.jar + makeWrapper ${jre}/bin/java $out/bin/sqlline \ + --add-flags "-jar $out/share/java/sqlline-${version}.jar" + runHook postInstall + ''; + + meta = { + description = "Shell for issuing SQL to relational databases via JDBC"; + homepage = "https://github.com/julianhyde/sqlline"; + mainProgram = "sqlline"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ taranarmo ]; + }; +} diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index dd54d9c645918..293c2e46ea81a 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "sticky"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-JrzBME1d4qvGjF2zdiqCX7h+sFadLsRQqZKnQj7elHs="; + hash = "sha256-vNS2p3cmuQB+wusx9VSi81ZyGmUYgVXlMjIMkrnvyrI="; }; postPatch = '' diff --git a/pkgs/by-name/tw/twig-language-server/package.nix b/pkgs/by-name/tw/twig-language-server/package.nix index 6be0f51ad55c4..c45f53ec4e273 100644 --- a/pkgs/by-name/tw/twig-language-server/package.nix +++ b/pkgs/by-name/tw/twig-language-server/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "twig-language-server"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "kaermorchen"; repo = "twig-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-bW0siZudzqk/4XgVH6nNCOrpJ6WHTCZoHJC+aXnE5mM="; + hash = "sha256-7czd7KZ/r+jGFxwPSxWkmb27wOkN4CNRVZjeVTMrk9g="; }; - npmDepsHash = "sha256-zbMjfdIXQf6oz6em0vkyvroijCb2MUioZjvZjkbuKc8="; + npmDepsHash = "sha256-Ci+F6k7hXYod+hDUy+XPqVQ7FnsxRG61VhDO86N44mY="; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py index dd6dcb2c70ad7..41e495d382298 100755 --- a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py +++ b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py @@ -486,7 +486,7 @@ def _update_package(path, target): if fetcher == "fetchFromGitHub": # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` # in which no string value is meant to be substituted. However, we can just overwrite the previous value. - regex = r"(rev\s+=\s+[^;]*;)" + regex = r"((?:rev|tag)\s+=\s+[^;]*;)" regex = re.compile(regex) matches = regex.findall(text) n = len(matches) @@ -496,7 +496,7 @@ def _update_package(path, target): else: # forcefully rewrite rev, incase tagging conventions changed for a release match = matches[0] - text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') + text = text.replace(match, f'tag = "{prefix}${{version}}";') # incase there's no prefix, just rewrite without interpolation text = text.replace('"${version}";', "version;") diff --git a/pkgs/by-name/ur/urlscan/package.nix b/pkgs/by-name/ur/urlscan/package.nix index d0e9e90db89f5..67efc7ad64e0c 100644 --- a/pkgs/by-name/ur/urlscan/package.nix +++ b/pkgs/by-name/ur/urlscan/package.nix @@ -1,35 +1,32 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "1.0.3"; - format = "pyproject"; + version = "1.0.6"; + pyproject = true; src = fetchFromGitHub { owner = "firecat53"; - repo = pname; + repo = "urlscan"; rev = "refs/tags/${version}"; - hash = "sha256-aAfsGsgCZwWcFkYaJsKjRroAZjW7b/vnX1oL/Mg0kgY="; + hash = "sha256-VbpKMaEjchfpLECCt1YtmiVynYgSLgAVP1iuHL7t8FQ="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ hatchling hatch-vcs ]; - propagatedBuildInputs = with python3.pkgs; [ - urwid - ]; + dependencies = with python3.pkgs; [ urwid ]; # No tests available doCheck = false; - pythonImportsCheck = [ - "urlscan" - ]; + pythonImportsCheck = [ "urlscan" ]; meta = with lib; { description = "Mutt and terminal url selector (similar to urlview)"; diff --git a/pkgs/by-name/va/vagrant/gemset.nix b/pkgs/by-name/va/vagrant/gemset.nix index d69322bc17c79..bb44c6feeb73c 100644 --- a/pkgs/by-name/va/vagrant/gemset.nix +++ b/pkgs/by-name/va/vagrant/gemset.nix @@ -1,33 +1,43 @@ { + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; bcrypt_pbkdf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; + sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; bigdecimal = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.8"; }; builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; childprocess = { groups = ["default"]; @@ -44,20 +54,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; date = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.4"; + version = "3.4.1"; }; diff-lcs = { groups = ["default" "development"]; @@ -84,20 +94,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x"; + sha256 = "00p5fww0bakph4p9skc7ypjqbqc8crnw31nrmpdm8j4rr5kp4jb0"; type = "gem"; }; - version = "0.109.0"; + version = "1.2.2"; }; fake_ftp = { groups = ["development"]; @@ -109,25 +119,48 @@ }; version = "0.3.0"; }; + faraday = { + dependencies = ["faraday-net_http" "json" "logger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vxaw0mg8avqivdj0lzj19nxf652ri208grsdf0361flyn5i5wi3"; + type = "gem"; + }; + version = "2.12.1"; + }; + faraday-net_http = { + dependencies = ["net-http"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; + type = "gem"; + }; + version = "3.4.0"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; google-protobuf = { + dependencies = ["bigdecimal" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; + sha256 = "1zzlmsv7djpgn6hxp5r1jg7f4nx368j0ccq6pipq1ncplnvbffij"; type = "gem"; }; - version = "3.25.3"; + version = "4.29.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -135,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zrxnv9s2q39f2nh32x7nbfi8lpwzmmn3ji4adglg8dlfr1xrz16"; + sha256 = "1xyinc2zaw25r3x774mni66im1b22l9zpbsqdgdb4g4zxcd5srcl"; type = "gem"; }; - version = "1.13.0"; + version = "1.16.0"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -146,20 +179,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ndyis4hyq5wyypvy5j2pxaax73k9xd9cdsc5hyvpk3vbnn26rdb"; + sha256 = "0z5x8f9k2m656imi59jrd49d8inbnzpcnylz0ijj1ly0ihdi3apd"; type = "gem"; }; - version = "1.56.2"; + version = "1.68.1"; }; grpc-tools = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pwwsmw402y8f8l3s3v433lx1f3cahzh2bj3i6jhkg1z87z83pqm"; + sha256 = "12wbiq7s1qc6dv35p8c5vay627c6mqm9p1dimv2nz2m6r5f1057v"; type = "gem"; }; - version = "1.62.0"; + version = "1.68.1"; }; gssapi = { dependencies = ["ffi"]; @@ -193,6 +226,16 @@ }; version = "0.1.5"; }; + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; + type = "gem"; + }; + version = "5.0.0"; + }; httpclient = { groups = ["default"]; platforms = []; @@ -209,20 +252,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.6"; }; ipaddr = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p98v9b6rn5ma04qwvzs0nrg0hmnwpm70s9jshzdsrkqapcw4sh2"; + sha256 = "0wmgwqv6c1kq8cxbxddllnrlh5jjmjw73i1sqbnvq55zzn3l0zyb"; + type = "gem"; + }; + version = "1.2.7"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kvbzh8530pp3qf63zvx9hnb708x7plv9wfn5ibns3h3knnvs3kw"; + type = "gem"; + }; + version = "2.9.0"; + }; + jwt = { + dependencies = ["base64"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rba9mji57sfa1kjhj0bwff1377vj0i8yx2rd39j5ik4vp60gzam"; type = "gem"; }; - version = "1.2.6"; + version = "2.9.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -255,37 +319,47 @@ }; version = "1.1.10"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q9jm4pzqxk92dq9a1y7gjwcw3dcsm1mnsdhi9ms5hw1dpnprzlx"; + type = "gem"; + }; + version = "1.6.2"; + }; logging = { dependencies = ["little-plugger" "multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; + sha256 = "1jqcq2yxh973f3aw63nd3wxhqyhkncz3pf8v2gs3df0iqair725s"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; mime-types = { - dependencies = ["mime-types-data"]; + dependencies = ["logger" "mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; + sha256 = "0a7fq0wn2fdv57dsxfmjyzsjhxprh56k0zg3c4nm9il4s3v0mzig"; type = "gem"; }; - version = "3.2024.0206"; + version = "3.2024.1203"; }; multi_json = { groups = ["default"]; @@ -297,16 +371,38 @@ }; version = "1.15.0"; }; + multi_xml = { + dependencies = ["bigdecimal"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06x61ca5j84nyhr1mwh9r436yiphnc5hmacb3gwqyn5gd0611kjg"; + type = "gem"; + }; + version = "0.7.1"; + }; net-ftp = { dependencies = ["net-protocol" "time"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pi67ywf8yvv18vr8kvyb1igdv8nsjafyy9c86fny5wvi10qcwqv"; + sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8"; + type = "gem"; + }; + version = "0.3.8"; + }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; type = "gem"; }; - version = "0.3.4"; + version = "0.6.0"; }; net-protocol = { dependencies = ["timeout"]; @@ -346,10 +442,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; type = "gem"; }; - version = "7.2.1"; + version = "7.3.0"; }; nori = { dependencies = ["bigdecimal"]; @@ -357,10 +453,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; + sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1"; + type = "gem"; + }; + version = "2.7.1"; + }; + oauth2 = { + dependencies = ["faraday" "jwt" "multi_xml" "rack" "snaky_hash" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj"; type = "gem"; }; - version = "2.7.0"; + version = "2.0.9"; + }; + ostruct = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; }; pairing_heap = { groups = ["default"]; @@ -372,15 +489,25 @@ }; version = "3.1.0"; }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cd13019gnnh2c0a3kj27ij5ibk72v0bmpypqv4l6ayw8g5cpyyk"; + type = "gem"; + }; + version = "3.1.8"; + }; rake = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rake-compiler = { dependencies = ["rake"]; @@ -388,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vhdkwblhzp4wp1jh95qiibly2zsnmg3659r6d5xp1mzgd9ghxji"; + sha256 = "0xlifh25mhlrigj020nya10s37dbkhc0rlqlf0ld88rxrdg1057k"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.8"; }; rb-fsevent = { groups = ["default"]; @@ -409,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rb-kqueue = { dependencies = ["ffi"]; @@ -430,10 +557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.9"; }; rgl = { dependencies = ["pairing_heap" "rexml" "stream"]; @@ -463,10 +590,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; + sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -474,10 +601,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bhhjzwdk96vf3gq3rs7mln80q27fhq82hda3r15byb24b34h7b2"; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.3"; }; rspec-its = { dependencies = ["rspec-core" "rspec-expectations"]; @@ -485,10 +612,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; + sha256 = "1xjikikx2sn9b7nbaza60xq7livjw9kp3a6gwbv5xz9zjd7k2164"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -496,30 +623,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rkzkcfk2x0qjr5fxw6ib4wpjy0hqbziywplnp6pg3bm2l98jnkk"; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.2"; }; rspec-support = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; + sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rubyntlm = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + sha256 = "1x8l0d1v88m40mby4jvgal46137cv8gga2lk7zlrxqlsp41380a7"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.5"; }; rubyzip = { groups = ["default"]; @@ -531,6 +659,17 @@ }; version = "2.3.2"; }; + snaky_hash = { + dependencies = ["hashie" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cfwvdcr46pk0c7m5aw2w3izbrp1iba0q7l21r37mzpwaz0pxj0s"; + type = "gem"; + }; + version = "2.0.1"; + }; stream = { groups = ["default"]; platforms = []; @@ -557,20 +696,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; + sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.1"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; + sha256 = "06fcniirx82hrljzfn5wb3634n8648v8qgy006jzgclfz5gjvjla"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; + }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk"; + type = "gem"; + }; + version = "1.0.2"; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; @@ -586,15 +735,25 @@ version = "0.0.1"; }; vagrant_cloud = { - dependencies = ["excon" "log4r" "rexml"]; + dependencies = ["excon" "log4r" "oauth2" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jhwciki5i8hjbgv2f1p544bi92s9wdsfrjympzslysdzk95djpg"; + sha256 = "07w7zv93pzpxjsq16z2d15irkl117x2h572bmd0gqhqd50da3lc6"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; + }; + version_gem = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08a6agx7xk1f6cr9a95dq42vl45si2ln21h33b96li59sv3555y6"; + type = "gem"; + }; + version = "1.1.4"; }; wdm = { groups = ["default"]; @@ -611,21 +770,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.7.0"; + version = "1.9.1"; }; winrm = { - dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + sha256 = "01jxpshw5kx5ha21ymaaj14vibv5bvm0dd80ccc6xl3jaxy7cszg"; type = "gem"; }; - version = "2.3.6"; + version = "2.3.9"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; diff --git a/pkgs/by-name/va/vagrant/gemset_libvirt.nix b/pkgs/by-name/va/vagrant/gemset_libvirt.nix index d31b76a4e7f87..cc9b49f42d9f0 100644 --- a/pkgs/by-name/va/vagrant/gemset_libvirt.nix +++ b/pkgs/by-name/va/vagrant/gemset_libvirt.nix @@ -1,38 +1,58 @@ { builder = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; + }; + diff-lcs = { + groups = ["default" "development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + type = "gem"; + }; + version = "1.5.1"; + }; + diffy = { + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22"; + type = "gem"; + }; + version = "3.4.3"; }; excon = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rv2hq29lx2337214a1p2qy70fi77ch6p0p77nw9h6x84q028qr0"; + sha256 = "00p5fww0bakph4p9skc7ypjqbqc8crnw31nrmpdm8j4rr5kp4jb0"; type = "gem"; }; - version = "0.92.3"; + version = "1.2.2"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw"; + sha256 = "1rjv4iqr64arxv07bh84zzbr1y081h21592b5zjdrk937al8mq1z"; type = "gem"; }; - version = "2.3.0"; + version = "2.6.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -43,18 +63,18 @@ }; fog-libvirt = { dependencies = ["fog-core" "fog-json" "fog-xml" "json" "ruby-libvirt"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-z0VkRqFk3JU02ULQ+xQbywekzrJgz1YPDul//Ov5ajU="; + sha256 = "036ajdyj4fxnhqf108jgzjkpiknnr6dg7mrapn8jsagqdr2a2k21"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.1"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -64,7 +84,7 @@ version = "0.1.4"; }; formatador = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -74,48 +94,58 @@ version = "1.1.0"; }; json = { - groups = ["default"]; + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kvbzh8530pp3qf63zvx9hnb708x7plv9wfn5ibns3h3knnvs3kw"; + type = "gem"; + }; + version = "2.9.0"; + }; + logger = { + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + sha256 = "0q9jm4pzqxk92dq9a1y7gjwcw3dcsm1mnsdhi9ms5hw1dpnprzlx"; type = "gem"; }; - version = "2.6.1"; + version = "1.6.2"; }; mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; + dependencies = ["logger" "mime-types-data"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.4.1"; + version = "3.6.0"; }; mime-types-data = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "0a7fq0wn2fdv57dsxfmjyzsjhxprh56k0zg3c4nm9il4s3v0mzig"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2024.1203"; }; mini_portile2 = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-RrLSRMxv8BqJv2EnRpDAn9vcpHqErp6sOQOegSMa7nw="; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.8"; }; multi_json = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -126,68 +156,122 @@ }; nokogiri = { dependencies = ["mini_portile2" "racc"]; - groups = ["default"]; + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny"; + type = "gem"; + }; + version = "1.16.8"; + }; + parallel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + type = "gem"; + }; + version = "1.26.3"; + }; + parallel_tests = { + dependencies = ["parallel"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-INyAC4++TE9LWxZOaqOrgqNxvLJ+toXBZpYcNN2KItc="; + sha256 = "04i61bkra454var9dc79ak3yffl13mbqx8xv2rvidx9n7ins9cyn"; type = "gem"; }; - version = "1.15.2"; + version = "4.7.2"; }; racc = { - groups = ["default"]; + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + rake = { + groups = ["development" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-r2QSSDb908AOgwcD1/hz6l3qvekj83AGo59aXg2hY4c="; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "1.7.1"; + version = "13.2.1"; }; rexml = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.5"; + version = "3.3.9"; }; - xml-simple = { - groups = ["default"]; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["development" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-0hEx5RnIbxpbwrbS1X1G5pmOR/GO0kmyXK2GQz29aV0="; + sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl"; type = "gem"; }; - version = "1.1.9"; + version = "3.13.2"; }; - diffy = { - groups = ["default"]; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; + type = "gem"; + }; + version = "3.13.3"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; + type = "gem"; + }; + version = "3.13.2"; + }; + rspec-support = { + groups = ["default" "development" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-NrQv++UTjdxWGCEHwkrY1rBm7P0odoKfOR46SZPYmuE="; + sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; type = "gem"; }; - version = "3.4.2"; + version = "3.13.2"; }; ruby-libvirt = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; + sha256 = "0r0igmwr22pi3dkkg1p79hjf8mr178qnz83q8fnaj87x7zk3qfyg"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.4"; }; vagrant-libvirt = { - dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple" "diffy"]; - groups = ["default"]; + dependencies = ["diffy" "fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple"]; + groups = ["plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -196,4 +280,15 @@ }; version = "0.12.2"; }; + xml-simple = { + dependencies = ["rexml"]; + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj"; + type = "gem"; + }; + version = "1.1.9"; + }; } diff --git a/pkgs/by-name/va/vagrant/package.nix b/pkgs/by-name/va/vagrant/package.nix index 60d28318930a9..6754a39fad4e3 100644 --- a/pkgs/by-name/va/vagrant/package.nix +++ b/pkgs/by-name/va/vagrant/package.nix @@ -6,9 +6,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.4.1"; + version = "2.4.3"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - hash = "sha256-Gc+jBuP/rl3b8wUE9hoaMSSqmodyGxMKFAmNTqH+v4k="; + hash = "sha256-ZQWdSCV5lBL8XUnOvCFwJAFk+tw30q2lRTHR93qeZ2I="; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -118,6 +118,5 @@ in buildRubyGem rec { license = licenses.bsl11; maintainers = with maintainers; [ tylerjl ]; platforms = with platforms; linux ++ darwin; - broken = true; # build fails on darwin and linux }; } diff --git a/pkgs/by-name/vi/villain/package.nix b/pkgs/by-name/vi/villain/package.nix index ab40f15b50ae9..9345a5f7023c8 100644 --- a/pkgs/by-name/vi/villain/package.nix +++ b/pkgs/by-name/vi/villain/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "villain"; - version = "2.2.0"; + version = "2.2.1"; pyproject = false; src = fetchFromGitHub { owner = "t3l3machus"; repo = "Villain"; - rev = "v${version}"; - hash = "sha256-7qZ91WEzQg9k9V/FlREW4YLlEnloeVkisDO8q/+bheo="; + rev = "refs/tags/V${version}"; + hash = "sha256-eIPxidBBVmjt/E1F8G3zPwteB1qsk3a5LD69CiNVApY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 48a4a92c919f1..7091625bf8168 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-N1CvHYWhwi75+eelp3UPrqnigRTg1LWKhmVDNXv96LA=", - "version": "0.2024.11.19.08.02.stable_03" + "hash": "sha256-utxgI+fpobY9z06TpbXHcSpR7d6o1XLbfP/OwkoYbZQ=", + "version": "0.2024.12.03.08.02.stable_04" }, "linux_x86_64": { - "hash": "sha256-vxK9GFYYFZK3NIIejh6dAK3sKkpAR4cyOSC/t2Aodg8=", - "version": "0.2024.11.19.08.02.stable_03" + "hash": "sha256-MNwO08xL3MtrB/3I0ObTa9hIK5GgeeXFKb0PDUld1EA=", + "version": "0.2024.12.03.08.02.stable_04" }, "linux_aarch64": { - "hash": "sha256-eADShsB0/kKNMzBP1/JZ0Kofh2iTQtsxFz2N1H+hxY0=", - "version": "0.2024.11.19.08.02.stable_03" + "hash": "sha256-gMfRNNI0aVQ6ePt5hOLu/DDkrHQJMePj7hRaJA5pTbU=", + "version": "0.2024.12.03.08.02.stable_04" } } diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix index c01cb066490ef..bb7b97b8b38d3 100644 --- a/pkgs/by-name/wa/warpinator/package.nix +++ b/pkgs/by-name/wa/warpinator/package.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-GJp2iRB3F42pSfYd2FLpmDTZ1zqt8thdRPAHu9/ns5E="; + hash = "sha256-EgTz0i7Dui74xYFShkLox6ITAEAF8yYATEcQ51pc7gA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 7f5c9ad4432b0..8fcd8869a2820 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -55,6 +55,7 @@ jackSupport ? true, mpdSupport ? true, mprisSupport ? stdenv.hostPlatform.isLinux, + niriSupport ? true, nlSupport ? true, pipewireSupport ? true, pulseSupport ? true, @@ -187,7 +188,10 @@ stdenv.mkDerivation (finalAttrs: { "upower_glib" = upowerSupport; "wireplumber" = wireplumberSupport; }) - ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + ++ (lib.mapAttrsToList lib.mesonBool { + "experimental" = experimentalPatches; + "niri" = niriSupport; + }); env = lib.optionalAttrs systemdSupport { PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; diff --git a/pkgs/by-name/wg/wget/package.nix b/pkgs/by-name/wg/wget/package.nix index 3bf64898b6f4d..69eebc4f1d419 100644 --- a/pkgs/by-name/wg/wget/package.nix +++ b/pkgs/by-name/wg/wget/package.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { perlPackages.perl ]; + strictDeps = true; + configureFlags = [ (lib.withFeatureAs withOpenssl "ssl" "openssl") @@ -101,7 +103,8 @@ stdenv.mkDerivation rec { sed -i 's/^exit/exit 77 #/' $f done ''; - checkInputs = + + nativeCheckInputs = [ perlPackages.HTTPDaemon python3 diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix index 1a24742e8a364..50e347a091241 100644 --- a/pkgs/by-name/wi/witness/package.nix +++ b/pkgs/by-name/wi/witness/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "witness"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-ao9mxN5cMGopCRXUkJRTNJemizzibdw0Q+oAhKjUyHA="; + sha256 = "sha256-eHAEaecL4bJUZfFiXK3NqgTZU9l6b46WI/vDBuAqCUw="; }; - vendorHash = "sha256-pDMvtSavifWfxJqfiOef0CyT8KtU8BUjEFwReElkEeM="; + vendorHash = "sha256-AZRY8N88dUKAybdstSTRB8sirx4L4ZmiffQ7Qwlpb/8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix index 0e04633f3c6ae..7cea7ce972a9b 100644 --- a/pkgs/by-name/xv/xviewer/package.nix +++ b/pkgs/by-name/xv/xviewer/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.4.6"; + version = "3.4.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-J1IlgHKyNGJTn1sIU3q02eTgWqyeRm2leFIhtKPIdhg="; + hash = "sha256-hRX+vSotjhoQ/fyFdCelr9IHZGUM8xaYHNfX2vD3nq0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 453a0caa999c6..27f9b0a4cc2a9 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -1,41 +1,80 @@ { lib -, fetchurl -, appimageTools +, fetchFromGitHub +, buildNpmPackage +, electron_32 +, makeDesktopItem +, makeShellWrapper +, copyDesktopItems }: -let +buildNpmPackage rec { pname = "zulip"; version = "5.11.1"; - src = fetchurl { - url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-t5qBm5+kTdeRMvcHpNbS5mp184UG/IqgJrtj7Ntcbb0="; - name="${pname}-${version}.AppImage"; + src = fetchFromGitHub { + owner = "zulip"; + repo = "zulip-desktop"; + rev = "v${version}"; + hash = "sha256-ELuQ/K5QhtS4QiTR35J9VtYNe1qBrS56Ay6mtcGL+FI="; }; - appimageContents = appimageTools.extractType2 { - inherit pname version src; + npmDepsHash = "sha256-13Rlqa7TC2JUq6q1b2U5X3EXpOJGZ62IeF163/mTo68="; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; }; -in appimageTools.wrapType2 { - inherit pname version src; + nativeBuildInputs = [ + makeShellWrapper + copyDesktopItems + ]; + + dontNpmBuild = true; + buildPhase = '' + runHook preBuild - runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}"; + npm run pack -- \ + -c.electronDist=${electron_32}/libexec/electron \ + -c.electronVersion=${electron_32.version} - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ - $out/share/icons/hicolor/512x512/apps/zulip.png - substituteInPlace $out/share/applications/zulip.desktop \ - --replace-fail 'Exec=AppRun' 'Exec=${pname}' + runHook postBuild ''; + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/lib/zulip" + cp -r dist/*-unpacked/resources/app.asar* "$out/share/lib/zulip/" + + install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png + + makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \ + --add-flags "$out/share/lib/zulip/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \ + --inherit-argv0 + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "zulip"; + exec = "zulip %U"; + icon = "zulip"; + desktopName = "Zulip"; + comment = "Zulip Desktop Client for Linux"; + categories = [ "Chat" "Network" "InstantMessaging" ]; + startupWMClass = "Zulip"; + terminal = false; + }) + ]; + meta = with lib; { description = "Desktop client for Zulip Chat"; homepage = "https://zulip.com"; license = licenses.asl20; maintainers = with maintainers; [ andersk ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; mainProgram = "zulip"; }; } diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 39745f61facab..0468bca709a7d 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -25,6 +25,7 @@ , pcre2 , pcre , pkg-config +, installShellFiles , readline , tzdata , which @@ -166,7 +167,7 @@ let strictDeps = true; - nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; + nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm installShellFiles ]; buildInputs = [ boehmgc (if lib.versionAtLeast version "1.8" then pcre2 else pcre) @@ -218,15 +219,18 @@ let cp -r docs/* $out/share/doc/crystal/api/ cp -r samples $out/share/doc/crystal/ - install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal - install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} etc/completion.* - install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 + installManPage man/crystal.1 install -Dm644 -t $out/share/licenses/crystal LICENSE README.md mkdir -p $out ln -s $bin/bin $out/bin + ln -s $bin/share/bash-completion $out/share/bash-completion + ln -s $bin/share/zsh $out/share/zsh + # fish completion was introduced in 1.6.0 + test -f etc/completion.fish && ln -s $bin/share/fish $out/share/fish ln -s $lib $out/lib runHook postInstall diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index e86488b3151d9..16f6e69ac23b0 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-reEPkJpoTCoFa4sOw6MOFXDOK4PEbF9iGkRk0Ccpr58=", + "tarballHash": "sha256-LhnsYVr+I+MY0Vu3y86rsAs8j7jNyo06SguY6uZkEcc=", "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.2.24474.1.centos.9-x64.tar.gz", "artifactsHash": "sha256-Cxjdi7vISz2wMT22o4ZOEd9RdmKHI8PO/JgH1YJWsVo=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index fe1ac1e239104..09dbce37a9bf8 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { "release": "9.0.0", "channel": "9.0", - "tag": "v9.0.0", - "sdkVersion": "9.0.100", + "tag": "v9.0.101", + "sdkVersion": "9.0.101", "runtimeVersion": "9.0.0", "aspNetCoreVersion": "9.0.0", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "a2bc464e40415d625118f38fbb0556d1803783ff" + "sourceVersion": "f303476b533b0f90901c0a5e07a3bd2fb68777e3" } diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 4fa837a4a2749..2a91d1fcfddc7 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -18,7 +18,7 @@ }: let - inherit (lib.importJSON releaseManifestFile) channel release; + inherit (lib.importJSON releaseManifestFile) channel tag; pkg = stdenvNoCC.mkDerivation { name = "update-dotnet-vmr-env"; @@ -93,15 +93,11 @@ writeScript "update-dotnet-vmr.sh" '' tmp="$(mktemp -d)" trap 'rm -rf "$tmp"' EXIT - echo ${lib.escapeShellArg (toString ./update.sh)} \ - -o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk foo - cd "$tmp" curl -fsSL "$releaseUrl" -o release.json - release=$(jq -r .release release.json) - if [[ -z $tag && "$release" == "${release}" ]]; then + if [[ -z $tag && "$tagName" == "${tag}" ]]; then >&2 echo "release is already $release" exit fi diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 7e8e6bfc880fe..66520f4658fd5 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -281,15 +281,18 @@ update() { # If patch was not specified, check if the package is already the latest version # If it is, exit early if [ "$patch_specified" == false ] && [ -f "$output" ]; then - local current_version - current_version=$(nix-instantiate --eval -E "(import $output { \ - buildAspNetCore = { ... }: {}; \ - buildNetSdk = { ... }: {}; \ - buildNetRuntime = { ... }: {}; \ - fetchNupkg = { ... }: {}; \ - }).release_${major_minor_underscore}" | jq -r) - - if [[ "$current_version" == "$major_minor_patch" ]]; then + local -a versions + IFS= readarray -d '' versions < <( + nix-instantiate --eval --json -E "with (import $output { + buildAspNetCore = { ... }: {}; + buildNetSdk = { version, ... }: { inherit version; }; + buildNetRuntime = { version, ... }: { inherit version; }; + fetchNupkg = { ... }: {}; + }); (x: builtins.deepSeq x x) [ + runtime_${major_minor_underscore}.version + sdk_${major_minor_underscore}.version + ]" | jq --raw-output0 .[]) + if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then echo "Nothing to update." return fi diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index b8af661041b39..3afb110ccbd79 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -204,39 +204,39 @@ in rec { }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100"; + version = "9.0.101"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/526d93c5-bae2-4cfc-a9cf-b2d28d7b5c98/17c926df21958999f74992973837d261/dotnet-sdk-9.0.100-linux-arm.tar.gz"; - hash = "sha512-3gbonlWbx2P/Z3O8+FLZFexH8tifTnBluggA2pmrVjV/MUNzkad9cJbkBfYzGGJbDLB09rQQA2++kG/OfzeU6A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/fa0fa6b6-8db2-441e-a393-2dd2f5c841b9/19b664790a03e20ce4069449eaa74b21/dotnet-sdk-9.0.101-linux-arm.tar.gz"; + hash = "sha512-zfiYnQLkpqoh5oCB6VYxjJTGAVg6dX1etDORnr5/pRjyB6oPWKCe4oz5X0RcSGOGwineaYkUM6SikUXvWWqhpA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f79d99b-dc38-4c44-a549-32329419bb9f/a411ec38fb374e3a4676647b236ba021/dotnet-sdk-9.0.100-linux-arm64.tar.gz"; - hash = "sha512-aERQ5tH3xxH//b8yorhqky0XpR9HQr0npCieMZxbJPZ0NVP8fgrRxxY+RI7VxAzR7PQZiy5oGsxGItjmGTpc8g=="; + url = "https://download.visualstudio.microsoft.com/download/pr/93a7156d-01ef-40a1-b6e9-bbe7602f7e8b/3c93e90c63b494972c44f073e15bfc26/dotnet-sdk-9.0.101-linux-arm64.tar.gz"; + hash = "sha512-xfnBfd7VEBy0tlrRAzrk2C/FsEMDvc5OthptxH76hCAr1ybQXK8RflNqAb14rXc7jSPL9DvGVeXrmRKxIHjgsQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/308f16a9-2ecf-4a42-b8bb-c1233de985fd/be6e87045ab21935bd8bb98ce69026c4/dotnet-sdk-9.0.100-linux-x64.tar.gz"; - hash = "sha512-f2m9oEfeH5Uihr4zCl6FgXHe2VLRqiQWnmIhL5CicUnmO2NsiK0xOm4+yGDaMfjFR/9KtoCBA6Bw9/smupnBxw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d74fd2dd-3384-4952-924b-f5d492326e35/e91d8295d4cbe82ba3501e411d78c9b8/dotnet-sdk-9.0.101-linux-x64.tar.gz"; + hash = "sha512-kbN+/WQkLl8fPCAl0YPrNOF/OpJxxWAvKd33lIRe7hA3I++VXthpeI6/WnMejdxpMoeZySxkyxGOEyjSWaatAQ=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/c77904f4-57f5-46cf-bf99-d0dd1e4b9b3b/d7b454d3500c1a930b38e39a916aa38f/dotnet-sdk-9.0.100-linux-musl-arm.tar.gz"; - hash = "sha512-sJIPgOhmp2A86mKKETDfADvF14GCdciliCoxxuTinwcyL8XP2HMziT5BMb2WEw+yOE0AjLrXBAIsiSZ9UmhuBw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5528c94e-1708-4291-917f-c9b693df3389/b851b22328c11e88f9fb61ea3e18582f/dotnet-sdk-9.0.101-linux-musl-arm.tar.gz"; + hash = "sha512-fmVg5puDueZJYekRVfhYVCHDos52iXhx04ZJLGI+koD2byKE3Ek2K8OHOeSBclI85UsiaVJENzlOo+kIcooBGA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ca5a82b7-704c-4405-bde2-4bde4b932d2e/0332e51e8d339cbc0410079f911205f3/dotnet-sdk-9.0.100-linux-musl-arm64.tar.gz"; - hash = "sha512-2uBtAHMn9vU/UMs6KIS5PNL8u3PHVqisX/ZzYX+b3wAJOTLzqDZSIR/C7rV8JxB4ZE71wopCiX2Dl/dtDolYbQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a8f1d5c7-c724-451c-8659-fe6ea4e72ea8/1c90dea91c1e117b96198bdccdc0b594/dotnet-sdk-9.0.101-linux-musl-arm64.tar.gz"; + hash = "sha512-am1qbW372stIN0wKyb2xyTeB85cMh3iwvuHxWaIrABdoaCZOYFMx/vgzy5/tgptP/UFCdtDRFAqLDiVxlcLzdA=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/404c65f4-7595-4792-85ab-e26084ebb5cf/db570cf4dc8d0a61270243c61fbdf619/dotnet-sdk-9.0.100-linux-musl-x64.tar.gz"; - hash = "sha512-4gMua07Zmts6krfgQeqJXuCcbtJFWh9o5V7VO9YTyMIO9KpcQ0OTu1/bwvVjWoMGf3dFH+L9P+vO4mT+B3rNqg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/73c11b94-0188-458f-b599-f7591718fc28/c44e21ffbf353b50ef88a76122e89e24/dotnet-sdk-9.0.101-linux-musl-x64.tar.gz"; + hash = "sha512-P04U+3tS37V7HjHLWXPm4KM49/Aw8SswgtO1XxL5WH3fSSanxfz4a3ZxOX5E+OXCD7lJ1w6afdDcJ75zpUjf/A=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4569c514-16ac-49fc-ac41-4416f547c249/851fb0aa9b2a8bdcb0d1d9f9493a952e/dotnet-sdk-9.0.100-osx-arm64.tar.gz"; - hash = "sha512-lN+kllIZWohPBtBs6yPvb31zgP4MQBW5bo+VC1epVYcR+6YRKHEPnI3gCB3ZGvSKkPe9D4uQA4rrWusk+2ck/w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/6707b71c-f95b-46b9-a4f8-067922291242/93d5be41bfa39461c47bae856a8ad93c/dotnet-sdk-9.0.101-osx-arm64.tar.gz"; + hash = "sha512-xmCO0oDlp2xGzo+bBrjHAUx721SpeVxFhd644FfbTVJAN+ToL5yvMkRO7eQnyctf27ciUI84nviahk8LuuR2ag=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/cab5bf72-f0c7-46c7-a8f2-074f71e4b6ca/a14ec2fc3b6fd32d47b4293994ab3c61/dotnet-sdk-9.0.100-osx-x64.tar.gz"; - hash = "sha512-We8yAol5arvcVzA20NG0qhkZyDFAt6NjF0q9aL5cwCUnQVRqIdRsIBWGMx9fkhF4e9GbU4G5AvO9fCJiIDRK6Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/330381bd-72dc-47ba-b5fb-884bd8b0bb44/8f1eef9415fc29a806fbf80a54e28c0e/dotnet-sdk-9.0.101-osx-x64.tar.gz"; + hash = "sha512-DBPjCBNI3SvPLgxrhLw3X4BlUPbDibH8phdnrWuQBDAK9yct4Zk1jzKv7ylVE7pexD9fhhTRJDe7iEvo7KTeAQ=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix index d59a6b4f51fbd..bbf1173f1b001 100644 --- a/pkgs/development/compilers/gnat-bootstrap/default.nix +++ b/pkgs/development/compilers/gnat-bootstrap/default.nix @@ -54,16 +54,13 @@ in { nativeBuildInputs = [ dejagnu - expat gmp guile libipt mpfr - ncurses5 python3 readline sourceHighlight - xz zlib ] ++ lib.optionals stdenv.buildPlatform.isLinux [ autoPatchelfHook @@ -72,6 +69,14 @@ in { elfutils ]; + buildInputs = [ + expat + ncurses5 + xz + ]; + + strictDeps = true; + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin) '' substituteInPlace lib/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders.conf \ --replace "SYSTEM_HEADER_DIR=\"/usr/include\"" "SYSTEM_HEADER_DIR=\"/include\"" diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix index 40e9482ba1fbd..cfff5645bfee0 100644 --- a/pkgs/development/compilers/mlton/20210117-binary.nix +++ b/pkgs/development/compilers/mlton/20210117-binary.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf, gmp }: +{ lib, stdenv, fetchpatch, fetchurl, patchelf, gmp }: let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in @@ -9,17 +9,31 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz.tgz"; - sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz"; + sha256 = "1lj51xg9p75qj1x5036lvjvd4a2j21kfi6vh8d0n9kdcdffvb73l"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin-19.6.gmp-static.tgz"; - sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv"; + sha256 = "0xndr2awlxdqr81j6snl9zqjx8r6f5fy9x65j1w899kf2dh9zsjv"; + }) + else if stdenv.hostPlatform.system == "aarch64-darwin" then + (fetchurl { + url = "https://projects.laas.fr/tina/software/mlton-${version}-1.arm64-darwin-21.6-gmp-static.tgz"; + sha256 = "1s61ayk3yj2xw8ilqk3fhb03x5x1wcakkmbhhvcsfb2hdw2c932x"; }) else throw "Architecture not supported"; + patches = [ + (fetchpatch { + name = "remove-duplicate-if.patch"; + url = "https://github.com/MLton/mlton/commit/22002cd0a53a1ab84491d74cb8dc6a4e50c1f7b7.patch"; + decode = "sed -e 's|Makefile\.binary|Makefile|g'"; + hash = "sha256-Gtmc+OIh+m7ordSn74fpOKVDQDtYyLHe6Le2snNCBYQ="; + }) + ]; + buildInputs = [ gmp ]; nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index d2704a4093d03..a74d1d85455b6 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -15,14 +15,14 @@ rec { mlton20210117Binary = callPackage ./20210117-binary.nix { }; mlton20210117 = callPackage ./from-git-source.nix { - mltonBootstrap = mlton20180207Binary; + mltonBootstrap = mlton20210117Binary; version = "20210117"; rev = "on-20210117-release"; sha256 = "sha256-rqL8lnzVVR+5Hc7sWXK8dCXN92dU76qSoii3/4StODM="; }; mltonHEAD = callPackage ./from-git-source.nix { - mltonBootstrap = mlton20180207Binary; + mltonBootstrap = mlton20210117Binary; version = "HEAD"; rev = "875f7912a0b135a9a7e86a04ecac9cacf0bfe5e5"; sha256 = "sha256-/MIoVqqv8qrJPehU7VRFpXtAAo8UUzE3waEvB7WnS9A="; diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix index 1e4c0aacfc3c2..afb11847adb60 100644 --- a/pkgs/development/compilers/mlton/meta.nix +++ b/pkgs/development/compilers/mlton/meta.nix @@ -11,5 +11,5 @@ homepage = "http://mlton.org/"; license = "bsd"; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; } diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix deleted file mode 100644 index c82d232e11a4d..0000000000000 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - makeFontsConf, - cacert, - cairo, - coreutils, - fontconfig, - freefont_ttf, - glib, - gmp, - gtk3, - libedit, - libffi, - libiconv, - libGL, - libGLU, - libjpeg, - libpng, - libtool, - mpfr, - openssl, - pango, - poppler, - readline, - sqlite, - disableDocs ? false, - CoreFoundation, - gsettings-desktop-schemas, - wrapGAppsHook3, -}: - -let - - fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; - - libPath = lib.makeLibraryPath [ - cairo - fontconfig - glib - gmp - gtk3 - gsettings-desktop-schemas - libedit - libGL - libGLU - libjpeg - libpng - mpfr - openssl - pango - poppler - readline - sqlite - ]; -in - -stdenv.mkDerivation rec { - pname = "racket"; - version = "7.9"; # always change at once with ./minimal.nix - - src = - (lib.makeOverridable ( - { name, sha256 }: - fetchurl { - url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - inherit sha256; - } - )) - { - name = "${pname}-${version}"; - sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; - }; - - FONTCONFIG_FILE = fontsConf; - LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") - (lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation") - ]; - - nativeBuildInputs = [ - cacert - wrapGAppsHook3 - ]; - - buildInputs = - [ - fontconfig - libffi - libtool - sqlite - gsettings-desktop-schemas - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - CoreFoundation - ]; - - preConfigure = '' - unset AR - for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do - substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname - done - mkdir src/build - cd src/build - - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) - ''; - - shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; - configureFlags = - [ - "--enable-${shared}" - "--enable-lt=${libtool}/bin/libtool" - ] - ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-xonx" ]; - - configureScript = "../configure"; - - enableParallelBuilding = false; - - meta = with lib; { - description = "Programmable programming language"; - longDescription = '' - Racket is a full-spectrum programming language. It goes beyond - Lisp and Scheme with dialects that support objects, types, - laziness, and more. Racket enables programmers to link - components written in different dialects, and it empowers - programmers to create new, project-specific dialects. Racket's - libraries support applications from web servers and databases to - GUIs and charts. - ''; - homepage = "https://racket-lang.org/"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = [ ]; - platforms = [ - "x86_64-darwin" - "x86_64-linux" - "aarch64-linux" - ]; - broken = stdenv.hostPlatform.isDarwin; # No support yet for setting FFI lookup path - }; -} diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index fe97768401118..889cfd2578b59 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; rev = "refs/tags/v${version}"; - hash = "sha256-GW3SNJKj42WXEeHM209waCQjqi0Hy0HhG3gs0Nw2rVI="; + hash = "sha256-svwYNo0pWyyCYn4NsTZcoCVSW7PHoNxcAN3Uth5zUWE="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock index 7b8ef04d66e1e..2b5fecda6507a 100644 --- a/pkgs/development/python-modules/blake3/Cargo.lock +++ b/pkgs/development/python-modules/blake3/Cargo.lock @@ -16,21 +16,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "blake3" -version = "0.4.1" +version = "1.0.0" dependencies = [ - "blake3 1.5.4", + "blake3 1.5.5", "hex", "pyo3", "rayon", @@ -38,9 +32,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -53,9 +47,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.21" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "shlex", ] @@ -105,9 +99,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -123,19 +117,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "memmap2" @@ -157,59 +141,36 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "parking_lot" -version = "0.12.3" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "f54b3d09cbdd1f8c20650b28e7b09e338881482f4aa908a5f61a00c98fba2690" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -219,9 +180,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "3015cf985888fe66cfb63ce0e321c603706cd541b7aec7ddd35c281390af45d8" dependencies = [ "once_cell", "target-lexicon", @@ -229,9 +190,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "6fca7cd8fd809b5ac4eefb89c1f98f7a7651d3739dfb341ca6980090f554c270" dependencies = [ "libc", "pyo3-build-config", @@ -239,9 +200,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "34e657fa5379a79151b6ff5328d9216a84f55dc93b17b08e7c3609a969b73aa0" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -251,9 +212,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "295548d5ffd95fd1981d2d3cf4458831b21d60af046b729b6fd143b0ba7aee2f" dependencies = [ "heck", "proc-macro2", @@ -291,38 +252,17 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - [[package]] name = "syn" -version = "2.0.77" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -337,76 +277,12 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unindent" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix index c59998b8fb96c..24f7afe4f9636 100644 --- a/pkgs/development/python-modules/blake3/default.nix +++ b/pkgs/development/python-modules/blake3/default.nix @@ -7,18 +7,19 @@ numpy, pytestCheckHook, rustPlatform, + nix-update-script, }: buildPythonPackage rec { pname = "blake3"; - version = "0.4.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "oconnor663"; repo = "blake3-py"; rev = "refs/tags/${version}"; - hash = "sha256-Ju40ea8IQMOPg9BiN47BMmr/WU8HptbqqzVI+jNGpA8="; + hash = "sha256-4fUCBragb4AQ75f1LEUvCiVOLYinjrg9cmJRz4TP4Vs="; }; postPatch = '' @@ -45,6 +46,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "blake3" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--generate-lockfile" + ]; + }; + meta = { description = "Python bindings for the BLAKE3 cryptographic hash function"; homepage = "https://github.com/oconnor663/blake3-py"; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 1c157dd5b4fab..8bd3465629c66 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.72"; + version = "1.35.76"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-mKCERaYFYGUNjV0etGTuvACfTOTcdhPU4HKjS6uXNgw="; + hash = "sha256-MhCbagyXIL98LjiWVUecbatO4zxiLizydGyeXsUnuuM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 5418807a9b689..231f69f75aee6 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.72"; + version = "1.35.76"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-bdIERxT6J4JNSbSejnjNlR9Eo8w8vcSBFNgac7e+DTI="; + hash = "sha256-yXegSUgdUKFL8tsO8VAgt2c0/2KNS44Od7jRxlMYNp4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index a14a4ecd8ba1f..f06bbda413896 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -3,7 +3,7 @@ breezy, build, buildPythonPackage, - fetchPypi, + fetchFromGitHub, git, pep517, pytestCheckHook, @@ -14,17 +14,21 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.49"; - format = "setuptools"; + version = "0.50"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ZKZARFVCzyJpGWV8e3jQLZwcpbHCXX5m4OH/MlBg9BY="; + src = fetchFromGitHub { + owner = "mgedmin"; + repo = "check-manifest"; + rev = "refs/tags/${version}"; + hash = "sha256-wZ0mx2b3QkwTOPMLQ03SFVwnbsVO5RezOSX50ZOYvw8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ build pep517 setuptools @@ -46,10 +50,10 @@ buildPythonPackage rec { meta = with lib; { description = "Check MANIFEST.in in a Python source package for completeness"; - mainProgram = "check-manifest"; homepage = "https://github.com/mgedmin/check-manifest"; changelog = "https://github.com/mgedmin/check-manifest/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; + mainProgram = "check-manifest"; }; } diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index b55279325b176..b6541db48f179 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "refs/tags/${version}"; - hash = "sha256-yDsnw7jw1NDs3dy5RUY4a+dWZzORyFG9kpR4WaJNbEE="; + hash = "sha256-voUBd4JQLk1Ik7JrhFYnY06AucVTj7WwAjDfjOTSENo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix index 35e3d880da4d6..7ec5744cdc003 100644 --- a/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/pkgs/development/python-modules/django-admin-datta/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.11"; + version = "1.0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jcX0PKyE2gHfaVJhXRvshJuZMfRJTloqIncNBLp3auc="; + hash = "sha256-QVobNrSZyDMldrhSccPnBEfXrwphVgtJ03yBHfTpits="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 8c8b720c097d8..5aad5fed69005 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.23.0"; + version = "3.25.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dlp"; inherit version; - hash = "sha256-NKH24p2jfjhbs73jHB/lWDk5P1Uin/Mp5TANR3fquzg="; + hash = "sha256-6R4CSOyB+beTUPNtj8wQc7uQmMUxhyO8lebV0PDu1Lg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 0b5d85130e7aa..28c9d3cfda69d 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pydgUTdCHsa2Je8wfiTvK0WmXUez5JY1GNPLNAzRwtc="; + hash = "sha256-Sm3WHZdCpz0F/tpGQc7tvpjcxfPc2cMAyc0rVjm6i04="; }; postPatch = '' diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 5d935550d3c8e..52c46d557cb32 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.9.0"; + version = "24.12.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-hUjtoTwxoepBugeGsp3eRmz7gSYXwleSFRM1sXpBD2M="; + hash = "sha256-ckP/WOC4FZqiz0ZbqWBdZX8dYUYXJkMHvvWzJRhGev4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 4eedc33e07c7f..8b44541cd2211 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-1f7Uj38IjI1wdWWzdAaOvoDtddukUhtH8xFKOYPzBdM="; + hash = "sha256-qCrBd1RIIjVJQyWf7srdFHNQc8TYh3zDtq/nepbk6tE="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5fca22eca00ba..e2b1c53c96070 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -718,8 +718,8 @@ rec { "sha256-xHARaL3zzxY6jy5VyQIrZLXqwvfprktif4pcSk+7xzY="; mypy-boto3-kendra = - buildMypyBoto3Package "kendra" "1.35.0" - "sha256-fnpRggcnA4mhk1vU7I0x+nn6wvx9PQ5Gi/WckSgfZ7c="; + buildMypyBoto3Package "kendra" "1.35.75" + "sha256-yLSTXvjrML3i/z2aJUj7feOaZlR+Yy5po0iBQ1pqc7M="; mypy-boto3-kendra-ranking = buildMypyBoto3Package "kendra-ranking" "1.35.0" @@ -1174,8 +1174,8 @@ rec { "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.35.68" - "sha256-SjKW9Gc6TOStmB6AexAOI3VuBqBiN0me3/+nbp92cv0="; + buildMypyBoto3Package "sagemaker" "1.35.75" + "sha256-FFTK2PvJJaM8eceQZ3ndYWungIAb4CoWp8ue32+nQPs="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0" diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index a3cc2d19f8998..991f52e3d6887 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-Hwi/ee8XuClN2FOY0qGwOsIR6F2Z5IVihBFiu5lT5t8="; + hash = "sha256-rVal/w7ZPKjdCXTeCy6NHDlrCaKDdmJkeusUdW0BRXI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index 91bffd81e2ce3..c4cfc5fcf15c0 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "proton-core"; - version = "0.3.3"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-2Drlai/PYzi1z1CtDYfNhol2wamb/HNrvUhj0XsiyHg="; + hash = "sha256-EZsPw2kPgY42MQxrXt7yAtCNSmSNN5AYxx7SllwsbvA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index 56bd41fea4a65..40a354ec31f40 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-feIgRC0U7d96gFcmHqRF3/8k/bsxlPJs1/K+ki7uXys="; + hash = "sha256-wT+0S3dGanLwqRrpCooAwy/RDyZDn1aEdJ7eWvwVfiY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index a15bf540f4cc3..5b5eee10365f8 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.36.6"; + version = "0.38.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-LzABTSIa7guoAYv9scSm2edxeiSS7yMfJdZnAqXHtF0="; + hash = "sha256-ldIslr2qiwClQW6rWNbEAAkUbdJfCzvUIkCuoajP2M4="; }; build-system = [ @@ -80,6 +80,7 @@ buildPythonPackage rec { description = "Acts as a facade to the other Proton VPN components, exposing a uniform API to the available Proton VPN services"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-api-core"; license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index fc6e1c28151b0..70a773c0a2655 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.9.7"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-d5OJ5p+f1YLcJNlQ8AHSBkuDWVJnFkdzW5/iWcXkMYQ="; + hash = "sha256-zS/H7efEJlvDlcoxil6pd6lFLdLRAV7Bmr/ngtZ8Nuc"; }; nativeBuildInputs = [ @@ -76,6 +76,7 @@ buildPythonPackage rec { description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 77d33a7d9b791..94b2bfa71b9b5 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.23.0"; + version = "4.24.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-R/RbkiKkhcZd17hgDJnEpr3OCVMvn744YM+lmzSXKWs="; + hash = "sha256-/QzLF6q3ygMLElLd8qMZ97Bv1KMOl8Dctv5QGjiRCKo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 329061f5c0823..3ed87e9cc77ae 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.10.7" +version = "0.10.8" dependencies = [ "pyo3", "yrs", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 701616a3922ad..553393f3a1d6d 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.10.7"; + version = "0.10.8"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; - rev = "refs/tags/${version}"; - hash = "sha256-Yb8ZFfJ/chF6+DUq7kLAxeRH9tuOCD2KiXxFG7ljQwg="; + tag = version; + hash = "sha256-5ukP2J9Mm7yRVXZ6x5VbArF5GDxQvRvOpKEwiySzPV8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynordpool/default.nix b/pkgs/development/python-modules/pynordpool/default.nix new file mode 100644 index 0000000000000..7a67a715d96a4 --- /dev/null +++ b/pkgs/development/python-modules/pynordpool/default.nix @@ -0,0 +1,40 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pynordpool"; + version = "0.2.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "gjohansson-ST"; + repo = "pynordpool"; + rev = "refs/tags/v${version}"; + hash = "sha256-JoH9ROT/npBd8BTEuynsF9gbE0jJgYLFPiwFv0s9sH4="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pynordpool" ]; + + meta = { + description = "Python api for Nordpool"; + homepage = "https://github.com/gjohansson-ST/pynordpool"; + changelog = "https://github.com/gjohansson-ST/pynordpool/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index 867d0b58c04a8..f00862f8804fb 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -6,27 +6,25 @@ setuptools, setuptools-scm, sip, - wheel, }: buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.16.4"; - format = "pyproject"; + version = "1.17.0"; + pyproject = true; src = fetchPypi { pname = "pyqt_builder"; inherit version; - hash = "sha256-RRXkGuN5vi5U+IqJ7PR81uTKxD6GLEq/3hg4nCZmr98="; + hash = "sha256-/ODpI0bSpCllJbetnwK3TqQl8mIQOQrg0+TKCMMc9Mw="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ packaging sip ]; diff --git a/pkgs/development/python-modules/qtile-bonsai/default.nix b/pkgs/development/python-modules/qtile-bonsai/default.nix new file mode 100644 index 0000000000000..0edd0eadd7765 --- /dev/null +++ b/pkgs/development/python-modules/qtile-bonsai/default.nix @@ -0,0 +1,70 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cairocffi, + cffi, + strenum, + psutil, + xcffib, + pdm-backend, + pyside6, + pyvirtualdisplay, + pytestCheckHook, + qtile, +}: + +buildPythonPackage rec { + pname = "qtile-bonsai"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aravinda0"; + repo = "qtile-bonsai"; + rev = "refs/tags/v${version}"; + hash = "sha256-IWy/YEVdZc+UgIKl75ZpOkOIvpS5hCX0ihQenUOuJHo="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + strenum + psutil + ]; + + nativeCheckInputs = [ + pyside6 + pyvirtualdisplay + (cairocffi.override { withXcffib = true; }) + cffi + xcffib + qtile + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # Needs a running DBUS + "tests/integration/test_layout.py" + "tests/integration/test_widget.py" + ]; + + pythonImportCheck = [ "qtile_bonsai" ]; + + meta = { + changelog = "https://github.com/aravinda0/qtile-bonsai/releases/tag/${version}"; + homepage = "https://github.com/aravinda0/qtile-bonsai"; + description = "Flexible layout for the qtile tiling window manager"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + gurjaka + sigmanificient + ]; + }; +} diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 9d45400b7dc7d..01061aefd2058 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "roadlib"; - version = "0.27.0"; + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k2ePgxWLbDGjMNfA/cQabSx98FRVrsdV9WANXuIGD+E="; + hash = "sha256-bCdPL9ic1zf6Kzv10bUQI5baqWofGDWk4ipuarsqbeY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index db35c0a269deb..bab6de96b59b4 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "2.7.0"; + version = "2.7.2"; format = "setuptools"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "xchwarze"; repo = "samsung-tv-ws-api"; rev = "refs/tags/v${version}"; - hash = "sha256-HwpshNwWZQ5dIS7IaJJ5VaE1bERcX79B/Mu4ISkyDJo="; + hash = "sha256-CU59Kg8kSEE71x6wifCKCaVFdaMftodtkrAOpD+qvWY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 8fd6240e4a512..c0a828ab39c81 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.8.6"; + version = "6.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo="; + hash = "sha256-CT/Q4V2Zri+Kg91/fbqj/yUMWCp3644IRc2aytsfCTQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/skyboxremote/default.nix b/pkgs/development/python-modules/skyboxremote/default.nix new file mode 100644 index 0000000000000..9fcb6ac61f9bd --- /dev/null +++ b/pkgs/development/python-modules/skyboxremote/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + flit-core, + pyspark, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "skyboxremote"; + version = "0.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-GgRUMGnU91UQm9LNctYhHfRmfFujfc8fXc9KSwLrNBM="; + }; + + build-system = [ flit-core ]; + + optional-dependencies = { + spark = [ + pyspark + ]; + }; + + nativeCheckInputs = [ + pytest-cov-stub + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "skyboxremote" ]; + + meta = { + description = "Module for controlling a sky box"; + homepage = "https://pypi.org/project/skyboxremote/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index b68f415276c9b..82411d20626e7 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.33.4"; + version = "3.33.5"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-WIUhkIFWbIcxjTjzZ2C3VNFhGftBmyYO3iaHpz6d+Sc="; + hash = "sha256-kpilxg/S9/U6lJW8FsMvcdGh+qqDH0Kr66sc+HsY2DM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 987f04dbdc9a7..83282a797da15 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.11"; + version = "1.8.12"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-um1s5vqiaTRxTDIlyd4wbi/u239K5EtLFspc2QdPWOQ="; + hash = "sha256-dlu4EuRSIksXaQ0iZ1MKrXraNytIHZ/1DM5f+8ijNMo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index c8b6bdbd3dc4f..02e77649f7de4 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.3.7"; + version = "9.3.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-ncLefK29GVhjiXi0zSXjUbL23oxoUH7Pu4cFttK4WrY="; + hash = "sha256-r4uhtvvsbiwcTdiT8HQtKL2587cowwGLaL2FowOEXiw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index b19508b01754c..0dde8e7401e5d 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.8"; + version = "0.5.9"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "upb-lib"; rev = "refs/tags/${version}"; - hash = "sha256-YCJl3cIaNmRQ5+GbIDcAvDhI0R4r2AWG2Ba1zmnfbMA="; + hash = "sha256-GnNzKU4mqBu2pUOju+4+HMLsTupd8s+nAAieixkBCDk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index d65ac33b96f28..3e9f1cc4c60fa 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.328"; + version = "3.2.330"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-1eQvzrYuScOLDb5ZoXN4EyUzYiOZ3LysDSQRdXBL2Iw="; + hash = "sha256-rMovncMrVpvj60WWdU5mBTpR2QVF2DLso1TUGjl3m38="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -92,6 +92,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ aioresponses + distutils mock pytest-asyncio pytest-mock diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index eee55e34faebc..4e280e5f3bdd3 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -15,47 +15,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.28"; + version = "1.92.29"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-zJ6SOBGLzu3C47P9BrQCQjPVSpZq3PPLPfhXjL7Rnns="; - "8.2" = "sha256-jiHmAs2O047sjOzOTk/k2VQXBz6OT+kBlTElW3TSZjU="; - "8.3" = "sha256-yop48pyCT/904Sh9hQTCVagc38giLDDZJebtdTRQV3w="; + "8.1" = "sha256-82QSfFeXkE6+jQZpQ53RtSrQkk4fKmFUdMxpjPyoH+I="; + "8.2" = "sha256-DdmXnMeE4FXdi8fDCeApwHnmoLZK5x7F5aDzi2PAoPk="; + "8.3" = "sha256-cx+BesBkumuKThWGQWjgz1IvRo4iem/PlFH8V1kGRt0="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-wK/P+4K0fmyzIsrp360TaNSxiols5KVIvMY6ABdXN+s="; - "8.2" = "sha256-jJId/K7+27UbCMeWwT1Z0sMOe6Uj2Gw6FgBTv794rwQ="; - "8.3" = "sha256-Am8UKQCxAn2up4laZ/u55vVKIJSdunuc85amSWQg8wI="; + "8.1" = "sha256-jJm0DL4nXPW0jW6w+bhRolWGvQEzcKKp3t7Aj6Yyh4E="; + "8.2" = "sha256-PcEzgoj+mnpK9CpHFW74lOrjoqbd9FBRO+ewplEkAlc="; + "8.3" = "sha256-Iv7y86hQd53j3I5MSmMQkq67Yv4sGPcS0Ljo7TigNUk="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-JtEKfZnPqWCBUUHrhlnc/My+zllVySiJlsgdSYP3s5A="; - "8.2" = "sha256-FMd17GarNGlCO5a9X4I1SVo0qKIjsBaJMtLCcoi/uvk="; - "8.3" = "sha256-ZFckNiN0cAQEoc7m53MH/fiTNrWTLzIDzjpvsSbd0Xo="; + "8.1" = "sha256-mgaaU/XpdLx1cYR/Dg09BCeMvV/Hfum0/9P2prHr/08="; + "8.2" = "sha256-QxIp4DCe5yqs32T0G8L1im5UHpJYcmVbHzJAAt/fa7o="; + "8.3" = "sha256-esR9wZ2I5gTGmBQgPqdDPkPGJED/stoZQUpUiWp0cNY="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-fI1ACatqdKQJqh5fBWC1ikLUEsXfqegJlJWUDQYiI2w="; - "8.2" = "sha256-BhSL2ee1viVKoS3R1F/kuHgzyojDk3Pxrvor/xQ3b+4="; - "8.3" = "sha256-fZk0n/nUSOyQNXhUObGwZj0n7MBM7RS86ShKkEfRDws="; + "8.1" = "sha256-LkbqZytdpaLU7eVwnI3dBY+a6+diMtKot/8PH1E9UpY="; + "8.2" = "sha256-IwFFVZ+ED/SVvl+Qj7F0BQ2yoLmbBKYHCzMPXlcffPY="; + "8.3" = "sha256-tcgfKgFnx8Cc3OvFWVObqV9nwH+F1ts1+TNfMTf/AI0="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-YglriIPnixhsg1wlLHyu17CUETVEPOenu41Gq7maewU="; - "8.2" = "sha256-zvucvA2w1gQMApud2ozIK5BY4noSUooruRXjevELeBw="; - "8.3" = "sha256-hMRZHO4sVZCVHBifyVAD2b59Be8teqx+/QKH+ytQKuI="; + "8.1" = "sha256-X+uLHJDA7wzXq0r+ZJu+XCxK8Lna2TKA+BhncFT7Jzw="; + "8.2" = "sha256-x8ejkI7qGUeii2Q6rWIOpLhgOTRQnh484asxo9un6aY="; + "8.3" = "sha256-FSh8fJv6+inpw7xdRIsU7cNLr5OyzLt0kAjeKa1aJX0="; }; }; }; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 10c647fb17aa6..4c84267c1d4c9 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,33 +1,33 @@ { - lib, - stdenv, + SDL2, fetchFromGitHub, - meson, - ninja, - glslang, - pkg-config, flac, - libopus, - opusfile, - makeWrapper, - SDL2, + glslang, gzip, + lib, + libmpg123, + libopus, libvorbis, - libmad, + makeWrapper, + meson, + moltenvk, + ninja, + opusfile, + pkg-config, + stdenv, vulkan-headers, vulkan-loader, - moltenvk, }: stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.31.2"; + version = "1.31.3"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-7JE1KBavZt8u55KpWMmQOJJuxlW99ICnaQI4MbTgGdw="; + sha256 = "sha256-VqTfcwt6/VTotD2Y7x7WiVwISRGOLfmMWh6EO5DSMX4="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { SDL2 flac gzip - libmad + libmpg123 libopus libvorbis opusfile diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix index c79635fae926f..173c3220a6fb8 100644 --- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hultenvp"; domain = "solis"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "hultenvp"; repo = "solis-sensor"; rev = "v${version}"; - hash = "sha256-oJXbDuHT5temcei3ea1cUsqVB70am6WZjHbIehnZs6k="; + hash = "sha256-8+KzZCfBYvXO73SrMXLGCUjecxKn49hz0wCXWCUBULU="; }; dependencies = [ aiofiles ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 0d38e49d62765..23f42fa49df4e 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -206,8 +206,8 @@ stdenv.mkDerivation { postInstall = let - noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/bin/nginx\n") modules; - in noSourceRefs + postInstall; + noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $(readlink -fn $out/bin/nginx)\n") modules; + in postInstall + noSourceRefs; passthru = { inherit modules; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 65191c6d713aa..0073fae047bed 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -5,6 +5,7 @@ , perl , postgresql , nixosTests +, withPostgres ? true , ... }@args: @@ -37,7 +38,7 @@ callPackage ../nginx/generic.nix args rec { patchShebangs configure bundle/ ''; - configureFlags = [ "--with-http_postgres_module" ]; + configureFlags = lib.optional withPostgres [ "--with-http_postgres_module" ]; postInstall = '' ln -s $out/luajit/bin/luajit-2.1.ROLLING $out/bin/luajit-openresty diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index cbd46b2cd1431..55c62327a0df4 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-oZYBojtP4h/cl2YkKJ54JT8PTZpzvbZVbaFAEL1sAE8="; + hash = "sha256-wMUVxhYFZzMUGijyS6sPWxSofqO6qvTt9i2hI+gwlwU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 72a41a53cdfe8..210355b700a67 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "zfs_replicate"; - version = "3.2.13"; + version = "4.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Xmg33bqs3gQJWqkCNiWYUem3o6XsxpfbHIVvLs/2D94="; + hash = "sha256-9WD2IW7GRxMF7hOa8HTI/+cuOjVaYMT4OnrYU/xFgME="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/gifski/Cargo.lock b/pkgs/tools/graphics/gifski/Cargo.lock deleted file mode 100644 index 5bc148787ee4b..0000000000000 --- a/pkgs/tools/graphics/gifski/Cargo.lock +++ /dev/null @@ -1,828 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bytemuck" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" - -[[package]] -name = "cc" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" - -[[package]] -name = "fallible_collections" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "ffmpeg-next" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e72c72e8dcf638fb0fb03f033a954691662b5dabeaa3f85a6607d101569fccd" -dependencies = [ - "bitflags", - "ffmpeg-sys-next", - "libc", -] - -[[package]] -name = "ffmpeg-sys-next" -version = "6.1.0" -source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=fd5784d645df2ebe022a204ac36582074da1edf7#fd5784d645df2ebe022a204ac36582074da1edf7" -dependencies = [ - "bindgen", - "cc", - "libc", - "num_cpus", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "weezl", -] - -[[package]] -name = "gif-dispose" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781005a5985b4c723fd3e6586df79d823151846ebcbcf2fcc7e3d3fba18c2d51" -dependencies = [ - "gif", - "imgref", - "rgb", -] - -[[package]] -name = "gifski" -version = "1.32.0" -dependencies = [ - "clap", - "crossbeam-channel", - "crossbeam-utils", - "dunce", - "ffmpeg-next", - "gif", - "gif-dispose", - "imagequant", - "imgref", - "lodepng", - "loop9", - "natord", - "num-traits", - "ordered-channel", - "pbr", - "quick-error", - "resize", - "rgb", - "wild", - "y4m", - "yuv", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "imagequant" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a7f142d232ccbdc00cbef49d17f45639aeb07d9bfe28e17c21dea3efac64e5" -dependencies = [ - "arrayvec", - "once_cell", - "rayon", - "rgb", - "thread_local", -] - -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets", -] - -[[package]] -name = "lodepng" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" -dependencies = [ - "crc32fast", - "fallible_collections", - "flate2", - "libc", - "rgb", -] - -[[package]] -name = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "natord" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "ordered-channel" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" -dependencies = [ - "crossbeam-channel", -] - -[[package]] -name = "pbr" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514" -dependencies = [ - "crossbeam-channel", - "libc", - "winapi", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "resize" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e29f584c07a8396c5e2eee0bd8d7aec5c8d9e0a3c2333806fd2ec1d2a5b080" -dependencies = [ - "rayon", - "rgb", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wild" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" -dependencies = [ - "glob", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "y4m" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" - -[[package]] -name = "yuv" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157c9233496247738a5417ce7e8ecf953c3d4e1931374d16b0c6a95636572be4" -dependencies = [ - "num-traits", - "rgb", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 8b5dff5f5e33c..7519d1f0109e0 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.43"; + version = "4.00"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-GwE/E8GgVIeZtCefLNvacDUxI2C+Uf8zgpOQ1NpiSmM="; + hash = "sha256-fliiNeZPEP4uNMRDgG093fvU01ZTxwv08YLGwBooOLA="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 98c397cd4e2a2..7494bc78ce203 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ makeWrapper ]; + strictDeps = true; + nativeBuildInputs = [ makeWrapper perl ]; buildInputs = [ perl procps ]; postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index d182fd22b5e12..a29c58734adec 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bore-cli"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ekzhang"; repo = "bore"; rev = "v${version}"; - hash = "sha256-i7JVE1Y982QUNocd56gHbhRr5rBWqTv1YT5uDwpAlA8="; + hash = "sha256-Wkhcv8q/dGRJqG7ArsnsPsRBnXdScGedwxunbOzAjyY="; }; - cargoHash = "sha256-PZDie/lBextHu8EV/butg2pJZFfizeOEdD21I3XFoHk="; + cargoHash = "sha256-vwvDtzShlQQO/oAnjbqDIP3fUdcH1kEmFR7fyV+uYbY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 6c2ea87aeb8f2..6cab660451e03 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.33.0"; + version = "11.33.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-RAMA+tBgOL9PeRGD2O3aeNGca1FsNiDV0lx0SlJl77c="; + hash = "sha256-zMv2Um8pw5unoy6h2aApDLGWy2SSJjkD2bbqYi1AxKU="; }; proxyVendor = true; - vendorHash = "sha256-T+eGhpjLwAmCKmgONLQ0HDF6qTyFXG+dbNN9doUyC3k="; + vendorHash = "sha256-n9PdtuKHm6gqVudf49PakK6fChHZfiGYr9eTPkSBfV8="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index cd49ec98ea5c6..1454b77ec1fe4 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.37" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.39" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d0ec8f891fcdf..d961f0bd50033 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: c58328ce3f0a86d24580e76961476ad37b8d6de9 - ref: refs/tags/6.4.37 + revision: b815ef9870c45e2f9d2e62475e1780ddb9bfb1d0 + ref: refs/tags/6.4.39 specs: - metasploit-framework (6.4.37) + metasploit-framework (6.4.39) aarch64 abbrev actionpack (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index f8aaaadb9af8f..0bd37f3be97cb 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metasploit-framework"; - version = "6.4.37"; + version = "6.4.39"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-/c0F/5bbuQYkNB2tzjK2NGoTr3OD4fAUUEjiJVybKFM="; + hash = "sha256-Zg6ui9B+l7tVVrv+gMpFL/xWuvdOc0Gf29s1ZvP2EYM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index f3406eb03ba81..77dacba2fca82 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -1,6 +1,5 @@ { aarch64 = { - dependencies = ["racc"]; groups = ["default"]; platforms = []; source = { @@ -21,7 +20,6 @@ version = "0.1.2"; }; actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { @@ -32,7 +30,6 @@ version = "7.0.8.6"; }; actionview = { - dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { @@ -43,7 +40,6 @@ version = "7.0.8.6"; }; activemodel = { - dependencies = ["activesupport"]; groups = ["default"]; platforms = []; source = { @@ -54,7 +50,6 @@ version = "7.0.8.6"; }; activerecord = { - dependencies = ["activemodel" "activesupport"]; groups = ["default"]; platforms = []; source = { @@ -65,7 +60,6 @@ version = "7.0.8.6"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { @@ -76,7 +70,6 @@ version = "7.0.8.6"; }; addressable = { - dependencies = ["public_suffix"]; groups = ["default"]; platforms = []; source = { @@ -97,7 +90,6 @@ version = "0.2.2"; }; arel-helpers = { - dependencies = ["activerecord"]; groups = ["default"]; platforms = []; source = { @@ -138,7 +130,6 @@ version = "1.999.0"; }; aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; groups = ["default"]; platforms = []; source = { @@ -149,7 +140,6 @@ version = "3.211.0"; }; aws-sdk-ec2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -160,7 +150,6 @@ version = "1.486.0"; }; aws-sdk-ec2instanceconnect = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -171,7 +160,6 @@ version = "1.52.0"; }; aws-sdk-iam = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -182,7 +170,6 @@ version = "1.112.0"; }; aws-sdk-kms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -193,7 +180,6 @@ version = "1.95.0"; }; aws-sdk-s3 = { - dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -204,7 +190,6 @@ version = "1.169.0"; }; aws-sdk-ssm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -215,7 +200,6 @@ version = "1.183.0"; }; aws-sigv4 = { - dependencies = ["aws-eventstream"]; groups = ["default"]; platforms = []; source = { @@ -276,7 +260,6 @@ version = "2.4.15"; }; bootsnap = { - dependencies = ["msgpack"]; groups = ["default"]; platforms = []; source = { @@ -377,7 +360,6 @@ version = "3.3.4"; }; dnsruby = { - dependencies = ["simpleidn"]; groups = ["default"]; platforms = []; source = { @@ -418,7 +400,6 @@ version = "1.3.0"; }; elftools = { - dependencies = ["bindata"]; groups = ["default"]; platforms = []; source = { @@ -429,7 +410,6 @@ version = "1.3.1"; }; em-http-request = { - dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; groups = ["default"]; platforms = []; source = { @@ -440,7 +420,6 @@ version = "1.1.7"; }; em-socksify = { - dependencies = ["base64" "eventmachine"]; groups = ["default"]; platforms = []; source = { @@ -471,7 +450,6 @@ version = "1.2.7"; }; faker = { - dependencies = ["i18n"]; groups = ["default"]; platforms = []; source = { @@ -482,7 +460,6 @@ version = "3.5.1"; }; faraday = { - dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { @@ -503,7 +480,6 @@ version = "3.0.2"; }; faraday-retry = { - dependencies = ["faraday"]; groups = ["default"]; platforms = []; source = { @@ -514,7 +490,6 @@ version = "2.2.1"; }; faye-websocket = { - dependencies = ["eventmachine" "websocket-driver"]; groups = ["default"]; platforms = []; source = { @@ -555,7 +530,6 @@ version = "0.2.1"; }; gssapi = { - dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { @@ -566,7 +540,6 @@ version = "1.3.1"; }; gyoku = { - dependencies = ["builder" "rexml"]; groups = ["default"]; platforms = []; source = { @@ -597,7 +570,6 @@ version = "0.4.2"; }; hrr_rb_ssh-ed25519 = { - dependencies = ["ed25519" "hrr_rb_ssh"]; groups = ["default"]; platforms = []; source = { @@ -608,7 +580,6 @@ version = "0.4.2"; }; http-cookie = { - dependencies = ["domain_name"]; groups = ["default"]; platforms = []; source = { @@ -639,7 +610,6 @@ version = "2.8.3"; }; i18n = { - dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { @@ -660,7 +630,6 @@ version = "0.7.2"; }; irb = { - dependencies = ["reline"]; groups = ["default"]; platforms = []; source = { @@ -681,7 +650,6 @@ version = "1.6.2"; }; jsobfu = { - dependencies = ["rkelly-remix"]; groups = ["default"]; platforms = []; source = { @@ -712,7 +680,6 @@ version = "1.1.4"; }; logging = { - dependencies = ["little-plugger" "multi_json"]; groups = ["default"]; platforms = []; source = { @@ -723,7 +690,6 @@ version = "2.4.0"; }; loofah = { - dependencies = ["crass" "nokogiri"]; groups = ["default"]; platforms = []; source = { @@ -744,7 +710,6 @@ version = "1.0.5"; }; metasploit-concern = { - dependencies = ["activemodel" "activesupport" "railties" "zeitwerk"]; groups = ["default"]; platforms = []; source = { @@ -755,7 +720,6 @@ version = "5.0.3"; }; metasploit-credential = { - dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "net-ssh" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"]; groups = ["default"]; platforms = []; source = { @@ -766,20 +730,18 @@ version = "6.0.11"; }; metasploit-framework = { - dependencies = ["aarch64" "abbrev" "actionpack" "activerecord" "activesupport" "aws-sdk-ec2" "aws-sdk-ec2instanceconnect" "aws-sdk-iam" "aws-sdk-s3" "aws-sdk-ssm" "base64" "bcrypt" "bcrypt_pbkdf" "bigdecimal" "bootsnap" "bson" "chunky_png" "csv" "dnsruby" "drb" "ed25519" "elftools" "em-http-request" "eventmachine" "faker" "faraday" "faraday-retry" "faye-websocket" "ffi" "filesize" "getoptlong" "hrr_rb_ssh-ed25519" "http-cookie" "irb" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "mqtt" "msgpack" "mutex_m" "nessus_rest" "net-imap" "net-ldap" "net-sftp" "net-smtp" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "puma" "railties" "rasn1" "rb-readline" "recog" "redcarpet" "reline" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "ruby-macho" "ruby-mysql" "ruby_smb" "rubyntlm" "rubyzip" "sinatra" "sqlite3" "sshkey" "swagger-blocks" "thin" "tzinfo" "tzinfo-data" "unix-crypt" "warden" "win32api" "windows_error" "winrm" "xdr" "xmlrpc" "zeitwerk"]; groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "c58328ce3f0a86d24580e76961476ad37b8d6de9"; - sha256 = "0lr8kdf2bqj8a0ag1qc3ffpi6silnqrcxb8x6hj0dffvjvzhbkgx"; + rev = "b815ef9870c45e2f9d2e62475e1780ddb9bfb1d0"; + sha256 = "10qiyvrncdfvvfgl2wsfyyx5dz1g8p581zmvaravp5vys25sw3k6"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.37"; + version = "6.4.39"; }; metasploit-model = { - dependencies = ["activemodel" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { @@ -800,7 +762,6 @@ version = "2.0.187"; }; metasploit_data_models = { - dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "railties" "recog" "webrick"]; groups = ["default"]; platforms = []; source = { @@ -881,7 +842,6 @@ version = "1.15.0"; }; mustermann = { - dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { @@ -912,7 +872,6 @@ version = "0.1.6"; }; net-imap = { - dependencies = ["date" "net-protocol"]; groups = ["default"]; platforms = []; source = { @@ -933,7 +892,6 @@ version = "0.19.0"; }; net-protocol = { - dependencies = ["timeout"]; groups = ["default"]; platforms = []; source = { @@ -944,7 +902,6 @@ version = "0.2.2"; }; net-sftp = { - dependencies = ["net-ssh"]; groups = ["default"]; platforms = []; source = { @@ -955,7 +912,6 @@ version = "4.0.0"; }; net-smtp = { - dependencies = ["net-protocol"]; groups = ["default"]; platforms = []; source = { @@ -1017,7 +973,6 @@ version = "1.16.7"; }; nori = { - dependencies = ["bigdecimal"]; groups = ["default"]; platforms = []; source = { @@ -1028,7 +983,6 @@ version = "2.7.1"; }; octokit = { - dependencies = ["faraday" "sawyer"]; groups = ["default"]; platforms = []; source = { @@ -1069,7 +1023,6 @@ version = "0.0.4"; }; packetfu = { - dependencies = ["pcaprub"]; groups = ["default"]; platforms = []; source = { @@ -1100,7 +1053,6 @@ version = "0.13.3"; }; pdf-reader = { - dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; groups = ["default"]; platforms = []; source = { @@ -1131,7 +1083,6 @@ version = "6.0.1"; }; puma = { - dependencies = ["nio4r"]; groups = ["default"]; platforms = []; source = { @@ -1162,7 +1113,6 @@ version = "2.2.10"; }; rack-protection = { - dependencies = ["base64" "rack"]; groups = ["default"]; platforms = []; source = { @@ -1173,7 +1123,6 @@ version = "3.2.0"; }; rack-test = { - dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { @@ -1184,7 +1133,6 @@ version = "2.1.0"; }; rails-dom-testing = { - dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["default"]; platforms = []; source = { @@ -1195,7 +1143,6 @@ version = "2.2.0"; }; rails-html-sanitizer = { - dependencies = ["loofah" "nokogiri"]; groups = ["default"]; platforms = []; source = { @@ -1206,7 +1153,6 @@ version = "1.6.0"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default"]; platforms = []; source = { @@ -1227,7 +1173,6 @@ version = "13.2.1"; }; rasn1 = { - dependencies = ["strptime"]; groups = ["default"]; platforms = []; source = { @@ -1248,7 +1193,6 @@ version = "0.5.5"; }; recog = { - dependencies = ["nokogiri"]; groups = ["default"]; platforms = []; source = { @@ -1269,7 +1213,6 @@ version = "3.6.0"; }; reline = { - dependencies = ["io-console"]; groups = ["default"]; platforms = []; source = { @@ -1280,7 +1223,6 @@ version = "0.5.10"; }; rex-arch = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1291,7 +1233,6 @@ version = "0.1.16"; }; rex-bin_tools = { - dependencies = ["metasm" "rex-arch" "rex-core" "rex-struct2" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1312,7 +1253,6 @@ version = "0.1.32"; }; rex-encoder = { - dependencies = ["metasm" "rex-arch" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1323,7 +1263,6 @@ version = "0.1.7"; }; rex-exploitation = { - dependencies = ["jsobfu" "metasm" "rex-arch" "rex-encoder" "rex-text" "rexml"]; groups = ["default"]; platforms = []; source = { @@ -1344,7 +1283,6 @@ version = "0.1.7"; }; rex-mime = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1355,7 +1293,6 @@ version = "0.1.8"; }; rex-nop = { - dependencies = ["rex-arch"]; groups = ["default"]; platforms = []; source = { @@ -1366,7 +1303,6 @@ version = "0.1.3"; }; rex-ole = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1377,7 +1313,6 @@ version = "0.1.8"; }; rex-powershell = { - dependencies = ["rex-random_identifier" "rex-text" "ruby-rc4"]; groups = ["default"]; platforms = []; source = { @@ -1388,7 +1323,6 @@ version = "0.1.100"; }; rex-random_identifier = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1409,7 +1343,6 @@ version = "0.1.5"; }; rex-rop_builder = { - dependencies = ["metasm" "rex-core" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1420,7 +1353,6 @@ version = "0.1.5"; }; rex-socket = { - dependencies = ["rex-core"]; groups = ["default"]; platforms = []; source = { @@ -1431,7 +1363,6 @@ version = "0.1.57"; }; rex-sslscan = { - dependencies = ["rex-core" "rex-socket" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1462,7 +1393,6 @@ version = "0.2.59"; }; rex-zip = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1533,7 +1463,6 @@ version = "0.0.5"; }; ruby_smb = { - dependencies = ["bindata" "openssl-ccm" "openssl-cmac" "rubyntlm" "windows_error"]; groups = ["default"]; platforms = []; source = { @@ -1544,7 +1473,6 @@ version = "3.3.11"; }; rubyntlm = { - dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { @@ -1565,7 +1493,6 @@ version = "2.3.2"; }; sawyer = { - dependencies = ["addressable" "faraday"]; groups = ["default"]; platforms = []; source = { @@ -1586,7 +1513,6 @@ version = "0.2.3"; }; sinatra = { - dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; groups = ["default"]; platforms = []; source = { @@ -1597,7 +1523,6 @@ version = "3.2.0"; }; sqlite3 = { - dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { @@ -1638,7 +1563,6 @@ version = "3.0.0"; }; thin = { - dependencies = ["daemons" "eventmachine" "rack"]; groups = ["default"]; platforms = []; source = { @@ -1679,7 +1603,6 @@ version = "0.4.1"; }; ttfunk = { - dependencies = ["bigdecimal"]; groups = ["default"]; platforms = []; source = { @@ -1690,7 +1613,6 @@ version = "1.8.0"; }; tzinfo = { - dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { @@ -1701,7 +1623,6 @@ version = "2.0.6"; }; tzinfo-data = { - dependencies = ["tzinfo"]; groups = ["default"]; platforms = []; source = { @@ -1722,7 +1643,6 @@ version = "1.3.1"; }; warden = { - dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { @@ -1743,7 +1663,6 @@ version = "1.8.2"; }; websocket-driver = { - dependencies = ["websocket-extensions"]; groups = ["default"]; platforms = []; source = { @@ -1784,7 +1703,6 @@ version = "0.1.5"; }; winrm = { - dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"]; groups = ["default"]; platforms = []; source = { @@ -1795,7 +1713,6 @@ version = "2.3.9"; }; xdr = { - dependencies = ["activemodel" "activesupport"]; groups = ["default"]; platforms = []; source = { @@ -1806,7 +1723,6 @@ version = "3.0.3"; }; xmlrpc = { - dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 47de7231119a7..33ba8b9bfdfe7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -395,6 +395,7 @@ mapAliases { flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 + fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06 fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 @@ -1095,6 +1096,7 @@ mapAliases { ### R ### rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15 + racket_7_9 = throw "Racket 7.9 has been removed because it is insecure. Consider using 'racket' instead."; # Added 2024-12-06 radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29 radicale3 = radicale; # Added 2024-11-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2624eea1a1cf8..a74cf4f4ae04c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -282,9 +282,7 @@ with pkgs; chef-cli = callPackage ../tools/misc/chef-cli { }; - checkov = callPackage ../development/tools/analysis/checkov { - python3 = python311; - }; + checkov = callPackage ../development/tools/analysis/checkov { }; clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { stdenv = clangStdenv; @@ -3502,10 +3500,6 @@ with pkgs; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; - gifski = callPackage ../tools/graphics/gifski { - ffmpeg = ffmpeg_6; - }; - gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; @@ -5102,8 +5096,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.libs) simd; }; - rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; - rosenpass = callPackage ../tools/networking/rosenpass { }; rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { }; @@ -7520,9 +7512,6 @@ with pkgs; racket = callPackage ../development/interpreters/racket { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - racket_7_9 = callPackage ../development/interpreters/racket/racket_7_9.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; rakudo = callPackage ../development/interpreters/rakudo { }; @@ -15808,10 +15797,7 @@ with pkgs; wlroots = wlroots_0_18; }; - treesheets = callPackage ../applications/office/treesheets { - wxGTK = wxGTK32; - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + treesheets = callPackage ../applications/office/treesheets { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; @@ -17725,10 +17711,9 @@ with pkgs; appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; - inherit (libsForQt5.callPackage ../applications/science/electronics/simulide { }) - simulide_0_4_15 simulide_1_0_0 simulide_1_1_0; - - simulide = simulide_1_0_0; + simulide_0_4_15 = simulide.override { versionNum = "0.4.15"; }; + simulide_1_0_0 = simulide.override { versionNum = "1.0.0"; }; + simulide_1_1_0 = simulide.override { versionNum = "1.1.0"; }; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c711a81ff3228..bac5e00390d83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10528,6 +10528,8 @@ self: super: with self; { pynotifier = callPackage ../development/python-modules/pynotifier { }; + pynordpool = callPackage ../development/python-modules/pynordpool { }; + pynslookup = callPackage ../development/python-modules/pynslookup { }; pynuki = callPackage ../development/python-modules/pynuki { }; @@ -13594,6 +13596,8 @@ self: super: with self; { }; qtile-extras = callPackage ../development/python-modules/qtile-extras { }; + qtile-bonsai = callPackage ../development/python-modules/qtile-bonsai { }; + qtpy = callPackage ../development/python-modules/qtpy { }; quadprog = callPackage ../development/python-modules/quadprog { }; @@ -14742,6 +14746,8 @@ self: super: with self; { skybellpy = callPackage ../development/python-modules/skybellpy { }; + skyboxremote = callPackage ../development/python-modules/skyboxremote { }; + skyfield = callPackage ../development/python-modules/skyfield { }; skytemple-dtef = callPackage ../development/python-modules/skytemple-dtef { };