chore: nixfmt *

This commit is contained in:
steveej 2022-10-31 11:04:38 +01:00
parent dc761a5271
commit d039179898
161 changed files with 2688 additions and 3024 deletions

View file

@ -1,28 +1,29 @@
with import <nixpkgs> {};
with import <nixpkgs> { };
stdenv.mkDerivation rec {
broken = true;
broken = true;
name = "browserpass";
version = "2.0.9";
name = "browserpass";
version = "2.0.9";
src = fetchzip {
url = "https://github.com/dannyvankooten/browserpass/releases/download/${version}/${name}-linux64.zip";
sha256 = "1nygcfjhyrcvbdmz4hjphcnmr4lm9y24lpdkdcjix6vbsjs0hipw";
stripRoot = false;
};
src = fetchzip {
url =
"https://github.com/dannyvankooten/browserpass/releases/download/${version}/${name}-linux64.zip";
sha256 = "1nygcfjhyrcvbdmz4hjphcnmr4lm9y24lpdkdcjix6vbsjs0hipw";
stripRoot = false;
};
buildPhase = '':'';
buildPhase = ":";
libPath = lib.makeLibraryPath [ ];
installPhase = ''
set -x
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 browserpass-linux64
libPath = lib.makeLibraryPath [ ];
installPhase = ''
set -x
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 browserpass-linux64
mkdir -p $out/bin
cp -a * $out/bin/
# wrapProgram $out/bin/browserpass-linux64 \
# --prefix LD_LIBRARY_PATH : "${libPath}"
#
'';
mkdir -p $out/bin
cp -a * $out/bin/
# wrapProgram $out/bin/browserpass-linux64 \
# --prefix LD_LIBRARY_PATH : "${libPath}"
#
'';
}

View file

@ -2,43 +2,41 @@
let
in rec {
nixpkgs-master = import <nixpkgs-master> {};
nixpkgs-master = import <nixpkgs-master> { };
linuxPackages_sgx_540rc3 = let
linux_sgx_pkg = { fetchurl, buildLinux, ... } @ args:
linux_sgx_pkg = { fetchurl, buildLinux, ... }@args:
buildLinux (args // rec {
version = "5.4.0-rc3";
modDirVersion = version;
buildLinux (args // rec {
version = "5.4.0-rc3";
modDirVersion = version;
src = fetchurl {
url = "https://github.com/jsakkine-intel/linux-sgx/archive/v23.tar.gz";
sha256 = "11rwlwv7s071ia889dk1dgrxprxiwgi7djhg47vi56dj81jgib20";
};
kernelPatches = [];
src = fetchurl {
url =
"https://github.com/jsakkine-intel/linux-sgx/archive/v23.tar.gz";
sha256 = "11rwlwv7s071ia889dk1dgrxprxiwgi7djhg47vi56dj81jgib20";
};
kernelPatches = [ ];
extraConfig = ''
INTEL_SGX y
'';
extraConfig = ''
INTEL_SGX y
'';
extraMeta.branch = "5.4";
} // (args.argsOverride or {}));
linux_sgx = pkgs.callPackage linux_sgx_pkg {};
in
pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_sgx);
extraMeta.branch = "5.4";
} // (args.argsOverride or { }));
linux_sgx = pkgs.callPackage linux_sgx_pkg { };
in pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_sgx);
linuxPackages_sgx_latest = linuxPackages_sgx_540rc3;
busyboxStatic = pkgs.busybox.override {
busyboxStatic = pkgs.busybox.override {
enableStatic = true;
extraConfig = ''
CONFIG_STATIC y
CONFIG_INSTALL_APPLET_DONT y
CONFIG_INSTALL_APPLET_SYMLINKS n
'';
};
dropbearStatic = pkgs.dropbear.override {
enableStatic = true;
CONFIG_STATIC y
CONFIG_INSTALL_APPLET_DONT y
CONFIG_INSTALL_APPLET_SYMLINKS n
'';
};
dropbearStatic = pkgs.dropbear.override { enableStatic = true; };
php5 = let
nixpkgsWithPhp5 = pkgs.fetchFromGitHub {
@ -47,10 +45,9 @@ in rec {
rev = "846d8f8305192dcc3a63139102698b4ac6b9ef9f";
sha256 = "1qifgc1q2i4g0ivpfjnxp4jl2cc82gfjws08dsllgw7q7kw4b4rb";
};
php5 = (pkgs.callPackage "${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {
config = (pkgs.lib.attrsets.recursiveUpdate
pkgs.config
{
php5 = (pkgs.callPackage
"${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {
config = (pkgs.lib.attrsets.recursiveUpdate pkgs.config {
php = {
imap = false;
openssl = false;
@ -58,58 +55,57 @@ in rec {
ldap = false;
mcrypt = false;
};
}
);
stdenv = pkgs.llvmPackages_6.stdenv; #broken
icu = pkgs.icu60;
}).php56;
in
php5
.overrideAttrs(attrs: rec {
# See https://secure.php.net/ChangeLog-5.php
version = "5.6.40";
name = "php-${version}";
});
stdenv = pkgs.llvmPackages_6.stdenv; # broken
icu = pkgs.icu60;
}).php56;
in php5.overrideAttrs (attrs: rec {
# See https://secure.php.net/ChangeLog-5.php
version = "5.6.40";
name = "php-${version}";
sha256 = "005s7w167dypl41wlrf51niryvwy1hfv53zxyyr3lm938v9jbl7z";
src = pkgs.fetchurl {
url = "http://www.php.net/distributions/php-${version}.tar.bz2";
inherit sha256;
};
sha256 = "005s7w167dypl41wlrf51niryvwy1hfv53zxyyr3lm938v9jbl7z";
src = pkgs.fetchurl {
url = "http://www.php.net/distributions/php-${version}.tar.bz2";
inherit sha256;
};
configureFlags = attrs.configureFlags ++ [
"--without-fpm-systemd"
];
configureFlags = attrs.configureFlags ++ [ "--without-fpm-systemd" ];
meta.license = null;
});
meta.license = null;
});
duplicacy = pkgs.callPackage ../pkgs/duplicacy {};
mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix {};
staruml = pkgs.callPackage ../pkgs/staruml.nix { inherit (pkgs.gnome2) GConf; libgcrypt = pkgs.libgcrypt_1_5; };
duplicacy = pkgs.callPackage ../pkgs/duplicacy { };
mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix { };
staruml = pkgs.callPackage ../pkgs/staruml.nix {
inherit (pkgs.gnome2) GConf;
libgcrypt = pkgs.libgcrypt_1_5;
};
pythonPackages = myPython;
myPython = pkgs.python310.withPackages (ps: with ps; [
pep8 yapf flake8
# autopep8 (broken)
# pylint (broken)
ipython
llfuse
dugong
defusedxml
wheel
pip
virtualenv
cffi
pyopenssl
urllib3
# mistune (insecure)
sympy
myPython = pkgs.python310.withPackages (ps:
with ps;
[
pep8
yapf
flake8
# autopep8 (broken)
# pylint (broken)
ipython
llfuse
dugong
defusedxml
wheel
pip
virtualenv
cffi
pyopenssl
urllib3
# mistune (insecure)
sympy
flask
flask
pyaml
] ++ [
pkgs.pypi2nix
pkgs.libffi
]);
pyaml
] ++ [ pkgs.pypi2nix pkgs.libffi ]);
}

View file

@ -1,6 +1,4 @@
{ buildGoPackage
, fetchFromGitHub
}:
{ buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "duplicay-${version}";

View file

@ -1,336 +1,336 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "cloud.google.com/go";
goPackagePath = "cloud.google.com/go";
fetch = {
type = "git";
url = "https://code.googlesource.com/gocloud";
rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613";
rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613";
sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq";
};
}
{
goPackagePath = "github.com/Azure/azure-sdk-for-go";
goPackagePath = "github.com/Azure/azure-sdk-for-go";
fetch = {
type = "git";
url = "https://github.com/Azure/azure-sdk-for-go";
rev = "b7fadebe0e7f5c5720986080a01495bd8d27be37";
rev = "b7fadebe0e7f5c5720986080a01495bd8d27be37";
sha256 = "11zcmd17206byxhgz2a75qascilydlzjbz73l2mrqng3yyr20yk1";
};
}
{
goPackagePath = "github.com/Azure/go-autorest";
goPackagePath = "github.com/Azure/go-autorest";
fetch = {
type = "git";
url = "https://github.com/Azure/go-autorest";
rev = "0ae36a9e544696de46fdadb7b0d5fb38af48c063";
rev = "0ae36a9e544696de46fdadb7b0d5fb38af48c063";
sha256 = "0f2qcv24l9bx3jys2m9ycyy77vqlx7dbfa3frxlk19wnrwiv3p6g";
};
}
{
goPackagePath = "github.com/aryann/difflib";
goPackagePath = "github.com/aryann/difflib";
fetch = {
type = "git";
url = "https://github.com/aryann/difflib";
rev = "e206f873d14a916d3d26c40ab667bca123f365a3";
rev = "e206f873d14a916d3d26c40ab667bca123f365a3";
sha256 = "00zb9sx6l6b2zq614x45zlyshl20zjhwfj8r5krw4f9y0mx3n2dm";
};
}
{
goPackagePath = "github.com/aws/aws-sdk-go";
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "a32b1dcd091264b5dee7b386149b6cc3823395c9";
rev = "a32b1dcd091264b5dee7b386149b6cc3823395c9";
sha256 = "1yicb7l6m4hs3mi724hz74wn8305qvx6g73mjqafaaqvh6dyn86m";
};
}
{
goPackagePath = "github.com/bkaradzic/go-lz4";
goPackagePath = "github.com/bkaradzic/go-lz4";
fetch = {
type = "git";
url = "https://github.com/bkaradzic/go-lz4";
rev = "74ddf82598bc4745b965729e9c6a463bedd33049";
rev = "74ddf82598bc4745b965729e9c6a463bedd33049";
sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1";
};
}
{
goPackagePath = "github.com/dgrijalva/jwt-go";
goPackagePath = "github.com/dgrijalva/jwt-go";
fetch = {
type = "git";
url = "https://github.com/dgrijalva/jwt-go";
rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29";
rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29";
sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs";
};
}
{
goPackagePath = "github.com/gilbertchen/azure-sdk-for-go";
goPackagePath = "github.com/gilbertchen/azure-sdk-for-go";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/azure-sdk-for-go";
rev = "bbf89bd4d716c184f158d1e1428c2dbef4a18307";
rev = "bbf89bd4d716c184f158d1e1428c2dbef4a18307";
sha256 = "14563izc2y05k8s20fmhanvjydbcq8k5adp4cgw91d9bs52qivx7";
};
}
{
goPackagePath = "github.com/gilbertchen/cli";
goPackagePath = "github.com/gilbertchen/cli";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/cli";
rev = "1de0a1836ce9c3ae1bf737a0869c4f04f28a7f98";
rev = "1de0a1836ce9c3ae1bf737a0869c4f04f28a7f98";
sha256 = "00vbyjsn009cqg24sxcizq10rgicnmrv0f8jg3fa1fw6yp5gqdl5";
};
}
{
goPackagePath = "github.com/gilbertchen/go-dropbox";
goPackagePath = "github.com/gilbertchen/go-dropbox";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/go-dropbox";
rev = "90711b603312b1f973f3a5da3793ac4f1e5c2f2a";
rev = "90711b603312b1f973f3a5da3793ac4f1e5c2f2a";
sha256 = "0y2ydl3mjbkfbqyygrwq7vqig9hjh7cxvzsn2gxc1851haqp4h19";
};
}
{
goPackagePath = "github.com/gilbertchen/go-ole";
goPackagePath = "github.com/gilbertchen/go-ole";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/go-ole";
rev = "0e87ea779d9deb219633b828a023b32e1244dd57";
rev = "0e87ea779d9deb219633b828a023b32e1244dd57";
sha256 = "1d937b4i9mrwfgs1s17qhbd78dcd97wwm8zsajkarky8d55rz1bw";
};
}
{
goPackagePath = "github.com/gilbertchen/go.dbus";
goPackagePath = "github.com/gilbertchen/go.dbus";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/go.dbus";
rev = "9e442e6378618c083fd3b85b703ffd202721fb17";
rev = "9e442e6378618c083fd3b85b703ffd202721fb17";
sha256 = "0q8ld38gnr4adzw5287lw5f5l14yp8slxsz1za5ryrkprh04bhkv";
};
}
{
goPackagePath = "github.com/gilbertchen/goamz";
goPackagePath = "github.com/gilbertchen/goamz";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/goamz";
rev = "eada9f4e8cc2a45db775dee08a2c37597ce4760a";
rev = "eada9f4e8cc2a45db775dee08a2c37597ce4760a";
sha256 = "0v6i4jdly06wixmm58ygxh284hnlbfxczvcwxvywiyy9bp5qyaid";
};
}
{
goPackagePath = "github.com/gilbertchen/gopass";
goPackagePath = "github.com/gilbertchen/gopass";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/gopass";
rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
};
}
{
goPackagePath = "github.com/gilbertchen/keyring";
goPackagePath = "github.com/gilbertchen/keyring";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/keyring";
rev = "8855f5632086e51468cd7ce91056f8da69687ef6";
rev = "8855f5632086e51468cd7ce91056f8da69687ef6";
sha256 = "1ja623dqnhkr1cvynrcai10s8kn2aiq53cvd8yxr47bb8i2a2q1m";
};
}
{
goPackagePath = "github.com/gilbertchen/xattr";
goPackagePath = "github.com/gilbertchen/xattr";
fetch = {
type = "git";
url = "https://github.com/gilbertchen/xattr";
rev = "68e7a6806b0137a396d7d05601d7403ae1abac58";
rev = "68e7a6806b0137a396d7d05601d7403ae1abac58";
sha256 = "120lq8vasc5yh0ajczsdpi8cfzgi4ymrnphgqdfcar3b9rsvx80b";
};
}
{
goPackagePath = "github.com/go-ini/ini";
goPackagePath = "github.com/go-ini/ini";
fetch = {
type = "git";
url = "https://github.com/go-ini/ini";
rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a";
rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a";
sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn";
};
}
{
goPackagePath = "github.com/golang/protobuf";
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";
rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";
sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
};
}
{
goPackagePath = "github.com/googleapis/gax-go";
goPackagePath = "github.com/googleapis/gax-go";
fetch = {
type = "git";
url = "https://github.com/googleapis/gax-go";
rev = "317e0006254c44a0ac427cc52a0e083ff0b9622f";
rev = "317e0006254c44a0ac427cc52a0e083ff0b9622f";
sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh";
};
}
{
goPackagePath = "github.com/jmespath/go-jmespath";
goPackagePath = "github.com/jmespath/go-jmespath";
fetch = {
type = "git";
url = "https://github.com/jmespath/go-jmespath";
rev = "0b12d6b5";
rev = "0b12d6b5";
sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
};
}
{
goPackagePath = "github.com/kr/fs";
goPackagePath = "github.com/kr/fs";
fetch = {
type = "git";
url = "https://github.com/kr/fs";
rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
};
}
{
goPackagePath = "github.com/marstr/guid";
goPackagePath = "github.com/marstr/guid";
fetch = {
type = "git";
url = "https://github.com/marstr/guid";
rev = "8bd9a64bf37eb297b492a4101fb28e80ac0b290f";
rev = "8bd9a64bf37eb297b492a4101fb28e80ac0b290f";
sha256 = "081qrar6wwpmb2pq3swv4byh73r9riyhl2dwv0902d8jg3kwricm";
};
}
{
goPackagePath = "github.com/minio/blake2b-simd";
goPackagePath = "github.com/minio/blake2b-simd";
fetch = {
type = "git";
url = "https://github.com/minio/blake2b-simd";
rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4";
rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4";
sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd";
};
}
{
goPackagePath = "github.com/ncw/swift";
goPackagePath = "github.com/ncw/swift";
fetch = {
type = "git";
url = "https://github.com/ncw/swift";
rev = "ae9f0ea1605b9aa6434ed5c731ca35d83ba67c55";
rev = "ae9f0ea1605b9aa6434ed5c731ca35d83ba67c55";
sha256 = "0a0iwynhgxsl3czabl7ajnxpyw6x0dzbiqz6il8aw7kn10ld1rvl";
};
}
{
goPackagePath = "github.com/pkg/errors";
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
{
goPackagePath = "github.com/pkg/sftp";
goPackagePath = "github.com/pkg/sftp";
fetch = {
type = "git";
url = "https://github.com/pkg/sftp";
rev = "98203f5a8333288eb3163b7c667d4260fe1333e9";
rev = "98203f5a8333288eb3163b7c667d4260fe1333e9";
sha256 = "09wxyrhwwh20rzpzb06vsj8k2bmw52cjlx7j4115zhky27528sx9";
};
}
{
goPackagePath = "github.com/satori/go.uuid";
goPackagePath = "github.com/satori/go.uuid";
fetch = {
type = "git";
url = "https://github.com/satori/go.uuid";
rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
};
}
{
goPackagePath = "github.com/vaughan0/go-ini";
goPackagePath = "github.com/vaughan0/go-ini";
fetch = {
type = "git";
url = "https://github.com/vaughan0/go-ini";
rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
};
}
{
goPackagePath = "golang.org/x/crypto";
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94";
rev = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94";
sha256 = "1mhmr6ljzl3iafsz4qy8vval7rmr828wh59dlqqqjqx6sqmcs1dv";
};
}
{
goPackagePath = "golang.org/x/net";
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "9dfe39835686865bff950a07b394c12a98ddc811";
rev = "9dfe39835686865bff950a07b394c12a98ddc811";
sha256 = "0z8mnl4mi88syafrgqys2ak2gg3yrbna25hpz88y3anl8x4jhg1a";
};
}
{
goPackagePath = "golang.org/x/oauth2";
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "f95fa95eaa936d9d87489b15d1d18b97c1ba9c28";
rev = "f95fa95eaa936d9d87489b15d1d18b97c1ba9c28";
sha256 = "0p9kis69wvhv8a2qbcjxvn9ggpdh81cbfjpq5pjga7n8k6d065fh";
};
}
{
goPackagePath = "golang.org/x/sys";
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "82aafbf43bf885069dc71b7e7c2f9d7a614d47da";
rev = "82aafbf43bf885069dc71b7e7c2f9d7a614d47da";
sha256 = "1jvngpvy0q40f7krkgmwf5bbjzhv449297awcr0y78kzn0cyawi2";
};
}
{
goPackagePath = "golang.org/x/text";
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "88f656faf3f37f690df1a32515b479415e1a6769";
rev = "88f656faf3f37f690df1a32515b479415e1a6769";
sha256 = "0zakmgg6dlwnkhignwjajn0dckzqq18zxvnmmg0fq6455x7fs673";
};
}
{
goPackagePath = "google.golang.org/api";
goPackagePath = "google.golang.org/api";
fetch = {
type = "git";
url = "https://code.googlesource.com/google-api-go-client";
rev = "17b5f22a248d6d3913171c1a557552ace0d9c806";
rev = "17b5f22a248d6d3913171c1a557552ace0d9c806";
sha256 = "0gs78qsxfg89kpiiray1x9jiv6bh328jmjkwd3ghnygf3l98kc8c";
};
}
{
goPackagePath = "google.golang.org/appengine";
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a";
rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a";
sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
};
}
{
goPackagePath = "google.golang.org/genproto";
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
rev = "891aceb7c239e72692819142dfca057bdcbfcb96";
rev = "891aceb7c239e72692819142dfca057bdcbfcb96";
sha256 = "1axim84fqzsp6iialk6zl4fsbfpx658vssc6ccakn4yy1xc9h854";
};
}
{
goPackagePath = "google.golang.org/grpc";
goPackagePath = "google.golang.org/grpc";
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "5a9f7b402fe85096d2e1d0383435ee1876e863d0";
rev = "5a9f7b402fe85096d2e1d0383435ee1876e863d0";
sha256 = "1hlirgvmzb929jpb1dvh930646ih5ffg3b6pmlilqr7ffdkl5z3j";
};
}
]
]

View file

@ -1,4 +1,4 @@
with import <nixpkgs> {};
with import <nixpkgs> { };
stdenv.mkDerivation {
name = "env";
buildInputs = [
@ -7,6 +7,6 @@ stdenv.mkDerivation {
go2nix
dep2nix
nix-prefetch-github
(callPackage ./default.nix {})
(callPackage ./default.nix { })
];
}

View file

@ -1,27 +1,17 @@
{ pkgsi686Linux
, stdenv
, fetchurl
, dpkg
, makeWrapper
, coreutils
, ghostscript
, gnugrep
, gnused
, which
, perl
, lib
}:
{ pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript
, gnugrep, gnused, which, perl, lib }:
let
let
model = "mfcl3770cdw";
version = "1.0.2-0";
src = fetchurl {
url = "https://download.brother.com/welcome/dlf103935/${model}pdrv-${version}.i386.deb";
url =
"https://download.brother.com/welcome/dlf103935/${model}pdrv-${version}.i386.deb";
sha256 = "09fhbzhpjymhkwxqyxzv24b06ybmajr6872yp7pri39595mhrvay";
};
reldir = "opt/brother/Printers/${model}/";
in rec {
in rec {
driver = stdenv.mkDerivation rec {
inherit src version;
name = "${model}drv-${version}";
@ -31,23 +21,23 @@ in rec {
unpackPhase = "dpkg-deb -x $src $out";
installPhase = ''
dir="$out/${reldir}"
substituteInPlace $dir/lpd/filter_${model} \
--replace /usr/bin/perl ${perl}/bin/perl \
--replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
wrapProgram $dir/lpd/filter_${model} \
--prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused which
]}
# need to use i686 glibc here, these are 32bit proprietary binaries
interpreter=${pkgsi686Linux.glibc}/lib/ld-linux.so.2
patchelf --set-interpreter "$interpreter" $dir/lpd/brmfcl3770cdwfilter
dir="$out/${reldir}"
substituteInPlace $dir/lpd/filter_${model} \
--replace /usr/bin/perl ${perl}/bin/perl \
--replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
wrapProgram $dir/lpd/filter_${model} \
--prefix PATH : ${
lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]
}
# need to use i686 glibc here, these are 32bit proprietary binaries
interpreter=${pkgsi686Linux.glibc}/lib/ld-linux.so.2
patchelf --set-interpreter "$interpreter" $dir/lpd/brmfcl3770cdwfilter
'';
meta = {
description = "Brother ${lib.strings.toUpper model} driver";
homepage = http://www.brother.com/;
homepage = "http://www.brother.com/";
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ lib.maintainers.steveej ];
@ -79,7 +69,7 @@ in rec {
meta = {
description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver";
homepage = http://www.brother.com/;
homepage = "http://www.brother.com/";
license = lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ lib.maintainers.steveej ];

View file

@ -1,61 +1,61 @@
with import <nixpkgs> {};
with import <nixpkgs> { };
stdenv.mkDerivation rec {
name = "nozbe";
version = "3.6.3";
name = "nozbe";
version = "3.6.3";
src = fetchzip {
url = "https://files.nozbe.com/linux/linux64_newest.tar.gz";
sha256 = "08hag0kv23psqa1pl9kardz90scgk21rsr5xxfg8jvmnxy2nc858";
stripRoot = false;
};
src = fetchzip {
url = "https://files.nozbe.com/linux/linux64_newest.tar.gz";
sha256 = "08hag0kv23psqa1pl9kardz90scgk21rsr5xxfg8jvmnxy2nc858";
stripRoot = false;
};
buildInputs = [ makeWrapper ];
buildInputs = [ makeWrapper ];
buildPhase = '':'';
buildPhase = ":";
libPath = lib.makeLibraryPath [
alsaLib
atk
cairo
cups
dbus
expat
freetype
fontconfig
gnome3.gconf
gcc.cc
gdk_pixbuf
gtk2-x11
glib
pango
nss
nspr
systemd.lib
xorg.libX11
xorg.libXcursor
xorg.libXcomposite
xorg.libXext
xorg.libXfixes
xorg.libXdamage
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libXScrnSaver
];
installPhase = ''
pushd Nozbe-${version}
ls -lha
libPath = lib.makeLibraryPath [
alsaLib
atk
cairo
cups
dbus
expat
freetype
fontconfig
gnome3.gconf
gcc.cc
gdk_pixbuf
gtk2-x11
glib
pango
nss
nspr
systemd.lib
xorg.libX11
xorg.libXcursor
xorg.libXcomposite
xorg.libXext
xorg.libXfixes
xorg.libXdamage
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libXScrnSaver
];
installPhase = ''
pushd Nozbe-${version}
ls -lha
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 Nozbe
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 Nozbe
mkdir -p $out/bin
cp -a * $out/
mkdir -p $out/bin
cp -a * $out/
wrapProgram $out/Nozbe \
--prefix LD_LIBRARY_PATH : "${libPath}"
wrapProgram $out/Nozbe \
--prefix LD_LIBRARY_PATH : "${libPath}"
ln -sf ../Nozbe $out/bin/
'';
ln -sf ../Nozbe $out/bin/
'';
}

View file

@ -3,47 +3,47 @@
let
cniConfigDir = let
loopback = pkgs.writeText "00-loopback.conf" ''
{
"cniVersion": "0.3.0",
"type": "loopback"
}
'';
podman-bridge = pkgs.writeText "87-podman-bridge.conflist" ''
{
"cniVersion": "0.3.0",
"name": "podman",
"plugins": [
{
"type": "bridge",
"bridge": "cni0",
"isGateway": true,
"ipMasq": true,
"ipam": {
"type": "host-local",
"subnet": "10.88.0.0/16",
"routes": [
{ "dst": "0.0.0.0/0" }
]
}
},
{
"type": "portmap",
"capabilities": {
"portMappings": true
}
}
]
}
'';
in pkgs.runCommand "cniConfig" {} ''
set -x
mkdir $out;
ln -s ${loopback} $out/${loopback.name}
ln -s ${podman-bridge} $out/${podman-bridge.name}
loopback = pkgs.writeText "00-loopback.conf" ''
{
"cniVersion": "0.3.0",
"type": "loopback"
}
'';
podman-bridge = pkgs.writeText "87-podman-bridge.conflist" ''
{
"cniVersion": "0.3.0",
"name": "podman",
"plugins": [
{
"type": "bridge",
"bridge": "cni0",
"isGateway": true,
"ipMasq": true,
"ipam": {
"type": "host-local",
"subnet": "10.88.0.0/16",
"routes": [
{ "dst": "0.0.0.0/0" }
]
}
},
{
"type": "portmap",
"capabilities": {
"portMappings": true
}
}
]
}
'';
in pkgs.runCommand "cniConfig" { } ''
set -x
mkdir $out;
ln -s ${loopback} $out/${loopback.name}
ln -s ${podman-bridge} $out/${podman-bridge.name}
'';
podmanConfig = pkgs.writeText "libpod.conf" ''
# libpod.conf is the default configuration file for all tools using libpod to
# manage containers
@ -126,13 +126,7 @@ let
}
'';
in
{ image
, pull ? "always"
, global_args ? ""
, run_args ? ""
, userns ? "keep-id"
in { image, pull ? "always", global_args ? "", run_args ? "", userns ? "keep-id"
}:
(pkgs.writeScriptBin "posh" ''
@ -170,12 +164,7 @@ in
--conmon ${pkgs.conmon}/bin/conmon --runtime ${pkgs.crun}/bin/crun \
--rm -i --network host --pull=''${POSH_PULL} \
$tty $ssh -e HOME -v $HOME:$HOME -w $HOME \
${if userns != null then "--userns="+userns else ""} \
${if userns != null then "--userns=" + userns else ""} \
${run_args} \
''${POSH_IMAGE} /usr/bin/env bash -l "''${cmd[@]}"
'')
.overrideAttrs(attrs: attrs // {
passthru = {
shellPath = "/bin/posh";
};
})
'').overrideAttrs (attrs: attrs // { passthru = { shellPath = "/bin/posh"; }; })

View file

@ -1,11 +1,4 @@
{ stdenv
, fetchFromGitHub
, autoconf
, automake
, libtool
, gnumake
, gcc
}:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gnumake, gcc }:
stdenv.mkDerivation rec {
name = "slirp4netns-${version}";
@ -18,21 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "0kqncza4kgqkqiki569j7ym9pvp7879i6q2z0djvda9y0i6b80w4";
};
buildInputs = [
autoconf
automake
libtool
gnumake
gcc
];
buildInputs = [ autoconf automake libtool gnumake gcc ];
configurePhase = ''
./autogen.sh
./configure --prefix=""
'';
buildPhase = ''
make
make
'';
installPhase = ''
@ -41,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "User-mode networking for unprivileged network namespaces";
homepage = https://github.com/rootless-containers/slirp4netns;
homepage = "https://github.com/rootless-containers/slirp4netns";
license = null;
maintainers = [ maintainers.steveej ];
platforms = platforms.all;

View file

@ -1,23 +1,34 @@
{ stdenv, fetchurl, makeWrapper
, dpkg, patchelf
, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
}:
{ stdenv, fetchurl, makeWrapper, dpkg, patchelf, gtk2, glib, gdk_pixbuf, alsaLib
, nss, nspr, GConf, cups, libgcrypt, dbus, systemd }:
let
inherit (stdenv) lib;
LD_LIBRARY_PATH = lib.makeLibraryPath
[ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ];
in
stdenv.mkDerivation rec {
LD_LIBRARY_PATH = lib.makeLibraryPath [
glib
gtk2
gdk_pixbuf
alsaLib
nss
nspr
GConf
cups
libgcrypt
dbus
];
in stdenv.mkDerivation rec {
version = "2.8.1";
name = "staruml-${version}";
src =
if stdenv.system == "i686-linux" then fetchurl {
url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";
src = if stdenv.system == "i686-linux" then
fetchurl {
url =
"http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";
sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n";
} else fetchurl {
url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb";
}
else
fetchurl {
url =
"https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb";
sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";
};
@ -50,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A sophisticated software modeler";
homepage = http://staruml.io/;
homepage = "http://staruml.io/";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
};