format and change
This commit is contained in:
parent
882ff4e5e9
commit
28c116337c
181 changed files with 2748 additions and 2578 deletions
|
|
@ -1,29 +1,27 @@
|
|||
with import <nixpkgs> { };
|
||||
with import <nixpkgs> {};
|
||||
stdenv.mkDerivation rec {
|
||||
broken = true;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
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}"
|
||||
#
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,34 @@
|
|||
{ pkgs }:
|
||||
let
|
||||
|
||||
{pkgs}: 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 {
|
||||
|
|
@ -36,7 +39,7 @@ in rec {
|
|||
CONFIG_INSTALL_APPLET_SYMLINKS n
|
||||
'';
|
||||
};
|
||||
dropbearStatic = pkgs.dropbear.override { enableStatic = true; };
|
||||
dropbearStatic = pkgs.dropbear.override {enableStatic = true;};
|
||||
|
||||
php5 = let
|
||||
nixpkgsWithPhp5 = pkgs.fetchFromGitHub {
|
||||
|
|
@ -45,38 +48,42 @@ in rec {
|
|||
rev = "846d8f8305192dcc3a63139102698b4ac6b9ef9f";
|
||||
sha256 = "1qifgc1q2i4g0ivpfjnxp4jl2cc82gfjws08dsllgw7q7kw4b4rb";
|
||||
};
|
||||
php5 = (pkgs.callPackage
|
||||
"${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {
|
||||
config = (pkgs.lib.attrsets.recursiveUpdate pkgs.config {
|
||||
php = {
|
||||
imap = false;
|
||||
openssl = false;
|
||||
curl = false;
|
||||
ldap = false;
|
||||
mcrypt = false;
|
||||
php5 =
|
||||
(pkgs.callPackage
|
||||
"${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix"
|
||||
{
|
||||
config = pkgs.lib.attrsets.recursiveUpdate pkgs.config {
|
||||
php = {
|
||||
imap = false;
|
||||
openssl = false;
|
||||
curl = false;
|
||||
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 { };
|
||||
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;
|
||||
|
|
@ -85,27 +92,28 @@ in rec {
|
|||
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
|
||||
[
|
||||
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]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
{
|
||||
buildGoPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGoPackage rec {
|
||||
name = "duplicay-${version}";
|
||||
version = "2.1.2";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
with import <nixpkgs> { };
|
||||
stdenv.mkDerivation {
|
||||
name = "env";
|
||||
buildInputs = [
|
||||
zsh
|
||||
go
|
||||
go2nix
|
||||
dep2nix
|
||||
nix-prefetch-github
|
||||
(callPackage ./default.nix { })
|
||||
];
|
||||
}
|
||||
with import <nixpkgs> {};
|
||||
stdenv.mkDerivation {
|
||||
name = "env";
|
||||
buildInputs = [
|
||||
zsh
|
||||
go
|
||||
go2nix
|
||||
dep2nix
|
||||
nix-prefetch-github
|
||||
(callPackage ./default.nix {})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,30 @@
|
|||
{ pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript
|
||||
, gnugrep, gnused, which, perl, lib }:
|
||||
|
||||
let
|
||||
{
|
||||
pkgsi686Linux,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
dpkg,
|
||||
makeWrapper,
|
||||
coreutils,
|
||||
ghostscript,
|
||||
gnugrep,
|
||||
gnused,
|
||||
which,
|
||||
perl,
|
||||
lib,
|
||||
}: 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 {
|
||||
driver = stdenv.mkDerivation rec {
|
||||
inherit src version;
|
||||
name = "${model}drv-${version}";
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
nativeBuildInputs = [dpkg makeWrapper];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src $out";
|
||||
|
||||
|
|
@ -28,8 +36,8 @@ in rec {
|
|||
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
|
||||
wrapProgram $dir/lpd/filter_${model} \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]
|
||||
}
|
||||
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
|
||||
|
|
@ -39,8 +47,8 @@ in rec {
|
|||
description = "Brother ${lib.strings.toUpper model} driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ lib.maintainers.steveej ];
|
||||
platforms = ["x86_64-linux" "i686-linux"];
|
||||
maintainers = [lib.maintainers.steveej];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -48,7 +56,7 @@ in rec {
|
|||
inherit version src;
|
||||
name = "${model}cupswrapper-${version}";
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
nativeBuildInputs = [dpkg makeWrapper];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src $out";
|
||||
|
||||
|
|
@ -60,7 +68,7 @@ in rec {
|
|||
--replace "basedir =~" "basedir = \"$basedir\"; #" \
|
||||
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
|
||||
wrapProgram $dir/cupswrapper/brother_lpdwrapper_${model} \
|
||||
--prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]}
|
||||
--prefix PATH : ${lib.makeBinPath [coreutils gnugrep gnused]}
|
||||
mkdir -p $out/lib/cups/filter
|
||||
mkdir -p $out/share/cups/model
|
||||
ln $dir/cupswrapper/brother_lpdwrapper_${model} $out/lib/cups/filter
|
||||
|
|
@ -71,8 +79,8 @@ in rec {
|
|||
description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ lib.maintainers.steveej ];
|
||||
platforms = ["x86_64-linux" "i686-linux"];
|
||||
maintainers = [lib.maintainers.steveej];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,61 +1,60 @@
|
|||
with import <nixpkgs> { };
|
||||
with import <nixpkgs> {};
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nozbe";
|
||||
version = "3.6.3";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
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/
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
# posh makes use of podman to run an encapsulated shell session
|
||||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
cniConfigDir = let
|
||||
loopback = pkgs.writeText "00-loopback.conf" ''
|
||||
{
|
||||
|
|
@ -37,12 +35,13 @@ let
|
|||
]
|
||||
}
|
||||
'';
|
||||
in pkgs.runCommand "cniConfig" { } ''
|
||||
set -x
|
||||
mkdir $out;
|
||||
ln -s ${loopback} $out/${loopback.name}
|
||||
ln -s ${podman-bridge} $out/${podman-bridge.name}
|
||||
'';
|
||||
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
|
||||
|
|
@ -125,46 +124,55 @@ let
|
|||
}
|
||||
}
|
||||
'';
|
||||
in
|
||||
{
|
||||
image,
|
||||
pull ? "always",
|
||||
global_args ? "",
|
||||
run_args ? "",
|
||||
userns ? "keep-id",
|
||||
}:
|
||||
(pkgs.writeScriptBin "posh" ''
|
||||
#! ${pkgs.bash}/bin/bash
|
||||
source /etc/profile
|
||||
|
||||
in { image, pull ? "always", global_args ? "", run_args ? "", userns ? "keep-id"
|
||||
}:
|
||||
test -S "$SSH_AUTH_SOCK" && ssh="-v $SSH_AUTH_SOCK:$SSH_AUTH_SOCK -e SSH_AUTH_SOCK"
|
||||
tty -s && tty="-t" entrypoint=--entrypoint='["/usr/bin/env","bash","-il"]' || quiet="-q"
|
||||
|
||||
(pkgs.writeScriptBin "posh" ''
|
||||
#! ${pkgs.bash}/bin/bash
|
||||
source /etc/profile
|
||||
# define these as variables so we can override them at runtime
|
||||
POSH_IMAGE=${image}
|
||||
POSH_PULL=${pull}
|
||||
|
||||
test -S "$SSH_AUTH_SOCK" && ssh="-v $SSH_AUTH_SOCK:$SSH_AUTH_SOCK -e SSH_AUTH_SOCK"
|
||||
tty -s && tty="-t" entrypoint=--entrypoint='["/usr/bin/env","bash","-il"]' || quiet="-q"
|
||||
if [ "$1" == "-c" ]; then
|
||||
# We've most likely been spawned by sshd and are interested in $2 whitch contains the command string
|
||||
shift
|
||||
# TODO parse the beginning of the command for POSH_* overrides
|
||||
fi
|
||||
|
||||
# define these as variables so we can override them at runtime
|
||||
POSH_IMAGE=${image}
|
||||
POSH_PULL=${pull}
|
||||
test "$@" && cmd=( -c "$@")
|
||||
|
||||
if [ "$1" == "-c" ]; then
|
||||
# We've most likely been spawned by sshd and are interested in $2 whitch contains the command string
|
||||
shift
|
||||
# TODO parse the beginning of the command for POSH_* overrides
|
||||
fi
|
||||
|
||||
test "$@" && cmd=( -c "$@")
|
||||
|
||||
HOME_CONTAINERS_CONFIGDIR="$HOME/.config/containers"
|
||||
HOME_POLICY_JSON="$HOME_CONTAINERS_CONFIGDIR/policy.json"
|
||||
test -d $HOME_CONTAINERS_CONFIGIDR || mkdir $HOME_CONTAINERS_CONFIGIDR
|
||||
ln -sf ${policy-json} $HOME_POLICY_JSON
|
||||
HOME_CONTAINERS_CONFIGDIR="$HOME/.config/containers"
|
||||
HOME_POLICY_JSON="$HOME_CONTAINERS_CONFIGDIR/policy.json"
|
||||
test -d $HOME_CONTAINERS_CONFIGIDR || mkdir $HOME_CONTAINERS_CONFIGIDR
|
||||
ln -sf ${policy-json} $HOME_POLICY_JSON
|
||||
|
||||
|
||||
set -x
|
||||
exec ${pkgs.podman}/bin/podman \
|
||||
--cgroup-manager=cgroupfs \
|
||||
${global_args} \
|
||||
run \
|
||||
--annotation=io.crun.keep_original_groups=1 \
|
||||
--config ${podmanConfig} \
|
||||
--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 ""} \
|
||||
${run_args} \
|
||||
''${POSH_IMAGE} /usr/bin/env bash -l "''${cmd[@]}"
|
||||
'').overrideAttrs (attrs: attrs // { passthru = { shellPath = "/bin/posh"; }; })
|
||||
set -x
|
||||
exec ${pkgs.podman}/bin/podman \
|
||||
--cgroup-manager=cgroupfs \
|
||||
${global_args} \
|
||||
run \
|
||||
--annotation=io.crun.keep_original_groups=1 \
|
||||
--config ${podmanConfig} \
|
||||
--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 ""
|
||||
} \
|
||||
${run_args} \
|
||||
''${POSH_IMAGE} /usr/bin/env bash -l "''${cmd[@]}"
|
||||
'')
|
||||
.overrideAttrs (attrs: attrs // {passthru = {shellPath = "/bin/posh";};})
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gnumake, gcc }:
|
||||
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
gnumake,
|
||||
gcc,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "slirp4netns-${version}";
|
||||
version = "v0.2.1";
|
||||
|
|
@ -11,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0kqncza4kgqkqiki569j7ym9pvp7879i6q2z0djvda9y0i6b80w4";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf automake libtool gnumake gcc ];
|
||||
buildInputs = [autoconf automake libtool gnumake gcc];
|
||||
|
||||
configurePhase = ''
|
||||
./autogen.sh
|
||||
|
|
@ -30,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
description = "User-mode networking for unprivileged network namespaces";
|
||||
homepage = "https://github.com/rootless-containers/slirp4netns";
|
||||
license = null;
|
||||
maintainers = [ maintainers.steveej ];
|
||||
maintainers = [maintainers.steveej];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,21 @@
|
|||
{ stdenv, fetchurl, makeWrapper, dpkg, patchelf, gtk2, glib, gdk_pixbuf, alsaLib
|
||||
, nss, nspr, GConf, cups, libgcrypt, dbus, systemd }:
|
||||
|
||||
let
|
||||
{
|
||||
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
|
||||
|
|
@ -15,54 +29,56 @@ let
|
|||
libgcrypt
|
||||
dbus
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "2.8.1";
|
||||
name = "staruml-${version}";
|
||||
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";
|
||||
sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url =
|
||||
"https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb";
|
||||
sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";
|
||||
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";
|
||||
sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";
|
||||
};
|
||||
|
||||
buildInputs = [dpkg];
|
||||
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
sourceRoot=pkg
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
mv opt/staruml $out/bin
|
||||
|
||||
mkdir -p $out/lib
|
||||
ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
|
||||
ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0
|
||||
|
||||
for binary in StarUML Brackets-node; do
|
||||
${patchelf}/bin/patchelf \
|
||||
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
$out/bin/$binary
|
||||
wrapProgram $out/bin/$binary \
|
||||
--prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A sophisticated software modeler";
|
||||
homepage = "http://staruml.io/";
|
||||
license = licenses.unfree;
|
||||
platforms = ["i686-linux" "x86_64-linux"];
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
sourceRoot=pkg
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
mv opt/staruml $out/bin
|
||||
|
||||
mkdir -p $out/lib
|
||||
ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
|
||||
ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0
|
||||
|
||||
for binary in StarUML Brackets-node; do
|
||||
${patchelf}/bin/patchelf \
|
||||
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
$out/bin/$binary
|
||||
wrapProgram $out/bin/$binary \
|
||||
--prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A sophisticated software modeler";
|
||||
homepage = "http://staruml.io/";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue