This commit is contained in:
legendofmiracles
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ aske ];
|
||||
mainProgram = "strangle";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ buildGoModule, lib, fetchFromGitHub, installShellFiles }:
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lib
|
||||
, makeWrapper
|
||||
, xdg-utils
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "aws-vault";
|
||||
version = "6.3.1";
|
||||
@@ -12,9 +18,10 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/aws-vault --prefix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
||||
installShellCompletion --cmd aws-vault \
|
||||
--bash $src/contrib/completions/bash/aws-vault.bash \
|
||||
--fish $src/contrib/completions/fish/aws-vault.fish \
|
||||
@@ -32,6 +39,12 @@ buildGoModule rec {
|
||||
-X main.Version=v${version}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/aws-vault --version 2>&1 | grep ${version} > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"A vault for securely storing and accessing AWS credentials in development environments";
|
||||
|
||||
@@ -152,9 +152,9 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
||||
argcomplete
|
||||
];
|
||||
|
||||
# TODO: make shell completion actually work
|
||||
# uses argcomplete, so completion needs PYTHONPATH to work
|
||||
postInstall = ''
|
||||
substituteInPlace az.completion.sh \
|
||||
--replace register-python-argcomplete ${py.pkgs.argcomplete}/bin/register-python-argcomplete
|
||||
installShellCompletion --bash --name az.bash az.completion.sh
|
||||
installShellCompletion --zsh --name _az az.completion.sh
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
@@ -11,6 +11,14 @@ buildGoModule rec {
|
||||
sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix test with Go 1.15
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cloudfoundry-incubator/credhub-cli/commit/4bd1accd513dc5e163e155c4b428878ca0bcedbc.patch";
|
||||
sha256 = "180n3q3d19aw02q7xsn7dxck18jgndz5garj2mb056cwa7mmhw0j";
|
||||
})
|
||||
];
|
||||
|
||||
# these tests require network access that we're not going to give them
|
||||
postPatch = ''
|
||||
rm commands/api_test.go
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.41.0";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-f4DkmIi4Uf4qJ3zkDWcpuN6nqXAwa91lj9Jd1MIskJ8=";
|
||||
sha256 = "sha256-fPs9xB27fxUnsXndqpcifmMPGA8hEyeYC7tq+W9eBKI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-G6rOmI1Q+bMRqOrkByff2q1AtuUN4hBfFzYaFq4TsxY=";
|
||||
vendorSha256 = "sha256-ZC5Rk5HcnxU9X5o/t+oz8qx36WjOVYVEXxxa875UrZk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,178 +1,186 @@
|
||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "2.24.1";
|
||||
version = "3.1.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.24.1-linux-x64.tar.gz";
|
||||
sha256 = "1c3a0ibwchl0lmcb8hr4j0x9b7hfsd0pfg6ay808zg1v8ddrj3xm";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.1.0-linux-x64.tar.gz";
|
||||
sha256 = "103r0rih8qzpswij3bxls9gsb832n4ykwrzbki9b21w2ymj7k3x1";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.10.0-linux-amd64.tar.gz";
|
||||
sha256 = "1gqbs33mqqssymn48glm9h5qfkc1097ygk0mdanfigyhwv6rdmnc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "1f6r59qk48x73nm17swcs3cp3qw616m7p36bvgsc1s96h23k805w";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.36.0-linux-amd64.tar.gz";
|
||||
sha256 = "0dg5szlslp863slv6lfd8g98946ljvxhvq64b3j4zk6rsn0badvh";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "12rnb18p7z709gvw50hvmx9v7f2wd3pwcncwz4g3ragd7f6a4kja";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.14.2-linux-amd64.tar.gz";
|
||||
sha256 = "00ibqxb1qzwi93dsq56av0vxq80lx2rr8wll4q6d8wlph215hlqs";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0xs7i9l871x5kr22jg7jjw0rgyvs4j4hazr4n9375xgzc8ysrk09";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.9.1-linux-amd64.tar.gz";
|
||||
sha256 = "04sk6km29ssqkv0xw26vq3iik2kfzc3dnzacn324m7fddv3p9wx9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "08588m5s6j1xhig4jprlkjgxk1sif4h3f6as7ixnvssin2vhhhl9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.17.1-linux-amd64.tar.gz";
|
||||
sha256 = "0b3bz952wz7fsbk51j0mlfsyyg9ymc9wnq8kgm7dvs1p5zgzv4ni";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "01dqah12p23658awcp0sx5h696rdyjl79vd9dm5075jdaix1f648";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.7.0-linux-amd64.tar.gz";
|
||||
sha256 = "0l1y8fckx7k3lasb6rzy3v58cl1x3qzbb999wi14z16z2a63zwsw";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0m8q1cswdml0hsc4vkq38pm2izs3lig57fg4a8ghqqi3ykni344d";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.9.1-linux-amd64.tar.gz";
|
||||
sha256 = "178l4h7wj9pn1283zajaqm7fwcfwzpzq7swrgr8q880qsa611gjs";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "06j5k599i8giy5v6scggw8zx1pyfm6w20biwcizv81zk0zkg3fzp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.19.0-linux-amd64.tar.gz";
|
||||
sha256 = "0iliagpyvzn63pwcdq74w8ag9vc7asqpq658b19zly4jd6z3cwkd";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "1bzy4zf473w49fz2n9lg5ncgblq2a5jh70nf6cfwc7kcla407in0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.4.0-linux-amd64.tar.gz";
|
||||
sha256 = "0zp3rwhngj009a9s6w2vyvgyhj7nd03mwm44x62ikhnz6f414kr9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0d17ccf84jj6a9hpdrnsziyw790i0y5zk18qgqh4qq79irwz6df2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.8.1-linux-amd64.tar.gz";
|
||||
sha256 = "1xhrj950lk6qdazg4flymn3dmkbivc2rd71k8sdy9zfanyxnq8vv";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "1j8232vw457fl0jhy08abs5hcx8nd2lll3zg9bp3s352wz2r5xl4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.7.1-linux-amd64.tar.gz";
|
||||
sha256 = "0n2p14iam44icms4c8qrjfy1z7p4m6igxckvqxr0gphi8ngk4ggh";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0lqnb1xrb5ma8ssvn63lh92ihja6zx4nrx40pici1ggaln4sphn0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.3-linux-amd64.tar.gz";
|
||||
sha256 = "0l9r0gqhhjbkv4vn4cxm2s9zf93005w8vrb103w101h1gc5gh93l";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0s7an3qvczhajs54i0ir3jjmwxpv9w94viqrik506k198j0qnl3b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.5.1-linux-amd64.tar.gz";
|
||||
sha256 = "0clck5cra6bplfxd0nb6vkji50gg4ah4yfvc7202hi3w2b9hfjjg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0ljxjv8rm4li61vgjbpmxw8w6d2pym5li3w61dqi3kka4ix25aww";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.5.1-linux-amd64.tar.gz";
|
||||
sha256 = "1cd2bm030fa9spv7bx817id419lz1c54i8h84ifinkx88ig7ngyx";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "1mxkwcricqnnbj0dp3wqidci6rgfn7daxkjprcnrndhgcdghq7sv";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.17.1-linux-amd64.tar.gz";
|
||||
sha256 = "1q9sx2lszmkcgphp3vwx0lvs5vc67sk98rn8s6ywhz0p426wakmr";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "04gaimdzh04v7f11xw1b7p95rbb142kbnix1zqas68wd6vpw9kyp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "1535c95ncgdifyz5m29gagpcr7lhhddlffmj9lmwch55w2xlk86k";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz";
|
||||
sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.9.0-linux-amd64.tar.gz";
|
||||
sha256 = "0n486h5f683yq6z53s9l9x5air1vk4nz1skiirsprz7a12cy2xkn";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "13j13kp0sbwp65l73mdcqiv4cszslxin567ccdkk2rw8vs1ni7x0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.1.1-linux-amd64.tar.gz";
|
||||
sha256 = "1zpwlvdgjvhnhlzyppqg76csma8kan33amxa1svlhcai8b168878";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0pah7s9wwaj8zp371blmj4c1bgyhh0dgsfr9axj0k4lhpqlyikmj";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.5.1-linux-amd64.tar.gz";
|
||||
sha256 = "16b1449vb6inlyjpb1iyr5j5mwg1g2d6bcd5g2kmxcsw4yhc7ai7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0bk26k1igqljjpwkkvri6dp14cfw9l9a2dvg2as3v5930w4jxql8";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.13.1-linux-amd64.tar.gz";
|
||||
sha256 = "1z6v5vz0p9g3hrrgrchx2wnbparkbf5b8vn9pwnw69nkplr1qzff";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "1lxb03z80r8a2vfckyw5yf036ii30gdi3rch4sriksfv30il9kbc";
|
||||
}
|
||||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.24.1-darwin-x64.tar.gz";
|
||||
sha256 = "1x6z0drvaxrps47nisvw513vgskaf86mz8fzlhqfkddp2k5la5j1";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.1.0-darwin-x64.tar.gz";
|
||||
sha256 = "1lfqm4s72bwrycspr9nbgfvf5i6p50x8lk81pcs6zbzz6iff4x7z";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.10.0-darwin-amd64.tar.gz";
|
||||
sha256 = "05cz7b738bcai4aiya4rkjhmkh9pg6za4xp2snb9nx0jkw2vw2ms";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0nycqlz3lkwirr8rs4sqdqbzn2igv51hjyfjjsgnhx85kjzlkas6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.36.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0k74x9a6b9xngrp1cgdal86h23m95r5sa3q036ms4py0phq47r2w";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1kim1lk9dycsanc2vcsr4fgfhk90zyjf24vvwmmkk70nq1lnwqp3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.14.2-darwin-amd64.tar.gz";
|
||||
sha256 = "05ggw10z0pp45yqq8bl32l3xjxvgwbs58czpw74whydqbd3qy8av";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0kvr057hdwcxf7gj788sv6ysz25ap3z0akqhhb20mlzv3shwiiji";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.9.1-darwin-amd64.tar.gz";
|
||||
sha256 = "022458yxscfg56s2nqdr95wp2ffm7sni4kaksj87i6c5ddc9f1gx";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "14d530fbzmq5m3njl31qkgwwfyipad9iqjhv3cd8pcl87blaxxki";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.17.1-darwin-amd64.tar.gz";
|
||||
sha256 = "09nd5nfvjqgpbjs82bm5ym5wdg37mg863wvdp8s3fd8id4gdqb24";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0q29dyrnramr2bl89503gnbm4zq2x3bn7kaiwbhg6r17xa6rkji4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.7.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0iflll8lkk3s3dx3xl0iqmxac9nlspjnv8gmjfqwpryzk8h1fmzy";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0v8iha0n1kqvaxrjll2mv9znc9lzqj7mqxgxig2g89qqjs6p69ql";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.9.1-darwin-amd64.tar.gz";
|
||||
sha256 = "10vp75fc41yk9lg5x7wyhs4mn2f4krfnw4jn5xys7dd475blm6rh";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0ffic6mqr1zyskrv60q9wg7jc0hq23l5g0pdh3clpnn2m1xnxnxm";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.19.0-darwin-amd64.tar.gz";
|
||||
sha256 = "061s8snsgz044ilh2s48810bmayypdyq9aqkhgal6v3l86jl8m95";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1793qry84bch32zbc70c777y04qgys6n0vxsxzxqgz2j4r9vmi6a";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.4.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1p6xxhy30qzprxk3kwiwimw5m0c73fk7c9j4vrzj2z4kpgj8qx7w";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1lzjjk2da1xla012xrs9jfcdsbpmkh48n6lypmbr2ixh13pdwk1b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.8.1-darwin-amd64.tar.gz";
|
||||
sha256 = "14gqwz5nalbv97vl9apwda0xxl7cgkp5mixrc10xvx6a94w5758p";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1i3zmflwjjfc13j7w9acavgrbblm9fri041z6qpb3ikcq5s9lqcm";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.7.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0i0h1iz999pbz23gbs75bj3lxfg9a6044g4bwdwf3agxf3k9pji3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1lkrx2cayhhv432dvzvz8q4i1gfi659rkl59c0y0dkwbs8x425zb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.3-darwin-amd64.tar.gz";
|
||||
sha256 = "1nwwqq1nn1zr6mia2wd82lzqsa8l3rr50hl1mf6l6ffyxz1q1lzj";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "10439p96wpxr13pxhii7li2cjq53pgr8c48ir63d2n4b8fn8iklr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.5.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0zkd3rm6z8bc7pcbwl0bbbn0zb3jrl69b84g62ma9vzskccrxxpr";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1n35b1cqglpwvcxdcgxwmv5j1qp8gwrjzh25884l0b72krna9alr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.5.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0v4qqp1x8xi0fqiczmmh2qbf3azbgf09cphia5w8r2kkrn4i0jxn";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0qx4p0jz3n66r3kgpgs25qbzlmwdqf80353nywyijv3ham6hpicf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.17.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1788ayj5zwlmvhd1qp6rzrcbman5i0hy1hw2fmgcrf66v5qc1f18";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "18vrp0zzi92x4l5nkjszvd0zr7pk6nl6s3h5a3hvsz5qrj2830q3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0159ng9c9hshmng8ipss7hncqs5qp8plmr1qjadka6vyp1mxn2c3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz";
|
||||
sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.9.0-darwin-amd64.tar.gz";
|
||||
sha256 = "08af55rrzpm42vx7w1i1cmfk48czjfwln737prp5mwcvddmg5s1g";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0h9zdiaanvm2yds9z0c5fmz0f05apdhm4w28d2i929djxh57jqrr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.1.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1j30gkz1m9ap8pd2r3lb3nl82bq5bq3h7y6jq2c0dmv3ksnp197f";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "15pzcymjr9bzx47sq86llzfg0hydyf4cn0bb95zxjqrx8y37rql8";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.5.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1s5kbqri9k7cpajkgnl2s5l0nznzridj5iscwd9n1nj4bsr44lap";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1wkak84yg5a4b5791pdwcl0fr089yjk853hwp44x3rhdh8xrdq1p";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.13.1-darwin-amd64.tar.gz";
|
||||
sha256 = "133xspppmydjri5ba2yxc331ljzd8wj88q3hzmgvp0m50il1ks71";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1g2q3zbhxmpk2qp3c9hz0vn0xh95pnl7pd5b5kcizbrdfgjlaabq";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@@ -3,31 +3,32 @@
|
||||
|
||||
# Version of Pulumi from
|
||||
# https://www.pulumi.com/docs/get-started/install/versions/
|
||||
VERSION="2.24.1"
|
||||
VERSION="3.1.0"
|
||||
|
||||
# Grab latest release ${VERSION} from
|
||||
# https://github.com/pulumi/pulumi-${NAME}/releases
|
||||
plugins=(
|
||||
"auth0=1.10.0"
|
||||
"aws=3.36.0"
|
||||
"cloudflare=2.14.2"
|
||||
"consul=2.9.1"
|
||||
"datadog=2.17.1"
|
||||
"digitalocean=3.7.0"
|
||||
"docker=2.9.1"
|
||||
"gcp=4.19.0"
|
||||
"github=3.4.0"
|
||||
"gitlab=3.8.1"
|
||||
"hcloud=0.7.1"
|
||||
"kubernetes=2.8.3"
|
||||
"mailgun=2.5.1"
|
||||
"mysql=2.5.1"
|
||||
"openstack=2.17.1"
|
||||
"auth0=2.0.0"
|
||||
"aws=4.0.0"
|
||||
"cloudflare=3.0.0"
|
||||
"consul=3.0.0"
|
||||
"datadog=3.0.0"
|
||||
"digitalocean=4.0.0"
|
||||
"docker=3.0.0"
|
||||
"gcp=5.0.0"
|
||||
"github=4.0.0"
|
||||
"gitlab=4.0.0"
|
||||
"hcloud=1.0.0"
|
||||
"kubernetes=3.0.0"
|
||||
"linode=3.0.0"
|
||||
"mailgun=3.0.0"
|
||||
"mysql=3.0.0"
|
||||
"openstack=3.0.0"
|
||||
"packet=3.2.2"
|
||||
"postgresql=2.9.0"
|
||||
"random=3.1.1"
|
||||
"vault=3.5.1"
|
||||
"vsphere=2.13.1"
|
||||
"postgresql=3.0.0"
|
||||
"random=4.0.0"
|
||||
"vault=4.0.0"
|
||||
"vsphere=3.0.0"
|
||||
)
|
||||
|
||||
function genMainSrc() {
|
||||
|
||||
@@ -2,27 +2,26 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.16.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E/tPjVc+XLDCFYzloAipwWjB4I86kAe/6NVoJSCrY2M=";
|
||||
sha256 = "sha256-5TOKYxH1Tnsd1t2yoUflFUSW0QGS9l5+0JtS2Fo6vL0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YoQF0Eug747LhsR3V0IplwXgm0ndDqK1pUVjguOhjOU=";
|
||||
vendorSha256 = "sha256-zVe1bTTLOHxfdbb6VcztOCWMbCbzT6igNpvPytktMWs=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
excludedPackages = "misc";
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=v${version}"
|
||||
];
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/aquasecurity/trivy";
|
||||
changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}";
|
||||
description = "A simple and comprehensive vulnerability scanner for containers, suitable for CI";
|
||||
longDescription = ''
|
||||
Trivy is a simple and comprehensive vulnerability scanner for containers
|
||||
@@ -31,8 +30,6 @@ buildGoModule rec {
|
||||
vulnerabilities of OS packages (Alpine, RHEL, CentOS, etc.) and
|
||||
application dependencies (Bundler, Composer, npm, yarn, etc.).
|
||||
'';
|
||||
homepage = src.meta.homepage;
|
||||
changelog = "${src.meta.homepage}/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jk ];
|
||||
};
|
||||
|
||||
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
mainProgram = "7z";
|
||||
# RAR code is under non-free UnRAR license, but we remove it
|
||||
license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;
|
||||
};
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@@ -77,6 +79,24 @@ in stdenv.mkDerivation rec {
|
||||
cp -R --no-preserve=mode,ownership ${vst3.src} vst3
|
||||
)'';
|
||||
|
||||
patches = [
|
||||
# Fix printing wine version when using absolute path (remove patches in next release):
|
||||
(fetchpatch {
|
||||
url = "https://github.com/robbert-vdh/yabridge/commit/2aadf5256b3eafeb86efa8626247972dd33baa13.patch";
|
||||
sha256 = "sha256-Nq9TQJxa22vJLmf+USyPBkF8cKyEzb1Lp2Rx86pDxnY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/robbert-vdh/yabridge/commit/93df3fa1da6ffcc69a5b384ba04e3da7c5ef23ef.patch";
|
||||
sha256 = "sha256-//8Dxolqe6n+aFo4yVnnMR9kSq/iEFE0qZPvcIBehvI=";
|
||||
})
|
||||
|
||||
# Hard code wine path so wine version is correct in logs
|
||||
(substituteAll {
|
||||
src = ./hardcode-wine.patch;
|
||||
inherit wine;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
@@ -117,6 +137,14 @@ in stdenv.mkDerivation rec {
|
||||
cp libyabridge-vst3.so "$out/lib"
|
||||
'';
|
||||
|
||||
# Hard code wine path in wrapper scripts generated by winegcc
|
||||
postFixup = ''
|
||||
for exe in "$out"/bin/*.exe; do
|
||||
substituteInPlace "$exe" \
|
||||
--replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"'
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yet Another VST bridge, run Windows VST2 plugins under Linux";
|
||||
homepage = "https://github.com/robbert-vdh/yabridge";
|
||||
|
||||
13
pkgs/tools/audio/yabridge/hardcode-wine.patch
Normal file
13
pkgs/tools/audio/yabridge/hardcode-wine.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
||||
index 1ff05bc..0723456 100644
|
||||
--- a/src/plugin/utils.cpp
|
||||
+++ b/src/plugin/utils.cpp
|
||||
@@ -351,7 +351,7 @@ std::string get_wine_version() {
|
||||
access(wineloader_path.c_str(), X_OK) == 0) {
|
||||
wine_path = wineloader_path;
|
||||
} else {
|
||||
- wine_path = bp::search_path("wine").string();
|
||||
+ wine_path = "@wine@/bin/wine";
|
||||
}
|
||||
|
||||
bp::ipstream output;
|
||||
@@ -1,4 +1,9 @@
|
||||
{ lib, rustPlatform, yabridge }:
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, yabridge
|
||||
, makeWrapper
|
||||
, wine
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yabridgectl";
|
||||
@@ -17,6 +22,13 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
patchFlags = [ "-p3" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/yabridgectl" \
|
||||
--prefix PATH : ${lib.makeBinPath [ wine ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A small, optional utility to help set up and update yabridge for several directories at once";
|
||||
homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl";
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.14";
|
||||
version = "2.7.0";
|
||||
pname = "dar";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-1uzKj+q2klIdANhLzy6TStJzeQndeUvdT0Dzwijad+U=";
|
||||
sha256 = "sha256-aJqNi2jZJgQmq0IObbAXZcmK2vvWePvHEUtw8O2nBwo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, coreutils }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kopia";
|
||||
version = "0.7.3";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1dnk764y71c9k9nghn9q06f2zz9igsvm4z826azil2d58h5d06j6";
|
||||
sha256 = "sha256-Or6RL6yT/X3rVIySqt5lWbXbI25f8HNLBpY3cOhMC0g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1mnhq6kn0pn67l55a9k6irmjlprr295218nms3klsk2720syzdwq";
|
||||
vendorSha256 = "sha256-1FK5IIvm2iyzGqj8IPL3/qvxFj0dC37aycQQ5MO0mBI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -23,12 +23,6 @@ buildGoModule rec {
|
||||
-X github.com/kopia/kopia/repo.BuildInfo=${src.rev}
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
|
||||
substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
|
||||
--replace "/bin/stty" "${coreutils}/bin/stty"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://kopia.io";
|
||||
description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib, stdenv, runCommand, fetchurl
|
||||
, fetchpatch
|
||||
, ensureNewerSourcesHook
|
||||
, cmake, pkg-config
|
||||
, which, git
|
||||
@@ -14,6 +13,15 @@
|
||||
, libnl, libcap_ng
|
||||
, rdkafka
|
||||
, nixosTests
|
||||
, cryptsetup
|
||||
, sqlite
|
||||
, lua
|
||||
, icu
|
||||
, bzip2
|
||||
, doxygen
|
||||
, graphviz
|
||||
, fmt
|
||||
, python3
|
||||
|
||||
# Optional Dependencies
|
||||
, yasm ? null, fcgi ? null, expat ? null
|
||||
@@ -123,10 +131,10 @@ let
|
||||
]);
|
||||
sitePackages = ceph-python-env.python.sitePackages;
|
||||
|
||||
version = "15.2.10";
|
||||
version = "16.2.1";
|
||||
src = fetchurl {
|
||||
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
|
||||
sha256 = "1xfijynfb56gydpwh6h4q781xymwxih6nx26idnkcjqih48nsn01";
|
||||
sha256 = "1qqvfhnc94vfrq1ddizf6habjlcp77abry4v18zlq6rnhwr99zrh";
|
||||
};
|
||||
in rec {
|
||||
ceph = stdenv.mkDerivation {
|
||||
@@ -142,12 +150,18 @@ in rec {
|
||||
pkg-config which git python3Packages.wrapPython makeWrapper
|
||||
python3Packages.python # for the toPythonPath function
|
||||
(ensureNewerSourcesHook { year = "1980"; })
|
||||
python3
|
||||
fmt
|
||||
# for building docs/man-pages presumably
|
||||
doxygen
|
||||
graphviz
|
||||
];
|
||||
|
||||
buildInputs = cryptoLibsMap.${cryptoStr} ++ [
|
||||
boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
|
||||
malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
|
||||
snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka
|
||||
cryptsetup sqlite lua icu bzip2
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
|
||||
# ceph 14
|
||||
@@ -172,7 +186,6 @@ in rec {
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_PYTHON3=ON"
|
||||
"-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore
|
||||
"-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"
|
||||
|
||||
@@ -183,6 +196,8 @@ in rec {
|
||||
"-DWITH_TESTS=OFF"
|
||||
# TODO breaks with sandbox, tries to download stuff with npm
|
||||
"-DWITH_MGR_DASHBOARD_FRONTEND=OFF"
|
||||
# WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
|
||||
''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
14
pkgs/tools/graphics/mangohud/combined.nix
Normal file
14
pkgs/tools/graphics/mangohud/combined.nix
Normal file
@@ -0,0 +1,14 @@
|
||||
{ stdenv, pkgs, lib
|
||||
, libXNVCtrl
|
||||
}:
|
||||
let
|
||||
mangohud_64 = pkgs.callPackage ./default.nix { inherit libXNVCtrl; };
|
||||
mangohud_32 = pkgs.pkgsi686Linux.callPackage ./default.nix { inherit libXNVCtrl; };
|
||||
in
|
||||
pkgs.buildEnv rec {
|
||||
name = "mangohud-${mangohud_64.version}";
|
||||
|
||||
paths = [ mangohud_32 ] ++ lib.optionals stdenv.is64bit [ mangohud_64 ];
|
||||
|
||||
meta = mangohud_64.meta;
|
||||
}
|
||||
79
pkgs/tools/graphics/mangohud/default.nix
Normal file
79
pkgs/tools/graphics/mangohud/default.nix
Normal file
@@ -0,0 +1,79 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, dbus
|
||||
, glslang
|
||||
, libglvnd
|
||||
, libXNVCtrl
|
||||
, mesa
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, xorg
|
||||
}:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mangohud${lib.optionalString stdenv.is32bit "_32"}";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flightlessmango";
|
||||
repo = "MangoHud";
|
||||
rev = "v${version}";
|
||||
sha256 = "04v2ps8n15ph2smjgnssax5hq88bszw2kbcff37cnd5c8yysvfi6";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# FIXME obsolete in >=0.5.0
|
||||
url = "https://patch-diff.githubusercontent.com/raw/flightlessmango/MangoHud/pull/208.patch";
|
||||
sha256 = "1i6x6sr4az1zv0p6vpw99n947c7awgbbv087fghjlczhry676nmh";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dappend_libdir_mangohud=false"
|
||||
"-Duse_system_vulkan=enabled"
|
||||
"--libdir=lib${lib.optionalString stdenv.is32bit "32"}"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
glslang
|
||||
libglvnd
|
||||
libXNVCtrl
|
||||
mesa
|
||||
python3Packages.Mako
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
xorg.libX11
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3Packages.Mako
|
||||
python3Packages.python
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p "$out/share/vulkan/"
|
||||
ln -sf "${vulkan-headers}/share/vulkan/registry/" $out/share/vulkan/
|
||||
ln -sf "${vulkan-headers}/include" $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more";
|
||||
homepage = "https://github.com/flightlessmango/MangoHud";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zeratax ];
|
||||
};
|
||||
}
|
||||
@@ -16,18 +16,18 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kime";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Riey";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10zd4yrqxzxf4nj3b5bsblcmlbqssxqq9pac0misa1g61jdbszj8";
|
||||
sha256 = "1kjw22hy2x90dc7xfm252v1pdr9x13mpm92rcgfy8zbkiqq242bl";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sha256 = "1bimi7020m7v287bh7via7zm9m7y13d13kqpd772xmpdbwrj8nrl";
|
||||
sha256 = "05kb9vnifaw01qw5cmdh4wzcf50szb0y00085wx41m8h4f28hfbk";
|
||||
};
|
||||
|
||||
# Replace autostart path
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
, fetchCrate
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, coreutils
|
||||
, libiconv
|
||||
, zlib
|
||||
, Security
|
||||
@@ -12,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.2.9";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-5tM8ywLBPPjCKEfXIfUZ5aF4t9YpYA3tzERxC1NEsso=";
|
||||
sha256 = "sha256-Iz9pXvgPIGUnfbnvk5kYAqlrMlz3I2kLszPe8GwwHVk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-P5ukwtRUpIJIqJjwTXIB2xRnpyLkzMeBMHmUz4Ery3s=";
|
||||
cargoHash = "sha256-eECAaTUgqasuDhLSk8p/CWSQmV8yV30UoMy3GZCRbGE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -33,8 +32,6 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/'
|
||||
|
||||
# Fill the version stub in the man page. We can't fill the date
|
||||
# stub reproducibly.
|
||||
substitute man/page man/broot.1 \
|
||||
|
||||
@@ -16,11 +16,11 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "171";
|
||||
version = "172";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "sha256-8PUFKwSWf84ics4w9yrCWMYgzzNF5z1kNn7LnksfCtA=";
|
||||
sha256 = "1j162jh5lkiixpb5ym3smyrkvjldm8m8vnx25cgwb7cxkk701w5x";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
clangStdenv,
|
||||
fetchFromGitHub,
|
||||
opencl-headers,
|
||||
@@ -8,6 +9,7 @@
|
||||
boost,
|
||||
makeWrapper,
|
||||
cudatoolkit,
|
||||
cudaSupport,
|
||||
mesa,
|
||||
ethash,
|
||||
opencl-info,
|
||||
@@ -15,22 +17,22 @@
|
||||
openssl,
|
||||
pkg-config,
|
||||
cli11
|
||||
}:
|
||||
}@args:
|
||||
|
||||
# Note that this requires clang < 9.0 to build, and currently
|
||||
# clangStdenv provides clang 7.1 which satisfies the requirement.
|
||||
let stdenv = clangStdenv;
|
||||
let stdenv = if cudaSupport then clangStdenv else args.stdenv;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ethminer";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src =
|
||||
fetchFromGitHub {
|
||||
owner = "ethereum-mining";
|
||||
repo = "ethminer";
|
||||
rev = "v${version}";
|
||||
sha256 = "10b6s35axmx8kyzn2vid6l5nnzcaf4nkk7f5f7lg3cizv6lsj707";
|
||||
sha256 = "1kyff3vx2r4hjpqah9qk99z6dwz7nsnbnhhl6a76mdhjmgp1q646";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -41,6 +43,8 @@ in stdenv.mkDerivation rec {
|
||||
"-DAPICORE=ON"
|
||||
"-DETHDBUS=OFF"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
] ++ lib.optionals (!cudaSupport) [
|
||||
"-DETHASHCUDA=OFF" # on by default
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -54,12 +58,13 @@ in stdenv.mkDerivation rec {
|
||||
boost
|
||||
opencl-headers
|
||||
mesa
|
||||
cudatoolkit
|
||||
ethash
|
||||
opencl-info
|
||||
ocl-icd
|
||||
openssl
|
||||
jsoncpp
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudatoolkit
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@@ -71,10 +76,11 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ethereum miner with OpenCL, CUDA and stratum support";
|
||||
description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support";
|
||||
homepage = "https://github.com/ethereum-mining/ethminer";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ nand0p ];
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ nand0p atemu ];
|
||||
license = licenses.gpl3Only;
|
||||
broken = cudaSupport;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl
|
||||
, darwin, installShellFiles
|
||||
, installShellFiles
|
||||
, CoreFoundation, CoreServices, Security, AppKit, libiconv
|
||||
|
||||
, x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD
|
||||
, xclip ? null, xsel ? null
|
||||
@@ -29,7 +30,7 @@ buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
|
||||
buildInputs =
|
||||
if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
|
||||
if stdenv.isDarwin then [ libiconv CoreFoundation CoreServices Security AppKit ]
|
||||
else [ openssl ];
|
||||
|
||||
preBuild = lib.optionalString (x11Support && usesX11) (
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluent-bit";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a3AVem+VbYKUsxAzGNu/VPqDiqG99bmj9p1/iiG1ZFw=";
|
||||
sha256 = "sha256-xOrEPZ+AUihVVaxrqCCeO6n3XFkVahCzHOuX947LRFs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "macchina";
|
||||
version = "0.6.9";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Macchina-CLI";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-y23gpYDnYoiTJcNyWKslVenPTXcCrOvxq+0N9PjQN3g=";
|
||||
sha256 = "sha256-ICiU0emo5lEs6996TwkauuBWb2+Yy6lL+/x7zQgO470=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jfLj8kLBG6AeeYo421JCl1bMqWwOGiwQgv7AEomtFcY=";
|
||||
cargoSha256 = "sha256-OfOh0YXeLT/kBuR9SOV7pHa8Z4b6+JvtVwqqwd1hCJY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "svtplay-dl";
|
||||
version = "3.3";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "00pz5vv39qjsw67fdlj6942371lyvv368lc82z17nnh723ck54yy";
|
||||
sha256 = "1hnbpj4k08356k2rmsairbfnxwfxs5lv59nxcj6hy5wf162h2hzb";
|
||||
};
|
||||
|
||||
pythonPaths = [ cryptography pyyaml requests ];
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{ lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }:
|
||||
|
||||
pythonPackages.buildPythonApplication {
|
||||
|
||||
pname = "togglesg-download-git";
|
||||
version = "2017-12-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0x776b7364";
|
||||
repo = "toggle.sg-download";
|
||||
rev = "e64959f99ac48920249987a644eefceee923282f";
|
||||
sha256 = "0j317wmyzpwfcixjkybbq2vkg52vij21bs40zg3n1bs61rgmzrn8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
doCheck = false;
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/doc/togglesg-download}
|
||||
substitute $src/download_toggle_video2.py $out/bin/download_toggle_video2.py \
|
||||
--replace "ffmpeg_download_cmd = 'ffmpeg" "ffmpeg_download_cmd = '${lib.getBin ffmpeg_3}/bin/ffmpeg"
|
||||
chmod 0755 $out/bin/download_toggle_video2.py
|
||||
|
||||
cp LICENSE README.md $out/share/doc/togglesg-download
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/0x776b7364/toggle.sg-download";
|
||||
description = "Command-line tool to download videos from toggle.sg written in Python";
|
||||
longDescription = ''
|
||||
toggle.sg requires SilverLight in order to view videos. This tool will
|
||||
allow you to download the video files for viewing in your media player and
|
||||
on your OS of choice.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -2,22 +2,27 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "trash-cli";
|
||||
version = "0.20.12.26";
|
||||
version = "0.21.4.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreafrancia";
|
||||
repo = "trash-cli";
|
||||
rev = version;
|
||||
sha256 = "15iivl9xln1bw1zr2x5zvqyb6aj7mc8hfqi6dniq6xkp5m046ib7";
|
||||
sha256 = "16xmg2d9rfmm5l1dxj3dydijpv3kwswrqsbj1sihyyka4s915g61";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.psutil ];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
nose
|
||||
mock
|
||||
pytest
|
||||
];
|
||||
checkPhase = "nosetests";
|
||||
|
||||
# Run tests, skipping `test_user_specified` since its result depends on the
|
||||
# mount path.
|
||||
checkPhase = ''
|
||||
pytest -k 'not test_user_specified'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/andreafrancia/trash-cli";
|
||||
@@ -25,5 +30,6 @@ python3Packages.buildPythonApplication rec {
|
||||
maintainers = [ maintainers.rycee ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
mainProgram = "trash";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
--- a/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100
|
||||
+++ a/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100
|
||||
@@ -12,7 +12,7 @@ def mount_points_from_getmnt():
|
||||
|
||||
def mount_points_from_df():
|
||||
import subprocess
|
||||
- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout
|
||||
+ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout
|
||||
return list(_mount_points_from_df_output(df_output))
|
||||
|
||||
def _mount_points_from_df_output(df_output):
|
||||
@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() :
|
||||
("mnt_freq", c_int), # Dump frequency (in days).
|
||||
("mnt_passno", c_int)] # Pass number for `fsck'.
|
||||
|
||||
- if sys.platform == "cygwin":
|
||||
- libc_name = "cygwin1.dll"
|
||||
- else:
|
||||
- libc_name = find_library("c")
|
||||
-
|
||||
- if libc_name == None :
|
||||
- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0
|
||||
+ libc_name = "@libc@"
|
||||
|
||||
libc = cdll.LoadLibrary(libc_name)
|
||||
libc.getmntent.restype = POINTER(mntent_struct)
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vector";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timberio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Sur5QfPIoJXkcYdyNlIHOvmV2yBedhNm7UinmaFEc2E=";
|
||||
sha256 = "sha256-ige0138alZ0KAmPakPVmDVydz5qco6m0xK7AEzScyXc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1Xm1X1pfx9J0tBck2WA+zt2OxtQsqustcWPazsPyKPY=";
|
||||
cargoSha256 = "sha256-oK4M6zTfI0QVW9kQTgpP/vSxFt2VlRABmKvQ4aAqC74=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl protobuf rdkafka ]
|
||||
++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "102zw4napzx05rpmx6scl6il55syf3lw1gzmy1y66cg1f70sij4d";
|
||||
sha256 = "sha256-spESDjX7scihVQrr/f6KMCI9VfdTxxPWP7FcJ965FYk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "121fsch0an6d2hqaq0ws9cm7g5ppzfrycmmhajfacfg6wbiax1m5";
|
||||
cargoSha256 = "0rm31sfcj2d85w1l4hhfmva3j828dfhiv5br1mnpaqaa01zzs1q1";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -22,13 +22,16 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion assets/completions/zellij.{bash,fish} --zsh assets/completions/_zellij
|
||||
installShellCompletion --cmd $pname \
|
||||
--bash <($out/bin/zellij generate-completion bash) \
|
||||
--fish <($out/bin/zellij generate-completion fish) \
|
||||
--zsh <($out/bin/zellij generate-completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal workspace with batteries included";
|
||||
homepage = "https://zellij.dev/";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ therealansh ];
|
||||
maintainers = with maintainers; [ therealansh _0x4A6F ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bgpq4";
|
||||
version = "0.0.6";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bgp";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n6d6xq7vafx1la0fckqv0yjr245ka9dgbcqaz9m6dcdk0fdlkks";
|
||||
sha256 = "sha256-iEm4BYlJi56Y4OBCdEDgRQ162F65PLZyvHSEQzULFww=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.1.0";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-teH4Y6PrUSE7Rxw0WV7Ka+CB44nwYXy9q09wOAhC8Bc=";
|
||||
sha256 = "sha256-MiTc8uT4FUHqEgE37kZ0pc7y1aK6u+4LqYQ8l1j2jA4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HPUvL22BrVH9/j41VFaystZWs0LO6KNIf2cNYqKxWnY=";
|
||||
vendorSha256 = "sha256-UGFFzpbBeL4YS3VSjCa31E2fiqND8j3E4FjRflg1NFc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
|
||||
${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
|
||||
# wait for things to settle
|
||||
sleep 1
|
||||
# receive
|
||||
MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
|
||||
# receive, as of croc 9 --overwrite is required for noninteractive use
|
||||
MSG2=$(${croc}/bin/croc --overwrite --relay localhost:11111 --yes correct-horse-battery-staple)
|
||||
# compare
|
||||
[ "$MSG" = "$MSG2" ] && touch $out
|
||||
'';
|
||||
|
||||
@@ -3,27 +3,38 @@
|
||||
, cmake
|
||||
, gflags
|
||||
, libsodium
|
||||
, openssl
|
||||
, protobuf
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eternal-terminal";
|
||||
version = "6.0.13";
|
||||
version = "6.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MisterTea";
|
||||
repo = "EternalTerminal";
|
||||
rev = "et-v${version}";
|
||||
sha256 = "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r";
|
||||
sha256 = "0jpm1ilr1qfz55y4mqp75v4q433qla5jhi1b8nsmx48srs7f0j2q";
|
||||
};
|
||||
|
||||
cmakeFlags= [
|
||||
"-DDISABLE_VCPKG=TRUE"
|
||||
"-DDISABLE_SENTRY=TRUE"
|
||||
"-DDISABLE_CRASH_LOG=TRUE"
|
||||
];
|
||||
|
||||
CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17";
|
||||
LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ gflags libsodium protobuf ];
|
||||
buildInputs = [ gflags openssl zlib libsodium protobuf ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Remote shell that automatically reconnects without interrupting the session";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://mistertea.github.io/EternalTerminal/";
|
||||
homepage = "https://eternalterminal.dev/";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ dezgeg pingiun ];
|
||||
};
|
||||
|
||||
@@ -1,5 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub, bison, meson, ninja, pkg-config
|
||||
, libuecc, libsodium, libcap, json_c, openssl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bison
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, libuecc
|
||||
, libsodium
|
||||
, libcap
|
||||
, json_c
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastd";
|
||||
@@ -12,8 +23,27 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1p4k50dk8byrghbr0fwmgwps8df6rlkgcd603r14i71m5g27z5gw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config bison meson ninja ];
|
||||
buildInputs = [ libuecc libsodium libcap json_c openssl ];
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
json_c
|
||||
libcap
|
||||
libsodium
|
||||
libuecc
|
||||
openssl
|
||||
];
|
||||
|
||||
# some options are only available on x86
|
||||
mesonFlags = lib.optionals (!stdenv.isx86_64 && !stdenv.isi686) [
|
||||
"-Dcipher_salsa20_xmm=disabled"
|
||||
"-Dcipher_salsa2012_xmm=disabled"
|
||||
"-Dmac_ghash_pclmulqdq=disabled"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haproxy";
|
||||
version = "2.3.7";
|
||||
version = "2.3.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-Mbp6zQ14NnxxtW5Kh8nxHNI1/FYCvFuEaQd5Eg4KMFs=";
|
||||
sha256 = "sha256-mUbgz8g/KQcrNDHjckYiHPnUqdKKFYwHVxTTRSZvTzU=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "innernet";
|
||||
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
clang
|
||||
installShellFiles
|
||||
];
|
||||
buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
|
||||
|
||||
@@ -12,18 +12,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kea";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-MkoG9IhkW+5YfkmkXUkbUl9TQXxWshnxyzdGH979nZE=";
|
||||
sha256 = "sha256-sEFE5OfYt1mcAnGZCWqYFzIepzKNZZcd2rVhdxv/3sw=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-create-var.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc"
|
||||
substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@(sysconfdir)@' "$out/etc"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lldpd";
|
||||
version = "1.0.8";
|
||||
version = "1.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-mNIA524w9iYsSkSTFIwYQIJ4mDKRRqV6NPjw+SjKPe8=";
|
||||
sha256 = "sha256-RFstdgN+8+vQPUDh/B8p7wgQL6o6Cf6Ea5Unl8i8dyI=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
|
||||
{ lib, stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
|
||||
|
||||
let version = "1.3.0"; in
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
export makeFlags="INSTALLPREFIX=$out"
|
||||
'';
|
||||
|
||||
buildInputs = [ ffmpeg_3 flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
|
||||
buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/man/man{5,8}
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
mkDerivation rec {
|
||||
pname = "nix-output-monitor";
|
||||
version = "1.0.3.0";
|
||||
version = "1.0.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "maralorn";
|
||||
repo = "nix-output-monitor";
|
||||
sha256 = "1gidg03cwz8ss370bgz4a2g9ldj1lap5ws7dmfg6vigpx8mxigpb";
|
||||
sha256 = "1kkf6cqq8aba8vmfcww30ah9j44bwakanyfdb6595vmaq5hrsq92";
|
||||
rev = "v${version}";
|
||||
};
|
||||
isLibrary = true;
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-audit";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustSec";
|
||||
repo = "cargo-audit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w3wKUAAp9z4iQbx16z5chpKHYxCDLZzJesnIct2Qy4g=";
|
||||
sha256 = "sha256-apIhTgS7xzDGq2OE1o46bEQxGwkV7bTmzSxy85wHwyo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ychF3qbwEjumLyqc+xDI8bbKzvdoRYF/X/idlk+JxDE=";
|
||||
cargoSha256 = "sha256-b4x5IxoT5KZnY6Pw3VEs/DuCPen6MlgQ2lSIxRDU+5U=";
|
||||
|
||||
buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deb";
|
||||
version = "1.29.1";
|
||||
version = "1.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmstick";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oWivGy2azF9zpeZ0UAi7Bxm4iXFWAjcBG0pN7qtkSU8=";
|
||||
sha256 = "sha256-2eOWhxKZ+YPj5oKTe5g7PyeakiSNnPz27dK150GAcVQ=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoSha256 = "0j9frvcmy9hydw73v0ffr0bjvq2ykylnpmiw700z344djpaaa08y";
|
||||
cargoSha256 = "sha256-QmchuY+4R7w0zMOdReH1m8idl9RI1hHE9VtbwT2K9YM=";
|
||||
|
||||
preCheck = ''
|
||||
substituteInPlace tests/command.rs \
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-outdated";
|
||||
version = "0.9.14";
|
||||
version = "0.9.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kbknapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-80H0yblEcxP6TTil0dJPZhvMivDLuyvoV0Rmcrykgjs=";
|
||||
sha256 = "sha256-Cd0QWFeAAHSkeCVQvb+Fsg5nBoutV1k1kQpMkWpci2E=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-RACdzaCWfm5rrIX0wrvKSmhLQt1a+2MQqrjTx+etpGo=";
|
||||
cargoSha256 = "sha256-VngJMDVKIV8+ODHia2U2gKKPKskyKiuKhSnO6NJsJHI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
diff --git src/libdnf/config.h src/libdnf/config.h
|
||||
index 16121f6f..737d0bc4 100644
|
||||
--- src/libdnf/config.h
|
||||
+++ src/libdnf/config.h
|
||||
@@ -18,7 +18,12 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
+
|
||||
+#ifdef __APPLE__
|
||||
+#include <stdint.h>
|
||||
+#else
|
||||
#include <bits/wordsize.h>
|
||||
+#endif
|
||||
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "config-32.h"
|
||||
diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp
|
||||
index 497c560d..5de077fa 100644
|
||||
--- src/libdnf/hy-iutil.cpp
|
||||
+++ src/libdnf/hy-iutil.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <errno.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
-#include <linux/limits.h>
|
||||
+#include <limits.h>
|
||||
#include <pwd.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp
|
||||
index 295fdc1b..9d584b8a 100644
|
||||
--- src/libdnf/hy-util.cpp
|
||||
+++ src/libdnf/hy-util.cpp
|
||||
@@ -24,7 +24,20 @@
|
||||
#include <ctype.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <sys/auxv.h>
|
||||
+
|
||||
+// Darwin compatibility hacks
|
||||
+typedef int auxv_t;
|
||||
+#ifndef AT_HWCAP2
|
||||
+#define AT_HWCAP2 26
|
||||
+#endif
|
||||
+#ifndef AT_HWCAP
|
||||
+#define AT_HWCAP 16
|
||||
+#endif
|
||||
+static unsigned long getauxval(unsigned long type)
|
||||
+{
|
||||
+ unsigned long ret = 0;
|
||||
+ return ret;
|
||||
+}
|
||||
|
||||
// hawkey
|
||||
#include "dnf-types.h"
|
||||
@@ -3,17 +3,15 @@
|
||||
|
||||
gcc9Stdenv.mkDerivation rec {
|
||||
pname = "libdnf";
|
||||
version = "0.60.0";
|
||||
version = "0.61.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s=";
|
||||
sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gettext
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, setuptools_scm
|
||||
, vdf
|
||||
, bash
|
||||
, steam-run
|
||||
, winetricks
|
||||
, zenity
|
||||
@@ -11,13 +12,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "protontricks";
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Matoking";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0i7p0jj7avmq3b2qlcpwcflipndrnwsvwvhc5aal7rm95aa7xhja";
|
||||
hash = "sha256-IHgoi5VUN3ORbufkruPb6wR7pTekJFQHhhDrnjOWzWM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -34,6 +35,7 @@ buildPythonApplication rec {
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [
|
||||
bash
|
||||
steam-run
|
||||
(winetricks.override {
|
||||
# Remove default build of wine to reduce closure size.
|
||||
@@ -45,15 +47,7 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
disabledTests = [
|
||||
# Steam runtime is hard-coded with steam-run.patch and can't be configured
|
||||
"test_run_steam_runtime_not_found"
|
||||
"test_unknown_steam_runtime_detected"
|
||||
|
||||
# Steam runtime 2 currently isn't supported
|
||||
# See https://github.com/NixOS/nixpkgs/issues/100655
|
||||
"test_run_winetricks_steam_runtime_v2"
|
||||
];
|
||||
pythonImportsCheck = [ "protontricks" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple wrapper for running Winetricks commands for Proton-enabled games";
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py
|
||||
index fec0563..d158b96 100755
|
||||
index 9641970..6a2b268 100755
|
||||
--- a/src/protontricks/cli.py
|
||||
+++ b/src/protontricks/cli.py
|
||||
@@ -14,7 +14,7 @@ import os
|
||||
import logging
|
||||
@@ -15,8 +15,8 @@ import sys
|
||||
|
||||
from . import __version__
|
||||
-from .steam import (find_proton_app, find_steam_path, find_steam_runtime_path,
|
||||
+from .steam import (find_proton_app, find_steam_path,
|
||||
get_steam_apps, get_steam_lib_paths)
|
||||
from .winetricks import get_winetricks_path
|
||||
from .gui import select_steam_app_with_gui
|
||||
-from .steam import (find_legacy_steam_runtime_path, find_proton_app,
|
||||
- find_steam_path, get_steam_apps, get_steam_lib_paths)
|
||||
+from .steam import (find_proton_app, find_steam_path, get_steam_apps,
|
||||
+ get_steam_lib_paths)
|
||||
from .util import run_command
|
||||
from .winetricks import get_winetricks_path
|
||||
|
||||
@@ -75,8 +75,7 @@ def main(args=None):
|
||||
"WINE: path to a custom 'wine' executable\n"
|
||||
"WINESERVER: path to a custom 'wineserver' executable\n"
|
||||
@@ -21,70 +23,73 @@ index fec0563..d158b96 100755
|
||||
),
|
||||
formatter_class=argparse.RawTextHelpFormatter
|
||||
)
|
||||
@@ -133,14 +132,10 @@ def main(args=None):
|
||||
@@ -138,18 +137,9 @@ def main(args=None):
|
||||
)
|
||||
sys.exit(-1)
|
||||
|
||||
# 2. Find Steam Runtime if enabled
|
||||
- steam_runtime_path = None
|
||||
+ steam_runtime = False
|
||||
|
||||
if os.environ.get("STEAM_RUNTIME", "") != "0" and not args.no_runtime:
|
||||
- steam_runtime_path = find_steam_runtime_path(steam_root=steam_root)
|
||||
- # 2. Find the pre-installed legacy Steam Runtime if enabled
|
||||
- legacy_steam_runtime_path = None
|
||||
- use_steam_runtime = True
|
||||
-
|
||||
- if not steam_runtime_path:
|
||||
+ # 2. Use Steam Runtime if enabled
|
||||
if os.environ.get("STEAM_RUNTIME", "") != "0" and not args.no_runtime:
|
||||
- legacy_steam_runtime_path = find_legacy_steam_runtime_path(
|
||||
- steam_root=steam_root
|
||||
- )
|
||||
-
|
||||
- if not legacy_steam_runtime_path:
|
||||
- print("Steam Runtime was enabled but couldn't be found!")
|
||||
- sys.exit(-1)
|
||||
+ steam_runtime = True
|
||||
+ use_steam_runtime = True
|
||||
else:
|
||||
use_steam_runtime = False
|
||||
logger.info("Steam Runtime disabled.")
|
||||
|
||||
@@ -201,7 +196,7 @@ def main(args=None):
|
||||
winetricks_path=winetricks_path,
|
||||
@@ -212,7 +202,6 @@ def main(args=None):
|
||||
proton_app=proton_app,
|
||||
steam_app=steam_app,
|
||||
- steam_runtime_path=steam_runtime_path,
|
||||
+ steam_runtime=steam_runtime,
|
||||
command=[winetricks_path, "--gui"]
|
||||
use_steam_runtime=use_steam_runtime,
|
||||
- legacy_steam_runtime_path=legacy_steam_runtime_path,
|
||||
command=[winetricks_path, "--gui"],
|
||||
use_bwrap=use_bwrap
|
||||
)
|
||||
|
||||
@@ -269,7 +264,7 @@ def main(args=None):
|
||||
winetricks_path=winetricks_path,
|
||||
@@ -282,7 +271,6 @@ def main(args=None):
|
||||
proton_app=proton_app,
|
||||
steam_app=steam_app,
|
||||
- steam_runtime_path=steam_runtime_path,
|
||||
+ steam_runtime=steam_runtime,
|
||||
use_steam_runtime=use_steam_runtime,
|
||||
- legacy_steam_runtime_path=legacy_steam_runtime_path,
|
||||
use_bwrap=use_bwrap,
|
||||
command=[winetricks_path] + args.winetricks_command)
|
||||
elif args.command:
|
||||
run_command(
|
||||
@@ -277,7 +272,7 @@ def main(args=None):
|
||||
proton_app=proton_app,
|
||||
@@ -292,7 +280,6 @@ def main(args=None):
|
||||
steam_app=steam_app,
|
||||
command=args.command,
|
||||
- steam_runtime_path=steam_runtime_path,
|
||||
+ steam_runtime=steam_runtime,
|
||||
use_steam_runtime=use_steam_runtime,
|
||||
- legacy_steam_runtime_path=legacy_steam_runtime_path,
|
||||
use_bwrap=use_bwrap,
|
||||
# Pass the command directly into the shell *without*
|
||||
# escaping it
|
||||
cwd=steam_app.install_path,
|
||||
diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py
|
||||
index fa5772d..4f30cd3 100644
|
||||
index 8554e24..509afb6 100644
|
||||
--- a/src/protontricks/steam.py
|
||||
+++ b/src/protontricks/steam.py
|
||||
@@ -11,7 +11,7 @@ from .util import lower_dict
|
||||
|
||||
@@ -13,8 +13,8 @@ from .util import lower_dict
|
||||
__all__ = (
|
||||
"COMMON_STEAM_DIRS", "SteamApp", "find_steam_path",
|
||||
- "find_steam_proton_app", "find_proton_app", "find_steam_runtime_path",
|
||||
+ "find_steam_proton_app", "find_proton_app",
|
||||
"find_appid_proton_prefix", "get_steam_lib_paths", "get_steam_apps",
|
||||
"get_custom_proton_installations"
|
||||
"find_steam_proton_app", "find_proton_app",
|
||||
- "find_legacy_steam_runtime_path", "find_appid_proton_prefix",
|
||||
- "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations"
|
||||
+ "find_appid_proton_prefix", "get_steam_lib_paths",
|
||||
+ "get_steam_apps", "get_custom_proton_installations"
|
||||
)
|
||||
@@ -254,37 +254,6 @@ def find_steam_path():
|
||||
|
||||
COMMON_STEAM_DIRS = [
|
||||
@@ -283,37 +283,6 @@ def find_steam_path():
|
||||
return None, None
|
||||
|
||||
|
||||
-def find_steam_runtime_path(steam_root):
|
||||
-def find_legacy_steam_runtime_path(steam_root):
|
||||
- """
|
||||
- Find the Steam Runtime either using the STEAM_RUNTIME env or
|
||||
- Find the legacy Steam Runtime either using the STEAM_RUNTIME env or
|
||||
- steam_root
|
||||
- """
|
||||
- env_steam_runtime = os.environ.get("STEAM_RUNTIME", "")
|
||||
@@ -117,162 +122,149 @@ index fa5772d..4f30cd3 100644
|
||||
APPINFO_STRUCT_SECTION = "<LLLLQ20sL"
|
||||
|
||||
diff --git a/src/protontricks/util.py b/src/protontricks/util.py
|
||||
index d513b46..c48e41f 100644
|
||||
index 40fa752..9da5509 100644
|
||||
--- a/src/protontricks/util.py
|
||||
+++ b/src/protontricks/util.py
|
||||
@@ -6,7 +6,7 @@ import stat
|
||||
from pathlib import Path
|
||||
from subprocess import check_output, run, PIPE
|
||||
|
||||
-__all__ = ("get_runtime_library_paths", "create_wine_bin_dir", "run_command")
|
||||
+__all__ = ("create_wine_bin_dir", "run_command")
|
||||
|
||||
logger = logging.getLogger("protontricks")
|
||||
|
||||
@@ -25,93 +25,10 @@ def lower_dict(d):
|
||||
@@ -25,24 +25,6 @@ def lower_dict(d):
|
||||
return {k.lower(): v for k, v in d.items()}
|
||||
|
||||
|
||||
-def get_host_library_paths():
|
||||
-def get_legacy_runtime_library_paths(legacy_steam_runtime_path, proton_app):
|
||||
- """
|
||||
- Get host library paths to use when creating the LD_LIBRARY_PATH environment
|
||||
- variable for use with newer Steam Runtime installations
|
||||
- Get LD_LIBRARY_PATH value to use when running a command using Steam Runtime
|
||||
- """
|
||||
- # The traditional Steam Runtime does the following when running the
|
||||
- # `run.sh --print-steam-runtime-library-paths` command.
|
||||
- # Since that command is unavailable with newer Steam Runtime releases,
|
||||
- # do it ourselves here.
|
||||
- result = run(
|
||||
- ["/sbin/ldconfig", "-XNv"],
|
||||
- check=True, stdout=PIPE, stderr=PIPE
|
||||
- )
|
||||
- lines = result.stdout.decode("utf-8").split("\n")
|
||||
- paths = [
|
||||
- line.split(":")[0] for line in lines
|
||||
- if line.startswith("/") and ":" in line
|
||||
- ]
|
||||
-
|
||||
- return ":".join(paths)
|
||||
-
|
||||
-
|
||||
-RUNTIME_ROOT_GLOB_PATTERNS = (
|
||||
- "var/*/files/",
|
||||
- "*/files/"
|
||||
-)
|
||||
-
|
||||
-
|
||||
-def get_runtime_library_paths(steam_runtime_path, proton_app):
|
||||
- """
|
||||
- Get LD_LIBRARY_PATH value to run a command using Steam Runtime
|
||||
- """
|
||||
- def find_runtime_app_root(runtime_app):
|
||||
- """
|
||||
- Find the runtime root (the directory containing the root fileystem
|
||||
- used for the container) for separately installed Steam Runtime app
|
||||
- """
|
||||
- for pattern in RUNTIME_ROOT_GLOB_PATTERNS:
|
||||
- try:
|
||||
- return next(
|
||||
- runtime_app.install_path.glob(pattern)
|
||||
- )
|
||||
- except StopIteration:
|
||||
- pass
|
||||
-
|
||||
- raise RuntimeError(
|
||||
- "Could not find Steam Runtime runtime root for {}".format(
|
||||
- runtime_app.name
|
||||
- )
|
||||
- )
|
||||
-
|
||||
- if proton_app.required_tool_appid:
|
||||
- # bwrap based Steam Runtime is used for Proton installations that
|
||||
- # use separate Steam runtimes
|
||||
- # TODO: Try to run the Wine binaries inside an user namespace somehow.
|
||||
- # Newer Steam Runtime environments may rely on a newer glibc than what
|
||||
- # is available on the host system, which may cause potential problems
|
||||
- # otherwise.
|
||||
- runtime_root = find_runtime_app_root(proton_app.required_tool_app)
|
||||
- return "".join([
|
||||
- str(proton_app.install_path / "dist" / "lib"), os.pathsep,
|
||||
- str(proton_app.install_path / "dist" / "lib64"), os.pathsep,
|
||||
- get_host_library_paths(), os.pathsep,
|
||||
- str(runtime_root / "lib" / "i386-linux-gnu"), os.pathsep,
|
||||
- str(runtime_root / "lib" / "x86_64-linux-gnu")
|
||||
- ])
|
||||
-
|
||||
- # Traditional LD_LIBRARY_PATH based Steam Runtime is used otherwise
|
||||
- steam_runtime_paths = check_output([
|
||||
- str(steam_runtime_path / "run.sh"),
|
||||
- str(legacy_steam_runtime_path / "run.sh"),
|
||||
- "--print-steam-runtime-library-paths"
|
||||
- ])
|
||||
- steam_runtime_paths = str(steam_runtime_paths, "utf-8")
|
||||
- # Add Proton installation directory first into LD_LIBRARY_PATH
|
||||
- # so that libwine.so.1 is picked up correctly (see issue #3)
|
||||
- return "".join([
|
||||
- str(proton_app.install_path / "dist" / "lib"), os.pathsep,
|
||||
- str(proton_app.install_path / "dist" / "lib64"), os.pathsep,
|
||||
- str(proton_app.proton_dist_path / "lib"), os.pathsep,
|
||||
- str(proton_app.proton_dist_path / "lib64"), os.pathsep,
|
||||
- steam_runtime_paths
|
||||
- ])
|
||||
-
|
||||
-
|
||||
WINE_SCRIPT_TEMPLATE = (
|
||||
- "#!/bin/bash\n"
|
||||
+ "#!/bin/sh\n"
|
||||
"# Helper script created by Protontricks to run Wine binaries using Steam Runtime\n"
|
||||
- "export LD_LIBRARY_PATH=\"$PROTON_LD_LIBRARY_PATH\"\n"
|
||||
- "exec \"$PROTON_PATH\"/dist/bin/{name} \"$@\""
|
||||
+ "exec steam-run \"$PROTON_PATH\"/dist/bin/{name} \"$@\""
|
||||
def get_host_library_paths():
|
||||
"""
|
||||
Get host library paths to use when creating the LD_LIBRARY_PATH environment
|
||||
@@ -54,7 +36,7 @@ def get_host_library_paths():
|
||||
# Since that command is unavailable with newer Steam Runtime releases,
|
||||
# do it ourselves here.
|
||||
result = run(
|
||||
- ["/sbin/ldconfig", "-XNv"],
|
||||
+ ["steam-run", "ldconfig", "-XNv"],
|
||||
check=True, stdout=PIPE, stderr=PIPE
|
||||
)
|
||||
lines = result.stdout.decode("utf-8").split("\n")
|
||||
@@ -72,7 +54,7 @@ RUNTIME_ROOT_GLOB_PATTERNS = (
|
||||
)
|
||||
|
||||
|
||||
@@ -172,7 +89,7 @@ def create_wine_bin_dir(proton_app):
|
||||
-def get_runtime_library_paths(proton_app, use_bwrap=True):
|
||||
+def get_runtime_library_paths(proton_app, proton_app_only=True):
|
||||
"""
|
||||
Get LD_LIBRARY_PATH value to use when running a command using Steam Runtime
|
||||
"""
|
||||
@@ -95,7 +77,7 @@ def get_runtime_library_paths(proton_app, use_bwrap=True):
|
||||
)
|
||||
)
|
||||
|
||||
- if use_bwrap:
|
||||
+ if proton_app_only:
|
||||
return "".join([
|
||||
str(proton_app.proton_dist_path / "lib"), os.pathsep,
|
||||
str(proton_app.proton_dist_path / "lib64"), os.pathsep
|
||||
@@ -111,14 +93,19 @@ def get_runtime_library_paths(proton_app, use_bwrap=True):
|
||||
])
|
||||
|
||||
|
||||
-WINE_SCRIPT_RUNTIME_V1_TEMPLATE = (
|
||||
- "#!/bin/bash\n"
|
||||
- "# Helper script created by Protontricks to run Wine binaries using Steam Runtime\n"
|
||||
- "export LD_LIBRARY_PATH=\"$PROTON_LD_LIBRARY_PATH\"\n"
|
||||
- "exec \"$PROTON_DIST_PATH\"/bin/{name} \"$@\""
|
||||
-)
|
||||
+# Add Proton installation directory first into LD_LIBRARY_PATH
|
||||
+# so that libwine.so.1 is picked up correctly (see issue #3)
|
||||
+WINE_SCRIPT_RUNTIME_V1_TEMPLATE = """#!/usr/bin/env -S steam-run bash
|
||||
+# Helper script created by Protontricks to run Wine binaries using Steam Runtime
|
||||
+export LD_LIBRARY_PATH="$PROTON_LD_LIBRARY_PATH":"$LD_LIBRARY_PATH"
|
||||
+exec "$PROTON_DIST_PATH"/bin/{name} "$@"
|
||||
+"""
|
||||
|
||||
-WINE_SCRIPT_RUNTIME_V2_TEMPLATE = """#!/bin/bash
|
||||
+# The run script calls pressure-vessel-unruntime which will unset
|
||||
+# LD_LIBRARY_PATH defined by steam-run. This will cause Pressure
|
||||
+# Vessel to segfault, so just call pressure-vessel-wrap directly
|
||||
+# instead.
|
||||
+WINE_SCRIPT_RUNTIME_V2_TEMPLATE = """#!/usr/bin/env bash
|
||||
# Helper script created by Protontricks to run Wine binaries using Steam Runtime
|
||||
PROTONTRICKS_PROXY_SCRIPT_PATH="{script_path}"
|
||||
if [[ -n "$PROTONTRICKS_INSIDE_STEAM_RUNTIME" ]]; then
|
||||
@@ -127,9 +114,13 @@ if [[ -n "$PROTONTRICKS_INSIDE_STEAM_RUNTIME" ]]; then
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$PROTON_LD_LIBRARY_PATH"
|
||||
"$PROTON_DIST_PATH"/bin/{name} "$@"
|
||||
else
|
||||
- exec "$STEAM_RUNTIME_PATH"/run --share-pid --batch --filesystem=/mnt \
|
||||
- --filesystem=/tmp --filesystem=/run/media --filesystem=/etc \
|
||||
- --filesystem=/opt --filesystem=/home --filesystem=/usr -- \
|
||||
+ exec steam-run "$STEAM_RUNTIME_PATH"/pressure-vessel/bin/pressure-vessel-wrap \
|
||||
+ --runtime-archive=$(echo "$STEAM_RUNTIME_PATH"/*runtime.tar.gz) \
|
||||
+ --variable-dir="${{PRESSURE_VESSEL_VARIABLE_DIR:-$STEAM_RUNTIME_PATH/var}}" \
|
||||
+ --share-pid --batch \
|
||||
+ --filesystem=/mnt --filesystem=/tmp --filesystem=/run/media \
|
||||
+ --filesystem=/etc --filesystem=/opt --filesystem=/home \
|
||||
+ --filesystem=/usr -- \
|
||||
env PROTONTRICKS_INSIDE_STEAM_RUNTIME=1 \
|
||||
"$PROTONTRICKS_PROXY_SCRIPT_PATH" "$@"
|
||||
fi
|
||||
@@ -194,7 +185,6 @@ def create_wine_bin_dir(proton_app, use_bwrap=True):
|
||||
def run_command(
|
||||
winetricks_path, proton_app, steam_app, command,
|
||||
- steam_runtime_path=None,
|
||||
+ steam_runtime=False,
|
||||
use_steam_runtime=False,
|
||||
- legacy_steam_runtime_path=None,
|
||||
use_bwrap=True,
|
||||
**kwargs):
|
||||
"""Run an arbitrary command with the correct environment variables
|
||||
for the given Proton app
|
||||
@@ -180,13 +97,13 @@ def run_command(
|
||||
The environment variables are set for the duration of the call
|
||||
and restored afterwards
|
||||
@@ -271,7 +261,7 @@ def run_command(
|
||||
os.environ["STEAM_RUNTIME_PATH"] = \
|
||||
str(proton_app.required_tool_app.install_path)
|
||||
os.environ["PROTON_LD_LIBRARY_PATH"] = \
|
||||
- get_runtime_library_paths(proton_app, use_bwrap=use_bwrap)
|
||||
+ get_runtime_library_paths(proton_app, proton_app_only=use_bwrap)
|
||||
|
||||
- If 'steam_runtime_path' is provided, run the command using Steam Runtime
|
||||
+ If 'steam_runtime' is provided, run the command using Steam Runtime
|
||||
"""
|
||||
# Check for incomplete Steam Runtime installation
|
||||
runtime_install_incomplete = \
|
||||
proton_app.required_tool_appid and not proton_app.required_tool_app
|
||||
|
||||
- if steam_runtime_path and runtime_install_incomplete:
|
||||
+ if steam_runtime and runtime_install_incomplete:
|
||||
raise RuntimeError(
|
||||
"{} is missing the required Steam Runtime. You may need to launch "
|
||||
"a Steam app using this Proton version to finish the "
|
||||
@@ -234,7 +151,7 @@ def run_command(
|
||||
os.environ.pop("WINEARCH", "")
|
||||
|
||||
wine_bin_dir = None
|
||||
- if steam_runtime_path:
|
||||
+ if steam_runtime:
|
||||
if proton_app.required_tool_app:
|
||||
runtime_name = proton_app.required_tool_app.name
|
||||
logger.info(
|
||||
@@ -251,8 +168,6 @@ def run_command(
|
||||
@@ -294,11 +284,8 @@ def run_command(
|
||||
"Current Steam Runtime not recognized by Protontricks."
|
||||
)
|
||||
else:
|
||||
- # Legacy Steam Runtime requires a different LD_LIBRARY_PATH
|
||||
os.environ["PROTON_LD_LIBRARY_PATH"] = \
|
||||
- get_legacy_runtime_library_paths(
|
||||
- legacy_steam_runtime_path, proton_app
|
||||
- )
|
||||
+ get_runtime_library_paths(proton_app, proton_app_only=True)
|
||||
|
||||
# When Steam Runtime is enabled, create a set of helper scripts
|
||||
# that load the underlying Proton Wine executables with Steam Runtime
|
||||
# and Proton libraries instead of system libraries
|
||||
wine_bin_dir = create_wine_bin_dir(proton_app=proton_app)
|
||||
- os.environ["PROTON_LD_LIBRARY_PATH"] = \
|
||||
- get_runtime_library_paths(steam_runtime_path, proton_app)
|
||||
@@ -306,8 +293,6 @@ def run_command(
|
||||
wine_bin_dir = create_wine_bin_dir(
|
||||
proton_app=proton_app, use_bwrap=use_bwrap
|
||||
)
|
||||
- os.environ["LEGACY_STEAM_RUNTIME_PATH"] = \
|
||||
- str(legacy_steam_runtime_path)
|
||||
|
||||
os.environ["PATH"] = "".join([
|
||||
str(wine_bin_dir), os.pathsep, os.environ["PATH"]
|
||||
])
|
||||
diff --git a/tests/test_cli.py b/tests/test_cli.py
|
||||
index b612dfa..c4d1de0 100644
|
||||
index 1955d81..1de44b3 100644
|
||||
--- a/tests/test_cli.py
|
||||
+++ b/tests/test_cli.py
|
||||
@@ -115,9 +115,6 @@ class TestCLIRun:
|
||||
@@ -117,15 +117,10 @@ class TestCLIRun:
|
||||
assert str(command.args[0]).endswith(".local/bin/winetricks")
|
||||
assert command.args[1] == "winecfg"
|
||||
assert command.env["PATH"].startswith(str(wine_bin_dir))
|
||||
@@ -282,3 +274,61 @@ index b612dfa..c4d1de0 100644
|
||||
assert command.env["WINE"] == str(wine_bin_dir / "wine")
|
||||
assert command.env["WINELOADER"] == str(wine_bin_dir / "wine")
|
||||
assert command.env["WINESERVER"] == str(wine_bin_dir / "wineserver")
|
||||
|
||||
- assert command.env["LEGACY_STEAM_RUNTIME_PATH"] == \
|
||||
- str(steam_runtime_dir / "steam-runtime")
|
||||
assert "STEAM_RUNTIME_PATH" not in command.env
|
||||
|
||||
for name in ("wine", "wineserver"):
|
||||
@@ -166,16 +161,14 @@ class TestCLIRun:
|
||||
assert command.env["PATH"].startswith(str(wine_bin_dir))
|
||||
|
||||
# Compared to the traditional Steam Runtime, PROTON_LD_LIBRARY_PATH
|
||||
- # will be different
|
||||
+ # will be the same (it would be different without steam-run.patch)
|
||||
proton_install_path = Path(proton_app.install_path)
|
||||
assert command.env["PROTON_LD_LIBRARY_PATH"] == "".join([
|
||||
str(proton_install_path / "dist" / "lib"), os.pathsep,
|
||||
str(proton_install_path / "dist" / "lib64"), os.pathsep
|
||||
])
|
||||
|
||||
- # Environment variables for both legacy and new Steam Runtime exist
|
||||
- assert command.env["LEGACY_STEAM_RUNTIME_PATH"] == \
|
||||
- str(steam_runtime_dir / "steam-runtime")
|
||||
+ # Environment variable for new Steam Runtime exists
|
||||
assert command.env["STEAM_RUNTIME_PATH"] == \
|
||||
str(steam_runtime_soldier.install_path)
|
||||
|
||||
@@ -238,10 +231,7 @@ class TestCLIRun:
|
||||
str(runtime_root / "lib" / "i386-linux-gnu"), os.pathsep,
|
||||
str(runtime_root / "lib" / "x86_64-linux-gnu")
|
||||
]))
|
||||
-
|
||||
- # Environment variables for both legacy and new Steam Runtime exist
|
||||
- assert command.env["LEGACY_STEAM_RUNTIME_PATH"] == \
|
||||
- str(steam_runtime_dir / "steam-runtime")
|
||||
+ # Environment variable for new Steam Runtime exists
|
||||
assert command.env["STEAM_RUNTIME_PATH"] == \
|
||||
str(steam_runtime_soldier.install_path)
|
||||
|
||||
@@ -324,20 +314,6 @@ class TestCLIRun:
|
||||
|
||||
assert "Zenity is not installed" in result
|
||||
|
||||
- def test_run_steam_runtime_not_found(
|
||||
- self, cli, steam_dir, steam_app_factory):
|
||||
- """
|
||||
- Try performing a command with Steam Runtime enabled but no
|
||||
- available Steam Runtime installation
|
||||
- """
|
||||
- steam_app_factory(name="Fake game 1", appid=10)
|
||||
- result = cli(
|
||||
- ["10", "winecfg"], env={"STEAM_RUNTIME": "invalid/path"},
|
||||
- expect_exit=True
|
||||
- )
|
||||
-
|
||||
- assert "Steam Runtime was enabled but couldn't be found" in result
|
||||
-
|
||||
def test_run_proton_not_found(self, cli, steam_dir, steam_app_factory):
|
||||
steam_app_factory(name="Fake game 1", appid=10)
|
||||
result = cli(["10", "winecfg"], expect_exit=True)
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clevis";
|
||||
version = "16";
|
||||
version = "18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latchset";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DWrxk+Nb2ptF5nCaXYvRY8hAFa/n+6OGdKWO+Sq61yk=";
|
||||
sha256 = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config asciidoc ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doppler";
|
||||
version = "3.23.2";
|
||||
version = "3.24.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dopplerhq";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-qdBq1vjvvb55gyL4XuPDrPK58YLSSH5kLp1oP84vJsU=";
|
||||
sha256 = "sha256-G7oyyvrn+19N0C0V5MBwls+dQNzHh+DJmMTmsln8rC4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY=";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ffuf";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0ckpEiXxen2E9IzrsmKoEKagoJ5maAbH1tHKgQjoCjo=";
|
||||
sha256 = "sha256-NkRf36wFmzqFv13P0DxpzEOGyBGbSXMLjWE7URzRXGY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU=";
|
||||
|
||||
@@ -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.0.41"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.42"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 451fe6ffdb90fffe3df6b788e6410217a511a3f4
|
||||
ref: refs/tags/6.0.41
|
||||
revision: 57fda58cdde0909e975394b34a8daa39c97f7e1c
|
||||
ref: refs/tags/6.0.42
|
||||
specs:
|
||||
metasploit-framework (6.0.41)
|
||||
metasploit-framework (6.0.42)
|
||||
actionpack (~> 5.2.2)
|
||||
activerecord (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
@@ -30,7 +30,7 @@ GIT
|
||||
metasploit-concern (~> 3.0.0)
|
||||
metasploit-credential (~> 4.0.0)
|
||||
metasploit-model (~> 3.1.0)
|
||||
metasploit-payloads (= 2.0.43)
|
||||
metasploit-payloads (= 2.0.44)
|
||||
metasploit_data_models (~> 4.1.0)
|
||||
metasploit_payloads-mettle (= 1.0.9)
|
||||
mqtt
|
||||
@@ -123,13 +123,13 @@ GEM
|
||||
arel-helpers (2.12.0)
|
||||
activerecord (>= 3.1.0, < 7)
|
||||
aws-eventstream (1.1.1)
|
||||
aws-partitions (1.446.0)
|
||||
aws-partitions (1.449.0)
|
||||
aws-sdk-core (3.114.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.239.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.234.0)
|
||||
aws-sdk-ec2 (1.235.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.52.0)
|
||||
@@ -138,7 +138,7 @@ GEM
|
||||
aws-sdk-kms (1.43.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.93.1)
|
||||
aws-sdk-s3 (1.94.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.1)
|
||||
@@ -198,11 +198,11 @@ GEM
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
metasm (1.0.4)
|
||||
metasploit-concern (3.0.1)
|
||||
metasploit-concern (3.0.2)
|
||||
activemodel (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
railties (~> 5.2.2)
|
||||
metasploit-credential (4.0.3)
|
||||
metasploit-credential (4.0.5)
|
||||
metasploit-concern
|
||||
metasploit-model
|
||||
metasploit_data_models (>= 3.0.0)
|
||||
@@ -212,12 +212,12 @@ GEM
|
||||
rex-socket
|
||||
rubyntlm
|
||||
rubyzip
|
||||
metasploit-model (3.1.3)
|
||||
metasploit-model (3.1.4)
|
||||
activemodel (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
railties (~> 5.2.2)
|
||||
metasploit-payloads (2.0.43)
|
||||
metasploit_data_models (4.1.3)
|
||||
metasploit-payloads (2.0.44)
|
||||
metasploit_data_models (4.1.4)
|
||||
activerecord (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
arel-helpers
|
||||
@@ -229,7 +229,7 @@ GEM
|
||||
webrick
|
||||
metasploit_payloads-mettle (1.0.9)
|
||||
method_source (1.0.0)
|
||||
mini_portile2 (2.5.0)
|
||||
mini_portile2 (2.5.1)
|
||||
minitest (5.14.4)
|
||||
mqtt (0.5.0)
|
||||
msgpack (1.4.2)
|
||||
@@ -245,7 +245,7 @@ GEM
|
||||
nokogiri (1.11.3)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
octokit (4.20.0)
|
||||
octokit (4.21.0)
|
||||
faraday (>= 0.9)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
openssl-ccm (1.2.2)
|
||||
@@ -316,7 +316,7 @@ GEM
|
||||
rex-arch
|
||||
rex-ole (0.1.7)
|
||||
rex-text
|
||||
rex-powershell (0.1.89)
|
||||
rex-powershell (0.1.90)
|
||||
rex-random_identifier
|
||||
rex-text
|
||||
ruby-rc4
|
||||
|
||||
@@ -8,13 +8,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.0.41";
|
||||
version = "6.0.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-6oaTc3UQayZ/ThurwFXdI1prwriz/XVS9zoeD427mj8=";
|
||||
sha256 = "sha256-L4P6QUERoH0JnaTpzrA0UWUYqRepBS97fSexKa8JZQU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -114,10 +114,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1n7cr44r7fvmc3rpk5kwwsz34ym2cmih76ij5xh2w1mmfyh3bgry";
|
||||
sha256 = "18d990l9mraf8j1akfn1f4l3y6n7shhnr9x5naj6pzv5z3y3dzf4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.446.0";
|
||||
version = "1.449.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
@@ -134,10 +134,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rlq8vifcmz24v1aw8vj2czqj4dnf00smm5ndfpaxz5k6550lbz4";
|
||||
sha256 = "1kcnfr5rw80d46hwp185jniqvbrxcdjy7srh24x7gjm2gpxmm234";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.234.0";
|
||||
version = "1.235.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
@@ -164,10 +164,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1x424hn32ipwxy21bhqn2wziz890w2gdr1xsli9lv2rrs1ibpnq7";
|
||||
sha256 = "119f1nf2q1k7xg7h2agm7g8i87abfdkad0l78hhk6y4f3v02niv9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.93.1";
|
||||
version = "1.94.0";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
groups = ["default"];
|
||||
@@ -514,62 +514,62 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19cz0g463wl35gpdy1630n88a9m7fhhlcylspvvwc0m01sipc33g";
|
||||
sha256 = "0zbcnhji80cyj19jkdp8wpi1msg9xfm0lacpm8ggm8fca56234zv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
};
|
||||
metasploit-credential = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1f6cjvk68yypciycp8vdvhc5hrwmc8qi4y06s1cd77zj4m2skkmn";
|
||||
sha256 = "0wflb4r5mz2g29bzjpwc004h6vca9kd0z02v27wc378jgg6q0gna";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.3";
|
||||
version = "4.0.5";
|
||||
};
|
||||
metasploit-framework = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "451fe6ffdb90fffe3df6b788e6410217a511a3f4";
|
||||
sha256 = "0gwspf6hy7isyx97bzdkp316nni3vmaw1aqv9rzjcsqhfmrr71pa";
|
||||
rev = "57fda58cdde0909e975394b34a8daa39c97f7e1c";
|
||||
sha256 = "01b516pjkc97gmxjy1d92ylihrai6jqcxsd4kl4pv80i850zm0rg";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.0.41";
|
||||
version = "6.0.42";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gmh23c3hc4my244m5lpd4kiysrsprag4rn6kvnnphxiflxvi4f7";
|
||||
sha256 = "10ndgv4c30rq211f5lyngfcp87lxzgc9h8a7jx40wih43dj6faxq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.3";
|
||||
version = "3.1.4";
|
||||
};
|
||||
metasploit-payloads = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rr6g3gqjsvdjkqfbgpc3wfzpq367dk9zn3rzm8h9kd09hy3i760";
|
||||
sha256 = "0z0cgg4fghcpj3pvjyqnnzll5zvhwpv68dvpz2y0zgij14cvfg7y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.43";
|
||||
version = "2.0.44";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0li8lphplsmv9x1f14c22w95gjx2lscas3x5py7x7kc05pfv33bg";
|
||||
sha256 = "1gzfvfqs9mf50dcnirc1944a25920s1swjd9g97d1x340651xmmr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.3";
|
||||
version = "4.1.4";
|
||||
};
|
||||
metasploit_payloads-mettle = {
|
||||
groups = ["default"];
|
||||
@@ -596,10 +596,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
|
||||
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
@@ -726,10 +726,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
|
||||
sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.20.0";
|
||||
version = "4.21.0";
|
||||
};
|
||||
openssl-ccm = {
|
||||
groups = ["default"];
|
||||
@@ -1046,10 +1046,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wza4g3kkscc17kaw44hnq8qs2nmvppb9awaf27lp4v1c1kdxixs";
|
||||
sha256 = "08a9s82y4bv2bis0szasrrqvz6imwx94ckg259f7w39ng1fbc7b1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.89";
|
||||
version = "0.1.90";
|
||||
};
|
||||
rex-random_identifier = {
|
||||
groups = ["default"];
|
||||
|
||||
@@ -17,9 +17,14 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA=";
|
||||
};
|
||||
|
||||
# by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..."
|
||||
# This is a better way to do the same, and takes advantage of the existing Nix python environments
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "support-for-keepass-4.0.0.patch";
|
||||
url = "https://github.com/roddhjav/pass-import/commit/86cfb1bb13a271fefe1e70f24be18e15a83a04d8.patch";
|
||||
sha256 = "0mrlblqlmwl9gqs2id4rl4sivrcclsv6zyc6vjqi78kkqmnwzhxh";
|
||||
})
|
||||
# by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..."
|
||||
# This is a better way to do the same, and takes advantage of the existing Nix python environments
|
||||
# from https://github.com/roddhjav/pass-import/pull/138
|
||||
(fetchpatch {
|
||||
name = "pass-import-pr-138-pimport-entrypoint.patch";
|
||||
|
||||
41
pkgs/tools/security/plasma-pass/default.nix
Normal file
41
pkgs/tools/security/plasma-pass/default.nix
Normal file
@@ -0,0 +1,41 @@
|
||||
{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules
|
||||
, ki18n
|
||||
, kitemmodels
|
||||
, oathToolkit
|
||||
, qgpgme
|
||||
, plasma-framework
|
||||
, qt5 }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "plasma-pass";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "plasma";
|
||||
repo = "plasma-pass";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ki18n
|
||||
kitemmodels
|
||||
oathToolkit
|
||||
qgpgme
|
||||
plasma-framework
|
||||
qt5.qtbase
|
||||
qt5.qtdeclarative
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Plasma applet to access passwords from pass, the standard UNIX password manager";
|
||||
homepage = "https://invent.kde.org/plasma/plasma-pass";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prs";
|
||||
version = "0.2.9";
|
||||
version = "0.2.11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "timvisee";
|
||||
repo = "prs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9qaRhTfdppU72w8jDwD1e8ABuGG+9GyrRIUVsry4Vos=";
|
||||
sha256 = "sha256-jBHe3ZeB+GS+Ds8c6ySwoyyJfqoCWKSgIObg+z1TNmU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-j+kyllMcYj7/Ig5ho548L1wW+TtuQOc/zkxT6SNNN6w=";
|
||||
cargoSha256 = "sha256-dhQuzzML817cDIsYuZElHZfq55AdZ20xeXTNm1nJPqk=";
|
||||
|
||||
postPatch = ''
|
||||
# The GPGME backend is recommended
|
||||
|
||||
@@ -1,17 +1,23 @@
|
||||
{ lib, stdenv, python3Packages, fetchFromGitHub, makeWrapper, substituteAll }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpytop";
|
||||
version = "1.0.63";
|
||||
version = "1.0.64";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5KTqiPqYBDI1KFQ+2WN7QZFL/YSb+MPPWbKzJTUa8Zw=";
|
||||
sha256 = "sha256-BwpMBPTWSrfmz7SHYa1+SZ79V2YZdIkZcOTLtlVlgr8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ python psutil ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "facter";
|
||||
version = "3.14.16";
|
||||
version = "3.14.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "sha256-VZIeyLJBlh5/r0EHinSiPiQyCNUBFBYjDZ6nTVnZBbE=";
|
||||
sha256 = "sha256-RvsUt1DyN8Xr+Xtz84mbKlDwxLewgK6qklYVdQHu6q0=";
|
||||
rev = version;
|
||||
repo = pname;
|
||||
owner = "puppetlabs";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "4.11.0";
|
||||
version = "4.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E+/Ig6+J7pJ98O+YAntBGERml2ELzkji3gworBdcSVY=";
|
||||
sha256 = "sha256-e9TYArmNWnK8XXcniAQCegrfWAUfTKKuClgdSTQep0U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hwinfo";
|
||||
version = "21.72";
|
||||
version = "21.73";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opensuse";
|
||||
repo = "hwinfo";
|
||||
rev = version;
|
||||
sha256 = "sha256-T/netiZqox+qa19wH+h8cbsGbiM+9VrSEIjccrPYqws=";
|
||||
sha256 = "sha256-u5EXU+BrTMeDbZAv8WyBTyFcZHdBIUMpJSLTYgf3Mo8=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
# VERSION and changelog are usually generated using Git
|
||||
# unless HWINFO_VERSION is defined (see Makefile)
|
||||
export HWINFO_VERSION="${version}"
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hardware detection tool from openSUSE";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
homepage = "https://github.com/openSUSE/hwinfo";
|
||||
maintainers = with maintainers; [ bobvanderlinden ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logcheck";
|
||||
version = "1.3.22";
|
||||
version = "1.3.23";
|
||||
_name = "logcheck_${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
|
||||
sha256 = "sha256-e7XeRNlFsexlVskK2OnLTmNV/ES2xWU+/+AElexV6E4=";
|
||||
sha256 = "sha256-ohiLpUn/9EEsggdLJxiE/2bSXz/bKkGRboF85naFWyk=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
Logcheck was part of the Abacus Project of security tools, but this version has been rewritten.
|
||||
'';
|
||||
homepage = "https://salsa.debian.org/debian/logcheck";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.bluescreen303 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,15 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chroma";
|
||||
version = "0.8.2";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alecthomas";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0vzxd0jvjaakwjvkkkjppakjb00z44k7gb5ng1i4924agh24n5ka";
|
||||
sha256 = "0zzk4wcjgxa9lsx8kwpmxvcw67f2fr7ai37jxmdahnws0ai2c2f7";
|
||||
leaveDotGit = true;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git ];
|
||||
@@ -27,7 +26,7 @@ buildGoModule rec {
|
||||
--replace 'date = "?"' "date = \"$date\""
|
||||
'';
|
||||
|
||||
vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m";
|
||||
vendorSha256 = "0y8mp08zccn9qxrsj9j7vambz8dwzsxbbgrlppzam53rg8rpxhrg";
|
||||
|
||||
subPackages = [ "cmd/chroma" ];
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@ with lib;
|
||||
let
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "highlight";
|
||||
version = "3.60";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "saalen";
|
||||
repo = "highlight";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1EBdtORd9P5DJUmbZa9KjR3UUoHOKLbjqbxpFi5WFvQ=";
|
||||
sha256 = "sha256-WWbT0CfrbHgpU5HQycRhU7Ymey1LKd/ruoF91F3mHdE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
Reference in New Issue
Block a user