diff options
Diffstat (limited to 'pkgs/tools')
151 files changed, 1141 insertions, 1499 deletions
diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix index 4a0d371a7fd6..33782f6ed6c6 100644 --- a/pkgs/tools/X11/xprintidle/default.nix +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -7,14 +7,14 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xprintidle"; version = "0.2.5"; src = fetchFromGitHub { owner = "g0hl1n"; repo = "xprintidle"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-bafDUZoSFsJ3g6mtLCRechGizfrWg2qW2vnlfIzj7mQ="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "xprintidle"; }; -} +}) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 06c30bda2be0..e384f38f6499 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.40"; + version = "0.41"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-G1CHm5z2D7l3NDmUMhubJsrXYUHb6FJ70EsYQShhsDE="; + sha256 = "sha256-N+bLW1Gf0lr5FKgd1lr84HVrhdjB+npaeS3nzYXoVl0="; }; - vendorHash = "sha256-j0tdFvOEp9VGx8OCfUruCzwVSB8thcenpvVNn7Rf0dA="; + vendorHash = "sha256-cu1TwCWdDQi2ZR96SvEeH/LIP7sZOVZoly3VczKZfRw="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/admin/lxd/wrapper.nix b/pkgs/tools/admin/lxd/wrapper.nix index b197cd496b1a..9edfefd57ccd 100644 --- a/pkgs/tools/admin/lxd/wrapper.nix +++ b/pkgs/tools/admin/lxd/wrapper.nix @@ -76,20 +76,11 @@ let ovmf-2mb = OVMF.override { secureBoot = true; - csmSupport = false; fdSize2MB = true; }; ovmf-4mb = OVMF.override { secureBoot = true; - csmSupport = false; - fdSize4MB = true; - }; - - ovmf-4mb-csm = OVMF.override { - secureBoot = true; - csmSupport = false; - fdSize2MB = false; fdSize4MB = true; }; @@ -99,13 +90,11 @@ let # also found in /snap/lxd/current/share/qemu/ on a snap install ovmf = linkFarm "lxd-ovmf" [ { name = "OVMF_CODE.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } - { name = "OVMF_CODE.4MB.CSM.fd"; path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_CODE.fd"; } { name = "OVMF_CODE.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } { name = "OVMF_CODE.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } { name = "OVMF_VARS.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } { name = "OVMF_VARS.2MB.ms.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } - { name = "OVMF_VARS.4MB.CSM.fd"; path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_VARS.fd"; } { name = "OVMF_VARS.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } { name = "OVMF_VARS.4MB.ms.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } { name = "OVMF_VARS.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 586d553f4109..dcd250b9e837 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -14,14 +14,14 @@ let pname = "pgadmin"; - version = "8.2"; - yarnHash = "sha256-uMSgpkYoLD32VYDAkjywC9bZjm7UKA0hhwVNc/toEbA="; + version = "8.3"; + yarnHash = "sha256-nhHss4YOFu2cGkIhA909lIdnf3H3pD9BQx4PvP9+9c0="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-RfpZXy265kwpMsWUBDVfbL/0eX0By79I4VNkG8zwVOs="; + hash = "sha256-2L/JLkuyjx1oD9akQULmzW0FlSq8/MQlZ1HmlO81jj0="; }; # keep the scope, as it is used throughout the derivation and tests diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index cf3e188e8674..c6573efabf78 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -4593,7 +4593,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -"commander@^2.20.0", "commander@^2.8.1": +"commander@^2.19.0", "commander@^2.20.0", "commander@^2.8.1": version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -5369,6 +5369,11 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +discontinuous-range@1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" + integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ== + dnd-core@14.0.1: version "14.0.1" resolved "https://registry.npmjs.org/dnd-core/-/dnd-core-14.0.1.tgz#76d000e41c494983210fb20a48b835f81a203c2e" @@ -6490,6 +6495,11 @@ get-proxy@^2.0.0: dependencies: npm-conf "^1.1.0" +get-stdin@=8.0.0: + version "8.0.0" + resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" + integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== + "get-stream@3.0.0", "get-stream@^3.0.0": version "3.0.0" resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -8903,6 +8913,11 @@ moment@^2.29.4: resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +moo@^0.5.0: + version "0.5.2" + resolved "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c" + integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q== + mousetrap@^1.6.3: version "1.6.5" resolved "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" @@ -8958,6 +8973,16 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== +nearley@^2.20.1: + version "2.20.1" + resolved "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474" + integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ== + dependencies: + commander "^2.19.0" + moo "^0.5.0" + railroad-diagrams "^1.0.0" + randexp "0.4.6" + neatequal@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" @@ -10210,6 +10235,19 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" +railroad-diagrams@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" + integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A== + +randexp@0.4.6: + version "0.4.6" + resolved "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" + integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ== + dependencies: + discontinuous-range "1.0.0" + ret "~0.1.10" + "randombytes@^2.0.0", "randombytes@^2.0.1", "randombytes@^2.0.5", "randombytes@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -10842,6 +10880,11 @@ responselike@1.0.2: dependencies: lowercase-keys "^1.0.0" +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + retry@^0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -11331,6 +11374,15 @@ sprintf-js@~1.0.2: resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== +sql-formatter@^15.1.2: + version "15.1.2" + resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.1.2.tgz#86df2592eedf6d422244e10e00a74380c22791b7" + integrity sha512-zBrLBclCNurCsQaO6yMvkXzHvv7eJPjiF8LIEQ5HdBV/x6UuWIZwqss3mlZ/6HLj+VYhFKeHpQnyLuZWG2agKQ== + dependencies: + argparse "^2.0.1" + get-stdin "=8.0.0" + nearley "^2.20.1" + ssri@^10.0.0: version "10.0.4" resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6" @@ -12716,8 +12768,3 @@ zustand@^4.4.1: resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" dependencies: "clsx" "^1.1.1" -"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8": - version "7.0.0-beta.14" - resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" - dependencies: - "clsx" "^1.1.1" diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 66db43918161..c5862887c553 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.107.0"; + version = "3.108.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.107.0-linux-x64.tar.gz"; - sha256 = "14hkk04jkfld8y051dxpigqhgx7s7n9d2sa4walkrz85vw928v2k"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.108.1-linux-x64.tar.gz"; + sha256 = "179hffqii76pc1ir8819af5vy6iiyygx5k33zpff0pg5bc6xm4w0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.12.0-linux-amd64.tar.gz"; @@ -17,8 +17,8 @@ sha256 = "17c5960kcjzz3hl4nwh41qkpj67072cfs2bxbqin9b2b33x9bfvy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.0-linux-amd64.tar.gz"; - sha256 = "07wyxig26ss9a4jcdwwrpy615ii17gky9s0ncz1nlrwrgiazmah0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.1-linux-amd64.tar.gz"; + sha256 = "17isifx3ysxdi4lrl8blkpzvcxn2yzxvyx3xsr22mqna57lzvh3l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.1.4-linux-amd64.tar.gz"; @@ -29,20 +29,20 @@ sha256 = "06gz2xqmwms01r4p59l9yvv3w3jvmlyaqr8y2z91hn0im4l8df2b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.23.0-linux-amd64.tar.gz"; - sha256 = "12bcq08my84h6pk736s4hswpvqxkrnw855jc6hqiiaskk3yk5a2i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.24.0-linux-amd64.tar.gz"; + sha256 = "1rimqplyil0r84n7yw9nzjx8y4r9k6fnyp7my1qb1wqy6w8sx5y4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.1-linux-amd64.tar.gz"; - sha256 = "068hi7f8jyia6rsmlzyc2vc7qgyl7b7ll05kx5czjrq132mv56d6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.2-linux-amd64.tar.gz"; + sha256 = "0d2swa7irx1xr18gs4p3can1bp1pckk5cggfl5cdfkrz966rv8cb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.15.0-linux-amd64.tar.gz"; sha256 = "0jaqkf7ibp0vxrvz6imaal9iyf60p6hhay7vmh62vmm0jgdv1ply"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.0-linux-amd64.tar.gz"; - sha256 = "0q801z0gvdp5kwxd2n59kl45lil78mgxwi22zcwnwh28bf48303n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.1-linux-amd64.tar.gz"; + sha256 = "01yh8cz2nq27ir6smv6j9rhnv796id961grd2ayjyjcrpin6b0pd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.21.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "0f4czs3hjibmwvswm2zgjq3nys2sp4lr7xy2rpm4k7msdcsxk5kb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.0-linux-amd64.tar.gz"; - sha256 = "181753mpnph9zgzc90rd9v00iqw1sjblbh4i6y7ybschmi2vcvwa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.2-linux-amd64.tar.gz"; + sha256 = "0hnhgiss847s7znii3fd3c0w1i7f582khrcvb4a422ws89nrf070"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.0.0-linux-amd64.tar.gz"; @@ -93,32 +93,32 @@ sha256 = "0pz7jga19pwwx7ba5364b6sv1zsmxvnldakdh6641fqp9wl6smxp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.0-linux-amd64.tar.gz"; - sha256 = "1z6nh7piwa54l81c32i25dx079m26a89q894m63hyjg3z47wqlci"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.1-linux-amd64.tar.gz"; + sha256 = "0fsif489vj0cnag7q1ap7hb2lhfrhihbpnjygghwlqdf9nrcr54i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.14.0-linux-amd64.tar.gz"; - sha256 = "0rzhdhb4lgjfzfhnmvs875axqivjwwfq6d62v7j6ksnxynlfzqmj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.15.0-linux-amd64.tar.gz"; + sha256 = "10p4gsz6qj93fd0f9d1pvql501gpyrl684465b51xxrh29506nwk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.1-linux-amd64.tar.gz"; sha256 = "1k2pa1wbh49qkg99khdyzj1qfjld74ijzn4y94c27vjsm9wmn7ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.1-linux-amd64.tar.gz"; - sha256 = "068zzad887pqsdyx93xdj5vnkr7pvsx7i4sqzm536g53k79xq54l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.3-linux-amd64.tar.gz"; + sha256 = "010x3wa1c3cjccli0b1y25xd6jkvhdcxahfwda8jv31b5ilsv3zx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.15.1-linux-amd64.tar.gz"; sha256 = "135br9q8f1ic0xvrhx9yii5giq1h5qzlyb5kyvnyb3hwx49f1ik6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.1-linux-amd64.tar.gz"; - sha256 = "1vi1mhkrxrl5ajaa93vfziii12w0wwlrxd6hyvvxwfkkxn0n3ivm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.0-linux-amd64.tar.gz"; + sha256 = "14blk6gfdxjr1l3gxfj3f1ljz66yi8z35lva3fy75fs5gy6z1wnb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.15.1-linux-amd64.tar.gz"; - sha256 = "1za2d3cad1grcnkkqmyn9b7wlz9ayimsv17ygg638wh7v34w0yjq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.0-linux-amd64.tar.gz"; + sha256 = "1wvdncw149ch6hi3fw7fibk78j2clbxlwmf4hivai7zhh8ikg1nq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.49.0-linux-amd64.tar.gz"; @@ -133,8 +133,8 @@ sha256 = "0jiny0s6hvzzcgv7zkdmc4d0rdcwpq49dz7fqsaz81maz7kck8a5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.14.0-linux-amd64.tar.gz"; - sha256 = "0q23ck7ifs42cfd1iadcn1djhmpg203z1r7nxlfhnp3h0f7z1p5h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.15.0-linux-amd64.tar.gz"; + sha256 = "19z0adq7dy7cvfkbi8xl3wq1shm4rjswjslnfq5fflyky8pgjyy3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.1-linux-amd64.tar.gz"; @@ -145,8 +145,8 @@ sha256 = "1nc72m6d0kixs0mih83f6bad2dwwmwz89r6w8dkhi0071bg28lgc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.3-linux-amd64.tar.gz"; - sha256 = "0jfp8wqb6gkq7ndihi4bpcm2s0vz1xkc2m4i58hy80zfvdiq3ipz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.7.0-linux-amd64.tar.gz"; + sha256 = "0w7cgafkz1r55bz8n51v2rqhmmxzrf7ma60awzlfd2apyihghxyp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.2-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.107.0-darwin-x64.tar.gz"; - sha256 = "0x05cbvwvmwrfdrnwr4ca9g0d0rs2pjyqgw5bqvrh0k7ll5z10dz"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.108.1-darwin-x64.tar.gz"; + sha256 = "1993jk9wraxxds7phlpp2kwhn80k6hvf54nb5nj9883nsm5n4syz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.12.0-darwin-amd64.tar.gz"; @@ -175,8 +175,8 @@ sha256 = "05x8allllb6spjkjf9lchk1pyprj356s0kgy2rdz24knvr2rxr3r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.0-darwin-amd64.tar.gz"; - sha256 = "1yd1s42lnjmz02i5kplxa0x6qk80m20f0x1dypxnbrjnghj05fcq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.1-darwin-amd64.tar.gz"; + sha256 = "08ji9qkl1njci37a2hsvi5gj28x986a4xlkc7z9y2n0vzr9cy3rl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.1.4-darwin-amd64.tar.gz"; @@ -187,20 +187,20 @@ sha256 = "1wlw4lvdy63fw2vpv0cg3g5ffy1frr8dfbvnr1avashw1bvmh6yd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.23.0-darwin-amd64.tar.gz"; - sha256 = "1wv0m7lbrpiwn5a9d96kh37zf8vp23sf25kyx3gxd2khx3g2s0ww"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.24.0-darwin-amd64.tar.gz"; + sha256 = "0zbappmx8za45nn0pn2vwab5z7zbx0yw2bfrlnpnmq6bflgv9mg2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.1-darwin-amd64.tar.gz"; - sha256 = "1hkkjqm5b8mnzvgkjzz3zkq86wzbi89n1i19l9jy57pbr6mr2kkk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.2-darwin-amd64.tar.gz"; + sha256 = "1bjvbqdhd49ayxcv60rii4y3ngafjfzz0w9flra9wkh8hv8z1xxz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.15.0-darwin-amd64.tar.gz"; sha256 = "11whky196lqgj8bgzxixd1m39jqw3fs9if8knmwcr7zmd3jyf80w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.0-darwin-amd64.tar.gz"; - sha256 = "1v3bqv5yf8ixfag8bshhhyq9wi1viys6r2c6hg26nw56i6g5i951"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.1-darwin-amd64.tar.gz"; + sha256 = "05ll4cbmvc61jx15y37n79bslqkxc5879kjg4i86l3cldgmazjdi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.21.0-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "03xk7hkcs0f8684ll7f7z7z14zwj66qnps0pcsd7r34s7qyhy33g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.0-darwin-amd64.tar.gz"; - sha256 = "1j0fkc2g8jbd07cc2s1v88psg01pgiqmdf3hph0zv67qsymfi5w8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.2-darwin-amd64.tar.gz"; + sha256 = "1s08pdqba2i81ijm4bm6qm4a1biy53hrxv964l9gv5gf45jm3md7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.0.0-darwin-amd64.tar.gz"; @@ -251,32 +251,32 @@ sha256 = "18w9x6ym08ljr71kl82qb017cxzfbpkhbvljb1ki8nrk32s7rljy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "0rylnwf2500iw2dkigs3jrxpjvvxs1b0vh6z2kv4l8xlfb47r2rn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.1-darwin-amd64.tar.gz"; + sha256 = "0r76x8339mdlmi7d4sxfnz3lisj5gsscdckv7ca8i5zs288yifhv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.14.0-darwin-amd64.tar.gz"; - sha256 = "1ij1j34321pa7x7cxb2lpcdakqgwnfvfh9jpbr1zgs5fqvi7ya1c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.15.0-darwin-amd64.tar.gz"; + sha256 = "1zn2wz1adypy2cr8wl60rsry7m923zyyl2kkf19j5326rbxhki37"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.1-darwin-amd64.tar.gz"; sha256 = "063jm09bpshlc86svwacafjbc6iv09n81jx4hmcwwgcic6pwb1ic"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.1-darwin-amd64.tar.gz"; - sha256 = "0457whyfc8vkq4jpd2z1sfwxsbdlbx6dzcr1kqf799xb1k049bwj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.3-darwin-amd64.tar.gz"; + sha256 = "1hrc3lrn7ry6p44f0d287z5nw754rwk0xlhr8zj5vx3xyx8jws34"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.15.1-darwin-amd64.tar.gz"; sha256 = "1wcripnsgxwlj7s6mv726kxrf689xlc7zxqmra5a1zdmfqskmq4k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.1-darwin-amd64.tar.gz"; - sha256 = "1ndpj3mpxbhpvj29x1a61jj2hqk6v9ysmrb87gd6a30rafs9r7fc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.0-darwin-amd64.tar.gz"; + sha256 = "1lp9ga9yzz52dnpw3im32d5g8pai42wnj3c3r7acb48ndy2xw9g7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.15.1-darwin-amd64.tar.gz"; - sha256 = "00m5f757fk01wkqf3ji4d0yjmk7i4b3sglgws3mgr5j1waswy4jw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.0-darwin-amd64.tar.gz"; + sha256 = "0xgcvika75bbyaabjxi1jzmv0w86i0nzixfc50x4crz0969qncz4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.49.0-darwin-amd64.tar.gz"; @@ -291,8 +291,8 @@ sha256 = "01f6c3zgmlmips4b5ysdp2vyflykq9bi1r1pbmqh05b6j35r90km"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.14.0-darwin-amd64.tar.gz"; - sha256 = "01f9lq4javm9fw87xclz44yq8iwa47fxz23fws694a0lsl0ki33m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "10skdrdb9dsd4pkamwihf73laaif90dkfl8ixi6irf30rqihc2nf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.1-darwin-amd64.tar.gz"; @@ -303,8 +303,8 @@ sha256 = "1wgdn8zv3q4fn6730jfyb5x7rmb460plc4iddlsibnwnx0w5c3s5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.3-darwin-amd64.tar.gz"; - sha256 = "04w6xmnqivc34grfgh3hqi9zp7ibsrrc2v0v102zh0sxn7lbksc6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.7.0-darwin-amd64.tar.gz"; + sha256 = "1pvbcyw1l2b27hn48klc2fj3is2y3z1dj90ac4kkqi2ag4xj45vx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.2-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.107.0-linux-arm64.tar.gz"; - sha256 = "14n3i99vyqnbab7glaa80f3irlw0x5di2fawbbqan3fzc2j46z9c"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.108.1-linux-arm64.tar.gz"; + sha256 = "0qf4lbldkc04jx13a4fdn6i2s1wfsa8x9c74fzplk75mwkv3fk1z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.12.0-linux-arm64.tar.gz"; @@ -333,8 +333,8 @@ sha256 = "0kb7hdciy8i91kmfndriav7sm05r1jkam7i634b5r6d7agdlvr2h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.0-linux-arm64.tar.gz"; - sha256 = "14x57ja726wb0kiwqdva6fk3jjd974apjqsq8i3nwkx6rrr91hvy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.1-linux-arm64.tar.gz"; + sha256 = "0r69ar70k0zyglyxh9v2ilv5xiks9dqfqi0fvy8lc8zkgrcwfb19"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.1.4-linux-arm64.tar.gz"; @@ -345,20 +345,20 @@ sha256 = "14wplnr5axic2a9skx0y6rjq8si02qwpadpcl978vchll0f4g1pz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.23.0-linux-arm64.tar.gz"; - sha256 = "04px1q2s7y97aw09j7s8n6yr6ysbhrly839vg6mag98g1b2ikz9p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.24.0-linux-arm64.tar.gz"; + sha256 = "15q20as4nmrcxf5dg4ahz3x4ffsnmzi6fcaiv9qn8ln30r5cvf98"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.1-linux-arm64.tar.gz"; - sha256 = "1rn6w2740zjcazrxy8h5f2g7mz17wvmnbyld7qm3zadn6rx4dipr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.2-linux-arm64.tar.gz"; + sha256 = "0pzbsz7c6q9x3xfpcc8yb6d14hk514yr03p3nfsvmp2nb7224r6s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.15.0-linux-arm64.tar.gz"; sha256 = "1fcpf2x9dlxk2s06pgvqwsmjpwlv47q666xpj6cmx9cybmnhgjn4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.0-linux-arm64.tar.gz"; - sha256 = "0zn6n92yf3kbp3z788db8gq1gnwsmrmnqijq9d1a4wn6a5fwdy04"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.1-linux-arm64.tar.gz"; + sha256 = "1vzfdagcqm5im4zn7dlqhmz0wjk8aq59yplzqfif411g09zhnr6j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.21.0-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1kf88g5jm3xr5b35is8h0rqxzy79az3s90givsnr7x6xmm6favqc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.0-linux-arm64.tar.gz"; - sha256 = "06mbbzb4c999r7x3vvngqsm58h7g6r8sq4w1aqbb8brkhhfg3wfj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.2-linux-arm64.tar.gz"; + sha256 = "0dp11yirgfr45pqbqva5zapcgzb7gsf53al389dnr00cizfihn1r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.0.0-linux-arm64.tar.gz"; @@ -409,32 +409,32 @@ sha256 = "1shra5wq8zx4l9b3sp6yklhi8hbd8r2ypay9nf4jgwnc6ppql102"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.0-linux-arm64.tar.gz"; - sha256 = "11i44aiqypn4x74m0x3w9h37k55dfdys2il9asxbfmkh4slmqc62"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.1-linux-arm64.tar.gz"; + sha256 = "10kk7m7nisd75nb0f689ldfprx56asxfsc785gsnssjjjhy40vvr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.14.0-linux-arm64.tar.gz"; - sha256 = "18mdgj637h4qrlsz3ryr5nf2dy59lji1mxfcy6cfrsapwdig9w3n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.15.0-linux-arm64.tar.gz"; + sha256 = "1alll2yq4h7qb2zc4n9pj9rvqv8mv5v9jrxgnrsw7mha3cnjysa4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.1-linux-arm64.tar.gz"; sha256 = "1cz4xvvdj0kr63a2x21zbjm4viw92k2920ljnqsfv2wr2f03yk6s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.1-linux-arm64.tar.gz"; - sha256 = "12smmvbqcdbnqr7r4vx1w3k77hn8l0z7lvb5i1f34fnybq1k3b81"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.3-linux-arm64.tar.gz"; + sha256 = "1czrp700a4sdlxij8xgsl595fzg1s0k3pwnrwa2bl41xws9p65zy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.15.1-linux-arm64.tar.gz"; sha256 = "17gbazfqs1f2m0h9awwqw14amxlxvl3zwhx3nbzh86my7gn3kjmv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.1-linux-arm64.tar.gz"; - sha256 = "0vkgdc0b76ngrd9vdsqx5rmlijxvdrkr1vkyisl81z73bgjyh9zp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.0-linux-arm64.tar.gz"; + sha256 = "0mrfh9mr825gj0gizviwihym8gisnx49lq1sff4128jgsfaq2snv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.15.1-linux-arm64.tar.gz"; - sha256 = "10k9v7v9krjsk095cmk84w875bllkbjl19syiqiq19am66k9n8jj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.0-linux-arm64.tar.gz"; + sha256 = "0fp9z7mfpprs4680s350wyys6a0jwx4s455jqr938zxnx8s3rhfg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.49.0-linux-arm64.tar.gz"; @@ -449,8 +449,8 @@ sha256 = "0m07iydqlampsx2zdgliyqa5h1zwj42p865anak37i59j1cx7ash"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.14.0-linux-arm64.tar.gz"; - sha256 = "1n4ywh7l77w4zjk8vpdhrp44f0hzpr5pbmnh89c5q5j5w0p5wwck"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.15.0-linux-arm64.tar.gz"; + sha256 = "12b7k1d3jl2s6lg5izr38yaf8n1k7hd76pdy1d09wrv5l2hbn8zh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.1-linux-arm64.tar.gz"; @@ -461,8 +461,8 @@ sha256 = "0irp9vqikmmgcgzkca2z9nnak8ih73bbhs5576sf7y4132f4wvjj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.3-linux-arm64.tar.gz"; - sha256 = "19xsgfb302nx6mcq4pninq66i7926r0dl2qdcvmsj6qbm83bdih4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.7.0-linux-arm64.tar.gz"; + sha256 = "017ff9x7s4yvsrf4ypsyaz934r9jm954080gn5535w1694k96wbn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.2-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.107.0-darwin-arm64.tar.gz"; - sha256 = "1bm1mnzi9xlh5yqqvfixb18c1pqajs6x7r96wafxj5097476cam1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.108.1-darwin-arm64.tar.gz"; + sha256 = "13qyf4cg3ksflx1ax5pzn1a75r9zk89a41ywp08s7vfacmmvm6ym"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.12.0-darwin-arm64.tar.gz"; @@ -491,8 +491,8 @@ sha256 = "1b47n69nc5nicagwdxq793a6nmbrg15690i8q40nixcf7k48krai"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.0-darwin-arm64.tar.gz"; - sha256 = "0vl8a1vf0n2xjk7k39b0w4plj0lj3rxqys2wjycxvkkp6kxfb6s9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.1-darwin-arm64.tar.gz"; + sha256 = "0vwpr8fawr8gag8nrsi0dl4vw0dczqa4rm5dflgf2v5gfdhclsd6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.1.4-darwin-arm64.tar.gz"; @@ -503,20 +503,20 @@ sha256 = "17d3p29w4hd5lrpgmf9j17fwy4vx1cr84nlfci3rvfzzih1x62yl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.23.0-darwin-arm64.tar.gz"; - sha256 = "0r3kv95dmfr04iy7ha7x2akbj4mwjdqd3fzld0ysnlbnm37mkfg8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.24.0-darwin-arm64.tar.gz"; + sha256 = "1i9z6ifhz0han1wmjm6f3ywm6jqbfgaq1xrwf8vq9yph54is0ysq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.1-darwin-arm64.tar.gz"; - sha256 = "1n2kvcd68hya0i8bkiciigrv621n9f0xc5y5wji09advh8cx8a4w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.2-darwin-arm64.tar.gz"; + sha256 = "1zj37idg91anzx0hd6y2mshgl0bxc9ysfd4prgvj4drf92gwrx4g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.15.0-darwin-arm64.tar.gz"; sha256 = "1c7ycicwszn9fsaw81rn88kgm7b5i0hp9sxp92qxfn649x742c45"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.0-darwin-arm64.tar.gz"; - sha256 = "1mdmrf663fys5g0haxsyqp725aba6kim1hws6jympcchnqpp0l7k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.1-darwin-arm64.tar.gz"; + sha256 = "0id3w5wsapr5jh879qmglymbjzhl2r0w6kjahm1zzwvlqc3vg66w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.21.0-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "1pd2x157ljb8rgm1mawqvqb39n0101450syr43z1qjmhgws7gz74"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.0-darwin-arm64.tar.gz"; - sha256 = "1rvxpzjy6q8flly4vb8248gyf0bh4f25az9m1bk13pil20xadsmx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.2-darwin-arm64.tar.gz"; + sha256 = "03njrkmia42i0sg6qp76n8ymch4jaql4lkx0ixiscdwzgbx4v03m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.0.0-darwin-arm64.tar.gz"; @@ -567,32 +567,32 @@ sha256 = "19zhkq9lppjj41ddhbk2fi5xrmmbgyk38mlzvkqfly9lwgbc18v3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.0-darwin-arm64.tar.gz"; - sha256 = "0c0d5b2wn73wmf5gmslkzg6hxkj97abhlwx5ipdqnd591d6zfw3a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.1-darwin-arm64.tar.gz"; + sha256 = "0sq72v8hshx4kwbzsp9dyg26p21cwz8y7dh5msaqlxwsqmsw62pc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.14.0-darwin-arm64.tar.gz"; - sha256 = "03bicis1q94jqhy4h3wyrqy059dx010fafmxnpmizxcn565hhpcs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.15.0-darwin-arm64.tar.gz"; + sha256 = "07wf92lhbjzxifdvzjss6hmphdllclzj3b7k7nda03pv90awsh79"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.1-darwin-arm64.tar.gz"; sha256 = "1d90jmcm98nlagaqlnjk8kz5dn35yp682rxkps5w0m2x2k48hqxm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.1-darwin-arm64.tar.gz"; - sha256 = "1li9qyzqknpjlj2z3pfghji47xvhsl268p48pl2i1g99d4qkpbsc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.3-darwin-arm64.tar.gz"; + sha256 = "1ss909lscg6diphzpgxkm2gylvj0nkyf4jzp422m94g6xcinfwhy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.15.1-darwin-arm64.tar.gz"; sha256 = "0dqvgmcpvv3h86licnmlswlj2dklj2sqr02wyc10srw8gddvysx5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.1-darwin-arm64.tar.gz"; - sha256 = "14dc917y4ddd35ib5d0c3swlm6vcsjs57g8zd5gx74vnfgvkbc3h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.0-darwin-arm64.tar.gz"; + sha256 = "0xx8mphabl1vvmmyb5ramlf6zvd32lx46f6hlmihh76zfajhc5ci"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.15.1-darwin-arm64.tar.gz"; - sha256 = "1gri8is4man0zgp3yg0dmfnk9fjhrg02zahlravscxpd4baycb6p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.0-darwin-arm64.tar.gz"; + sha256 = "15zxfi82jqja0xzryb74pvcxnrbn6axrs98j463z248b5fbwc7b8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.49.0-darwin-arm64.tar.gz"; @@ -607,8 +607,8 @@ sha256 = "041zjnywmpxa302igaszj0hd6k4qb455i2c0452rlfh9kj7k2sa5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.14.0-darwin-arm64.tar.gz"; - sha256 = "1c63r0mr4q51b7bsc60idbinz6f0irgcg4wl72qhinbrl8wgdwd9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "1mrjn3g55h77rjni6v2v0hz4csclfiy2wdx7gllnwbpgfcchlqr2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.1-darwin-arm64.tar.gz"; @@ -619,8 +619,8 @@ sha256 = "0aidg913j23b7i018yqwgz1pcssgyrvyfhlwh0jbdxay66v8cdi9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.3-darwin-arm64.tar.gz"; - sha256 = "16kaha5i49sr7m60c3ql9j0amp051z3yxrfpw18ksygshinii8cb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.7.0-darwin-arm64.tar.gz"; + sha256 = "00qq53wirdjm8zqqisad34fzx70m96dwg0dqysz6nqikq620h7dp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.2-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 5ed4c5ec1e92..ae2b11d6be2e 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.105.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-laseVMbgzKuVyF6PWpthtt3Wgv+WW5ccTjp0jj15nB0="; + hash = "sha256-JDPHAFLs1o2dH72CRSglRbpmF+/xcSjvBqyYJUU3Ta8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-u5leq9K9c31No6saMO5cK9futt4Wl4f/d6V2djC8T1w="; + vendorHash = "sha256-tgptjaW9yu8Vk98YY+nX/lZU+ys/VuFKrwS8QIG8mXE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 48b072b0cf4b..a10283dc59f8 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -99,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = lib.optionals useUasm [ uasm ]; + setupHook = ./setup-hook.sh; + enableParallelBuilding = true; preBuild = "cd CPP/7zip/Bundles/Alone2"; diff --git a/pkgs/tools/archivers/7zz/setup-hook.sh b/pkgs/tools/archivers/7zz/setup-hook.sh new file mode 100644 index 000000000000..97f2cc8a7694 --- /dev/null +++ b/pkgs/tools/archivers/7zz/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_tryUnpackDmg) +_tryUnpackDmg() { + if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi + 7zz x "$curSrc" +} diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index b931e70d23ea..6a8d491480ea 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2024.02.19"; + version = "2024.03.02"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-mby2GAOcjSDgF21ZUOoPbyVV0RNMjIBvS5hg+15G75U="; + hash = "sha256-LWVU6OZc4hTjYY7Q8zjlR4vMqRc2Y+8QGFST543FR1I="; }; meta = with lib; { diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 88703b28b582..43aaa534c041 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dvd-vr"; version = "0.9.7"; src = fetchurl { - url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz"; + url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${finalAttrs.version}.tar.gz"; sha256 = "13wkdia3c0ryda40b2nzpb9vddimasgc4w95hvl0k555k9k8bl0r"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { mainProgram = "dvd-vr"; }; } - +) diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/tools/compression/heatshrink/default.nix index b5cfb92247af..d18f82ef21fa 100644 --- a/pkgs/tools/compression/heatshrink/default.nix +++ b/pkgs/tools/compression/heatshrink/default.nix @@ -5,14 +5,14 @@ , fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "heatshrink"; version = "0.4.1"; src = fetchFromGitHub { owner = "atomicobject"; repo = "heatshrink"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Nm9/+JFMDXY1N90hmNFGh755V2sXSRQ4VBN9f8TcsGk="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "heatshrink"; }; -} +}) diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 3a5d62b8092d..cbf789d1bbf1 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-install-exe-file.patch + # https://lists.nongnu.org/archive/html/lzip-bug/2024-02/msg00015.html + # patch provided by upstream, to be removed in the next release + ./mingw-mkdir-one-argument.patch ]; configureFlags = [ diff --git a/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch b/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch new file mode 100644 index 000000000000..efa0d8e3a067 --- /dev/null +++ b/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch @@ -0,0 +1,13 @@ +--- lzip-1.24/main.cc 2024-01-26 00:08:47.000000000 +0100 ++++ lzip-1.24.1/src/main.cc 2024-02-06 16:04:00.000000000 +0100 +@@ -42,8 +42,10 @@ + #if defined __MSVCRT__ || defined __OS2__ || defined __DJGPP__ + #include <io.h> + #if defined __MSVCRT__ ++#include <direct.h> + #define fchmod(x,y) 0 + #define fchown(x,y,z) 0 ++#define mkdir(name,mode) _mkdir(name) + #define strtoull std::strtoul + #define SIGHUP SIGTERM + #define S_ISSOCK(x) 0 diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index a64812e96b9c..529d963af304 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -8,12 +8,12 @@ , wrapperDir ? "/run/wrappers/bin" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "davfs2"; version = "1.7.0"; src = fetchurl { - url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; + url = "mirror://savannah/davfs2/davfs2-${finalAttrs.version}.tar.gz"; sha256 = "sha256-JR23Wic4DMoTMLG5cXAMXl3MDJDlpHYiKF8BQO3+Oi8="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/filesystems/fuse-ext2/default.nix b/pkgs/tools/filesystems/fuse-ext2/default.nix index aaff185a4a1b..e608bc5a41db 100644 --- a/pkgs/tools/filesystems/fuse-ext2/default.nix +++ b/pkgs/tools/filesystems/fuse-ext2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fuse-ext2"; - version = "unstable-2020-07-12"; + version = "0.0.11"; src = fetchFromGitHub { owner = "alperakcan"; repo = "fuse-ext2"; - rev = "899f17c982dadcea13aa447c3a83c53b9431435a"; - sha256 = "AE7Z+HePAy/h2TCNI9tsz6GVLdnE2AIOM3GnQzerKn8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-VQMftlnd6q1PdwhSIQwjffjnkhupY8MUc8E+p1tgvUM="; }; patches = [ diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index e34822845b40..520a6951941a 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -70,6 +70,11 @@ let "sqlite" ]; + disabledTests = [ + # Upstream told us this test is flakey. + "k2v::poll::test_poll_item" + ]; + passthru.tests = nixosTests.garage; meta = { @@ -89,22 +94,23 @@ rec { # we have to keep all the numbers in the version to handle major/minor/patch level. # for <1.0. - garage_0_8_5 = generic { - version = "0.8.5"; - sha256 = "sha256-YRxkjETSmI1dcHP9qTPLcOMqXx9B2uplVR3bBjJWn3I="; - cargoSha256 = "sha256-VOcymlvqqQRdT1MFzRcMuD+Xo3fc3XTuRA12tW7ZjdI="; + garage_0_8_7 = generic { + version = "0.8.7"; + sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; + cargoSha256 = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo="; broken = stdenv.isDarwin; }; - garage_0_8 = garage_0_8_5; + garage_0_8 = garage_0_8_7; - garage_0_9_1 = generic { - version = "0.9.1"; - sha256 = "sha256-AXLaifVmZU4j5D/wKn/0TzhjHZBzZW1+tMyhsAo2eBU="; - cargoSha256 = "sha256-4/+OsM73TroBB1TGqare2xASO5KhqVyNkkss0Y0JZXg="; + garage_0_9_3 = generic { + version = "0.9.3"; + sha256 = "sha256-NN2HoheSW2+SAFX71K12KTe0wpaBEwkwxvZDi0Bdx+8="; + cargoSha256 = "sha256-OabgWVMkccFFAtBHEf3z+MRVcWaO+NCk/pumEqdNNRs="; + broken = stdenv.isDarwin; }; - garage_0_9 = garage_0_9_1; + garage_0_9 = garage_0_9_3; garage = garage_0_9; } diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 1ff360bc3399..c5dca0278ecb 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.40.1"; + version = "2.40.2"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-EeAgDkm8WyD9OCM8/tHydp/slDGPwCAljeOrUCIWAqQ="; + sha256 = "sha256-3DfSGuTtM+h0IdtsIhLVXQxX5/Tj9G5Qcha3DWmyyq4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 5f3b5e534ca3..ae96def578f6 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nilfs-utils"; - version = "2.2.9"; + version = "2.2.10"; src = fetchFromGitHub { owner = "nilfs-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XqViUvPj2BHO3bGs9xBO3VpRq9XqnwBptHvMwBOntqo="; + sha256 = "sha256-xTnd3sfBaVU4Ovcsk4oufylNpGS+5n3ZLa2GXzUbeCE="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index c8c80e5ff777..5a7022ee6a13 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { description = "SGI XFS utilities"; license = with licenses; [ gpl2Only lgpl21 gpl3Plus ]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright platforms = platforms.linux; - maintainers = with maintainers; [ dezgeg ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ dezgeg ajs124 ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a5968425f5d8..30681663a7ce 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "2.86"; + version = "2.87"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - hash = "sha256-Bk8/WIQTfrbOo9b2hw580vJwiK6P1OBV5HMqMH+LkuE="; + hash = "sha256-xzRZ7NOWeu+uC5WeTxwh5MFm7psXMhxrxucT4PVtRxM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index 3216790590e1..8c3e603cae84 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2023-08-30"; + version = "0-unstable-2024-02-12"; src = fetchfossil { url = "https://pikchr.org/home"; - rev = "d6f80b1ab30654d5"; - sha256 = "sha256-GEH1qFiMYmNFJnZzLG5rxpl+F7OSRMoVcdo94+mvrlY="; + rev = "ae3317b0ec2e635c"; + hash = "sha256-kCbd6XAaUCwFVYOPPLIux7wW62KRfVnfaxT8Z1RGFfc="; }; # can't open generated html files diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index a3b5e180bcfb..865134947be5 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-XI4E+fWDIYDiYBv6HezytaZmhzv4NUaNam1T5Fyx+LI="; + hash = "sha256-MeknggrpOzpkT1EXZCftIrlevuMEEHM5d8vszKRp+DI="; }; prePatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 385043ef9a29..0699f23e3aab 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchurl , fetchFromGitHub , cmake @@ -13,6 +13,7 @@ , opencc , curl , fmt +, qtbase , luaSupport ? true }: @@ -29,15 +30,15 @@ let }; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-z+udRjvAZbnu6EcvvdaFVCr0OKLxFBJbgoYpH9QjrDI="; + sha256 = "sha256-OqVoXZ8SIO8KRs3ehxul9Ug4sV47cxVCbLCBh6/8EoE="; }; nativeBuildInputs = [ @@ -62,6 +63,12 @@ mkDerivation rec { fmt ] ++ lib.optional luaSupport fcitx5-lua; + cmakeFlags = [ + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) + ]; + + dontWrapQtApps = true; + meta = with lib; { description = "Addons related to Chinese, including IME previous bundled inside fcitx4"; homepage = "https://github.com/fcitx/fcitx5-chinese-addons"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index b726a3515508..f0553a5d52f7 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -1,60 +1,81 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , extra-cmake-modules +, pkg-config , fcitx5 , fcitx5-qt -, qtx11extras -, qtquickcontrols2 +, qtbase +, qtsvg +, qtwayland +, qtdeclarative +, qtx11extras ? null +, kitemviews , kwidgetsaddons +, qtquickcontrols2 ? null +, kcoreaddons , kdeclarative -, kirigami2 +, kirigami ? null +, kirigami2 ? null , isocodes , xkeyboardconfig , libxkbfile -, libXdmcp -, plasma5Packages -, plasma-framework +, libplasma ? null +, plasma-framework ? null +, wrapQtAppsHook , kcmSupport ? true }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-IwGlhIeON0SenW738p07LWZAzVDMtxOSMuUIAgfmTEg="; + sha256 = "sha256-jYO1jdiuDjt6e98qhwMpTQTnGxoIYWMKkORGJbmk3mk="; }; cmakeFlags = [ - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" + (lib.cmakeBool "KDE_INSTALL_USE_QT_SYS_PATHS" true) + (lib.cmakeBool "ENABLE_KCM" kcmSupport) + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) ]; nativeBuildInputs = [ cmake extra-cmake-modules + pkg-config + wrapQtAppsHook ]; buildInputs = [ fcitx5 fcitx5-qt - qtx11extras - qtquickcontrols2 - kirigami2 + qtbase + qtsvg + qtwayland + kitemviews + kwidgetsaddons isocodes xkeyboardconfig libxkbfile - libXdmcp - ] ++ lib.optionals kcmSupport [ + ] ++ lib.optionals (lib.versions.major qtbase.version == "5") [ + qtx11extras + ] ++ lib.optionals kcmSupport ([ + qtdeclarative + kcoreaddons kdeclarative - kwidgetsaddons - plasma5Packages.kiconthemes + ] ++ lib.optionals (lib.versions.major qtbase.version == "5") [ + qtquickcontrols2 plasma-framework - ]; + kirigami2 + ] ++ lib.optionals (lib.versions.major qtbase.version == "6") [ + libplasma + kirigami + ]); meta = with lib; { description = "Configuration Tool for Fcitx5"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 1036b28685c3..6be9e49886f8 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Ex24cHTsYsZjP8o+vrCdgGogk1UotWpd8xaLZAqzgaQ="; + sha256 = "sha256-iNqY/VORDEPR4rc0LjVgcojZlMcT+LBdrdOwBkC5Vkk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 9a1a2c8eca24..23aabde1e653 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-3gkZh+ZzgTdpTbQe92gxJlG0x6Yhl7LfMiFEq5mb92o="; + sha256 = "sha256-S5TGjb5vD0rk7V88b4yRziszLrwO1pgVFWuEGMp48oY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 202886e4e8e1..b0cd6dc6d59b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -1,52 +1,50 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , extra-cmake-modules , fcitx5 -, qtx11extras -, libxcb -, libXdmcp , qtbase -, qt6 +, qtwayland +, wrapQtAppsHook , wayland }: - -mkDerivation rec { - pname = "fcitx5-qt"; +let + majorVersion = lib.versions.major qtbase.version; +in +stdenv.mkDerivation rec { + pname = "fcitx5-qt${majorVersion}"; version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; - repo = pname; + repo = "fcitx5-qt"; rev = version; sha256 = "sha256-bVH2US/uEZGERslnAh/fyUbzR9fK1UfG4J+mOmrIE8Y="; }; - preConfigure = '' - substituteInPlace qt5/platforminputcontext/CMakeLists.txt \ - --replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix} - substituteInPlace qt6/platforminputcontext/CMakeLists.txt \ - --replace \$"{CMAKE_INSTALL_QT6PLUGINDIR}" $out/${qt6.qtbase.qtPluginPrefix} + postPatch = '' + substituteInPlace qt${majorVersion}/platforminputcontext/CMakeLists.txt \ + --replace \$"{CMAKE_INSTALL_QT${majorVersion}PLUGINDIR}" $out/${qtbase.qtPluginPrefix} ''; cmakeFlags = [ - # adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies - "-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}" - "-DENABLE_QT4=0" - "-DENABLE_QT6=1" + "-DENABLE_QT4=OFF" + "-DENABLE_QT5=OFF" + "-DENABLE_QT6=OFF" + "-DENABLE_QT${majorVersion}=ON" ]; nativeBuildInputs = [ cmake extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ + qtbase + qtwayland fcitx5 - qtx11extras - libxcb - libXdmcp wayland ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 3698abeed8aa..4fecf46e5e3b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-tbCIWenH5brJUVIsmOiw/E/uIXAWwK1yangIVlkeOAs="; + hash = "sha256-/eVgF5kgf1gmbkOInoGbmH/eH0vO2xj3X6k+wzeEssM="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 31ecbed35bc9..6cfced6a632e 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -10,19 +10,18 @@ , libskk , qtbase , skk-dicts -, wrapQtAppsHook , enableQt ? false }: stdenv.mkDerivation rec { pname = "fcitx5-skk"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-a+ZsuFEan61U0oOuhrTFoK5J4Vd0jj463jQ8Mk7TdbA="; + sha256 = "sha256-vg79zJ/ZoUjCKU11krDUjO0rAyZxDMsBnHqJ/I6NTTA="; }; nativeBuildInputs = [ @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { extra-cmake-modules gettext pkg-config - ] ++ lib.optional enableQt wrapQtAppsHook; + ]; buildInputs = [ fcitx5 @@ -41,10 +40,13 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DENABLE_QT=${toString enableQt}" + (lib.cmakeBool "ENABLE_QT" enableQt) + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.L" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Input method engine for Fcitx5, which uses libskk as its backend"; homepage = "https://github.com/fcitx/fcitx5-skk"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 0320fa5c4f01..dea3e2d03802 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-w4JFZvYFL3fHrDgZqYND2bl3lT9/O1GXgfOwR7WyzWY="; + hash = "sha256-Lb8CYFQl48arJEn9gemZ7imD/gdKjN+7Wnm21/0/Sko="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index b0129a923438..410413bf30d8 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-ymHAKaPmQckxM/XHoDOVSzEWpyQGb7zVG21CDwNfyjg="; + sha256 = "sha256-G34hPEdcdi5agWiFEgUHWD18ozOgBCaoS6HMAklUcO4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index aa87d725f104..a1a077264b3a 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -6,23 +6,37 @@ , fcitx5 , fcitx5-qt , gettext -, wrapQtAppsHook +, qtbase }: stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-tLooADS8HojS9i178i5FJVqZtKrTXlzOBPlE9K49Tjc="; + sha256 = "sha256-wrsA0gSexOZgsJunozt49GyP9R3Xe2Aci7Q8p3zAM9Q="; }; - nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; - buildInputs = [ fcitx5 fcitx5-qt gettext ]; + buildInputs = [ + qtbase + fcitx5 + fcitx5-qt + gettext + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) + ]; + + dontWrapQtApps = true; meta = with lib; { description = "Unikey engine support for Fcitx5"; diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 75fac87b6285..614074595f51 100644 --- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -4,7 +4,8 @@ , fcitx5 , withConfigtool ? true , fcitx5-configtool -, fcitx5-qt +, libsForQt5 +, qt6Packages , fcitx5-gtk , addons ? [ ] }: @@ -14,7 +15,8 @@ symlinkJoin { paths = [ fcitx5 - fcitx5-qt + libsForQt5.fcitx5-qt + qt6Packages.fcitx5-qt fcitx5-gtk ] ++ lib.optionals withConfigtool [ fcitx5-configtool diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index ab71af957481..0107e8755880 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ibus-anthy"; - version = "1.5.15"; + version = "1.5.16"; src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-WMTm1YNqSsnjOqnoTljE3rZ62pjztUSyRAxXgyN+2Ys="; + sha256 = "sha256-FVIiFLWK2ISsydmx2hPxXbfc12w7GKiFCQRuXsYT0a4="; }; buildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch b/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch index cb587ccf47d8..cff6787667fa 100644 --- a/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch +++ b/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch @@ -1,19 +1,24 @@ diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh -index 601c1c3f..fcb7305d 100755 +index 32cb1530..375baa41 100755 --- a/data/dconf/make-dconf-override-db.sh +++ b/data/dconf/make-dconf-override-db.sh -@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" +@@ -12,15 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR -eval `dbus-launch --sh-syntax` - --trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +-trap cleanup EXIT +- +-cleanup() { +- test $? -eq 0 && exit +- rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID +-} - # in case that schema is not installed on the system glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" -@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then +@@ -57,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then umount $TMPDIR/cache/gvfs fi rm -rf $TMPDIR diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 417b1be605d5..5de2fc67d020 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , substituteAll , fetchFromGitHub -, fetchpatch , autoreconfHook , gettext , makeWrapper @@ -17,6 +17,7 @@ , gtk3 , gtk4 , gtk-doc +, libdbusmenu-gtk3 , runCommand , isocodes , cldr-annotations @@ -26,7 +27,7 @@ , json-glib , libnotify ? null , enableUI ? true -, withWayland ? false +, withWayland ? true , libxkbcommon , wayland , buildPackages @@ -46,23 +47,24 @@ let }; # make-dconf-override-db.sh needs to execute dbus-launch in the sandbox, # it will fail to read /etc/dbus-1/session.conf unless we add this flag - dbus-launch = runCommand "sandbox-dbus-launch" { - nativeBuildInputs = [ makeWrapper ]; - } '' - makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ - --add-flags --config-file=${dbus}/share/dbus-1/session.conf + dbus-launch = runCommand "sandbox-dbus-launch" + { + nativeBuildInputs = [ makeWrapper ]; + } '' + makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ + --add-flags --config-file=${dbus}/share/dbus-1/session.conf ''; in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.28"; + version = "1.5.29"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "sha256-zjV+QkhVkrHFs9Vt1FpbvmS4nRHxwKaKU3mQkSgyLaQ="; + sha256 = "sha256-d4EUIg0v8rfHdvzG5USc6GLY6QHtQpIJp1PrPaaBxxE="; }; patches = [ @@ -72,27 +74,17 @@ stdenv.mkDerivation rec { pythonSitePackages = python3.sitePackages; }) ./build-without-dbus-launch.patch - # unicode and emoji input are broken before 1.5.29 - # https://github.com/NixOS/nixpkgs/issues/226526 - (fetchpatch { - url = "https://github.com/ibus/ibus/commit/7c8abbe89403c2fcb08e3fda42049a97187e53ab.patch"; - hash = "sha256-59HzAdLq8ahrF7K+tFGLjTodwIiTkJGEkFe8quqIkhU="; - }) - # fix SIGABRT in X11 https://github.com/ibus/ibus/issues/2484 - (fetchpatch { - url = "https://github.com/ibus/ibus/commit/8f706d160631f1ffdbfa16543a38b9d5f91c16ad.patch"; - hash = "sha256-YzS9TmUWW0OmheDeCeU00kFK2U2QEmKYMSRJAbu14ec="; - }) - # fix missing key releases in Wine https://github.com/ibus/ibus/issues/2480 - (fetchpatch { - url = "https://github.com/ibus/ibus/commit/497f0c74230a65309e22ce5569060ce48310406b.patch"; - hash = "sha256-PAZcUxmzjChs1/K8hXgOcytyS4LYoNL1dtU6X5Tx8ic="; - }) ]; outputs = [ "out" "dev" "installedTests" ]; postPatch = '' + # Maintainer does not want to create separate tarballs for final release candidate and release versions, + # so we need to set `ibus_released` to `1` in `configure.ac`. Otherwise, anyone running `ibus version` gets + # a version with an inaccurate `-rcX` suffix. + # https://github.com/ibus/ibus/issues/2584 + substituteInPlace configure.ac --replace "m4_define([ibus_released], [0])" "m4_define([ibus_released], [1])" + patchShebangs --build data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . substituteInPlace bus/services/org.freedesktop.IBus.session.GNOME.service.in --replace "ExecStart=sh" "ExecStart=${runtimeShell}" @@ -102,6 +94,11 @@ stdenv.mkDerivation rec { preAutoreconf = "touch ChangeLog"; configureFlags = [ + # The `AX_PROG_{CC,CXX}_FOR_BUILD` autoconf macros can pick up unwrapped GCC binaries, + # so we set `{CC,CXX}_FOR_BUILD` to override that behavior. + # https://github.com/NixOS/nixpkgs/issues/21751 + "CC_FOR_BUILD=${stdenv.cc}/bin/cc" + "CXX_FOR_BUILD=${stdenv.cc}/bin/c++" "--disable-memconf" (lib.enableFeature (dconf != null) "dconf") (lib.enableFeature (libnotify != null) "libnotify") @@ -115,12 +112,6 @@ stdenv.mkDerivation rec { "--with-ucd-dir=${unicode-character-database}/share/unicode" ]; - # missing make dependency - # https://github.com/NixOS/nixpkgs/pull/218120#issuecomment-1514027173 - preBuild = '' - make -C src ibusenumtypes.h - ''; - makeFlags = [ "test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus" "test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus" @@ -154,6 +145,7 @@ stdenv.mkDerivation rec { isocodes json-glib libnotify + libdbusmenu-gtk3 ] ++ lib.optionals withWayland [ libxkbcommon wayland diff --git a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix index b28b7ad784f8..6337b0d7f4f5 100644 --- a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix +++ b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix @@ -15,7 +15,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { # APFS format is unsupported by undmg nativeBuildInputs = [ _7zz ]; - unpackCmd = "7zz x $curSrc"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index e5850f8871e7..23c5372e5eef 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -42,9 +42,7 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - unpackPhase = if stdenv.hostPlatform.isDarwin then '' - 7zz x $src - '' else null; + sourceRoot = if stdenv.isDarwin then "." else null; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix index 297917b6a92a..4d0134e8eaee 100644 --- a/pkgs/tools/misc/audible-cli/default.nix +++ b/pkgs/tools/misc/audible-cli/default.nix @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { packaging pillow questionary + setuptools tabulate toml tqdm diff --git a/pkgs/tools/misc/blahaj/default.nix b/pkgs/tools/misc/blahaj/default.nix index c0e591515cdf..a37d37bf4184 100644 --- a/pkgs/tools/misc/blahaj/default.nix +++ b/pkgs/tools/misc/blahaj/default.nix @@ -1,6 +1,10 @@ { lib +, stdenv , crystal , fetchFromGitHub + # https://crystal-lang.org/2019/09/06/parallelism-in-crystal/ +, multithreading ? true +, static ? stdenv.hostPlatform.isStatic }: crystal.buildCrystalPackage rec { @@ -14,6 +18,8 @@ crystal.buildCrystalPackage rec { hash = "sha256-CmMF9jDKUo+c8dYc2UEHKdBDE4dgwExcRS5sSUsUJik="; }; + buildTargets = [ "${if static then "static" else "build"}${if multithreading then "_mt" else ""}" ]; + meta = with lib; { description = "Gay sharks at your local terminal - lolcat-like CLI tool"; homepage = "https://blahaj.queer.software"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index ee907902ada8..751860860436 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-5CWcc55OunZwCTqODQnvPUnn5cJET83PfIyDyzmpOkA="; + hash = "sha256-L9a1fQZkCHSHseZtQYwqIt1CokPGBqLcqY0jccHYqGw="; }; - cargoHash = "sha256-kNZPAU8QSR9hDwalvsRqRL4gaKTyvUA2gZ/bBB6/YDU="; + cargoHash = "sha256-DRW1gv5lqdXWcRLD2yf7+u6J/xIUWmELmb/l729Sqo4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 62ae9994fff8..874299905e07 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers, cowsay }: +{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cowsay"; version = "3.7.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cowsay-org"; repo = "cowsay"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-t1grmCPQhRgwS64RjEwkK61F2qxxMBKuv0/DzBTnL3s="; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { - package = cowsay; + package = finalAttrs.finalPackage; command = "cowsay --version"; }; }; @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program which generates ASCII pictures of a cow with a message"; homepage = "https://cowsay.diamonds"; - changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${version}"; + changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ rob anthonyroussel ]; }; -} +}) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index c8e009569cd5..28a31a16d078 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; - hash = "sha256-l6C9cJ0MfffzULuH9DIoNzGKqp7o4cwpbDrbC93yc/g="; + hash = "sha256-4U/igqtgw2rwyuhEkV1pWYPIyNZEt2N6hlXJ9bDUyRw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 625f86c1da47..5bac5602c79f 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -79,11 +79,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "257"; + version = "259"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-Fejp4i0uzsK9+9JBVPsE1AdDwshtRlxpxPfJdqRQQH4="; + hash = "sha256-WYgFWM6HKFt3xVcRNytQPWOf3ZpH1cG7Cghhu/AES80="; }; outputs = [ diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 9395cade650b..4bb9d9bacaff 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "direnv"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-/xOqJ3dr+3S502rXHVBcHhgBCctoMYnWpfLqgrxIoN8="; + sha256 = "sha256-EvzqLS/FiWrbIXDkp0L/T8QNKnRGuQkbMWajI3X3BDw="; }; - vendorHash = "sha256-QGPcNgA/iiGt0CdFs2kR3zLL5/SWulSyyf/pW212JpU="; + vendorHash = "sha256-FfKvLPv+jUT5s2qQ7QlzBMArI+acj7nhpE8FGMPpp5E="; # we have no bash at the moment for windows BASH_PATH = diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index d05360ccffe3..228cdf7f2f2f 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.15"; + version = "1.0.16"; src = fetchCrate { inherit pname version; - hash = "sha256-f32Y9Aj4Z9y6Da9rbRgwi9BGPl4FsI790BH52cIIoPA="; + hash = "sha256-BlQnVjYPFUfEurFUE2MHOL2ad56Nu/atzRuFu4OoCSI="; }; - cargoHash = "sha256-+M1oq2CHUK6CIDFiUNLjO1UmHI19D5zdHVl8dvmQ1G8="; + cargoHash = "sha256-q9jx03XYA977481B9xuUfaaMBDbSVx4xREj4Q1Ti/Yw="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index bcfbdfa9becb..2e727896905d 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.8.5"; + version = "2.8.7"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-aIGT2NwtkKJ1uTgy4rvFegzJadRuGkki63gpnVCPKbw="; + hash = "sha256-lJRTw8Z//x6tMpwfwSodTz7aVbnJPt3rac7AudqF+DA="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/flashrom-stable/default.nix b/pkgs/tools/misc/flashrom-stable/default.nix deleted file mode 100644 index 81beb2346e34..000000000000 --- a/pkgs/tools/misc/flashrom-stable/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchgit -, installShellFiles -, lib -, libftdi1 -, libgpiod_1 -, libjaylink -, libusb1 -, pciutils -, pkg-config -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "flashrom-stable"; - version = "1.1"; - - src = fetchgit { - url = "https://review.coreboot.org/flashrom-stable"; - rev = "272aae888ce5abf5e999d750ee4577407db32246"; - hash = "sha256-DR4PAING69+TMsyycGxt1cu0ba1tTlG36+H/pJ0oP4E="; - }; - - nativeBuildInputs = [ - installShellFiles - pkg-config - ]; - - buildInputs = [ - libftdi1 - libjaylink - libusb1 - ] ++ lib.optionals (!stdenv.isDarwin) [ - libgpiod_1 - pciutils - ]; - - makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optionals stdenv.isDarwin [ "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=0" ]; - - meta = with lib; { - homepage = "https://www.flashrom.org"; - description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = with licenses; [ gpl2 gpl2Plus ]; - maintainers = with maintainers; [ felixsinger ]; - platforms = platforms.all; - mainProgram = "flashrom"; - }; -} diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index 409179461ef0..90b1bec1f5a2 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "desbma"; repo = pname; rev = version; - sha256 = "sha256-TuqzwmKB48xcdzrAr7MvDA9JChobraESQZPKoy24mPE="; + sha256 = "sha256-epolESdf9+2lI+AJ8hMpVPakS1f8fYam+JniiPLIHCs="; }; - cargoHash = "sha256-vg3al+eH9Q4D/T56jwWBlBT4IhuggiEVBl8WoZmUS2Y="; + cargoHash = "sha256-VJ/k6sfBCuokXGpfZ9zGQ7ucbHLweUSgBhlChwko69g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/grizzly/default.nix b/pkgs/tools/misc/grizzly/default.nix index d16356d6d5ce..e523571e79f6 100644 --- a/pkgs/tools/misc/grizzly/default.nix +++ b/pkgs/tools/misc/grizzly/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "grizzly"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-d/DUazWBT96+dnwVXo667RHALUM2FHxXoI54fFU2HZw="; + hash = "sha256-c+QT3NwfnkVzAb1mqNIuNhSJJOnzME4e3ASawdNBFmg="; }; - vendorHash = "sha256-8myfB2LKDPUCFV9GBSXrBo9E+WrCOCm0ZHKTQ1dEb9U="; + vendorHash = "sha256-EVP2w0mvzzBcrhohM2VmetK8UQu7fauelSa+C+q3n+g="; subPackages = [ "cmd/grr" ]; diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/tools/misc/hwatch/default.nix index 2eb8be5d2f93..96621948192a 100644 --- a/pkgs/tools/misc/hwatch/default.nix +++ b/pkgs/tools/misc/hwatch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-RvsL6OajXwEY77W3Wj6GMijYwn7XDnKiJyDXbNG01ag="; + sha256 = "sha256-S6hnmNnwdWd6iFM01K52oiKXiqu/0v5yvKKoeQMEqy0="; }; - cargoHash = "sha256-v7MvXnc9Xa+6QAyi2N9/WtqnvXf9M1SlR86kNjfu46Y="; + cargoHash = "sha256-P4XkbV6QlokedKumX3UbCfEaAqH9VF9IKVyZIumZ6u0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ksnip/default.nix b/pkgs/tools/misc/ksnip/default.nix index 60ba06a29930..8e5cc40740cc 100644 --- a/pkgs/tools/misc/ksnip/default.nix +++ b/pkgs/tools/misc/ksnip/default.nix @@ -3,6 +3,7 @@ , cmake , extra-cmake-modules , fetchFromGitHub +, fetchpatch , kcolorpicker , kimageannotator , wrapQtAppsHook @@ -22,6 +23,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I="; }; + patches = [ + # Fix build with latest kImageAnnotator + (fetchpatch { + url = "https://github.com/ksnip/ksnip/commit/76f4b381971eead6ff31b8bf3bb64bb5717469c3.patch"; + hash = "sha256-JWoI974qDNZIzr/8oksI8m6g3XNWEaQRGsqSfvQrmao="; + }) + ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt --replace-fail "kColorPicker::kColorPicker" "kColorPicker::kColorPicker-Qt5" + ''; + nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index c7978485c7e4..5bc3f97c3c78 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,4 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, procps, file, gnused, bash, binutils }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, perl +, procps +, bash + +# shell referenced dependencies +, resholve +, binutils-unwrapped +, file +, gnugrep +, coreutils +, gnused +, gnutar +, iconv +, ncurses +}: stdenv.mkDerivation rec { pname = "lesspipe"; @@ -28,9 +46,65 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' - for f in lesspipe.sh lesscomplete; do - wrapProgram "$out/bin/$f" --prefix-each PATH : "${lib.makeBinPath [ binutils file gnused procps ]}" - done + # resholve doesn't see strings in an array definition + substituteInPlace $out/bin/lesspipe.sh --replace 'nodash strings' "nodash ${binutils-unwrapped}/bin/strings" + + ${resholve.phraseSolution "lesspipe.sh" { + scripts = [ "bin/lesspipe.sh" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + file + gnugrep + gnused + gnutar + iconv + procps + ncurses + ]; + keep = [ "$prog" "$c1" "$c2" "$c3" "$c4" "$c5" "$cmd" "$colorizer" "$HOME" ]; + fake = { + # script guards usage behind has_cmd test function, it's safe to leave these external and optional + external = [ + "cpio" "isoinfo" "cabextract" "bsdtar" "rpm2cpio" "bsdtar" "unzip" "ar" "unrar" "rar" "7zr" "7za" "isoinfo" + "gzip" "bzip2" "lzip" "lzma" "xz" "brotli" "compress" "zstd" "lz4" + "archive_color" "bat" "batcat" "pygmentize" "source-highlight" "vimcolor" "code2color" + + "w3m" "lynx" "elinks" "html2text" "dtc" "pdftotext" "pdftohtml" "pdfinfo" "ps2ascii" "procyon" "ccze" + "mdcat" "pandoc" "docx2txt" "libreoffice" "pptx2md" "mdcat" "xlscat" "odt2txt" "wvText" "antiword" "catdoc" + "broken_catppt" "sxw2txt" "groff" "mandoc" "unrtf" "dvi2tty" "pod2text" "perldoc" "h5dump" "ncdump" "matdump" + "djvutxt" "openssl" "gpg" "plistutil" "plutil" "id3v2" "csvlook" "jq" "zlib-flate" "lessfilter" + ] ++ lib.optional stdenv.isDarwin [ + # resholve only identifies this on darwin + # call site is gaurded by || so it's safe to leave dynamic + "locale" + ]; + builtin = [ "setopt" ]; + }; + execer = [ + "cannot:${iconv}/bin/iconv" + ]; + }} + ${resholve.phraseSolution "lesscomplete" { + scripts = [ "bin/lesscomplete" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + file + gnugrep + gnused + gnutar + ]; + keep = [ "$prog" "$c1" "$c2" "$c3" "$c4" "$c5" "$cmd" ]; + fake = { + # script guards usage behind has_cmd test function, it's safe to leave these external and optional + external = [ + "cpio" "isoinfo" "cabextract" "bsdtar" "rpm2cpio" "bsdtar" "unzip" "ar" "unrar" "rar" "7zr" "7za" "isoinfo" + "gzip" "bzip2" "lzip" "lzma" "xz" "brotli" "compress" "zstd" "lz4" + ]; + builtin = [ "setopt" ]; + }; + }} ''; meta = with lib; { diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index 4afa360df25b..959be1430da5 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.2.18"; + version = "2024.2.19"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-YidcjhPgaDODtz0EpktIsRmnRMryvGJKQ2vx/MEQG9s="; + hash = "sha256-SDGXSjCDdtjKn474s2SQm9YDHofMOmHuodLS2iu10Co="; }; - cargoHash = "sha256-QXtjM2yGOCf1nGOvrJCcLlI+MAGiu6bfsc/hSENNd1k="; + cargoHash = "sha256-4MEBIZOXjcLEyW0TB+AXWsEc24VZz8bGCkduHqbazuo="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index c8ce33207787..f2d2bd81ae11 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mmv"; - version = "2.5.1"; + version = "2.6"; src = fetchFromGitHub { owner = "rrthomas"; repo = "mmv"; rev = "v${version}"; - sha256 = "sha256-01MJjYVPfDaRkzitqKXTJZHbkkZTEaFoyYZEEMizHp0="; + sha256 = "sha256-hYSTENSmkJP5rAemDyTzbzMKFrWYcMpsJDRWq43etTM="; fetchSubmodules = true; }; @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ]; buildInputs = [ boehmgc ]; + enableParallelBuilding = true; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" "-Wno-error=implicit-int" + "-Wno-error=int-conversion" ]; }; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 7e3185b489d9..0bd72f25689d 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.42.1"; + version = "1.42.2"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-URxzoMb03p8UTLbn8tmtaSQQV27hYRSwlTiacF/48F8="; + sha256 = "sha256-NvHFsB+wXNq2XmHb2tYI1P9vUXwVcwbhR645LjHM0/Y="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 6975d4878c52..7d7dd80d7e7a 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "moreutils"; - version = "0.68"; + version = "0.69"; src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - hash = "sha256-kOY12oejH0xKaaPrKem+l0PACqyPqD4P1jEjOYfNntM="; + hash = "sha256-hVvRAIXlG8+pAD2v/Ma9Z6EUL/1xIRz7Gx1fOxoQyi0="; }; preBuild = '' diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 54e85c063633..b200731ab8f2 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -14,14 +14,14 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = pname; - rev = version; - hash = "sha256-fcTbt8O/7KEme5+GlDD7hMMcE2RaYqFdfojzJ1KhnA0="; + rev = "refs/tags/${version}"; + hash = "sha256-liyzgbZGl08gHLVpsy8NbTiTytNdiMdymF70ik4cPXs="; }; patches = [ ./hardcode-gsettings.patch ]; diff --git a/pkgs/tools/misc/nbqa/default.nix b/pkgs/tools/misc/nbqa/default.nix index 0c55c78f7b49..10115affcca2 100644 --- a/pkgs/tools/misc/nbqa/default.nix +++ b/pkgs/tools/misc/nbqa/default.nix @@ -7,14 +7,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nbqa"; - version = "1.7.1"; + version = "1.8.3"; pyproject = true; src = fetchFromGitHub { owner = "nbQA-dev"; repo = "nbQA"; rev = "refs/tags/${version}"; - hash = "sha256-a/FuhJyf8BmZekUibzEiGgkHL51A+75R4a6S+h5i28s="; + hash = "sha256-RucDwXXEOTInhV/hk6gYXUmxUu660/pSTrBtHLrLkQ8="; }; nativeBuildInputs = with python3.pkgs; [ @@ -81,6 +81,7 @@ python3.pkgs.buildPythonApplication rec { "test_running_in_different_dir_works" "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" + "test_pylint_works" ]; disabledTestPaths = [ diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index 32b7f5fcbfc3..7a0fea0c116b 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -24,7 +24,14 @@ let pname = "ollama"; - version = "0.1.26"; + version = "0.1.27"; + src = fetchFromGitHub { + owner = "jmorganca"; + repo = "ollama"; + rev = "v${version}"; + hash = "sha256-+ayby+yVknFHLTyLjMAPMnOTMSzTKqzi9caN/TppcEg="; + fetchSubmodules = true; + }; validAccel = lib.assertOneOf "ollama.acceleration" acceleration [ null "rocm" "cuda" ]; @@ -74,14 +81,6 @@ let buildGoModule.override { stdenv = overrideCC stdenv gcc12; } else buildGoModule; - - src = fetchFromGitHub { - owner = "jmorganca"; - repo = "ollama"; - rev = "v${version}"; - hash = "sha256-Kw3tt9ayEMgI2V6OeaOkWfNwqfCL7MDD/nN5iXk5LnY="; - fetchSubmodules = true; - }; preparePatch = patch: hash: fetchpatch { url = "file://${src}/llm/patches/${patch}"; inherit hash; diff --git a/pkgs/tools/misc/outils/default.nix b/pkgs/tools/misc/outils/default.nix deleted file mode 100644 index 065d641f4f30..000000000000 --- a/pkgs/tools/misc/outils/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, lib }: - -stdenv.mkDerivation rec { - pname = "outils"; - version = "0.10"; - - src = fetchFromGitHub { - owner = "leahneukirchen"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-xYjILa0Km57q/xNP+M34r29WLGC15tzUNoUgPzQTtIs="; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - homepage = "https://github.com/leahneukirchen/outils"; - description = "Port of OpenBSD-exclusive tools such as `calendar`, `vis`, and `signify`"; - license = with licenses; [ - beerware - bsd2 - bsd3 - bsdOriginal - isc - mit - publicDomain - ]; - platforms = platforms.linux; - maintainers = with maintainers; [ somasis ]; - }; -} diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index d0c86c1275f5..2238cafe6983 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-+B/k3MqoefD3AVSYuR006eYyNe+njsfiqwBtQ+1YIHA="; + sha256 = "sha256-h2MJqbouPSciOdChLNIskYm3YLpJYK9gjTDB8StmBqg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d196de07f648..488039c80763 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20240122"; + version = "20240222"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-hZaIy7VkHNe2sWsrlgviSqTjfmVcyP/NivlxzX1bRJ8="; + sha256 = "sha256-66Cban4jj2Iik/fUYVl/NQdctW8XDQpzFI9T0lnshVY="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/tools/misc/pipectl/default.nix index f3e80655279f..f5cdeffc3ece 100644 --- a/pkgs/tools/misc/pipectl/default.nix +++ b/pkgs/tools/misc/pipectl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pipectl"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = "v${version}"; - hash = "sha256-dWRem9VHzMwVo+ahUagZB2r4Ag8PyBef5X41vVpZcAc="; + hash = "sha256-Ixch5iyeIjx+hSvln8L0N8pXG7ordpsFVroqZPUzAG0="; }; nativeBuildInputs = [ cmake scdoc ]; diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index c52c453dd8be..04b485427547 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -18,7 +18,7 @@ with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "3.6.1"; + version = "3.6.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonApplication rec { owner = "pre-commit"; repo = "pre-commit"; rev = "refs/tags/v${version}"; - hash = "sha256-UmQ1GehoMDXKEXo8wgPLxTDbtObk7YC2cfk1yNqesJM="; + hash = "sha256-rlGkoaVLrTCEPgPFNUWefJf6MJaKTA2RDSbV7eGtaAU="; }; patches = [ @@ -134,6 +134,7 @@ buildPythonApplication rec { "test_docker_hook" "test_docker_image_hook_via_args" "test_docker_image_hook_via_entrypoint" + "test_during_commit_all" "test_golang_default_version" "test_golang_hook" "test_golang_hook_still_works_when_gobin_is_set" diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index d6e8486681ac..8f244839803c 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xvuBMOAXnuRYCkripjwfv64BCTLySNxebyHF3sB8EQw="; + sha256 = "sha256-IWfYjn8CCgYK2hna59Awr5tzWnXCtR6c1XpV5fCiSE4="; }; passthru = { diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index bd049671336e..f003b36ea755 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -15,11 +15,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.02.09"; + version = "04.03.01"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-ZEaEYLQFpwXfp7ONsUt4I/ENqPADruooFRfdtJhrhyo="; + sha256 = "sha256-thmjcNWa1t4sHQTUu6NotbThTJ6scqrd/UWBqELe1NM="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/tools/misc/tkman/default.nix index e178e173108a..4df680fb6b8c 100644 --- a/pkgs/tools/misc/tkman/default.nix +++ b/pkgs/tools/misc/tkman/default.nix @@ -10,12 +10,12 @@ , rman }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tkman"; version = "2.2"; src = fetchzip { - url = "mirror://sourceforge/tkman/tkman-${version}.tar.gz"; + url = "mirror://sourceforge/tkman/tkman-${finalAttrs.version}.tar.gz"; hash = "sha256-S4ffz+7zmVy9+isz/8q+FV4wF5Rw2iL1ftY8RsJjRLs="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 1d1eaa53e7bb..b61f0bddaa26 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.34.0"; - format = "pyproject"; + version = "1.39.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-G93YtgXo4li+tLWKgJFaxx4Ax4sK4F+vK6M3WTXIeiU="; + hash = "sha256-E8Q1uCV3kl4rYg/bzwjk3CNQU/uP9lEZzSqcOFkLrY0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index b38c0242a3b0..e4f5c11a980a 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-Eft1grHJKSfr6ePJa7vdq6ckAP38ASXOTwJSvW0Ptp4="; + sha256 = "sha256-VOy6IoXw3MCa5hNQ/BmuGKwjbNRvDC+xwIcLXep8rRI="; }; vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s="; diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index d72e726da863..539850306bfe 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.200.0"; + version = "1.201.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-GuN70HiCmqBRwcosXqzT8sl5SRCTttOPIRl6pxaQiec="; + hash = "sha256-L3wo6a9rxqZ8Rjz8nejbfdTgQclFFp2ShdP6QECbrmg="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-T9p1PvgiAZrj82ABx7KX2InZACQ/ff7N0zPKGTCTBPk="; + cargoHash = "sha256-XzU43bcoRGHhVmpkcKvdRH9UybjTkQWH8RKBqsM/31M="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/pkgs/tools/misc/wit-bindgen/default.nix b/pkgs/tools/misc/wit-bindgen/default.nix deleted file mode 100644 index 9f0fbe1f4565..000000000000 --- a/pkgs/tools/misc/wit-bindgen/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "wit-bindgen"; - version = "0.17.0"; - - src = fetchFromGitHub { - owner = "bytecodealliance"; - repo = "wit-bindgen"; - rev = "wit-bindgen-cli-${version}"; - hash = "sha256-eFJkr/RqQdULPquCVbjhR8843aGjeEnUCF/Ws2U5fQk="; - }; - - cargoHash = "sha256-934lHOXzE2cLW6LMM0AQl/GJt4wSIKZlY1C7gmjGVrc="; - - # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. - # However, GitHub Actions ensures a proper build. - # See also: - # https://github.com/bytecodealliance/wit-bindgen/actions - # https://github.com/bytecodealliance/wit-bindgen/blob/main/.github/workflows/main.yml - doCheck = false; - - meta = with lib; { - description = "A language binding generator for WebAssembly interface types"; - homepage = "https://github.com/bytecodealliance/wit-bindgen"; - license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ]; - mainProgram = "wit-bindgen"; - }; -} diff --git a/pkgs/tools/networking/decode-spam-headers/default.nix b/pkgs/tools/networking/decode-spam-headers/default.nix new file mode 100644 index 000000000000..8f18658b52c5 --- /dev/null +++ b/pkgs/tools/networking/decode-spam-headers/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "decode-spam-headers"; + version = "2022-09-22-unreleased"; + + src = fetchFromGitHub { + owner = "mgeeky"; + repo = "decode-spam-headers"; + rev = "492b6e744475cd5d3dd68a8140bc3478244b7df1"; + sha256 = "sha256-gBDkvlZCndQjochn6TZtM/Lanza64LqMjNnLjn+pPR4="; + }; + + format = "other"; + + outputs = [ "out" "doc" ]; + + installPhase = '' + install -D decode-spam-headers.py $out/bin/decode-spam-headers + + mkdir -p $doc/share/doc/${pname} + mv \ + README.md \ + img/ \ + $doc/share/doc/${pname} + ''; + + propagatedBuildInputs = [ + python3Packages.python-dateutil + python3Packages.tldextract + python3Packages.packaging + python3Packages.dnspython + python3Packages.requests + python3Packages.colorama + ]; + + meta = with lib; { + homepage = "https://github.com/mgeeky/decode-spam-headers/"; + description = "A script that helps you understand why your E-Mail ended up in Spam"; + longDescription = '' + Whether you are trying to understand why a specific e-mail ended up in + SPAM/Junk for your daily Administrative duties or for your Red-Team + Phishing simulation purposes, this script is there for you to help! + + This tool accepts on input an *.EML or *.txt file with all the SMTP + headers. It will then extract a subset of interesting headers and using + 105+ tests will attempt to decode them as much as possible. + + This script also extracts all IPv4 addresses and domain names and performs + full DNS resolution of them. + + Resulting output will contain useful information on why this e-mail might + have been blocked. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index ab2ae59950cb..ed04e7f57b0a 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-PUwYcwWgaV/DQl565fugppc+I/y7z7Ns3P4SspS88ts="; + sha256 = "sha256-JGgkhNSKprqaUBaW+m/5vYnuDri1Ibyf2Y6SMlscnIU="; }; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 675c7d19b65a..ae15785a21ff 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -29,11 +29,11 @@ let sslPkg = sslPkgs.${sslLibrary}; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-MreFsSiDj0IYuNVGkMhsSHlNA/gXy7Yn+0h2n3nv1Zs="; + hash = "sha256-IIrfR8j6g8VJeANLpcARC3RjxHB48Rm9BSNCFxo7mgs="; }; buildInputs = [ sslPkg zlib libxcrypt ] diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index f05814f00f0f..b2f7367ab26a 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-02-16T11-05-48Z"; + version = "2024-02-24T01-33-20Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-Kqv48krXiDi/8QtCEpn0uGvuLS2P6BYAtSnY5sNrCQ0="; + sha256 = "sha256-WWQwrrsYyJ96rVORSmxqid2bhYvkOREpP03uQ/Bbj9Q="; }; - vendorHash = "sha256-wxFhj+oqj5WV/UkPZlmeJHF2WC4oLlZOql1qgSFs+zU="; + vendorHash = "sha256-yteWhm9GxNIiYhuCxrlLqP2OzZ1iv1UmpEj8GH8LIWY="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 46519c730446..f94e83552130 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.12.0"; + version = "1.12.1"; outputs = [ "out" "mu4e" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-z0sHDZlhsSeIf+ZRCni3j/DbfYrmn6bvYmKpt4PA2i8="; + hash = "sha256-JnKvMbgkaZ1MO7cZMb2PGZsNMjV1M+dnaDpsBDsT0L4="; }; postPatch = '' diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix index c363df34e8f7..a9fe4398afd7 100644 --- a/pkgs/tools/networking/muffet/default.nix +++ b/pkgs/tools/networking/muffet/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.9.3"; + version = "2.10.0"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-w9PoKGxZdP/sKdlTlnWBMqDPDLUvcYubkCyNHUm3AAc="; + hash = "sha256-kwEHabQYAaxC8nKewc5XHZnSvUSEQRw7qg0jtJoOw9g="; }; - vendorHash = "sha256-2an4xj1gqQqj9NrSdTAss7hn6SiWoiq3RQ2xxUlSuaE="; + vendorHash = "sha256-GNwyQHqyfuzKnNAv5gpZFmhSq+jIHdfeceLSD9UphdA="; meta = with lib; { description = "A website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 590ee909d059..20f146ab9330 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.0"; + version = "0.26.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-hZnxemBoMAol0m9XZPMEh/Lf0woxoLNH97bRyg8xtv4="; + hash = "sha256-fnKrv8bMONZbZGZtCQUAeGo3OIvOIqLX3nvVfGhYoK8="; }; - vendorHash = "sha256-csa83P74Y9fHsPg5VgPfR9WMg4VKOXcIR0pOMzh0QoA="; + vendorHash = "sha256-Zp8LAaADpSa/wfnLAQVJ8cG3bMkC7ZU1BT+Dz214c34="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -73,9 +73,9 @@ buildGoModule rec { postPatch = '' # make it compatible with systemd's RuntimeDirectory substituteInPlace client/cmd/root.go \ - --replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' + --replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' substituteInPlace client/ui/client_ui.go \ - --replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' + --replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' ''; postInstall = lib.concatStringsSep "\n" @@ -90,13 +90,13 @@ buildGoModule rec { '') modules) + lib.optionalString (stdenv.isLinux && ui) '' mkdir -p $out/share/pixmaps - cp $src/client/ui/netbird-systemtray-default.png $out/share/pixmaps/netbird.png + cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png mkdir -p $out/share/applications cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop substituteInPlace $out/share/applications/netbird.desktop \ - --replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" + --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" ''; passthru = { diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index b98f1c4b492a..8cef901c88bc 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-t7P1W1iw5nCdACrByZormeq3r2KGAnZRFoXTRNjGztg="; + hash = "sha256-SZd67DyDsKZZ9hKgRtbQLJzfft+vl49k9J/+Xv8ghHs="; }; - vendorHash = "sha256-J6+b0uZwBoxwc43+5PXFwztXC1abHvtK4ejg5vA757E="; + vendorHash = "sha256-9aH8KHn+8brGT/eJS9SWVYBMxDI1R3Q+pORfnjUI7ms="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index cac350ff597a..f48824f04054 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "snowflake"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-h8T8kc7idZcfepVjhpX+0RIypFDp2nMt3ZZ61YmeLQk="; + sha256 = "sha256-LDr/Fzg1fC2lf7W+yTD1y5q4C2pPXZz+ZJf9sI1BxcQ="; }; - vendorHash = "sha256-TSB0UDVD9ijOFgOmIh7ppnKJn/VWzejeDcb1+30+Mnc="; + vendorHash = "sha256-IT2+5HmgkV6BKPEARkCZbULyVr7VDLtwGUCF22YuodA="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/pkgs/tools/networking/termscp/Cargo.lock.patch b/pkgs/tools/networking/termscp/Cargo.lock.patch deleted file mode 100644 index 76b2d996e25e..000000000000 --- a/pkgs/tools/networking/termscp/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/Cargo.lock w/Cargo.lock -index 5cbb602..47046b8 100644 ---- i/Cargo.lock -+++ w/Cargo.lock -@@ -2949,7 +2949,7 @@ dependencies = [ - - [[package]] - name = "termscp" --version = "0.12.2" -+version = "0.12.3" - dependencies = [ - "argh", - "bitflags 2.3.3", diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index 101a38e4f5dd..924de6cf1e2e 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -14,20 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "veeso"; - repo = pname; + repo = "termscp"; rev = "refs/tags/v${version}"; - hash = "sha256-+5s5PskSHZKv1deti5r986qXg8J9APuVXY+Lvq3ki0w="; + hash = "sha256-/Mnoljgp87ML6+3vV1vZTFO0TSY5hr8E8U1fXJq31pE="; }; - cargoPatches = [ - ./Cargo.lock.patch - ]; - - cargoHash = "sha256-2RmYxtjJm70qbiGl8YHXgebtvNsQvBdgkNDm8td9oNk="; + cargoHash = "sha256-xq21cncEYNSwDiKvVSM1J2Jz3TqOkYMK3gckKpM5+6E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 734bf10790f0..349c0823a510 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.90"; + version = "1.0.91"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C1xrsL7+S+TyMWULVuw7+ZV5hxfhXorScfqndomefRw="; + sha256 = "sha256-/aykQolUWcCU/PV3bYq8cR0oSAS+ojzZC5PBWgIh2dM="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index f540d59d9a01..d2bb8fec3aa0 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.8"; + version = "0.10.9"; src = fetchCrate { inherit pname version; - hash = "sha256-D+yROQidu+a3qzCNrVxn0RNutIHNcIjMSNqPLHwA+zA="; + hash = "sha256-j8o9UxyBE7uML/7gw9UYbXLNYK9ka2jhUw5/v7pxIc8="; }; - cargoHash = "sha256-oKoSHjABtaJYGyJ/G0zXC42XpXiUXwdPsOhyL1+D3GI="; + cargoHash = "sha256-foJSaifllpGNMfxWMGm4BWwItOdtAmUcaOO1j1JMCpo="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index a50a7fc1a0d1..1e1ef3c0d0f6 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -6,7 +6,7 @@ , installShellFiles , pkg-config , bzip2 -, libgit2_1_6 +, libgit2 , openssl , zlib , zstd @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 curl - libgit2_1_6 + libgit2 openssl zlib zstd @@ -80,6 +80,7 @@ rustPlatform.buildRustPackage rec { env = { GEN_ARTIFACTS = "artifacts"; + LIBGIT2_NO_VENDOR = 1; NIX = lib.getExe nix; NURL = lib.getExe nurl; ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index e757e79f4684..1d5014a1c700 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "2.7.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-0cyKI8KHFsMXYca3hzbqxmBpxGdhl4/i183kfUQr8pg="; + sha256 = "sha256-PnvVGw0DMBg/l7+QpcXW5AFfR6MeXBiUYdVAZuue1jA="; }; - cargoHash = "sha256-9dqjNExxLDgVsu14yDQOJP1qxKy2ACiUH+pbX77iT70="; + cargoHash = "sha256-qLTUyhoEVtjgh+ilEv+pQLXLYWlW9gVsCiA5rPfymZY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; diff --git a/pkgs/tools/nix/nixos-option/nixos-option.cc b/pkgs/tools/nix/nixos-option/nixos-option.cc index e2a73866d0ed..d8c3d46c4fa1 100644 --- a/pkgs/tools/nix/nixos-option/nixos-option.cc +++ b/pkgs/tools/nix/nixos-option/nixos-option.cc @@ -368,20 +368,20 @@ std::string describeError(const Error & e) { return "«error: " + e.msg() + "»" void describeDerivation(Context & ctx, Out & out, Value v) { // Copy-pasted from nix/src/nix/repl.cc :( + out << "«derivation "; Bindings::iterator i = v.attrs->find(ctx.state.sDrvPath); - PathSet pathset; - try { - Path drvPath = i != v.attrs->end() ? ctx.state.coerceToPath(i->pos, *i->value, pathset, "while evaluating the drvPath of a derivation") : "???"; - out << "«derivation " << drvPath << "»"; - } catch (Error & e) { - out << describeError(e); - } + nix::NixStringContext strContext; + if (i != v.attrs->end()) + out << ctx.state.store->printStorePath(ctx.state.coerceToStorePath(i->pos, *i->value, strContext, "while evaluating the drvPath of a derivation")); + else + out << "???"; + out << "»"; } Value parseAndEval(EvalState & state, const std::string & expression, const std::string & path) { Value v{}; - state.eval(state.parseExprFromString(expression, absPath(path)), v); + state.eval(state.parseExprFromString(expression, nix::SourcePath(nix::CanonPath::fromCwd(path))), v); return v; } diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/tools/package-management/deploy-rs/default.nix index 72eacb558bb8..ad656ca385e4 100644 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ b/pkgs/tools/package-management/deploy-rs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage { pname = "deploy-rs"; - version = "unstable-2023-12-20"; + version = "unstable-2024-02-16"; src = fetchFromGitHub { owner = "serokell"; repo = "deploy-rs"; - rev = "b709d63debafce9f5645a5ba550c9e0983b3d1f7"; - hash = "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M="; + rev = "0a0187794ac7f7a1e62cda3dabf8dc041f868790"; + hash = "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE="; }; - cargoHash = "sha256-PVeCB1g3JSYE6PKWHyE3hfN/CKlb9XErt8uaD/ZyxIs="; + cargoHash = "sha256-Vo/45cZM/sBAaoikhEwCvduhMQjurwSZwCjwrIQn7IA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 129b98867cb0..fc22001a5192 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.13"; + version = "5.1.14"; outputs = [ "out" "man" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-6fgQA9L6yBDdtCzxPg+EyxERr/dzW1PWVaT1+lRCXmo="; + hash = "sha256-LVemkL3Ysv2hS0/c+ZTqzEKq3kFu+T1rEBwZpjssE2k="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix deleted file mode 100644 index 7a427300f85e..000000000000 --- a/pkgs/tools/package-management/home-manager/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, bash -, coreutils -, findutils -, gettext -, gnused -, less -, ncurses -, nixos-option -, unixtools -, installShellFiles -, unstableGitUpdater -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "home-manager"; - version = "unstable-2024-02-20"; - - src = fetchFromGitHub { - name = "home-manager-source"; - owner = "nix-community"; - repo = "home-manager"; - rev = "517601b37c6d495274454f63c5a483c8e3ca6be1"; - hash = "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790="; - }; - - nativeBuildInputs = [ - gettext - installShellFiles - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - install -D -m755 home-manager/home-manager $out/bin/home-manager - install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh - - substituteInPlace $out/bin/home-manager \ - --subst-var-by bash "${bash}" \ - --subst-var-by DEP_PATH "${ - lib.makeBinPath [ - coreutils - findutils - gettext - gnused - less - ncurses - nixos-option - unixtools.hostname - ] - }" \ - --subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \ - --subst-var-by HOME_MANAGER_PATH "${finalAttrs.src}" \ - --subst-var-by OUT '${placeholder "out"}' - - installShellCompletion --bash --name home-manager.bash home-manager/completion.bash - installShellCompletion --fish --name home-manager.fish home-manager/completion.fish - installShellCompletion --zsh --name _home-manager home-manager/completion.zsh - - for pofile in home-manager/po/*.po; do - lang="''${pofile##*/}" - lang="''${lang%%.*}" - mkdir -p "$out/share/locale/$lang/LC_MESSAGES" - msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile" - done - - runHook postInstall - ''; - - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/nix-community/home-manager/"; - }; - - meta = { - homepage = "https://nix-community.github.io/home-manager/"; - description = "A Nix-based user environment configurator"; - longDescription = '' - The Home-Manager project provides a basic system for managing a user - environment using the Nix package manager together with the Nix libraries - found in Nixpkgs. It allows declarative configuration of user specific - (non global) packages and dotfiles. - ''; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - mainProgram = "home-manager"; - }; -}) diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 800e392f0f24..90252dca9cb2 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchpatch -, fetchurl +, fetchFromGitLab , asciidoc , binutils , coreutils @@ -39,19 +38,23 @@ , sysHookDir ? "/usr/share/libalpm/hooks/" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (final: { pname = "pacman"; - version = "6.0.2"; + version = "6.1.0"; - src = fetchurl { - url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-fY4+jFEhrsCWXfcfWb7fRgUsbPFPljZcRBHsPeCkwaU="; + src = fetchFromGitLab { + domain = "gitlab.archlinux.org"; + owner = "pacman"; + repo = "pacman"; + rev = "v${final.version}"; + hash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78="; }; strictDeps = true; nativeBuildInputs = [ asciidoc + gettext installShellFiles libarchive makeWrapper @@ -71,11 +74,6 @@ stdenv.mkDerivation rec { patches = [ ./dont-create-empty-dirs.patch - # Add keyringdir meson option to configure the keyring directory - (fetchpatch { - url = "https://gitlab.archlinux.org/pacman/pacman/-/commit/79bd512181af12ec80fd8f79486fc9508fa4a1b3.patch"; - hash = "sha256-ivTPwWe06Q5shn++R6EY0x3GC0P4X0SuC+F5sndfAtM="; - }) ]; postPatch = let compressionTools = [ @@ -93,16 +91,16 @@ stdenv.mkDerivation rec { substituteInPlace meson.build \ --replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \ --replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \ - --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'" + --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'" \ + --replace "join_paths(SYSCONFDIR, 'makepkg.conf.d/')" "'$out/etc/makepkg.conf.d/'" substituteInPlace doc/meson.build \ --replace "/bin/true" "${coreutils}/bin/true" substituteInPlace scripts/repo-add.sh.in \ --replace bsdtar "${libarchive}/bin/bsdtar" substituteInPlace scripts/pacman-key.sh.in \ --replace "local KEYRING_IMPORT_DIR='@keyringdir@'" "" \ - --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' \ - --replace "--batch --check-trustdb" "--batch --check-trustdb --allow-weak-key-signatures" - ''; # the line above should be removed once Arch migrates to gnupg 2.3.x + --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' + ''; mesonFlags = [ "--sysconfdir=/etc" @@ -132,6 +130,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${version}/NEWS"; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "pacman"; maintainers = with maintainers; [ samlukeyes123 ]; }; -} +}) diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 75cede5df7d3..d7442d74674f 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -12,12 +12,12 @@ let # We keep the override around even when the versions match, as # it's likely to become relevant again after the next Poetry update. poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; - rev = version; - hash = "sha256-RnCJ67jaL2knwv+Uo7p0zOejHAT73f40weaJnfqOYoM="; + rev = "refs/tags/${version}"; + hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw="; }; }); } // (plugins self); diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index f13a7715464b..5e2cc63644ab 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -4,7 +4,6 @@ , pythonOlder , fetchFromGitHub , installShellFiles -, pythonRelaxDepsHook , build , cachecontrol , cleo @@ -29,41 +28,30 @@ , xattr , tomli , importlib-metadata -, cachy , deepdiff -, flatdict , pytestCheckHook , httpretty , pytest-mock , pytest-xdist -, pythonAtLeast , darwin }: buildPythonPackage rec { pname = "poetry"; - version = "1.7.1"; - format = "pyproject"; + version = "1.8.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-poetry"; - repo = pname; + repo = "poetry"; rev = "refs/tags/${version}"; - hash = "sha256-PM3FIZYso7p0Oe0RpiPuxHrQrgnMlkT5SVeaJPK/J94="; + hash = "sha256-MBWVeS/UHpzeeNUeiHMoXnLA3enRO/6yGIbg4Vf2GxU="; }; nativeBuildInputs = [ installShellFiles - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - # platformdirs 4.x is backwards compatible; https://github.com/python-poetry/poetry/commit/eb80d10846f7336b0b2a66ce2964e72dffee9a1c - "platformdirs" - # xattr 1.0 is backwards compatible modulo dropping Python 2 support: https://github.com/xattr/xattr/compare/v0.10.0...v1.0.0 - "xattr" ]; propagatedBuildInputs = [ @@ -104,9 +92,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - cachy deepdiff - flatdict pytestCheckHook httpretty pytest-mock @@ -127,32 +113,14 @@ buildPythonPackage rec { ''; disabledTests = [ + "test_builder_should_execute_build_scripts" "test_env_system_packages_are_relative_to_lib" + "test_executor_known_hashes" "test_install_warning_corrupt_root" - "test_installer_with_pypi_repository" - # touches network - "git" - "solver" - "load" - "vcs" - "prereleases_if_they_are_compatible" - "test_builder_setup_generation_runs_with_pip_editable" - "test_executor" - # requires git history to work correctly - "default_with_excluded_data" - # toml ordering has changed - "lock" - # fs permission errors - "test_builder_should_execute_build_scripts" - # poetry.installation.chef.ChefBuildError: Backend 'poetry.core.masonry.api' is not available. - "test_isolated_env_install_success" - "test_prepare_sdist" - "test_prepare_directory" - "test_prepare_directory_with_extensions" - "test_prepare_directory_editable" - ] ++ lib.optionals (pythonAtLeast "3.10") [ - # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended - "test_info_setup_complex_pep517_error" + ]; + + pytestFlagsArray = [ + "-m 'not network'" ]; # Allow for package to use pep420's native namespaces diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index d7368463ffd7..ef202fb69eb1 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.13"; + version = "1.2.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-Afbys0ChT1640PfKnAH/0Knl2IfKcrsCqqoxryFDPo0="; + hash = "sha256-ba07btx3eorFiocRk1YbkkGcblgsWaMI14r1SaPNr9g="; }; - cargoHash = "sha256-Y4JpVQU1wVwCWWaE5HMT+SaoRpmqzzhZjefbOOwPPRg="; + cargoHash = "sha256-+TVmmyjAFLDlnXMED0+S0M3VbGBRHds4C1GNyTGD4wI="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; @@ -35,8 +35,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An implementation of Tor in Rust"; - homepage = "https://gitlab.torproject.org/tpo/core/arti"; - changelog = "https://gitlab.torproject.org/tpo/core/arti/-/raw/${src.rev}/CHANGELOG.md"; + homepage = "https://arti.torproject.org/"; + changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index 44f2e09fc1a9..984f5340eeeb 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,21 @@ buildGoModule rec { pname = "asnmap"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; - repo = pname; + repo = "asnmap"; rev = "refs/tags/v${version}"; - hash = "sha256-uX7mf1y30JngRI4UJYzghk2F4DZh9OQAjgkkNRbAgwc="; + hash = "sha256-Of4IVra6kMHY9btWcF9grM/r3lTWFP/geeT309Seasw="; }; - vendorHash = "sha256-co18Q8nfRjJyDfpmJ1YSJ275DJRJHn2AR3jF8WionNY="; + vendorHash = "sha256-RDv8vkBI3miyeNAbhUsMpuZCYRUZ0ATfXYHxaTgTVfA="; + + ldflags = [ + "-w" + "-s" + ]; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/tools/security/bitwarden/cli.nix deleted file mode 100644 index 68abb6385319..000000000000 --- a/pkgs/tools/security/bitwarden/cli.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, buildNpmPackage -, nodejs_18 -, fetchFromGitHub -, python3 -, darwin -, nixosTests -}: - -buildNpmPackage rec { - pname = "bitwarden-cli"; - version = "2024.2.0"; - - src = fetchFromGitHub { - owner = "bitwarden"; - repo = "clients"; - rev = "cli-v${version}"; - hash = "sha256-nCjcwe+7Riml/J0hAVv/t6/oHIDPhwFD5A3iQ/LNR5Y="; - }; - - nodejs = nodejs_18; - - npmDepsHash = "sha256-GJl9pVwFWEg9yku9IXLcu2XMJZz+ZoQOxCf1TrW715Y="; - - nativeBuildInputs = [ - python3 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.cctools - ]; - - makeCacheWritable = true; - - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - - npmBuildScript = "build:prod"; - - npmWorkspace = "apps/cli"; - - npmFlags = [ "--legacy-peer-deps" ]; - - passthru.tests = { - vaultwarden = nixosTests.vaultwarden.sqlite; - }; - - meta = with lib; { - changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; - description = "A secure and free password manager for all of your devices"; - homepage = "https://bitwarden.com"; - license = lib.licenses.gpl3Only; - mainProgram = "bw"; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix deleted file mode 100644 index 5ed43dc6b3b6..000000000000 --- a/pkgs/tools/security/bitwarden/default.nix +++ /dev/null @@ -1,191 +0,0 @@ -{ lib -, buildNpmPackage -, cargo -, copyDesktopItems -, dbus -, electron_28 -, fetchFromGitHub -, fetchpatch2 -, glib -, gnome -, gtk3 -, jq -, libsecret -, makeDesktopItem -, makeWrapper -, moreutils -, napi-rs-cli -, nodejs_18 -, patchutils_0_4_2 -, pkg-config -, python3 -, runCommand -, rustc -, rustPlatform -}: - -let - description = "A secure and free password manager for all of your devices"; - icon = "bitwarden"; - electron = electron_28; -in buildNpmPackage rec { - pname = "bitwarden"; - version = "2024.2.0"; - - src = fetchFromGitHub { - owner = "bitwarden"; - repo = "clients"; - rev = "desktop-v${version}"; - hash = "sha256-nCjcwe+7Riml/J0hAVv/t6/oHIDPhwFD5A3iQ/LNR5Y="; - }; - - patches = [ - (fetchpatch2 { - # https://github.com/bitwarden/clients/pull/7508 - url = "https://github.com/amarshall/bitwarden-clients/commit/e85fa4ef610d9dd05bd22a9b93d54b0c7901776d.patch"; - hash = "sha256-P9MTsiNbAb2kKo/PasIm9kGm0lQjuVUxAJ3Fh1DfpzY="; - }) - ]; - - nodejs = nodejs_18; - - makeCacheWritable = true; - npmFlags = [ "--legacy-peer-deps" ]; - npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-GJl9pVwFWEg9yku9IXLcu2XMJZz+ZoQOxCf1TrW715Y="; - - cargoDeps = rustPlatform.fetchCargoTarball { - name = "${pname}-${version}"; - inherit src; - patches = map - (patch: runCommand - (builtins.baseNameOf patch) - { nativeBuildInputs = [ patchutils_0_4_2 ]; } - '' - < ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out - '' - ) - patches; - patchFlags = [ "-p4" ]; - sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-KJUz5hvdsurnohUWRZedXvuWMnLtR0dcdTeHtJGrZBs="; - }; - cargoRoot = "apps/desktop/desktop_native"; - - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - - nativeBuildInputs = [ - cargo - copyDesktopItems - jq - makeWrapper - moreutils - napi-rs-cli - pkg-config - python3 - rustc - rustPlatform.cargoCheckHook - rustPlatform.cargoSetupHook - ]; - - buildInputs = [ - glib - gtk3 - libsecret - ]; - - preBuild = '' - if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then - echo 'ERROR: electron version mismatch' - exit 1 - fi - ''; - - postBuild = '' - pushd apps/desktop - - # desktop_native/index.js loads a file of that name regarldess of the libc being used - mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node - - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${electron}/libexec/electron \ - -c.electronVersion=${electron.version} - - popd - ''; - - doCheck = true; - - nativeCheckInputs = [ - dbus - (gnome.gnome-keyring.override { useWrappedDaemon = false; }) - ]; - - checkFlags = [ - "--skip=password::password::tests::test" - ]; - - checkPhase = '' - runHook preCheck - - pushd ${cargoRoot} - export HOME=$(mktemp -d) - export -f cargoCheckHook runHook _eval _callImplicitHook - export cargoCheckType=release - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - -- bash -e -c cargoCheckHook - popd - - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir $out - - pushd apps/desktop/dist/linux-unpacked - mkdir -p $out/opt/Bitwarden - cp -r locales resources{,.pak} $out/opt/Bitwarden - popd - - makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \ - --add-flags $out/opt/Bitwarden/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set-default ELECTRON_IS_DEV 0 \ - --inherit-argv0 - - pushd apps/desktop/resources/icons - for icon in *.png; do - dir=$out/share/icons/hicolor/"''${icon%.png}"/apps - mkdir -p "$dir" - cp "$icon" "$dir"/${icon}.png - done - popd - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "bitwarden"; - exec = "bitwarden %U"; - inherit icon; - comment = description; - desktopName = "Bitwarden"; - categories = [ "Utility" ]; - }) - ]; - - meta = { - changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; - inherit description; - homepage = "https://bitwarden.com"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ amarshall kiwi ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "bitwarden"; - }; -} diff --git a/pkgs/tools/security/bitwarden/electron-27.patch b/pkgs/tools/security/bitwarden/electron-27.patch deleted file mode 100644 index 5b2af2ce30f4..000000000000 --- a/pkgs/tools/security/bitwarden/electron-27.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e2c15e826fe9d4d2d12868ef5409e423e3191b58 Mon Sep 17 00:00:00 2001 -From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> -Date: Fri, 8 Dec 2023 13:07:46 +0100 -Subject: [PATCH] Bump electron to v27.1.3 (#7134) - -Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> - -(cherry picked from commit d76602343f36d8e17a9b0204e0290488456c96d5) ---- - apps/desktop/electron-builder.json | 2 +- - package-lock.json | 8 ++++---- - package.json | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json -index 69d1c0074f..a12870bd96 100644 ---- a/apps/desktop/electron-builder.json -+++ b/apps/desktop/electron-builder.json -@@ -19,7 +19,7 @@ - "**/node_modules/@bitwarden/desktop-native/index.js", - "**/node_modules/@bitwarden/desktop-native/desktop_native.${platform}-${arch}*.node" - ], -- "electronVersion": "25.9.1", -+ "electronVersion": "27.1.3", - "generateUpdatesFilesForAllChannels": true, - "publish": { - "provider": "generic", -diff --git a/package-lock.json b/package-lock.json -index 3f0afde95b..9b7b2dbcd9 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -125,7 +125,7 @@ - "cross-env": "7.0.3", - "css-loader": "6.8.1", - "del": "6.1.1", -- "electron": "25.9.1", -+ "electron": "27.1.3", - "electron-builder": "23.6.0", - "electron-log": "5.0.0", - "electron-reload": "2.0.0-alpha.1", -@@ -20173,9 +20173,9 @@ - } - }, - "node_modules/electron": { -- "version": "25.9.1", -- "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", -- "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", -+ "version": "27.1.3", -+ "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.3.tgz", -+ "integrity": "sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==", - "dev": true, - "hasInstallScript": true, - "dependencies": { -diff --git a/package.json b/package.json -index 9ee884b31d..4a5c3513fd 100644 ---- a/package.json -+++ b/package.json -@@ -88,7 +88,7 @@ - "cross-env": "7.0.3", - "css-loader": "6.8.1", - "del": "6.1.1", -- "electron": "25.9.1", -+ "electron": "27.1.3", - "electron-builder": "23.6.0", - "electron-log": "5.0.0", - "electron-reload": "2.0.0-alpha.1", --- -2.42.0 - diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index aac55cf46b74..51fa61067425 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -12,23 +12,24 @@ let }; in python.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.15.4"; + version = "1.15.6"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; rev = "refs/tags/v${version}"; - hash = "sha256-heVFum+Eaofd9L0dNHqD9GgHP+ckGwJi+NfeFci+ESc="; + hash = "sha256-h/NNTE5u1coyD4owiGjsK6SIuvDq1SQOPW4RM4yJtno="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pluggy~=0.13.1" "pluggy" \ - ''; + pythonRelaxDeps = [ + "pluggy" + ]; nativeBuildInputs = with python.pkgs; [ + pythonRelaxDepsHook setuptools + setuptools-scm ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index bf6f5c3c0587..85ce0c879792 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -14,17 +14,17 @@ in assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` mavenJdk.buildMavenPackage rec { pname = "cryptomator"; - version = "1.11.1"; + version = "1.12.3"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - hash = "sha256-Y+oG2NF4Vsklp1W22Xv+XrkY6vwn23FkzAXG/5828Og="; + hash = "sha256-pVQ3xlNgJIDz8dnNoiLJaG6y4kNHNLL7zYq1sl6rleY="; }; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-cXmnJHgKW6SGnhHFuFJP/DKNmFacfHbC3nQ2uVdIvUE="; + mvnHash = "sha256-Zx2HhgmebF8UOp+2JKl2+FGA98aPRSUTIduHPTtgAjI="; preBuild = '' VERSION=${version} diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 648f7883788e..1f25de07c174 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.1.6"; + version = "1.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "refs/tags/v${version}"; - hash = "sha256-dyqZXc5k76BwF2Kh2vm9d+dpvgpXK/8VQeGjx1UzA6k="; + hash = "sha256-scp0CDIO8F2TqpSCgXXfb8I83stvO/GZqSA5/BkN8pE="; }; - vendorHash = "sha256-S1mJMVfQSy49Lm4q3v05kjbXBlBgBt/AAzLOoQkk75A="; + vendorHash = "sha256-WbFkBTPy4N+mAVSkq1q9XcNs1jk6YuBcYxiEmQV/TsM="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/dontgo403/default.nix b/pkgs/tools/security/dontgo403/default.nix index 79002c1cfc89..84e7667377b7 100644 --- a/pkgs/tools/security/dontgo403/default.nix +++ b/pkgs/tools/security/dontgo403/default.nix @@ -5,17 +5,22 @@ buildGoModule rec { pname = "dontgo403"; - version = "0.9.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "devploit"; - repo = pname; + repo = "dontgo403"; rev = "refs/tags/${version}"; - hash = "sha256-PKI/DqMihhMaIa9OzDKtLIs34TRUtewAbBkx89IXLU4="; + hash = "sha256-znmPXue+pzv7vAKnIYsjJQQGMeBETH+ekyVKGz9wRik="; }; vendorHash = "sha256-IGnTbuaQH8A6aKyahHMd2RyFRh4WxZ3Vx/A9V3uelRg="; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { description = "Tool to bypass 40X response codes"; homepage = "https://github.com/devploit/dontgo403"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 117a02a040e3..c0a596550eb5 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-02-22"; + version = "2024-03-04"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+5N7qe7YuNNBiizzI2aBKZCsl64ODkit5Y9QlhNWVMw="; + hash = "sha256-3i4Hzz5rcGNWpIJeMPEQMRy6Dxk8lafusEk9Plhfx8U="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 18af1a0f1c48..5871895cd9c0 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "epi052"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AFh/IeB88NYPsyUqzaN92GoDbAgl+HG87cIy+Ni06Q8="; + hash = "sha256-jsaUSnqzqeKxos8fDvaOAzuGWxn5tJYjFp4qolWRRs4="; }; # disable linker overrides on aarch64-linux @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; - cargoHash = "sha256-Fu3qw3qRK3TZlzK1WcmI/GQ5TM1j+gbGoedwp18SolY="; + cargoHash = "sha256-xACWDgFrZXcxbfczR9tfT1CTaPnDHBITbg3x8+708gE="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 9c40c051bebc..17bd273c0a30 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LT8J9s008XQtDtNdH1ungQREqQUrlTsoxnlRLKimqLY="; + sha256 = "sha256-zL+53GIGDQagWtsSHQT1Gn1hZUCpYF3uYKXmJWFGy7k="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-ImZJXdOfMepMFU1z47XyNU39NGGdiCzQji2/tKVfibQ="; + vendorHash = "sha256-B4/SIY9G5uEP+P+oSdhaMM7HRaHm5nq2jqXdIWxdP+8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index 6b93977558c8..3bf136683333 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.24.0"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-N0yokLsp6jRELIPu8w6gvD7V97xiKJl+kLQQB9h2mMY="; + hash = "sha256-D6+0ZYuOiCy5LonP1Ob7PlWmBXvLwU3PODOT6F+70HY="; }; pythonRelaxDeps = true; diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 69afb96a47e2..fe72e598306f 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.12"; + version = "0.4.14"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-av6N6RQ+9iW+xG1FpmFjBHL1leU4P0IPiqf7kvJxm6M="; + hash = "sha256-c8eFndK84ckwKcvu5BbIuH6SXNVyBiwEjHsHTkgwaPU="; }; vendorHash = null; diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/tools/security/hfinger/default.nix index 8d3d7e25d33f..900f7402451d 100644 --- a/pkgs/tools/security/hfinger/default.nix +++ b/pkgs/tools/security/hfinger/default.nix @@ -7,15 +7,19 @@ python3.pkgs.buildPythonApplication rec { pname = "hfinger"; version = "0.2.2"; - disabled = python3.pythonOlder "3.3"; + pyproject = true; src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "hfinger"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gxwirAqtY4R3KDHyNmDIknABO+SFuoDua9nm1UyXbxA="; + hash = "sha256-gxwirAqtY4R3KDHyNmDIknABO+SFuoDua9nm1UyXbxA="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ fnvhash python-magic @@ -25,11 +29,15 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "hfinger" ]; + + pythonImportsCheck = [ + "hfinger" + ]; meta = with lib; { description = "Fingerprinting tool for HTTP requests"; homepage = "https://github.com/CERT-Polska/hfinger"; + changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 98f41b9c599f..54b187f1696e 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-G+N9Zo8MbXbCRB21SvxSNftvn5v8Ss+I0v7Lj30CgJo="; + hash = "sha256-UYMaviHuRP47WSm8tsxjpsVrPgeQRUGTe7TxDAfhoGM="; }; - vendorHash = "sha256-fy4yJkwBlVNRn8FWHtZHCMcCF7LQXsDhEYVSv4RVcBM="; + vendorHash = "sha256-tCwh+uEqXw4PZp11xRSFovXxNstulCMPfcEiVhTFuI4="; subPackages = [ "cmd/httpx" diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index a3342e0b3809..5b68560c1fa3 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -5,30 +5,39 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = "refs/tags/${version}"; - hash = "sha256-O4tXq4pDzuTBEGAls2I9bfBRdHssF4rFBec4OtfUx6A="; + hash = "sha256-Xtv7K19OBS2iHFFoSasNcy9VLL15eQ8AD79wAEhxCHk="; }; + pythonRelaxDeps = [ + "beautifulsoup4" + "tqdm" + ]; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 - colorama - matplotlib - networkx - pyqt5 + dnspython + pyopenssl requests + tqdm ]; # Project has no tests doCheck = false; pythonImportsCheck = [ - "knockpy" + "knock" ]; meta = with lib; { diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index 28b90f3d4bae..673dde4a58a1 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EsUjGc7IIu5PK9KaODlQSfmm8jpjuBXvGZPNjSc1824="; + hash = "sha256-e8iB66fXc8lKwFEZlkk4qbsgExKUrf5WpEVCOiHiZUg="; }; - vendorHash = "sha256-i4k7eworPUvLUustr5U53qizHqUVw8yqGjdPQT6UIf4="; + vendorHash = "sha256-8DWjuweGCx2yxocm1GvcP+O3QYWYUdOFKmu6neQfWI4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 6e44829f7ee9..ddbff2357271 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.52"; + version = "1.0.53"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-I51vz3zF1J3223hcO3cdfsNBfpq/UolDxUEXyqx3dLI="; + hash = "sha256-67jVpzvdjEcjFmTRE2YjPr4AO1iN+PakwoKcjvimt8g="; }; pythonRelaxDeps = [ diff --git a/pkgs/tools/security/metabigor/default.nix b/pkgs/tools/security/metabigor/default.nix index 84e4d39d6a2c..2949fb6db541 100644 --- a/pkgs/tools/security/metabigor/default.nix +++ b/pkgs/tools/security/metabigor/default.nix @@ -5,16 +5,21 @@ buildGoModule rec { pname = "metabigor"; - version = "1.12.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "j3ssie"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-T1P+jAAsKObKRaoxH8c/DMEfXtmSrvnDd5Y3ocKcCSc="; + repo = "metabigor"; + rev = "refs/tags/v${version}"; + hash = "sha256-JFt9PC6VHWTYuaIWh2t2BiGFm1tGwZDdhhdp2xtmXSI="; }; - vendorHash = "sha256-V+72l2TvhEWgDg7kvn5OOjYcyEgWGLgTGnt58Bu+AEQ="; + vendorHash = "sha256-PGUOTEFcOL1pG+itTp9ce1qW+1V6hts8jKpA0E8orDk="; + + ldflags = [ + "-w" + "-s" + ]; # Disabled for now as there are some failures ("undefined:") doCheck = false; @@ -22,7 +27,9 @@ buildGoModule rec { meta = with lib; { description = "Tool to perform OSINT tasks"; homepage = "https://github.com/j3ssie/metabigor"; + changelog = "https://github.com/j3ssie/metabigor/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "metabigor"; }; } diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 3f528744390e..20860f2e5d79 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.57" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.58" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 04cc6dd3fbfd..662512b54dca 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e01334b3bd267539df650f14627231fb8e4bc21d - ref: refs/tags/6.3.57 + revision: 08ebefe2368f73ceeac2c5f9c20a49a82d6a969e + ref: refs/tags/6.3.58 specs: - metasploit-framework (6.3.57) + metasploit-framework (6.3.58) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -106,25 +106,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.1) + actionview (= 7.0.8.1) + activesupport (= 7.0.8.1) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.1) + activesupport (= 7.0.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activesupport (7.0.8) + activemodel (7.0.8.1) + activesupport (= 7.0.8.1) + activerecord (7.0.8.1) + activemodel (= 7.0.8.1) + activesupport (= 7.0.8.1) + activesupport (7.0.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -135,50 +135,51 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.3.0) - aws-partitions (1.872.0) - aws-sdk-core (3.190.1) + aws-partitions (1.895.0) + aws-sdk-core (3.191.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.431.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-ec2 (1.440.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2instanceconnect (1.36.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-ec2instanceconnect (1.37.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.92.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-iam (1.94.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.75.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-kms (1.77.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) - aws-sdk-core (~> 3, >= 3.189.0) + aws-sdk-s3 (1.143.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) - aws-sdk-ssm (1.162.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-ssm (1.165.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.0) - bindata (2.4.15) - bootsnap (1.17.0) + bigdecimal (3.1.6) + bindata (2.5.0) + bootsnap (1.18.3) msgpack (~> 1.2) - bson (4.15.0) + bson (5.0.0) builder (3.2.4) chunky_png (1.4.0) - concurrent-ruby (1.2.2) - cookiejar (0.3.3) + concurrent-ruby (1.2.3) + cookiejar (0.3.4) crass (1.0.6) daemons (1.4.1) date (3.3.4) dnsruby (1.70.0) simpleidn (~> 0.2.1) - domain_name (0.6.20231109) + domain_name (0.6.20240107) ed25519 (1.3.0) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -190,13 +191,12 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.12.0) eventmachine (1.2.7) - faker (3.2.2) + faker (3.2.3) i18n (>= 1.8.11, < 2) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http faraday-retry (2.2.0) faraday (~> 2.0) faye-websocket (0.11.3) @@ -220,7 +220,7 @@ GEM httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.7.1) + io-console (0.7.2) irb (1.7.4) reline (>= 0.3.6) jmespath (1.6.2) @@ -240,7 +240,7 @@ GEM activesupport (~> 7.0) railties (~> 7.0) zeitwerk - metasploit-credential (6.0.6) + metasploit-credential (6.0.8) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -268,20 +268,22 @@ GEM metasploit_payloads-mettle (1.0.26) method_source (1.0.0) mini_portile2 (2.8.5) - minitest (5.20.0) + minitest (5.22.2) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-imap (0.4.8) + net-http (0.4.1) + uri + net-imap (0.4.10) date net-protocol - net-ldap (0.18.0) + net-ldap (0.19.0) net-protocol (0.2.2) timeout - net-smtp (0.4.0) + net-smtp (0.4.0.1) net-protocol net-ssh (7.2.1) network_interface (0.0.4) @@ -290,7 +292,8 @@ GEM nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nori (2.6.0) + nori (2.7.0) + bigdecimal octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -301,19 +304,20 @@ GEM pcaprub (~> 0.13.1) patch_finder (1.0.2) pcaprub (0.13.1) - pdf-reader (2.11.0) + pdf-reader (2.12.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.4) + pg (1.5.6) public_suffix (5.0.4) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) - rack (2.2.8) - rack-protection (3.1.0) + rack (2.2.8.1) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) @@ -324,21 +328,21 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rake (13.1.0) - rasn1 (0.12.1) + rasn1 (0.13.0) strptime (~> 0.2.5) rb-readline (0.5.5) recog (3.1.4) nokogiri redcarpet (3.6.0) - reline (0.4.1) + reline (0.4.3) io-console (~> 0.5) rex-arch (0.1.15) rex-text @@ -378,23 +382,23 @@ GEM metasm rex-core rex-text - rex-socket (0.1.55) + rex-socket (0.1.56) rex-core rex-sslscan (0.1.10) rex-core rex-socket rex-text rex-struct2 (0.1.4) - rex-text (0.2.55) + rex-text (0.2.56) rex-zip (0.1.5) rex-text rexml (3.2.6) rkelly-remix (0.0.7) - ruby-macho (4.0.0) + ruby-macho (4.0.1) ruby-mysql (4.1.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.3.1) + ruby_smb (3.3.2) bindata openssl-ccm openssl-cmac @@ -407,12 +411,12 @@ GEM faraday (>= 0.17.3, < 3) simpleidn (0.2.1) unf (~> 0.1.4) - sinatra (3.1.0) + sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack-protection (= 3.2.0) tilt (~> 2.0) - sqlite3 (1.6.9) + sqlite3 (1.7.2) mini_portile2 (~> 2.8.0) sshkey (3.0.0) strptime (0.2.5) @@ -421,18 +425,19 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.3.0) + thor (1.3.1) tilt (2.3.0) timeout (0.4.1) ttfunk (1.7.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.3) + tzinfo-data (1.2024.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext unf_ext (0.0.9.1) unix-crypt (1.3.1) + uri (0.13.0) warden (1.2.9) rack (>= 2.0.9) webrick (1.8.1) @@ -455,7 +460,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.3) webrick - zeitwerk (2.6.12) + zeitwerk (2.6.13) PLATFORMS ruby @@ -464,4 +469,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.5.5 + 2.4.13 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index ebfb36b8227c..a0d8a05c0821 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.57"; + version = "6.3.58"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-MToWengiF4dacD6E0byZENNMh408d3YJ18sn93nEksI="; + hash = "sha256-NUm+6vWmSpGpy4KGXQ/pQDqeU3ORhQrQwwicFCMyjhg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index b9285cdab6b1..5cfb435137d2 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; + sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; + sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; + sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; + sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; + sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; addressable = { groups = ["default"]; @@ -104,80 +104,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm"; + sha256 = "018hh97dcj3nd80jb1cf63fxk6h8gc4rrq118bv9npnw5ahd5pv8"; type = "gem"; }; - version = "1.872.0"; + version = "1.895.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh"; + sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns"; type = "gem"; }; - version = "3.190.1"; + version = "3.191.3"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04lg4g6aivkf6zvvcc1clw0dqdlpkn3c87kiz5mfc7m2jr0m0ljx"; + sha256 = "1kcsfkpfqx96ax1slvl4lq61cdasaki6hddi22ja1zyc1ak4x9dg"; type = "gem"; }; - version = "1.431.0"; + version = "1.440.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iifrmdls17a3hniq43iyj9q4mr8iy0danqmy65xbh05bnqq2ca9"; + sha256 = "0hd4xdhf6b2bvfb4h9fc0c96vwz30cmdhra3r7zpdllhz7d1hh5q"; type = "gem"; }; - version = "1.36.0"; + version = "1.37.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0whclpcvbdy7gzvqpk8734nxjfxs3362k197xl1wnrpixklkacyz"; + sha256 = "1ymb6lnkmhi98lwk402msanr7i012k82pvspd2rd66aq0vdql9rd"; type = "gem"; }; - version = "1.92.0"; + version = "1.94.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1"; + sha256 = "1gbxms3daszl4mk89swjrpq3fqgm9lg0wl65yjfp0nfz8jm4jyqf"; type = "gem"; }; - version = "1.75.0"; + version = "1.77.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya"; + sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s"; type = "gem"; }; - version = "1.141.0"; + version = "1.143.0"; }; aws-sdk-ssm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xz10344dwm4pj8qnl19bnh99arxp7cd9mn2alslrnw7y2gipzz1"; + sha256 = "1wbizrm7spkwx6rnwmwbxyg16mpkn3hllxz8aj7v2dlplzkwksb6"; type = "gem"; }; - version = "1.162.0"; + version = "1.165.0"; }; aws-sigv4 = { groups = ["default"]; @@ -219,35 +219,45 @@ }; version = "1.1.0"; }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + type = "gem"; + }; + version = "3.1.6"; + }; bindata = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; + sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19"; type = "gem"; }; - version = "2.4.15"; + version = "2.5.0"; }; bootsnap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; + sha256 = "1srlq3gqirzdkhv12ljpnp5cb0f8jfrl3n8xs9iivyz2c7khvdyp"; type = "gem"; }; - version = "1.17.0"; + version = "1.18.3"; }; bson = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vgs9rzzyvd7jfrzynjnc6518q0ffpfciyicfywbp77zl8nc9hk"; + sha256 = "1wsim17cdr4ps7ca6q5gkidkasfw4g4qr5zn1aclnbn4xpnhpx4d"; type = "gem"; }; - version = "4.15.0"; + version = "5.0.0"; }; builder = { groups = ["default"]; @@ -274,20 +284,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; cookiejar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; + sha256 = "1px0zlnlkwwp9prdkm2lamgy412y009646n2cgsa1xxsqk7nmc8i"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.4"; }; crass = { groups = ["default"]; @@ -334,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.6.20231109"; + version = "0.6.20240107"; }; ed25519 = { groups = ["default"]; @@ -394,30 +404,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ic47k6f0q6xl9g2yxa3x60gfbwx98wnx75qnbhhgk0zc7a5ijhy"; + sha256 = "1rrwh78515yqljh09wjxfsb64siqd8qgp4hv57syajhza5x8vbzz"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.3"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; + sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; faraday-retry = { groups = ["default"]; @@ -554,10 +564,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fmwbcapyhla84xhwj3gfws6rb4lw3928ybz6g3lr372dgxakzx5"; + sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.2"; }; irb = { groups = ["default"]; @@ -654,22 +664,22 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmh37pss5bsxjasl52pi9jxnzv75wacpnhrif5cprg6jxwn8dzl"; + sha256 = "0v1bylci121psqg669lgxpp6d965m4xxmg1djvmy0srcys8dvp5n"; type = "gem"; }; - version = "6.0.6"; + version = "6.0.8"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "e01334b3bd267539df650f14627231fb8e4bc21d"; - sha256 = "1hljqiwzf9ybsw4pcxrwin3lrlqhk6yd311yf1d8f5r2g1x1cfii"; + rev = "08ebefe2368f73ceeac2c5f9c20a49a82d6a969e"; + sha256 = "064f68ii9708qg80m1cifd9rwfj0x47mv1l2rflr2jm6ypmbwj9m"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.57"; + version = "6.3.58"; }; metasploit-model = { groups = ["default"]; @@ -736,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; + sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; type = "gem"; }; - version = "5.20.0"; + version = "5.22.2"; }; mqtt = { groups = ["default"]; @@ -791,25 +801,35 @@ }; version = "0.1.6"; }; + net-http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; + type = "gem"; + }; + version = "0.4.1"; + }; net-imap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnmxcrpv7zaf8wli5nvfnz5ybmw7f3r06s05p3d96idc61193mv"; + sha256 = "0zn7j2w0hc622ig0rslk4iy6yp3937dy9ibhyr1mwwx39n7paxaj"; type = "gem"; }; - version = "0.4.8"; + version = "0.4.10"; }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; + sha256 = "0g9gz39bs2iy4ky4fhjphimqd9m9wdsaz50anxgwg3yjrff3famy"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; net-protocol = { groups = ["default"]; @@ -826,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid"; + sha256 = "0csspzqrg7s2v2wdp6vqqs1rra6w5ilpgnps5h52ig6rp7x2i389"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.0.1"; }; net-ssh = { groups = ["default"]; @@ -887,10 +907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; octokit = { groups = ["default"]; @@ -967,20 +987,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09sx25jpnip2sp6wh5sn5ad7za78rfi95qp5iiczfh43z4jqa8q3"; + sha256 = "0n0pp7blk3np3fqsb54l34fsamrww80cp3dhlhskfayg7542mrv1"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; + sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; public_suffix = { groups = ["default"]; @@ -997,10 +1017,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; + sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; type = "gem"; }; - version = "6.4.0"; + version = "6.4.2"; }; racc = { groups = ["default"]; @@ -1017,20 +1037,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; + sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7"; type = "gem"; }; - version = "2.2.8"; + version = "2.2.8.1"; }; rack-protection = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; + sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; rack-test = { groups = ["default"]; @@ -1067,10 +1087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; + sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; rake = { groups = ["default"]; @@ -1087,10 +1107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05n3ki7jlkll0rf6zrqi41a9fc6zmw87f94ai21jgmvsswjfx15i"; + sha256 = "07dvrv2s9hs2vcbr6lai8vj4vk2i3m4jf468hyvkp9k8xzjvc0fi"; type = "gem"; }; - version = "0.12.1"; + version = "0.13.0"; }; rb-readline = { groups = ["default"]; @@ -1127,10 +1147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi6zfj6zqzxcbamhjm9w9cswv62f76l8gsdfcnmhpw35cyxphh8"; + sha256 = "1zx7sdh11p4z77c3f9ka6f065mgl6xwbamnsq4rrgwk310qhn41n"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.3"; }; rex-arch = { groups = ["default"]; @@ -1267,10 +1287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qs8fq14ivhnhssq966ikxdis864gw80pfbxllbs35v0njw46nj3"; + sha256 = "0vd9gfhyplwg2y55jk1c6nfsin733dy831x8zx78cp2lxp07s0p7"; type = "gem"; }; - version = "0.1.55"; + version = "0.1.56"; }; rex-sslscan = { groups = ["default"]; @@ -1297,10 +1317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1finkvvmxa654mldx1vqpnl9w1xvjp0s7lyb7qjymlphvbj3mi40"; + sha256 = "108x7k7x0ghc1zzqwbmja1f81b1wnllpda2rzbkws9ckvqx0cayf"; type = "gem"; }; - version = "0.2.55"; + version = "0.2.56"; }; rex-zip = { groups = ["default"]; @@ -1337,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yf8fq0l5hlqkjklcpxmg6vhzvbyigwd2n441aq42b2wa2f8xj5q"; + sha256 = "06addh9m9z25kpk52z56v6ygvg43sjxmqwb2qqx7rg7y55zlp3ks"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; ruby-mysql = { groups = ["default"]; @@ -1377,10 +1397,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04m366ldi33h79k7f35dvyhq0jyh762v8360zf8ss5jbax3bzlkk"; + sha256 = "1yy5z53mp2l3d8k8dhf8s8hbscmgd829j50nfcgmqrli0vvz0s1a"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.2"; }; rubyntlm = { groups = ["default"]; @@ -1427,20 +1447,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8"; + sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; sqlite3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am"; + sha256 = "137xkh8jnk3xyajvzmn2390yzs13hnb37jylr0sm02d3zrshf18n"; type = "gem"; }; - version = "1.6.9"; + version = "1.7.2"; }; sshkey = { groups = ["default"]; @@ -1487,10 +1507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; tilt = { groups = ["default"]; @@ -1537,10 +1557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; + sha256 = "1rg1dmx6mknjazb8qq0j9sb9fah470my5sbjb6f3pa6si5018682"; type = "gem"; }; - version = "1.2023.3"; + version = "1.2024.1"; }; unf = { groups = ["default"]; @@ -1572,6 +1592,16 @@ }; version = "1.3.1"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + type = "gem"; + }; + version = "0.13.0"; + }; warden = { groups = ["default"]; platforms = []; @@ -1667,9 +1697,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; + sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; type = "gem"; }; - version = "2.6.12"; + version = "2.6.13"; }; } diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index d56e882cb09e..6f392f5d7f53 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -1,20 +1,38 @@ { lib -, buildPythonApplication +, python3 +, fetchPypi +, rustPlatform , fetchFromGitHub -, pythonOlder -, pyside6 -, poetry-core -, pynitrokey -, pyudev -, qt-material }: -buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/nxp-mcuxpresso/spsdk/issues/64 + cryptography = super.cryptography.overridePythonAttrs (old: rec { + version = "41.0.7"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw="; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${old.pname}-${version}/${old.cargoRoot}"; + name = "${old.pname}-${version}"; + hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw="; + }; + patches = [ ]; + doCheck = false; # would require overriding cryptography-vectors + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "nitrokey-app2"; version = "2.1.5"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = python.pythonOlder "3.9"; src = fetchFromGitHub { owner = "Nitrokey"; @@ -31,11 +49,11 @@ buildPythonApplication rec { substituteInPlace pyproject.toml --replace 'pynitrokey = "' 'pynitrokey = ">=' ''; - nativeBuildInputs = [ + nativeBuildInputs = with python.pkgs; [ poetry-core ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ pynitrokey pyudev pyside6 diff --git a/pkgs/tools/security/sequoia-sq/default.nix b/pkgs/tools/security/sequoia-sq/default.nix deleted file mode 100644 index 699a8ee63632..000000000000 --- a/pkgs/tools/security/sequoia-sq/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv -, fetchFromGitLab -, lib -, darwin -, nettle -, nix-update-script -, rustPlatform -, pkg-config -, openssl -, sqlite -}: - -rustPlatform.buildRustPackage rec { - pname = "sequoia-sq"; - version = "0.32.0"; - - src = fetchFromGitLab { - owner = "sequoia-pgp"; - repo = "sequoia-sq"; - rev = "v${version}"; - hash = "sha256-2a6LIW5ohSi7fbMwk/wmNJ0AOz5JIXiXJI7EoVKv1Sk="; - }; - - cargoHash = "sha256-beA0viJVDjfANsPegkc/x2syVp8uGKTMnrPcM7jcvG4="; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - ]; - - buildInputs = [ - openssl - sqlite - nettle - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); - - # Sometimes, tests fail on CI (ofborg) & hydra without this - checkFlags = [ - # doctest for sequoia-ipc fail for some reason - "--skip=macros::assert_send_and_sync" - "--skip=macros::time_it" - ]; - - # Install manual pages, see https://gitlab.com/sequoia-pgp/sequoia-sq#building - postInstall = '' - mkdir -p $out/share/man - SQ_MAN=$out/share/man/man1 cargo run - ''; - - doCheck = true; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "A cool new OpenPGP implementation"; - homepage = "https://sequoia-pgp.org/"; - changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ minijackson doronbehar ]; - mainProgram = "sq"; - }; -} diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix deleted file mode 100644 index 66f89f77e8ea..000000000000 --- a/pkgs/tools/security/sn0int/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, libseccomp -, libsodium -, pkg-config -, pkgs -, sqlite -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "sn0int"; - version = "0.26.0"; - - src = fetchFromGitHub { - owner = "kpcyrd"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-ze4OFKUuc/t6tXgmoWFFDjpAQraSY6RIekkcDBctPJo="; - }; - - cargoHash = "sha256-PAKmoifqB1YC02fVF2SRbXAAGrMcB+Wlvr3FwuqmPVU="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - libsodium - sqlite - ] ++ lib.optionals stdenv.isLinux [ - libseccomp - ] ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Security - ]; - - # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf" - # in "checkPhase", hence fails in sandbox of "nix". - doCheck = false; - - meta = with lib; { - description = "Semi-automatic OSINT framework and package manager"; - homepage = "https://github.com/kpcyrd/sn0int"; - changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ fab xrelkd ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index 90ea4c9b7eb5..5392f0c8a8c4 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-cYSrosDFdueEJPQdDYCMObMPwQTvuXUBHXPO0rhehxk="; + sha256 = "sha256-NHNjBMK4eJZSZMOg75VmpD6mVQaRJbk5GoJST9W6j4w="; }; - vendorHash = "sha256-dmxFkoz/2qyUv2/I8bLFTYAfUcYdHjVYQgmg8xleIxA="; + vendorHash = "sha256-JpZ+cdDQ3yfH0EAyzi3HO7bozGYJgCYFf2KO/lXwCf8="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 91470205666b..3331c9c4b33f 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.18.11"; + version = "1.18.12"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BICXMSkfGDXOqBH+4UlJmqkUSV+oZa1wg7c20EtJ3WI="; + hash = "sha256-NTk/tCIArucJ12RR173bQ/VoP74oROYwmMrQizE+5iU="; }; - vendorHash = "sha256-9zD81p/UjH43B0aeqlItP9vrGMaT/zhVYv60ot153Gc="; + vendorHash = "sha256-Hk7dkhb1GiCY9CkKZ1dMQc+s97VRUli7WAoneJVNK08="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 00c7ceeb70bd..39eb57d3f21d 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.68.2"; + version = "3.68.4"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-6gQoyVlLE+cXYwh8lTkL2giDhd3ETgETjT3XuEOwOU8="; + hash = "sha256-cAEUNQ16AeqZvYyZR2HYDsY/TiSwAb3UMVsXvpoOHFA="; }; - vendorHash = "sha256-D58WqqDwQo7fRubkGNRhD6g9ooKS9peb2qJJDRXgLtk="; + vendorHash = "sha256-q1mfvGdavTLdb0BswR9dmpf1tovsvr6K/eqpXLpnuN4="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 0db950ddca54..bec13959dc43 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.15.5"; + version = "1.15.6"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-KDQgiG+HSkLjiJfej9VqTcPZxOMMTh9n9yTDGfiGF3g="; + hash = "sha256-XqPuikUUm8C02Uv6qZHPz/KEmrvBrr8gOznQ7qbMKnU="; }; - vendorHash = "sha256-fNUoeyBVci/S4LCpAPYjVbf8r+ROB5uL1TaUKJZsNes="; + vendorHash = "sha256-SYGqlLCA7T4MhRlOVBSYnZdZ2+WuJvmmHw3MdnfoezM="; proxyVendor = true; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 88430d842841..8644949bf68b 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.15.5"; + version = "1.15.6"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-WchJdMn8PkCu3MydY6ssbXpMCaQBlDbyTQ1kF69KQ+0="; - aarch64-linux = "sha256-tjLyPC156q8y4RKB0+QVIxiXbkW6/qTytCC0WhOo8xU="; - i686-linux = "sha256-TSAhomxTIKSHE0BE1jiL9a15hpGRmF7clFbTwsrDxuk="; - x86_64-darwin = "sha256-vG3S84P7+zvQnIjohPHN3JefN4wM9uDdPqindnwlXpE="; - aarch64-darwin = "sha256-nQsKXD+1gGclUoZLlUpA6k9QuNv/NQ+roRa6kvXCIXQ="; + x86_64-linux = "sha256-qZXR0bqsU0BcM4hWbCZ6vqnjh5pnddl7WTKKBGt1ioU="; + aarch64-linux = "sha256-4f0D+D+rL28mzCN8ku/FWrRFFUevY5yWIgifvZrDbuw="; + i686-linux = "sha256-YoG2NC6cBCunIql7kIRIOs0hU0dIQKIHN/Z27IGj1io="; + x86_64-darwin = "sha256-sdbwnoWZKbq0l86ikfHAR+LYI285IGRiZBB7woD/s/8="; + aarch64-darwin = "sha256-JcTt67eWgORgEmuiBpY5fSGJr8vvCOwKbnOTYZh2fIM="; }; in fetchzip { diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 3261dc5a923c..5fbe5e22d765 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dani-garcia/vaultwarden"; changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ivan ]; + maintainers = with maintainers; [ dotlambda SuperSandro2000 ]; mainProgram = "vaultwarden"; }; } diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 2fceb8b05f95..528ba9434c44 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -4,6 +4,7 @@ , git , nixosTests , python3 +, vaultwarden }: let @@ -69,6 +70,6 @@ in buildNpmPackage rec { changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}"; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda msteen mic92 ]; + inherit (vaultwarden.meta) maintainers; }; } diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 2b600f4a8617..0b62b31d94e1 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "witness"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-uwps/sHPgOdVhjaFxATVL5A/BGw6zPX/GSkYm802jmU="; + sha256 = "sha256-uv/HxPYOKxZskmlAxUS2I1sW4YsSAmIeNHjoJeR7VWs="; }; - vendorHash = "sha256-ktBpv2NDsha2mN3OtZWIDkneR8zi1RZkVQdvi9XPSLY="; + vendorHash = "sha256-9IkDBaDRJGWfPRN5+rYU4uH6nAsfnytDkF518rfNpyc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/tools/security/yaralyzer/default.nix index 4379bbc5c63c..ddfc828741e5 100644 --- a/pkgs/tools/security/yaralyzer/default.nix +++ b/pkgs/tools/security/yaralyzer/default.nix @@ -3,16 +3,31 @@ , fetchFromGitHub }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + yara-python = super.yara-python.overridePythonAttrs (oldAttrs: rec { + version = "4.2.3"; + src = fetchFromGitHub { + owner = "VirusTotal"; + repo = "yara-python"; + rev = "v${version}"; + hash = "sha256-spUQuezQMqaG1hboM0/Gs7siCM6x0b40O+sV7qGGBng="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "yaralyzer"; - version = "0.9.0"; - format = "pyproject"; + version = "0.9.3"; + pyproject = true; src = fetchFromGitHub { owner = "michelcrypt4d4mus"; repo = "yaralyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-QsMO/fnHy4puuToUHSS05fWnXHdAVnWFFBVq3cb0Zj4="; + hash = "sha256-KGQNonzAZp8c0a3Rjb1WfsEkx5srgRzZfGR3gfNEdzY="; }; pythonRelaxDeps = [ @@ -20,12 +35,12 @@ python3.pkgs.buildPythonApplication rec { "rich" ]; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ chardet python-dotenv rich @@ -43,5 +58,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/michelcrypt4d4mus/yaralyzer/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "yaralyze"; }; } diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index db663f46d70e..9ea63fafdeda 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - hash = "sha256-lsVfsNVjFX38YaYVBJWEst3c3RhUCbK2ycteqZZUM3M="; + hash = "sha256-xq29KzONDkq+KeABl8rpu0vr50KKFw/UKPFDXcAMNoo="; }; buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl liburing ]; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 843249f911e8..deecc9ea00c8 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ts"; - version = "1.0"; + version = "1.0.2"; installPhase=''make install "PREFIX=$out"''; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://viric.name/~viric/soft/ts/ts-${version}.tar.gz"; - sha256 = "15dkzczx10fhl0zs9bmcgkxfbwq2znc7bpscljm4rchbzx7y6lsg"; + sha256 = "sha256-9zRSrtgOL5p3ZIg+k1Oqf0DmXTwZmtHzvmD9WLWOr+w="; }; meta = with lib; { diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 2c450207f50c..8f5ed7989f47 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O6IJGfJwGdtxLyUTFNHp9rGy05gVLlQTS8bTRsSYIuY="; + sha256 = "sha256-7AppXnU9VQx1CMyK2evWtRFVb8qvgSzKp+oFKoIGR9w="; }; - cargoHash = "sha256-jwkoyvelxl2lJoOHznZDmd39GJMye/+vi7PjrzjlLk4="; + cargoHash = "sha256-npbvKwxf6OxNw340yZ9vrQkXrZxD4G8yhZZEdDLwLs8="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index fc1a2bab79f4..2ed24f93d4d7 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - hash = "sha256-vxDBtYrfSmYE2mCqhepeLr4u+zLfHxCrYSXGq05CEYQ="; + hash = "sha256-EJf5Qv5ICJJdGNcRQ7v/ANyxx2j9d9NsZJnzIBrwam4="; }; vendorHash = null; diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index d27a2857413c..266b807c3f60 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.8"; + version = "1.10.9"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-gxX5Cq5SPDNWtwtuo35RW+N/WE0ZximxDlTi9TnTACM="; + hash = "sha256-3OXrKt3rM166JXqFuB+S0BJJkmkHPzJaWDDFeClmdM8="; }; vendorHash = "sha256-5biKUOzYaVY+52f0ewvHslAnb+BM0BuqGrU8wwA3t+E="; diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index 05c4957f27dd..c148f1e57f3f 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.18.1"; + version = "0.19.0"; src = fetchCrate { inherit pname version; - hash = "sha256-fnX2v7VxVFgn9UT1+qWBvN+oDDI2DbK6UFKmby5aB5c="; + hash = "sha256-HfZ8zyjghTXIyIYS+MaGF5OdMLJv6NIjQswdn/tvQbU="; }; - cargoHash = "sha256-HeT3U4H/OM/91BdXTvZq+gpmOnt/P4wTlqc2dl4erlQ="; + cargoHash = "sha256-py8VVciNJ36/aSTlTH+Bx36yrh/8AuzB9XNNv/PrFak="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index a04c4289f5c7..5f302cafd4db 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "3.1.0"; + version = "3.2.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-BWY/a5XFadyeyjtfBv9vVpT/EPYXoL/DqtUVk9nMkQg="; + hash = "sha256-e3cxUO05OU1RYINX24E8XXkxPADWpaIYTUgbcQIys7w="; }; - vendorHash = "sha256-uEuzAMsQHTAbKeAPIWu2yoCLhBrQNEYxdmjfzLLWONQ="; + vendorHash = "sha256-KxIQZViUYT4cgRlOuKBwen6pqQjGiAofkeBztmjnKdQ="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/tools/text/zim-tools/default.nix index e51755dd7e44..100c9e706ff7 100644 --- a/pkgs/tools/text/zim-tools/default.nix +++ b/pkgs/tools/text/zim-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "zim-tools"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "openzim"; repo = "zim-tools"; rev = version; - sha256 = "sha256-kPUw13GVYZ1GLb4b4ch64GkJZtf6PW1gae8F/cgyG90="; + sha256 = "sha256-A1A0Ri2OwPyqpx0f5CPJL3zAwo2I/AiRKpmk3r4DeTc="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index e7172e608746..1e2c58d60356 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - fetchSubmodules = true; sha256 = "sha256-xZHYiaQ8ASUwu0ieHIXcjRaH06SQoB6OR1y7Ok+FjAs="; }; @@ -34,6 +33,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; + buildFeatures = [ "external-harfbuzz" ]; + buildInputs = [ icu fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index df4a2862516e..46ec52f75d84 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -3,7 +3,7 @@ , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , perl, perlPackages, python3Packages, pkg-config, cmake, ninja -, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr, mupdf +, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr, mupdf-headless , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang, useFixedHashes, asymptote , biber-ms @@ -361,7 +361,7 @@ dvisvgm = stdenv.mkDerivation { ++ [ "--with-system-kpathsea" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ core brotli ghostscript zlib freetype woff2 potrace xxHash mupdf ]; + buildInputs = [ core brotli ghostscript zlib freetype woff2 potrace xxHash mupdf-headless ]; enableParallelBuilding = true; }; diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index 7dea97bf649e..39e085931dda 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "yaydl"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "dertuxmalwieder"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-JwyWWqbUNZyH6gymeScb9tMZoPvn/Igz9iW2pp0XvEI="; + sha256 = "sha256-r0Z/dihDaiW/lBLMftLtzLELpKT2twqru1xxI9LnjU8="; }; - cargoSha256 = "sha256-jmqO0UvU6s+E5r6VFFjOvSe8oiLiTG5rPNHzoHVftWo="; + cargoHash = "sha256-FkOiMeNwYj++gZ1Kl4RZHmsRDVMZQBEYtRpogK6XSFE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 2bbdf2104954..dd6e6c483a33 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -17,14 +17,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "23.4.3"; + version = "23.4.4"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-oYZr0Zvo6hn9sWtgSAGgfK2stHO247f0WUbzIIWUP18="; + hash = "sha256-imA3C2895W4vbBT9TsELT1H9QfNIxntNQLsniv+/FGg="; }; patches = [ diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index da2f1a909156..fb08c7110039 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -51,7 +51,10 @@ buildGoModule rec { ''; passthru = { - tests.incus = nixosTests.incus.container; + tests = { + incus-old-init = nixosTests.incus.container-old-init; + incus-new-init = nixosTests.incus.container-new-init; + }; generator = callPackage ./generator.nix { inherit src version; }; }; diff --git a/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch b/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch index 6194f33e1918..3c0d726e610d 100644 --- a/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch +++ b/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch @@ -1,5 +1,5 @@ diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator -index 0ad81d1..69dbfe7 100644 +index 0ad81d1..21ddb39 100644 --- a/distrobuilder/lxc.generator +++ b/distrobuilder/lxc.generator @@ -25,16 +25,6 @@ is_incus_vm() { @@ -73,9 +73,22 @@ index 0ad81d1..69dbfe7 100644 mkdir -p /run/systemd/system/systemd-udev-trigger.service.d cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf -@@ -145,24 +97,12 @@ EOF +@@ -132,37 +84,13 @@ ExecStart=-${cmd} trigger --type=devices --action=add + EOF } +-# fix_systemd_sysctl overrides the systemd-sysctl.service to use "ExecStart=-" instead of "ExecStart=". +-fix_systemd_sysctl() { +- cmd=/usr/lib/systemd/systemd-sysctl +- ! [ -e "${cmd}" ] && cmd=/lib/systemd/systemd-sysctl +- mkdir -p /run/systemd/system/systemd-sysctl.service.d +- cat <<-EOF > /run/systemd/system/systemd-sysctl.service.d/zzz-lxc-override.conf +-[Service] +-ExecStart= +-ExecStart=-${cmd} +-EOF +-} +- ## Main logic -# Nothing to do in Incus VM but deployed in case it is later converted to a container -is_incus_vm || is_lxd_vm && exit 0 @@ -99,7 +112,15 @@ index 0ad81d1..69dbfe7 100644 # Determine distro name and release ID="" -@@ -222,11 +162,6 @@ ACTION=="add|change|move", ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth[0-9] +@@ -192,7 +120,6 @@ fi + + # Ignore failures on some units. + fix_systemd_udev_trigger +-fix_systemd_sysctl + + # Mask some units. + fix_systemd_mask dev-hugepages.mount +@@ -222,11 +149,6 @@ ACTION=="add|change|move", ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth[0-9] EOF fi diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix index e7875f00bb6a..c746639e98ee 100644 --- a/pkgs/tools/virtualization/multipass/default.nix +++ b/pkgs/tools/virtualization/multipass/default.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation # Patch the patch of the OVMF binaries to use paths from the nix store. substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \ - --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \ - --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd" + --replace "OVMF.fd" "${OVMF.firmware}" \ + --replace "QEMU_EFI.fd" "${OVMF.firmware}" # Copy the grpc submodule we fetched into the source code. cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc @@ -122,7 +122,6 @@ stdenv.mkDerivation dnsmasq iproute2 iptables - OVMF.fd qemu qemu-utils xterm diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index cfd89ee451e6..18360fc7e212 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-QjGjP7GiJiP2bJE707Oc4wZ9o/gRmSboK9xGbbyG5EM="; + hash = "sha256-qcVgLhBUVZTvXz5/QytYWzYtCKscBab/Iy25KAgzExo="; }; - vendorHash = "sha256-mNuj4/e1qH3P5MfbwPLddXWhc8aDcQuoSSHZ+S+zKWw="; + vendorHash = "sha256-ctZt0jkBhQPryEKCrd1a+ymnVKkGasZV6gOtR5U0L0I="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index f8f085f1632b..db0095a973c3 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayrbar"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayrbar-${version}"; - sha256 = "sha256-41zlVT060Fu90N4oiZ6lWSZdJJSZjyk3GEA/u+bVNCI="; + sha256 = "sha256-pCXkgIesHqXI/m8ecytlq+U62lIrf7bOv95Hi/nyf/g="; }; - cargoHash = "sha256-/MUolnEdYlBTfmUB/j9vHaVpU63upeMoScjHl38cGjo="; + cargoHash = "sha256-RSdNYr6l9ayn9anczeGGh2rkKt6COqj+H71d14Gb8r0="; # don't build swayr buildAndTestSubdir = pname; diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 81be582a25e3..73355f0877d8 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-VUdmHJfbY1bA1/CeC8PJc+Xtupaz5a/15u4u3YGpxBA="; + hash = "sha256-srGqMqkkdJzcxN2sNToqDw/6B4OirlmKW1MXt1Nmvsk="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/tools/wayland/wl-screenrec/default.nix index c96a5834fa25..2836d7fed2bb 100644 --- a/pkgs/tools/wayland/wl-screenrec/default.nix +++ b/pkgs/tools/wayland/wl-screenrec/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wl-screenrec"; - version = "unstable-2023-09-17"; + version = "0.1.3"; src = fetchFromGitHub { owner = "russelltg"; repo = pname; - rev = "a36c5923009b44f2131196d8a3a234948f8e0102"; - hash = "sha256-V29eB9vozVKIBq8dO7zgA4nirsh1eDBjJN+rwVkeDLE="; + rev = "v${version}"; + hash = "sha256-ThPZPV1GyMFRu94O9WwUpXbR4gnIML26K7TyIfXZlcI="; }; - cargoHash = "sha256-uUfEweLWn/NdqgY8O7Ld+YnGPKQV1tpJi/Gd4MZB4xI="; + cargoHash = "sha256-DtlVsUFKNKXcwqNvGvqkSKUE+kRHX8wajL4fR0c9ZuQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix deleted file mode 100644 index 96cabcc38e87..000000000000 --- a/pkgs/tools/wayland/wlogout/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, meson -, ninja -, scdoc -, gtk3 -, libxkbcommon -, wayland -, wayland-protocols -, gtk-layer-shell -# gtk-layer-shell fails to cross-compile due to a hard dependency -# on gobject-introspection. -# Disable it when cross-compiling since it's an optional dependency. -# This disables transparency support. -, withGtkLayerShell ? (stdenv.buildPlatform == stdenv.hostPlatform) -}: - -stdenv.mkDerivation rec { - pname = "wlogout"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "ArtsyMacaw"; - repo = "wlogout"; - rev = version; - hash = "sha256-xeTO8MBUrvcVA7WTRY7OhaVGInijuvXsVYEax8JmMZ0="; - }; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config meson ninja scdoc ]; - buildInputs = [ - gtk3 - libxkbcommon - wayland - wayland-protocols - ] ++ lib.optionals withGtkLayerShell [ - gtk-layer-shell - ]; - - postPatch = '' - substituteInPlace style.css \ - --replace "/usr/share/wlogout" "$out/share/${pname}" - - substituteInPlace main.c \ - --replace "/etc/wlogout" "$out/etc/${pname}" - ''; - - mesonFlags = [ - "--datadir=${placeholder "out"}/share" - "--sysconfdir=${placeholder "out"}/etc" - ]; - - meta = with lib; { - homepage = "https://github.com/ArtsyMacaw/wlogout"; - description = "A wayland based logout menu"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - mainProgram = "wlogout"; - }; -} -# TODO: shell completions |