0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900 2024-12-06 21:27:37 +03:00
commit 2236e731a3
170 changed files with 1821 additions and 2531 deletions

30
.github/workflows/eval-lib-tests.yml vendored Normal file
View file

@ -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

22
.mergify.yml Normal file
View file

@ -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

View file

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

View file

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

View file

@ -0,0 +1 @@
/target

View file

@ -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"] }

View file

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

View file

@ -1,3 +1,3 @@
#!/usr/bin/env nix-shell #!/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 #!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 $@

View file

@ -59,6 +59,10 @@
- `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead. - `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. - 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. - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel.

View file

@ -30,14 +30,14 @@ rec {
guestSystem = pkgs.stdenv.hostPlatform.system; guestSystem = pkgs.stdenv.hostPlatform.system;
linuxHostGuestMatrix = { 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"; 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"; 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"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
powerpc64-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"; riscv32-linux = "${qemuPkg}/bin/qemu-system-riscv32 -machine virt";
riscv64-linux = "${qemuPkg}/bin/qemu-system-riscv64 -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 = { otherHostGuestMatrix = {
aarch64-darwin = { aarch64-darwin = {

View file

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

View file

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

View file

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

View file

@ -185,7 +185,7 @@ in
DB_PORT = 3306; DB_PORT = 3306;
DB_DATABASE = "firefly"; DB_DATABASE = "firefly";
DB_USERNAME = "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 { type = lib.types.submodule {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -30,13 +30,13 @@ let
in in
mkDerivation rec { mkDerivation rec {
pname = "osmscout-server"; pname = "osmscout-server";
version = "3.0.0"; version = "3.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rinigus"; owner = "rinigus";
repo = "osmscout-server"; repo = "osmscout-server";
rev = version; rev = version;
hash = "sha256-jcg/0SKeLviEC+vszh5DployKDAI7N+a8lzvImzFTvY="; hash = "sha256-GqUXHn3ZK8gdDlm3TitEp/jhBpQoVeQZUCfAyiyrDEg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -47,19 +47,6 @@ mkDerivation rec {
libpostal sqlite marisa kyotocabinet boost protobuf date 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 = [ qmakeFlags = [
"SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant
"CONFIG+=disable_mapnik" # Disable the optional mapnik backend "CONFIG+=disable_mapnik" # Disable the optional mapnik backend

View file

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

View file

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

View file

@ -7,13 +7,13 @@
let let
pname = "mendeley"; pname = "mendeley";
version = "2.122.1"; version = "2.127.1";
executableName = "${pname}-reference-manager"; executableName = "${pname}-reference-manager";
src = fetchurl { src = fetchurl {
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; 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 { appimageContents = appimageTools.extractType2 {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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)
################################################################################

View file

@ -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;
};
}

View file

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

View file

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

View file

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

View file

@ -2,49 +2,47 @@
stdenv, stdenv,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
python3Packages, python3Packages,
libnotify, libnotify,
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "gcalcli"; pname = "gcalcli";
version = "4.4.0"; version = "4.5.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "insanum"; owner = "insanum";
repo = "gcalcli"; repo = "gcalcli";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-X9sgnujHMbmrt7cpcBOvTycIKFz3G2QzNDt3me5GUrQ="; hash = "sha256-FU1EHLQ+/2sOGeeGwONsrV786kHTFfMel7ocBcCe+rI=";
}; };
postPatch = updateScript = nix-update-script { };
''
# 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 ]; 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; [ dependencies = with python3Packages; [
argcomplete argcomplete
python-dateutil babel
gflags gflags
httplib2
parsedatetime
vobject
google-api-python-client google-api-python-client
google-auth-oauthlib google-auth-oauthlib
uritemplate httplib2
libnotify libnotify
parsedatetime
platformdirs
pydantic
python-dateutil
truststore
uritemplate
vobject
]; ];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ];

View file

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

View file

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

View file

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

View file

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

View file

@ -2,7 +2,6 @@
, stdenv , stdenv
, autoreconfHook , autoreconfHook
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, icu , icu
, libarchive , libarchive
, pkg-config , pkg-config
@ -10,24 +9,15 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "hfst-ospell"; pname = "hfst-ospell";
version = "0.5.3"; version = "0.5.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hfst"; owner = "hfst";
repo = "hfst-ospell"; repo = "hfst-ospell";
rev = "refs/tags/v${finalAttrs.version}"; 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 = [ buildInputs = [
icu icu
libarchive libarchive

View file

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

View file

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

View file

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

View file

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

View file

@ -21,7 +21,7 @@
}: }:
let let
version = "0.23.0"; version = "0.24.0";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
@ -32,10 +32,10 @@ rustPlatform.buildRustPackage {
owner = "martinvonz"; owner = "martinvonz";
repo = "jj"; repo = "jj";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-NCeD+WA3uVl4l/KKFDtdG8+vpm10Y3rEAf8kY6SP0yo="; hash = "sha256-XsD4P2UygZFcnlV2o3E/hRRgsGjwKw1r9zniEeAk758";
}; };
cargoHash = "sha256-lnfh9zMMZfHhYY7kgmxuqZwoEQxiInjmHjzLabbUijU="; cargoHash = "sha256-9JwRdeHo8JkwRQwPA+UsIEWar4gYQS4SIM/uj1TU2yg";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
@ -77,14 +77,6 @@ rustPlatform.buildRustPackage {
"jj-cli" "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 = { env = {
# Disable vendored libraries. # Disable vendored libraries.
ZSTD_SYS_USE_PKG_CONFIG = "1"; ZSTD_SYS_USE_PKG_CONFIG = "1";
@ -101,9 +93,9 @@ rustPlatform.buildRustPackage {
installManPage ./jj.1 installManPage ./jj.1
installShellCompletion --cmd jj \ installShellCompletion --cmd jj \
--bash <(${jj} util completion bash) \ --bash <(COMPLETE=bash ${jj}) \
--fish <(${jj} util completion fish) \ --fish <(COMPLETE=fish ${jj}) \
--zsh <(${jj} util completion zsh) --zsh <(COMPLETE=zsh ${jj})
''; '';
passthru = { passthru = {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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";
};
}

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

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

View file

@ -33,13 +33,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pix"; pname = "pix";
version = "3.4.3"; version = "3.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-WL9EW7oKeQwufw1VYDigbqAt52GQTpc5RgDEmnKO6vc="; hash = "sha256-BasS0Z8fj7vxFnMZ6KOd5LkvSvTaw6+DDfcRFrdus7A=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -90,15 +90,12 @@ stdenv.mkDerivation (finalAttrs: {
substituteAllInPlace src/utils/file.cpp substituteAllInPlace src/utils/file.cpp
''; '';
postInstall = postInstall = ''
lib.optionalString i3Support ''
wrapProgram $out/bin/polybar \
--prefix PATH : "${i3}/bin"
'';
postFixup = ''
remove-references-to -t ${stdenv.cc} $out/bin/polybar remove-references-to -t ${stdenv.cc} $out/bin/polybar
''; '' + (lib.optionalString i3Support ''
wrapProgram $out/bin/polybar \
--prefix PATH : "${i3}/bin"
'');
meta = with lib; { meta = with lib; {
homepage = "https://polybar.github.io/"; homepage = "https://polybar.github.io/";

View file

@ -9,11 +9,11 @@
}: }:
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-pass"; pname = "proton-pass";
version = "1.24.1"; version = "1.25.0";
src = fetchurl { src = fetchurl {
url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
hash = "sha256-NtSZ3TSF3nBD+mEU6+uW2x8nqv0dz3jpankyTjJ8xvE="; hash = "sha256-gilHkk9vVxnYJKy79lDrlMd8uWys50TEUbGaHVr958o=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -8,14 +8,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "proton-vpn-local-agent"; pname = "proton-vpn-local-agent";
version = "1.0.0"; version = "1.2.0";
cargoHash = "sha256-TE2iqxTC6UH7pCM1wKEwaujMenNIp4LE+oy545tGmL0="; cargoHash = "sha256-qxNbHM6KmBmLbruOhbFIp3klz6RuKWBLioVsBPDQiLI=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ProtonVPN"; owner = "ProtonVPN";
repo = "python-proton-vpn-local-agent"; repo = "python-proton-vpn-local-agent";
rev = version; rev = version;
hash = "sha256-I+tbVQzD4xJUsoRF8TU/2EMldVqtfxY3E7PQN3ks0mA="; hash = "sha256-1iUeAWojIcXbvO6YoPEh//dbVdl90cUocyO3nfDtUEM";
}; };
sourceRoot = "${src.name}/python-proton-vpn-local-agent"; sourceRoot = "${src.name}/python-proton-vpn-local-agent";

View file

@ -1,80 +1,58 @@
{ {
asar,
lib, lib,
stdenv, stdenv,
fetchurl, fetchurl,
makeWrapper, makeWrapper,
dpkg, dpkg,
electron, electron,
unzip,
}: }:
let let
mainProgram = "proton-mail"; mainProgram = "proton-mail";
srcHashes = { version = "1.5.1";
# 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=";
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "protonmail-desktop"; pname = "protonmail-desktop";
# Upstream info: "v"-prefix got dropped inherit version;
version = "1.0.6";
src = fetchurl { src = fetchurl {
url = url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
if stdenv.hostPlatform.isDarwin then sha256 = "sha256-PkxJUzSmSeIf/WjXCj5Pne5DHrXnTRib1IqHtbe3lNA=";
"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}");
}; };
sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin ".";
dontConfigure = true; dontConfigure = true;
dontBuild = true; dontBuild = true;
nativeBuildInputs = nativeBuildInputs = [
[ dpkg
makeWrapper makeWrapper
] asar
++ lib.optional stdenv.hostPlatform.isLinux dpkg ++ lib.optional stdenv.hostPlatform.isDarwin unzip; ];
installPhase = # Rebuild the ASAR archive, hardcoding the resourcesPath
let preInstall = ''
darwin = '' asar extract usr/lib/proton-mail/resources/app.asar tmp
mkdir -p $out/{Applications,bin} rm usr/lib/proton-mail/resources/app.asar
cp -r "Proton Mail.app" $out/Applications/ substituteInPlace tmp/.webpack/main/index.js \
makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop --replace-fail "process.resourcesPath" "'$out/share/proton-mail'"
''; asar pack tmp/ usr/lib/proton-mail/resources/app.asar
linux = '' rm -fr tmp
runHook preInstall '';
mkdir -p $out
cp -r usr/share/ $out/
cp -r usr/lib/proton-mail/resources/app.asar $out/share/
'';
in installPhase = ''
'' runHook preInstall
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 '' preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ 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}}" \ --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_FORCE_IS_PACKAGED 1 \
--set-default ELECTRON_IS_DEV 0 \ --set-default ELECTRON_IS_DEV 0 \
@ -85,7 +63,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Desktop application for Mail and Calendar, made with Electron"; 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; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
rsniezek rsniezek
@ -94,10 +72,9 @@ stdenv.mkDerivation rec {
]; ];
platforms = [ platforms = [
"x86_64-linux" "x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
]; ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
inherit mainProgram; inherit mainProgram;
}; };
} }

View file

@ -5,25 +5,7 @@
set -eu -o pipefail set -eu -o pipefail
latestVersion=$(curl https://api.github.com/repos/ProtonMail/inbox-desktop/releases/latest | jq -r '.tag_name') 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"
declare -A platforms latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash')
platforms[x86_64-linux]="amd64" update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix
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

View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "prowler"; pname = "prowler";
version = "4.6.1"; version = "5.0.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prowler-cloud"; owner = "prowler-cloud";
repo = "prowler"; repo = "prowler";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-lEoUZQh5wnfX6J5ZbpCM+ZwJyyw/Ex6LNTTT9ZXw2Z4="; hash = "sha256-RrVmM9j+eApmTT3ufatpQ1CeQT7bart/ESs75THU574=";
}; };
pythonRelaxDeps = true; pythonRelaxDeps = true;

View file

@ -8,16 +8,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "redocly"; pname = "redocly";
version = "1.25.9"; version = "1.25.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Redocly"; owner = "Redocly";
repo = "redocly-cli"; repo = "redocly-cli";
rev = "@redocly/cli@${version}"; rev = "@redocly/cli@${version}";
hash = "sha256-QOD1EqigHa/daanwajoiQAy0fJRi8yWJKj41k0SZyJo="; hash = "sha256-mZrD+ex1AZfQopnroA9gu7z5DeuC79k90KIWGhgAgrQ=";
}; };
npmDepsHash = "sha256-Bo8Zdft+AfjSXDnxXvKq+AEpU4vtB+XBkmzqLRuHLrw="; npmDepsHash = "sha256-pavWVmCOM40eaYgIcese/XTumV8Jsb8nKU86AyNdsz4=";
npmBuildScript = "prepare"; npmBuildScript = "prepare";

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "release-plz"; pname = "release-plz";
version = "0.3.98"; version = "0.3.110";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MarcoIeni"; owner = "MarcoIeni";
repo = "release-plz"; repo = "release-plz";
rev = "release-plz-v${version}"; rev = "release-plz-v${version}";
hash = "sha256-DSEtku9Xyp8MRibO8VPeRlc9CnPupAqQRFXMJD2yNA8="; hash = "sha256-BDlLvOW13Z6jE9OVC6QskVzXONkYKjXouPzedaPDmi0=";
}; };
cargoHash = "sha256-66P9ShtMZM5XcH8Q9ifw92VCDcwKPhZOywj3Acbhf9o="; cargoHash = "sha256-GptaDa8NjCcWg5OsyujIgxGH4egWGBVVTLaYp4fqP3Q=";
nativeBuildInputs = [ installShellFiles pkg-config perl ]; nativeBuildInputs = [ installShellFiles pkg-config perl ];

View file

@ -1,54 +1,82 @@
{ lib {
, stdenv lib,
, fetchurl stdenv,
, cmake fetchurl,
, makedepend cmake,
, perl makedepend,
, pkg-config perl,
, qttools pkg-config,
, wrapQtAppsHook qt5,
, dssi alsa-lib,
, fftwSinglePrec dssi,
, ladspaH fftwSinglePrec,
, ladspaPlugins flac,
, libjack2 glib,
, alsa-lib ladspaH,
, liblo ladspaPlugins,
, libsamplerate libjack2,
, libsndfile liblo,
, lirc libmpg123,
, lrdf libopus,
, qtbase libsamplerate,
libsndfile,
libsysprof-capture,
libvorbis,
lilv,
lv2,
lirc,
lrdf,
libogg,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rosegarden"; pname = "rosegarden";
version = "22.12.1"; version = "24.12";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.xz";
sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY="; sha256 = "sha256-fz9mE2sJrxS9mZjkreTWIE1Fiv0WlHiP1tyzqW6/Fcw=";
}; };
postPhase = '' postPhase = ''
substituteInPlace src/CMakeLists.txt --replace svnheader svnversion 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 = [ buildInputs = [
alsa-lib
dssi dssi
fftwSinglePrec fftwSinglePrec
flac
glib
ladspaH ladspaH
ladspaPlugins ladspaPlugins
libjack2 libjack2
liblo liblo
libmpg123
libogg
libopus
libsamplerate libsamplerate
libsndfile libsndfile
libsysprof-capture
libvorbis
lilv
lv2
lirc lirc
lrdf lrdf
qtbase qt5.qtbase
alsa-lib ];
cmakeFlags = [
"-DLILV_INCLUDE_DIR=${lilv.dev}/include/lilv-0"
]; ];
meta = with lib; { meta = with lib; {

View file

@ -14,31 +14,22 @@
ncurses, ncurses,
openssl, openssl,
pkg-config, pkg-config,
xmlrpc_c,
zlib, zlib,
nixosTests, nixosTests,
gitUpdater, unstableGitUpdater,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rakshasa-rtorrent"; pname = "rakshasa-rtorrent";
version = "0.10.0"; version = "0.10.0-unstable-2024-12-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rakshasa"; owner = "rakshasa";
repo = "rtorrent"; repo = "rtorrent";
rev = "v${version}"; rev = "5a200f5d8f8bc8ed28dfc948321451585f724b15";
hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8="; hash = "sha256-RLFOHJLpt7xkrEvYwEBWs5wQRThrK1N2olI64p2TPeA=";
}; };
patches = [
# fix: use fsync for osx builds
(fetchpatch {
url = "https://github.com/rakshasa/rtorrent/commit/5ce84929e44fbe3f8d6cf142e3133f43afa4071f.patch";
hash = "sha256-bFDxbpkTZ6nIUT2zMxKMgV94vWlVNzBbIbhx4Bpr8gw=";
})
];
outputs = [ outputs = [
"out" "out"
"man" "man"
@ -63,17 +54,16 @@ stdenv.mkDerivation rec {
libtorrent libtorrent
ncurses ncurses
openssl openssl
xmlrpc_c
zlib zlib
]; ];
configureFlags = [ configureFlags = [
"--with-xmlrpc-c" "--with-xmlrpc-tinyxml2"
"--with-posix-fallocate" "--with-posix-fallocate"
]; ];
passthru = { passthru = {
updateScript = gitUpdater { rev-prefix = "v"; }; updateScript = unstableGitUpdater { rev-prefix = "v"; };
tests = { tests = {
inherit (nixosTests) rtorrent; inherit (nixosTests) rtorrent;
}; };

View file

@ -12,7 +12,9 @@
libxslt, libxslt,
gobject-introspection, gobject-introspection,
wrapGAppsHook3, wrapGAppsHook3,
wrapGAppsNoGuiHook,
python3, python3,
gdk-pixbuf,
glib, glib,
gssdp_1_6, gssdp_1_6,
gupnp_1_6, gupnp_1_6,
@ -21,6 +23,8 @@
gst_all_1, gst_all_1,
libgee, libgee,
libsoup_3, libsoup_3,
libX11,
withGtk ? true,
gtk3, gtk3,
libmediaart, libmediaart,
pipewire, pipewire,
@ -29,6 +33,7 @@
tinysparql, tinysparql,
shared-mime-info, shared-mime-info,
gnome, gnome,
rygel,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -60,12 +65,13 @@ stdenv.mkDerivation (finalAttrs: {
libxml2 libxml2
libxslt # for xsltproc libxslt # for xsltproc
gobject-introspection gobject-introspection
wrapGAppsHook3 (if withGtk then wrapGAppsHook3 else wrapGAppsNoGuiHook)
python3 python3
]; ];
buildInputs = buildInputs =
[ [
gdk-pixbuf
glib glib
gssdp_1_6 gssdp_1_6
gupnp_1_6 gupnp_1_6
@ -73,14 +79,18 @@ stdenv.mkDerivation (finalAttrs: {
gupnp-dlna gupnp-dlna
libgee libgee
libsoup_3 libsoup_3
gtk3
libmediaart libmediaart
pipewire 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 sqlite
systemd systemd
tinysparql tinysparql
shared-mime-info shared-mime-info
] ]
++ lib.optionals withGtk [ gtk3 ]
++ (with gst_all_1; [ ++ (with gst_all_1; [
gstreamer gstreamer
gst-editing-services gst-editing-services
@ -95,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dapi-docs=false" "-Dapi-docs=false"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc" "-Dsysconfdir_install=${placeholder "out"}/etc"
(lib.mesonEnable "gtk" withGtk)
]; ];
doCheck = true; doCheck = true;
@ -108,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
packageName = "rygel"; packageName = "rygel";
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";
}; };
noGtk = rygel.override { withGtk = false; };
}; };
meta = with lib; { meta = with lib; {

View file

@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "http://s2geometry.io/"; homepage = "http://s2geometry.io/";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.Thra11 ]; maintainers = [ maintainers.Thra11 ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
}) })

View file

@ -1,108 +0,0 @@
From cf12e591c6007c6e32bd86167816e316f5b70c26 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 25 May 2024 15:38:41 +0200
Subject: [PATCH] Fix go module
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
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

View file

@ -1,45 +1,59 @@
{ lib {
, buildGoModule lib,
, fetchFromGitHub buildGoModule,
, installShellFiles stdenv,
, asciidoc fetchFromGitHub,
, databasePath ? "/etc/secureboot" installShellFiles,
, nix-update-script asciidoc,
databasePath ? "/etc/secureboot",
nix-update-script,
}: }:
buildGoModule rec { buildGoModule rec {
pname = "sbctl"; pname = "sbctl";
version = "0.14"; version = "0.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Foxboron"; owner = "Foxboron";
repo = pname; repo = "sbctl";
rev = version; rev = "refs/tags/${version}";
hash = "sha256-1TprUr+bLPOlMpe4ReV1S/QbVsA8Q7QIOcLczEaSyAQ="; hash = "sha256-BLSvjo6GCqpECJPJtQ6C2zEz1p03uyvxTYa+DoxZ78s=";
}; };
patches = [ vendorHash = "sha256-srfZ+TD93szabegwtzLTjB+uo8aj8mB4ecQ9m8er00A=";
./fix-go-module.patch
ldflags = [
"-s"
"-w"
"-X github.com/foxboron/sbctl.DatabasePath=${databasePath}"
"-X github.com/foxboron/sbctl.Version=${version}"
]; ];
vendorHash = "sha256-LuSewWK/sxaHibJ6a05PM9CPen8J+MJD6lwk4SNOWSA="; nativeBuildInputs = [
installShellFiles
ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" ]; asciidoc
];
nativeBuildInputs = [ installShellFiles asciidoc ];
postBuild = '' postBuild = ''
make docs/sbctl.8 make docs/sbctl.conf.5 docs/sbctl.8
''; '';
postInstall = '' checkFlags = [
installManPage docs/sbctl.8 # https://github.com/Foxboron/sbctl/issues/343
"-skip"
"github.com/google/go-tpm-tools/.*"
];
installShellCompletion --cmd sbctl \ postInstall =
--bash <($out/bin/sbctl completion bash) \ ''
--fish <($out/bin/sbctl completion fish) \ installManPage docs/sbctl.conf.5 docs/sbctl.8
--zsh <($out/bin/sbctl completion zsh) ''
''; + 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 { }; passthru.updateScript = nix-update-script { };
@ -48,7 +62,10 @@ buildGoModule rec {
mainProgram = "sbctl"; mainProgram = "sbctl";
homepage = "https://github.com/Foxboron/sbctl"; homepage = "https://github.com/Foxboron/sbctl";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ raitobezarius ]; maintainers = with maintainers; [
raitobezarius
Scrumplex
];
# go-uefi do not support darwin at the moment: # go-uefi do not support darwin at the moment:
# see upstream on https://github.com/Foxboron/go-uefi/issues/13 # see upstream on https://github.com/Foxboron/go-uefi/issues/13
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -20,13 +20,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "screenfetch"; pname = "screenfetch";
version = "3.9.1"; version = "3.9.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KittyKatt"; owner = "KittyKatt";
repo = "screenFetch"; repo = "screenFetch";
rev = "v${version}"; rev = "v${version}";
sha256 = "04l8aqr474pb115nagn9f6y48jw92n1qfszgw7dbhgl4mpn95lcr"; sha256 = "sha256-UNZMCLXhH4wDV0/fGWsB+KAi6aJVuPs6zpWXIQAqnjo=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20241119"; version = "20241205";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = "signalbackup-tools"; repo = "signalbackup-tools";
rev = version; rev = version;
hash = "sha256-HZNjkOuJOoOSPmJHu6QTYzyxgS4dSC6lWB++xF4rRnI="; hash = "sha256-e6T40FMM24wsVOZDE8lFeE5WKjpAFoG0M05E8oHiZeo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -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 <cstdint> header explicitly included
sed -i src/gpsim/value.h -e '1i #include <cstdint>'
sed -i src/gpsim/modules/watchdog.h -e '1i #include <cstdint>'
'';
extraBuildInputs = 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" ];
};
}

View file

@ -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 ];
};
}

View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sticky"; pname = "sticky";
version = "1.22"; version = "1.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-JrzBME1d4qvGjF2zdiqCX7h+sFadLsRQqZKnQj7elHs="; hash = "sha256-vNS2p3cmuQB+wusx9VSi81ZyGmUYgVXlMjIMkrnvyrI=";
}; };
postPatch = '' postPatch = ''

View file

@ -7,16 +7,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "twig-language-server"; pname = "twig-language-server";
version = "0.5.1"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kaermorchen"; owner = "kaermorchen";
repo = "twig-language-server"; repo = "twig-language-server";
rev = "refs/tags/v${version}"; 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 = '' installPhase = ''
runHook preInstall runHook preInstall

View file

@ -486,7 +486,7 @@ def _update_package(path, target):
if fetcher == "fetchFromGitHub": if fetcher == "fetchFromGitHub":
# in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` # 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. # 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) regex = re.compile(regex)
matches = regex.findall(text) matches = regex.findall(text)
n = len(matches) n = len(matches)
@ -496,7 +496,7 @@ def _update_package(path, target):
else: else:
# forcefully rewrite rev, incase tagging conventions changed for a release # forcefully rewrite rev, incase tagging conventions changed for a release
match = matches[0] 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 # incase there's no prefix, just rewrite without interpolation
text = text.replace('"${version}";', "version;") text = text.replace('"${version}";', "version;")

View file

@ -1,35 +1,32 @@
{ lib {
, fetchFromGitHub lib,
, python3 fetchFromGitHub,
python3,
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "urlscan"; pname = "urlscan";
version = "1.0.3"; version = "1.0.6";
format = "pyproject"; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "firecat53"; owner = "firecat53";
repo = pname; repo = "urlscan";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-aAfsGsgCZwWcFkYaJsKjRroAZjW7b/vnX1oL/Mg0kgY="; hash = "sha256-VbpKMaEjchfpLECCt1YtmiVynYgSLgAVP1iuHL7t8FQ=";
}; };
nativeBuildInputs = with python3.pkgs; [ build-system = with python3.pkgs; [
hatchling hatchling
hatch-vcs hatch-vcs
]; ];
propagatedBuildInputs = with python3.pkgs; [ dependencies = with python3.pkgs; [ urwid ];
urwid
];
# No tests available # No tests available
doCheck = false; doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [ "urlscan" ];
"urlscan"
];
meta = with lib; { meta = with lib; {
description = "Mutt and terminal url selector (similar to urlview)"; description = "Mutt and terminal url selector (similar to urlview)";

View file

@ -1,33 +1,43 @@
{ {
base64 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
bcrypt_pbkdf = { bcrypt_pbkdf = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g";
type = "gem"; type = "gem";
}; };
version = "1.1.0"; version = "1.1.1";
}; };
bigdecimal = { bigdecimal = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem"; type = "gem";
}; };
version = "3.1.6"; version = "3.1.8";
}; };
builder = { builder = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
type = "gem"; type = "gem";
}; };
version = "3.2.4"; version = "3.3.0";
}; };
childprocess = { childprocess = {
groups = ["default"]; groups = ["default"];
@ -44,20 +54,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem"; type = "gem";
}; };
version = "1.2.3"; version = "1.3.4";
}; };
date = { date = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
type = "gem"; type = "gem";
}; };
version = "3.3.4"; version = "3.4.1";
}; };
diff-lcs = { diff-lcs = {
groups = ["default" "development"]; groups = ["default" "development"];
@ -84,20 +94,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw";
type = "gem"; type = "gem";
}; };
version = "1.12.0"; version = "1.13.0";
}; };
excon = { excon = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x"; sha256 = "00p5fww0bakph4p9skc7ypjqbqc8crnw31nrmpdm8j4rr5kp4jb0";
type = "gem"; type = "gem";
}; };
version = "0.109.0"; version = "1.2.2";
}; };
fake_ftp = { fake_ftp = {
groups = ["development"]; groups = ["development"];
@ -109,25 +119,48 @@
}; };
version = "0.3.0"; 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 = { ffi = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
type = "gem"; type = "gem";
}; };
version = "1.16.3"; version = "1.17.0";
}; };
google-protobuf = { google-protobuf = {
dependencies = ["bigdecimal" "rake"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; sha256 = "1zzlmsv7djpgn6hxp5r1jg7f4nx368j0ccq6pipq1ncplnvbffij";
type = "gem"; type = "gem";
}; };
version = "3.25.3"; version = "4.29.1";
}; };
googleapis-common-protos-types = { googleapis-common-protos-types = {
dependencies = ["google-protobuf"]; dependencies = ["google-protobuf"];
@ -135,10 +168,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zrxnv9s2q39f2nh32x7nbfi8lpwzmmn3ji4adglg8dlfr1xrz16"; sha256 = "1xyinc2zaw25r3x774mni66im1b22l9zpbsqdgdb4g4zxcd5srcl";
type = "gem"; type = "gem";
}; };
version = "1.13.0"; version = "1.16.0";
}; };
grpc = { grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"]; dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@ -146,20 +179,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ndyis4hyq5wyypvy5j2pxaax73k9xd9cdsc5hyvpk3vbnn26rdb"; sha256 = "0z5x8f9k2m656imi59jrd49d8inbnzpcnylz0ijj1ly0ihdi3apd";
type = "gem"; type = "gem";
}; };
version = "1.56.2"; version = "1.68.1";
}; };
grpc-tools = { grpc-tools = {
groups = ["development"]; groups = ["development"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pwwsmw402y8f8l3s3v433lx1f3cahzh2bj3i6jhkg1z87z83pqm"; sha256 = "12wbiq7s1qc6dv35p8c5vay627c6mqm9p1dimv2nz2m6r5f1057v";
type = "gem"; type = "gem";
}; };
version = "1.62.0"; version = "1.68.1";
}; };
gssapi = { gssapi = {
dependencies = ["ffi"]; dependencies = ["ffi"];
@ -193,6 +226,16 @@
}; };
version = "0.1.5"; version = "0.1.5";
}; };
hashie = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x";
type = "gem";
};
version = "5.0.0";
};
httpclient = { httpclient = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -209,20 +252,41 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem"; type = "gem";
}; };
version = "1.14.1"; version = "1.14.6";
}; };
ipaddr = { ipaddr = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0p98v9b6rn5ma04qwvzs0nrg0hmnwpm70s9jshzdsrkqapcw4sh2"; sha256 = "0wmgwqv6c1kq8cxbxddllnrlh5jjmjw73i1sqbnvq55zzn3l0zyb";
type = "gem"; type = "gem";
}; };
version = "1.2.6"; 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 = "2.9.3";
}; };
listen = { listen = {
dependencies = ["rb-fsevent" "rb-inotify"]; dependencies = ["rb-fsevent" "rb-inotify"];
@ -255,37 +319,47 @@
}; };
version = "1.1.10"; version = "1.1.10";
}; };
logger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q9jm4pzqxk92dq9a1y7gjwcw3dcsm1mnsdhi9ms5hw1dpnprzlx";
type = "gem";
};
version = "1.6.2";
};
logging = { logging = {
dependencies = ["little-plugger" "multi_json"]; dependencies = ["little-plugger" "multi_json"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; sha256 = "1jqcq2yxh973f3aw63nd3wxhqyhkncz3pf8v2gs3df0iqair725s";
type = "gem"; type = "gem";
}; };
version = "2.3.1"; version = "2.4.0";
}; };
mime-types = { mime-types = {
dependencies = ["mime-types-data"]; dependencies = ["logger" "mime-types-data"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
type = "gem"; type = "gem";
}; };
version = "3.5.2"; version = "3.6.0";
}; };
mime-types-data = { mime-types-data = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; sha256 = "0a7fq0wn2fdv57dsxfmjyzsjhxprh56k0zg3c4nm9il4s3v0mzig";
type = "gem"; type = "gem";
}; };
version = "3.2024.0206"; version = "3.2024.1203";
}; };
multi_json = { multi_json = {
groups = ["default"]; groups = ["default"];
@ -297,16 +371,38 @@
}; };
version = "1.15.0"; 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 = { net-ftp = {
dependencies = ["net-protocol" "time"]; dependencies = ["net-protocol" "time"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pi67ywf8yvv18vr8kvyb1igdv8nsjafyy9c86fny5wvi10qcwqv"; sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8";
type = "gem"; type = "gem";
}; };
version = "0.3.4"; version = "0.3.8";
};
net-http = {
dependencies = ["uri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
type = "gem";
};
version = "0.6.0";
}; };
net-protocol = { net-protocol = {
dependencies = ["timeout"]; dependencies = ["timeout"];
@ -346,10 +442,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p";
type = "gem"; type = "gem";
}; };
version = "7.2.1"; version = "7.3.0";
}; };
nori = { nori = {
dependencies = ["bigdecimal"]; dependencies = ["bigdecimal"];
@ -357,10 +453,31 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1";
type = "gem"; type = "gem";
}; };
version = "2.7.0"; 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.0.9";
};
ostruct = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
type = "gem";
};
version = "0.6.1";
}; };
pairing_heap = { pairing_heap = {
groups = ["default"]; groups = ["default"];
@ -372,15 +489,25 @@
}; };
version = "3.1.0"; version = "3.1.0";
}; };
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cd13019gnnh2c0a3kj27ij5ibk72v0bmpypqv4l6ayw8g5cpyyk";
type = "gem";
};
version = "3.1.8";
};
rake = { rake = {
groups = ["development"]; groups = ["development"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
type = "gem"; type = "gem";
}; };
version = "13.1.0"; version = "13.2.1";
}; };
rake-compiler = { rake-compiler = {
dependencies = ["rake"]; dependencies = ["rake"];
@ -388,10 +515,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1vhdkwblhzp4wp1jh95qiibly2zsnmg3659r6d5xp1mzgd9ghxji"; sha256 = "0xlifh25mhlrigj020nya10s37dbkhc0rlqlf0ld88rxrdg1057k";
type = "gem"; type = "gem";
}; };
version = "1.2.7"; version = "1.2.8";
}; };
rb-fsevent = { rb-fsevent = {
groups = ["default"]; groups = ["default"];
@ -409,10 +536,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0";
type = "gem"; type = "gem";
}; };
version = "0.10.1"; version = "0.11.1";
}; };
rb-kqueue = { rb-kqueue = {
dependencies = ["ffi"]; dependencies = ["ffi"];
@ -430,10 +557,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem"; type = "gem";
}; };
version = "3.2.6"; version = "3.3.9";
}; };
rgl = { rgl = {
dependencies = ["pairing_heap" "rexml" "stream"]; dependencies = ["pairing_heap" "rexml" "stream"];
@ -463,10 +590,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl";
type = "gem"; type = "gem";
}; };
version = "3.13.0"; version = "3.13.2";
}; };
rspec-expectations = { rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"]; dependencies = ["diff-lcs" "rspec-support"];
@ -474,10 +601,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0bhhjzwdk96vf3gq3rs7mln80q27fhq82hda3r15byb24b34h7b2"; sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
type = "gem"; type = "gem";
}; };
version = "3.13.0"; version = "3.13.3";
}; };
rspec-its = { rspec-its = {
dependencies = ["rspec-core" "rspec-expectations"]; dependencies = ["rspec-core" "rspec-expectations"];
@ -485,10 +612,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; sha256 = "1xjikikx2sn9b7nbaza60xq7livjw9kp3a6gwbv5xz9zjd7k2164";
type = "gem"; type = "gem";
}; };
version = "1.3.0"; version = "1.3.1";
}; };
rspec-mocks = { rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"]; dependencies = ["diff-lcs" "rspec-support"];
@ -496,30 +623,31 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0rkzkcfk2x0qjr5fxw6ib4wpjy0hqbziywplnp6pg3bm2l98jnkk"; sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3";
type = "gem"; type = "gem";
}; };
version = "3.13.0"; version = "3.13.2";
}; };
rspec-support = { rspec-support = {
groups = ["default" "development"]; groups = ["default" "development"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf";
type = "gem"; type = "gem";
}; };
version = "3.13.1"; version = "3.13.2";
}; };
rubyntlm = { rubyntlm = {
dependencies = ["base64"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; sha256 = "1x8l0d1v88m40mby4jvgal46137cv8gga2lk7zlrxqlsp41380a7";
type = "gem"; type = "gem";
}; };
version = "0.6.3"; version = "0.6.5";
}; };
rubyzip = { rubyzip = {
groups = ["default"]; groups = ["default"];
@ -531,6 +659,17 @@
}; };
version = "2.3.2"; 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 = { stream = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -557,20 +696,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3";
type = "gem"; type = "gem";
}; };
version = "0.3.0"; version = "0.4.1";
}; };
timeout = { timeout = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; sha256 = "06fcniirx82hrljzfn5wb3634n8648v8qgy006jzgclfz5gjvjla";
type = "gem"; 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 = { vagrant-spec = {
dependencies = ["childprocess" "log4r" "rspec" "thor"]; dependencies = ["childprocess" "log4r" "rspec" "thor"];
@ -586,15 +735,25 @@
version = "0.0.1"; version = "0.0.1";
}; };
vagrant_cloud = { vagrant_cloud = {
dependencies = ["excon" "log4r" "rexml"]; dependencies = ["excon" "log4r" "oauth2" "rexml"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0jhwciki5i8hjbgv2f1p544bi92s9wdsfrjympzslysdzk95djpg"; sha256 = "07w7zv93pzpxjsq16z2d15irkl117x2h572bmd0gqhqd50da3lc6";
type = "gem"; 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 = { wdm = {
groups = ["default"]; groups = ["default"];
@ -611,21 +770,21 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
type = "gem"; type = "gem";
}; };
version = "1.7.0"; version = "1.9.1";
}; };
winrm = { winrm = {
dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; sha256 = "01jxpshw5kx5ha21ymaaj14vibv5bvm0dd80ccc6xl3jaxy7cszg";
type = "gem"; type = "gem";
}; };
version = "2.3.6"; version = "2.3.9";
}; };
winrm-elevated = { winrm-elevated = {
dependencies = ["erubi" "winrm" "winrm-fs"]; dependencies = ["erubi" "winrm" "winrm-fs"];

View file

@ -1,38 +1,58 @@
{ {
builder = { builder = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
type = "gem"; 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 = { excon = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1rv2hq29lx2337214a1p2qy70fi77ch6p0p77nw9h6x84q028qr0"; sha256 = "00p5fww0bakph4p9skc7ypjqbqc8crnw31nrmpdm8j4rr5kp4jb0";
type = "gem"; type = "gem";
}; };
version = "0.92.3"; version = "1.2.2";
}; };
fog-core = { fog-core = {
dependencies = ["builder" "excon" "formatador" "mime-types"]; dependencies = ["builder" "excon" "formatador" "mime-types"];
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw"; sha256 = "1rjv4iqr64arxv07bh84zzbr1y081h21592b5zjdrk937al8mq1z";
type = "gem"; type = "gem";
}; };
version = "2.3.0"; version = "2.6.0";
}; };
fog-json = { fog-json = {
dependencies = ["fog-core" "multi_json"]; dependencies = ["fog-core" "multi_json"];
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
@ -43,18 +63,18 @@
}; };
fog-libvirt = { fog-libvirt = {
dependencies = ["fog-core" "fog-json" "fog-xml" "json" "ruby-libvirt"]; dependencies = ["fog-core" "fog-json" "fog-xml" "json" "ruby-libvirt"];
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "sha256-z0VkRqFk3JU02ULQ+xQbywekzrJgz1YPDul//Ov5ajU="; sha256 = "036ajdyj4fxnhqf108jgzjkpiknnr6dg7mrapn8jsagqdr2a2k21";
type = "gem"; type = "gem";
}; };
version = "0.11.0"; version = "0.13.1";
}; };
fog-xml = { fog-xml = {
dependencies = ["fog-core" "nokogiri"]; dependencies = ["fog-core" "nokogiri"];
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
@ -64,7 +84,7 @@
version = "0.1.4"; version = "0.1.4";
}; };
formatador = { formatador = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
@ -74,48 +94,58 @@
version = "1.1.0"; version = "1.1.0";
}; };
json = { json = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; sha256 = "1kvbzh8530pp3qf63zvx9hnb708x7plv9wfn5ibns3h3knnvs3kw";
type = "gem"; type = "gem";
}; };
version = "2.6.1"; version = "2.9.0";
};
logger = {
groups = ["default" "plugins"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q9jm4pzqxk92dq9a1y7gjwcw3dcsm1mnsdhi9ms5hw1dpnprzlx";
type = "gem";
};
version = "1.6.2";
}; };
mime-types = { mime-types = {
dependencies = ["mime-types-data"]; dependencies = ["logger" "mime-types-data"];
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
type = "gem"; type = "gem";
}; };
version = "3.4.1"; version = "3.6.0";
}; };
mime-types-data = { mime-types-data = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; sha256 = "0a7fq0wn2fdv57dsxfmjyzsjhxprh56k0zg3c4nm9il4s3v0mzig";
type = "gem"; type = "gem";
}; };
version = "3.2022.0105"; version = "3.2024.1203";
}; };
mini_portile2 = { mini_portile2 = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "sha256-RrLSRMxv8BqJv2EnRpDAn9vcpHqErp6sOQOegSMa7nw="; sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
type = "gem"; type = "gem";
}; };
version = "2.8.2"; version = "2.8.8";
}; };
multi_json = { multi_json = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
@ -126,68 +156,122 @@
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2" "racc"]; dependencies = ["mini_portile2" "racc"];
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "sha256-INyAC4++TE9LWxZOaqOrgqNxvLJ+toXBZpYcNN2KItc="; sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny";
type = "gem"; type = "gem";
}; };
version = "1.15.2"; 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 = "04i61bkra454var9dc79ak3yffl13mbqx8xv2rvidx9n7ins9cyn";
type = "gem";
};
version = "4.7.2";
}; };
racc = { racc = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "sha256-r2QSSDb908AOgwcD1/hz6l3qvekj83AGo59aXg2hY4c="; sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem"; type = "gem";
}; };
version = "1.7.1"; version = "1.8.1";
};
rake = {
groups = ["development" "plugins"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
type = "gem";
};
version = "13.2.1";
}; };
rexml = { rexml = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem"; type = "gem";
}; };
version = "3.2.5"; version = "3.3.9";
}; };
xml-simple = { rspec-core = {
groups = ["default"]; dependencies = ["rspec-support"];
groups = ["development" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "sha256-0hEx5RnIbxpbwrbS1X1G5pmOR/GO0kmyXK2GQz29aV0="; sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl";
type = "gem"; type = "gem";
}; };
version = "1.1.9"; version = "3.13.2";
}; };
diffy = { rspec-expectations = {
groups = ["default"]; dependencies = ["diff-lcs" "rspec-support"];
groups = ["development" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "sha256-NrQv++UTjdxWGCEHwkrY1rBm7P0odoKfOR46SZPYmuE="; sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
type = "gem"; type = "gem";
}; };
version = "3.4.2"; 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 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf";
type = "gem";
};
version = "3.13.2";
}; };
ruby-libvirt = { ruby-libvirt = {
groups = ["default"]; groups = ["default" "plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; sha256 = "0r0igmwr22pi3dkkg1p79hjf8mr178qnz83q8fnaj87x7zk3qfyg";
type = "gem"; type = "gem";
}; };
version = "0.8.0"; version = "0.8.4";
}; };
vagrant-libvirt = { vagrant-libvirt = {
dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple" "diffy"]; dependencies = ["diffy" "fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple"];
groups = ["default"]; groups = ["plugins"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
@ -196,4 +280,15 @@
}; };
version = "0.12.2"; 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";
};
} }

View file

@ -6,9 +6,9 @@
let let
# NOTE: bumping the version and updating the hash is insufficient; # NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source. # 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"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
hash = "sha256-Gc+jBuP/rl3b8wUE9hoaMSSqmodyGxMKFAmNTqH+v4k="; hash = "sha256-ZQWdSCV5lBL8XUnOvCFwJAFk+tw30q2lRTHR93qeZ2I=";
deps = bundlerEnv rec { deps = bundlerEnv rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -118,6 +118,5 @@ in buildRubyGem rec {
license = licenses.bsl11; license = licenses.bsl11;
maintainers = with maintainers; [ tylerjl ]; maintainers = with maintainers; [ tylerjl ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
broken = true; # build fails on darwin and linux
}; };
} }

View file

@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "villain"; pname = "villain";
version = "2.2.0"; version = "2.2.1";
pyproject = false; pyproject = false;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "t3l3machus"; owner = "t3l3machus";
repo = "Villain"; repo = "Villain";
rev = "v${version}"; rev = "refs/tags/V${version}";
hash = "sha256-7qZ91WEzQg9k9V/FlREW4YLlEnloeVkisDO8q/+bheo="; hash = "sha256-eIPxidBBVmjt/E1F8G3zPwteB1qsk3a5LD69CiNVApY=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

Some files were not shown because too many files have changed in this diff Show more