Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
2874eebfd2
@ -1,10 +1,11 @@
|
||||
# to run these tests:
|
||||
# nix-build nixpkgs/lib/tests/maintainers.nix
|
||||
# If nothing is output, all tests passed
|
||||
{ pkgs ? import ../.. {} }:
|
||||
# to run these tests (and the others)
|
||||
# nix-build nixpkgs/lib/tests/release.nix
|
||||
{ # The pkgs used for dependencies for the testing itself
|
||||
pkgs
|
||||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
inherit (lib) types;
|
||||
|
||||
maintainerModule = { config, ... }: {
|
||||
|
||||
@ -1,8 +1,17 @@
|
||||
{ pkgs ? import ../.. {} }:
|
||||
{ # The pkgs used for dependencies for the testing itself
|
||||
# Don't test properties of pkgs.lib, but rather the lib in the parent directory
|
||||
pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }
|
||||
}:
|
||||
|
||||
pkgs.runCommandNoCC "nixpkgs-lib-tests" {
|
||||
buildInputs = [ pkgs.nix (import ./check-eval.nix) (import ./maintainers.nix { inherit pkgs; }) ];
|
||||
NIX_PATH = "nixpkgs=${toString pkgs.path}";
|
||||
buildInputs = [
|
||||
pkgs.nix
|
||||
(import ./check-eval.nix)
|
||||
(import ./maintainers.nix {
|
||||
inherit pkgs;
|
||||
lib = import ../.;
|
||||
})
|
||||
];
|
||||
} ''
|
||||
datadir="${pkgs.nix}/share"
|
||||
export TEST_ROOT=$(pwd)/test-tmp
|
||||
|
||||
@ -17,6 +17,18 @@
|
||||
|
||||
{ lib }:
|
||||
with lib.maintainers; {
|
||||
acme = {
|
||||
members = [
|
||||
aanderse
|
||||
andrew-d
|
||||
arianvp
|
||||
emily
|
||||
flokli
|
||||
m1cr0man
|
||||
];
|
||||
scope = "Maintain ACME-related packages and modules.";
|
||||
};
|
||||
|
||||
freedesktop = {
|
||||
members = [ jtojnar worldofpeace ];
|
||||
scope = "Maintain Freedesktop.org packages for graphical desktop.";
|
||||
|
||||
@ -26,6 +26,11 @@
|
||||
<listitem>
|
||||
<para>GNOME desktop environment was upgraded to 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
We now distribute a GNOME ISO.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
PHP now defaults to PHP 7.4, updated from 7.3.
|
||||
|
||||
@ -10,35 +10,36 @@ let
|
||||
canLoadExternalModules = config.services.nscd.enable;
|
||||
myhostname = canLoadExternalModules;
|
||||
mymachines = canLoadExternalModules;
|
||||
# XXX Move these to their respective modules
|
||||
nssmdns = canLoadExternalModules && config.services.avahi.nssmdns;
|
||||
nsswins = canLoadExternalModules && config.services.samba.nsswins;
|
||||
ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch);
|
||||
sssd = canLoadExternalModules && config.services.sssd.enable;
|
||||
resolved = canLoadExternalModules && config.services.resolved.enable;
|
||||
googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable;
|
||||
|
||||
hostArray = [ "files" ]
|
||||
++ optional mymachines "mymachines"
|
||||
++ optional nssmdns "mdns_minimal [NOTFOUND=return]"
|
||||
++ optional nsswins "wins"
|
||||
++ optional resolved "resolve [!UNAVAIL=return]"
|
||||
++ [ "dns" ]
|
||||
++ optional nssmdns "mdns"
|
||||
++ optional myhostname "myhostname";
|
||||
hostArray = mkMerge [
|
||||
(mkBefore [ "files" ])
|
||||
(mkIf mymachines [ "mymachines" ])
|
||||
(mkIf nssmdns [ "mdns_minimal [NOTFOUND=return]" ])
|
||||
(mkIf nsswins [ "wins" ])
|
||||
(mkIf resolved [ "resolve [!UNAVAIL=return]" ])
|
||||
(mkAfter [ "dns" ])
|
||||
(mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns
|
||||
(mkIf myhostname (mkOrder 1600 [ "myhostname" ])) # 1600 to ensure it's always the last
|
||||
];
|
||||
|
||||
passwdArray = [ "files" ]
|
||||
++ optional sssd "sss"
|
||||
++ optional ldap "ldap"
|
||||
++ optional mymachines "mymachines"
|
||||
++ optional googleOsLogin "cache_oslogin oslogin"
|
||||
++ [ "systemd" ];
|
||||
passwdArray = mkMerge [
|
||||
(mkBefore [ "files" ])
|
||||
(mkIf ldap [ "ldap" ])
|
||||
(mkIf mymachines [ "mymachines" ])
|
||||
(mkIf googleOsLogin [ "cache_oslogin oslogin" ])
|
||||
(mkIf canLoadExternalModules (mkAfter [ "systemd" ]))
|
||||
];
|
||||
|
||||
shadowArray = [ "files" ]
|
||||
++ optional sssd "sss"
|
||||
++ optional ldap "ldap";
|
||||
|
||||
servicesArray = [ "files" ]
|
||||
++ optional sssd "sss";
|
||||
shadowArray = mkMerge [
|
||||
(mkBefore [ "files" ])
|
||||
(mkIf ldap [ "ldap" ])
|
||||
];
|
||||
|
||||
in {
|
||||
options = {
|
||||
@ -61,17 +62,73 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
system.nssHosts = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
example = [ "mdns" ];
|
||||
description = ''
|
||||
List of host entries to configure in <filename>/etc/nsswitch.conf</filename>.
|
||||
'';
|
||||
};
|
||||
system.nssDatabases = {
|
||||
passwd = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of passwd entries to configure in <filename>/etc/nsswitch.conf</filename>.
|
||||
|
||||
Note that "files" is always prepended while "systemd" is appended if nscd is enabled.
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of group entries to configure in <filename>/etc/nsswitch.conf</filename>.
|
||||
|
||||
Note that "files" is always prepended while "systemd" is appended if nscd is enabled.
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
};
|
||||
|
||||
shadow = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of shadow entries to configure in <filename>/etc/nsswitch.conf</filename>.
|
||||
|
||||
Note that "files" is always prepended.
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
};
|
||||
|
||||
hosts = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of hosts entries to configure in <filename>/etc/nsswitch.conf</filename>.
|
||||
|
||||
Note that "files" is always prepended, and "dns" and "myhostname" are always appended.
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
};
|
||||
|
||||
services = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of services entries to configure in <filename>/etc/nsswitch.conf</filename>.
|
||||
|
||||
Note that "files" is always prepended.
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "system" "nssHosts" ] [ "system" "nssDatabases" "hosts" ])
|
||||
];
|
||||
|
||||
config = {
|
||||
assertions = [
|
||||
{
|
||||
@ -87,23 +144,28 @@ in {
|
||||
];
|
||||
|
||||
# Name Service Switch configuration file. Required by the C
|
||||
# library. !!! Factor out the mdns stuff. The avahi module
|
||||
# should define an option used by this module.
|
||||
# library.
|
||||
environment.etc."nsswitch.conf".text = ''
|
||||
passwd: ${concatStringsSep " " passwdArray}
|
||||
group: ${concatStringsSep " " passwdArray}
|
||||
shadow: ${concatStringsSep " " shadowArray}
|
||||
passwd: ${concatStringsSep " " config.system.nssDatabases.passwd}
|
||||
group: ${concatStringsSep " " config.system.nssDatabases.group}
|
||||
shadow: ${concatStringsSep " " config.system.nssDatabases.shadow}
|
||||
|
||||
hosts: ${concatStringsSep " " config.system.nssHosts}
|
||||
hosts: ${concatStringsSep " " config.system.nssDatabases.hosts}
|
||||
networks: files
|
||||
|
||||
ethers: files
|
||||
services: ${concatStringsSep " " servicesArray}
|
||||
services: ${concatStringsSep " " config.system.nssDatabases.services}
|
||||
protocols: files
|
||||
rpc: files
|
||||
'';
|
||||
|
||||
system.nssHosts = hostArray;
|
||||
system.nssDatabases = {
|
||||
passwd = passwdArray;
|
||||
group = passwdArray;
|
||||
shadow = shadowArray;
|
||||
hosts = hostArray;
|
||||
services = mkBefore [ "files" ];
|
||||
};
|
||||
|
||||
# Systemd provides nss-myhostname to ensure that our hostname
|
||||
# always resolves to a valid IP address. It returns all locally
|
||||
|
||||
@ -196,7 +196,6 @@
|
||||
./security/pam_usb.nix
|
||||
./security/pam_mount.nix
|
||||
./security/polkit.nix
|
||||
./security/prey.nix
|
||||
./security/rngd.nix
|
||||
./security/rtkit.nix
|
||||
./security/wrappers/default.nix
|
||||
|
||||
@ -178,6 +178,10 @@ in
|
||||
set -l post (string join0 $fish_complete_path | string match --regex "[^\x00]*generated_completions.*" | string split0 | string match -er ".")
|
||||
set fish_complete_path $prev "/etc/fish/generated_completions" $post
|
||||
end
|
||||
# prevent fish from generating completions on first run
|
||||
if not test -d $__fish_user_data_dir/generated_completions
|
||||
${pkgs.coreutils}/bin/mkdir $__fish_user_data_dir/generated_completions
|
||||
end
|
||||
'';
|
||||
|
||||
environment.etc."fish/generated_completions".source =
|
||||
|
||||
@ -49,6 +49,10 @@ with lib;
|
||||
simply add the brightnessctl package to environment.systemPackages.
|
||||
'')
|
||||
|
||||
(mkRemovedOptionModule ["services" "prey" ] ''
|
||||
prey-bash-client is deprecated upstream
|
||||
'')
|
||||
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
}
|
||||
|
||||
@ -458,7 +458,7 @@ in
|
||||
];
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ abbradar fpletz globin m1cr0man ];
|
||||
maintainers = lib.teams.acme.members;
|
||||
doc = ./acme.xml;
|
||||
};
|
||||
}
|
||||
|
||||
@ -219,6 +219,14 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
nodelay = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Wheather the delay after typing a wrong password should be disabled.
|
||||
'';
|
||||
};
|
||||
|
||||
requireWheel = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
@ -366,7 +374,7 @@ let
|
||||
|| cfg.enableGnomeKeyring
|
||||
|| cfg.googleAuthenticator.enable
|
||||
|| cfg.duoSecurity.enable)) ''
|
||||
auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
|
||||
auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth
|
||||
${optionalString config.security.pam.enableEcryptfs
|
||||
"auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
|
||||
${optionalString cfg.pamMount
|
||||
@ -382,7 +390,7 @@ let
|
||||
"auth required ${pkgs.duo-unix}/lib/security/pam_duo.so"}
|
||||
'') + ''
|
||||
${optionalString cfg.unixAuth
|
||||
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
|
||||
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass"}
|
||||
${optionalString cfg.otpwAuth
|
||||
"auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
|
||||
${optionalString use_ldap
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prey;
|
||||
myPrey = pkgs.prey-bash-client.override {
|
||||
apiKey = cfg.apiKey;
|
||||
deviceKey = cfg.deviceKey;
|
||||
};
|
||||
in {
|
||||
options = {
|
||||
|
||||
services.prey = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Enables the <link xlink:href="http://preyproject.com/" />
|
||||
shell client. Be sure to specify both API and device keys.
|
||||
Once enabled, a <command>cron</command> job will run every 15
|
||||
minutes to report status information.
|
||||
'';
|
||||
};
|
||||
|
||||
deviceKey = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
<literal>Device key</literal> obtained by visiting
|
||||
<link xlink:href="https://panel.preyproject.com/devices" />
|
||||
and clicking on your device.
|
||||
'';
|
||||
};
|
||||
|
||||
apiKey = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
<literal>API key</literal> obtained from
|
||||
<link xlink:href="https://panel.preyproject.com/profile" />.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ myPrey ];
|
||||
services.cron.systemCronJobs = [ "*/15 * * * * root ${myPrey}/prey.sh" ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -82,6 +82,7 @@ in {
|
||||
]);
|
||||
ProtectHome = "tmpfs";
|
||||
WorkingDirectory = libDir;
|
||||
SyslogIdentifier = "pykms";
|
||||
Restart = "on-failure";
|
||||
MemoryLimit = cfg.memoryLimit;
|
||||
};
|
||||
|
||||
@ -75,6 +75,11 @@ in {
|
||||
};
|
||||
|
||||
system.nssModules = optional cfg.enable pkgs.sssd;
|
||||
system.nssDatabases = {
|
||||
passwd = [ "sss" ];
|
||||
shadow = [ "sss" ];
|
||||
services = [ "sss" ];
|
||||
};
|
||||
services.dbus.packages = [ pkgs.sssd ];
|
||||
})
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<chapter xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xml:id="chap-pantheon">
|
||||
<title>Pantheon Destkop</title>
|
||||
<title>Pantheon Desktop</title>
|
||||
<para>
|
||||
Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite.
|
||||
</para>
|
||||
|
||||
@ -50,6 +50,7 @@ in rec {
|
||||
(onFullSupported "nixos.dummy")
|
||||
(onAllSupported "nixos.iso_minimal")
|
||||
(onSystems ["x86_64-linux"] "nixos.iso_plasma5")
|
||||
(onSystems ["x86_64-linux"] "nixos.iso_gnome")
|
||||
(onFullSupported "nixos.manual")
|
||||
(onSystems ["x86_64-linux"] "nixos.ova")
|
||||
(onSystems ["aarch64-linux"] "nixos.sd_image")
|
||||
|
||||
@ -155,6 +155,12 @@ in rec {
|
||||
inherit system;
|
||||
});
|
||||
|
||||
iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
|
||||
module = ./modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;
|
||||
type = "gnome";
|
||||
inherit system;
|
||||
});
|
||||
|
||||
# A variant with a more recent (but possibly less stable) kernel
|
||||
# that might support more hardware.
|
||||
iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
|
||||
|
||||
@ -12,8 +12,9 @@ let
|
||||
fi
|
||||
'';
|
||||
|
||||
in import ./make-test-python.nix {
|
||||
in import ./make-test-python.nix ({ lib, ... }: {
|
||||
name = "acme";
|
||||
meta.maintainers = lib.teams.acme.members;
|
||||
|
||||
nodes = rec {
|
||||
acme = { nodes, lib, ... }: {
|
||||
@ -207,4 +208,4 @@ in import ./make-test-python.nix {
|
||||
"curl --cacert /tmp/ca.crt https://c.example.test/ | grep -qF 'hello world'"
|
||||
)
|
||||
'';
|
||||
}
|
||||
})
|
||||
|
||||
@ -2,16 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lnd";
|
||||
version = "0.9.0-beta";
|
||||
version = "0.9.2-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightningnetwork";
|
||||
repo = "lnd";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9";
|
||||
sha256 = "0gm33z89fiqv231ks2mkpsblskcsijipq8fcmip6m6jy8g06b1gb";
|
||||
};
|
||||
|
||||
modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq";
|
||||
modSha256 = "1khxplvyaqgaddrx1nna1fw0nb1xz9bmqpxpfifif4f5nmx90gbr";
|
||||
|
||||
subPackages = ["cmd/lncli" "cmd/lnd"];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightning Network Daemon";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, qtquickcontrols, qtquickcontrols2
|
||||
, monero, unbound, readline, boost, libunwind
|
||||
, libsodium, pcsclite, zeromq, cppzmq
|
||||
, hidapi, libusb, protobuf, randomx
|
||||
, hidapi, libusb-compat-0_1, protobuf, randomx
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
qtxmlpatterns
|
||||
monero unbound readline
|
||||
boost libunwind libsodium pcsclite zeromq
|
||||
cppzmq hidapi libusb protobuf randomx
|
||||
cppzmq hidapi libusb-compat-0_1 protobuf randomx
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, cmake, pkgconfig
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||
, zeromq, pcsclite, readline, libsodium, hidapi
|
||||
, pythonProtobuf, randomx, rapidjson, libusb
|
||||
, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1
|
||||
, CoreData, IOKit, PCSC
|
||||
}:
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
boost miniupnpc openssl unbound
|
||||
cppzmq zeromq pcsclite readline
|
||||
libsodium hidapi randomx rapidjson
|
||||
pythonProtobuf libusb
|
||||
pythonProtobuf libusb-compat-0_1
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }:
|
||||
{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }:
|
||||
|
||||
let
|
||||
myPatchElf = file: with stdenv.lib; ''
|
||||
@ -30,13 +30,13 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];
|
||||
buildInputs = [ libusb ];
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
dontBuild = true;
|
||||
|
||||
patchPhase = ''
|
||||
${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"}
|
||||
|
||||
RPATH=${libusb.out}/lib
|
||||
RPATH=${libusb-compat-0_1.out}/lib
|
||||
for a in usr/lib64/sane/*.so*; do
|
||||
if ! test -L $a; then
|
||||
patchelf --set-rpath $RPATH $a
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
|
||||
{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sane-frontends";
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [ sane-backends libX11 gtk2 ]
|
||||
++ stdenv.lib.optional (libusb != null) libusb;
|
||||
++ stdenv.lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng
|
||||
, libusb ? null
|
||||
, libusb-compat-0_1 ? null
|
||||
, gimpSupport ? false, gimp ? null
|
||||
}:
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ]
|
||||
++ (if libusb != null then [libusb] else [])
|
||||
++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else [])
|
||||
++ stdenv.lib.optional gimpSupport gimp;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -14,6 +14,16 @@ mkDerivation {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
||||
# InitialPreference values are too high and end up making kate &
|
||||
# kwrite defaults for anything considered text/plain. Resetting to
|
||||
# 1, which is the default.
|
||||
postPatch = ''
|
||||
substituteInPlace kate/data/org.kde.kate.desktop \
|
||||
--replace InitialPreference=9 InitialPreference=1
|
||||
substituteInPlace kwrite/data/org.kde.kwrite.desktop \
|
||||
--replace InitialPreference=8 InitialPreference=1
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
libgit2
|
||||
|
||||
@ -12,9 +12,17 @@ mkDerivation {
|
||||
kdelibs4support kcmutils khtml kdesu
|
||||
qtwebkit qtwebengine qtx11extras qtscript qtwayland
|
||||
];
|
||||
|
||||
# InitialPreference values are too high and any text/html ends up
|
||||
# opening konqueror, even if firefox or chromium are also available.
|
||||
# Resetting to 1, which is the default.
|
||||
postPatch = ''
|
||||
substituteInPlace kfmclient_html.desktop \
|
||||
--replace InitialPreference=9 InitialPreference=1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -18,6 +18,15 @@ mkDerivation {
|
||||
kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
|
||||
qtdeclarative qtsvg threadweaver kcrash
|
||||
] ++ lib.optional (!stdenv.isAarch64) chmlib;
|
||||
|
||||
# InitialPreference values are too high and end up making okular
|
||||
# default for anything considered text/plain. Resetting to 1, which
|
||||
# is the default.
|
||||
postPatch = ''
|
||||
substituteInPlace generators/txt/okularApplication_txt.desktop \
|
||||
--replace InitialPreference=3 InitialPreference=1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.kde.org";
|
||||
license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, libtool
|
||||
, qrencode
|
||||
, udev
|
||||
, libusb
|
||||
, libusb-compat-0_1
|
||||
, makeWrapper
|
||||
, pkgconfig
|
||||
, qtbase
|
||||
@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
|
||||
libevent
|
||||
libtool
|
||||
udev
|
||||
libusb
|
||||
libusb-compat-0_1
|
||||
qrencode
|
||||
|
||||
qtbase
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, garmintools, libgcrypt, libusb, pkgconfig, tinyxml, zlib }:
|
||||
{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }:
|
||||
stdenv.mkDerivation {
|
||||
name = "garmin-plugin-0.3.26";
|
||||
src = fetchurl {
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
sourceRoot = "GarminPlugin-0.3.26/src";
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ];
|
||||
buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ];
|
||||
configureFlags = [
|
||||
"--with-libgcrypt-prefix=${libgcrypt.dev}"
|
||||
"--with-garmintools-incdir=${garmintools}/include"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, mkDerivation
|
||||
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
|
||||
, qtconnectivity, qtcharts, libusb
|
||||
, qtconnectivity, qtcharts, libusb-compat-0_1
|
||||
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
|
||||
}:
|
||||
|
||||
@ -27,7 +27,7 @@ in mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
|
||||
qtconnectivity qtcharts libusb
|
||||
qtconnectivity qtcharts libusb-compat-0_1
|
||||
];
|
||||
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
|
||||
|
||||
@ -39,9 +39,9 @@ in mkDerivation rec {
|
||||
cp src/gcconfig.pri.in src/gcconfig.pri
|
||||
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
|
||||
echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri
|
||||
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
|
||||
|
||||
# Use qtwebengine instead of qtwebkit
|
||||
|
||||
@ -92,7 +92,7 @@ in buildFHSUserEnv {
|
||||
multiPkgs = pkgs: with pkgs; [
|
||||
# Common
|
||||
libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
|
||||
libao libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
|
||||
libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l
|
||||
libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
|
||||
libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib
|
||||
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
|
||||
{ stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi
|
||||
, libtool, makeWrapper, autoreconfHook, fetchpatch
|
||||
}:
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
|
||||
buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ];
|
||||
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
|
||||
"$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
|
||||
"$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -13,13 +13,13 @@ let
|
||||
|
||||
in buildGoPackage rec {
|
||||
name = "perkeep-${version}";
|
||||
version = "unstable-2019-07-29";
|
||||
version = "unstable-2020-03-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "perkeep";
|
||||
repo = "perkeep";
|
||||
rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41";
|
||||
sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg";
|
||||
rev = "c2e31370ddefd86b6112a5d891100ea3382a4254";
|
||||
sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4";
|
||||
};
|
||||
|
||||
goPackagePath = "perkeep.org";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, libusb }:
|
||||
{ stdenv, fetchurl, cmake, libusb-compat-0_1 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "garmindev";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ libusb ];
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev
|
||||
, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb
|
||||
, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1
|
||||
, libsndfile, libmad
|
||||
}:
|
||||
|
||||
@ -16,7 +16,7 @@ mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ qmake pkgconfig ];
|
||||
buildInputs = [
|
||||
udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad
|
||||
udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad
|
||||
];
|
||||
|
||||
qmakeFlags = [ "INSTALLROOT=$(out)" ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake
|
||||
, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib
|
||||
, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib
|
||||
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
|
||||
}:
|
||||
|
||||
@ -83,7 +83,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
libdc googlemaps
|
||||
curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip
|
||||
curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip
|
||||
qtbase qtconnectivity qtsvg qttools qtwebkit
|
||||
];
|
||||
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wtf";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wtfutil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0pybj2h844x9vncwdcaymihyd1mwdnxxpnzpq0p29ra0cwmsxcgr";
|
||||
sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7";
|
||||
};
|
||||
|
||||
modSha256 = "00xvhajag25kfkizi2spv4ady3h06as43rnbjzfbv7z1mln844y4";
|
||||
modSha256 = "0csxc5q7i2iq8z71ysfan2kwf4mghi89i5zja5g1a4cvmcabiq1g";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "nomad";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/nomad";
|
||||
@ -12,7 +12,7 @@ buildGoPackage rec {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "0jg7h52wlgd2aslx13fs97j3b8g5xfgil3p2jsc4j95l7lmqn7bv";
|
||||
sha256 = "1pcn1bk7sqhhsrm3izqljwyrwdz6bdlplrajvjzka39l3k6f9hgc";
|
||||
};
|
||||
|
||||
# ui:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux
|
||||
, coreutils, kerberos, clang, installShellFiles
|
||||
, coreutils, kerberos, ncurses, clang, installShellFiles
|
||||
, components ? [
|
||||
"cmd/oc"
|
||||
"cmd/openshift"
|
||||
@ -9,12 +9,12 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "3.11.0";
|
||||
version = "4.1.0";
|
||||
ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version);
|
||||
versionMajor = ver 0;
|
||||
versionMinor = ver 1;
|
||||
versionPatch = ver 2;
|
||||
gitCommit = "0cbc58b";
|
||||
gitCommit = "b4261e0";
|
||||
# version is in vendor/k8s.io/kubernetes/pkg/version/base.go
|
||||
k8sversion = "v1.11.1";
|
||||
k8sgitcommit = "b1b2997";
|
||||
@ -28,29 +28,17 @@ in buildGoPackage rec {
|
||||
owner = "openshift";
|
||||
repo = "origin";
|
||||
rev = "v${version}";
|
||||
sha256 = "06q4v2a1mm6c659ab0rzkqz6b66vx4avqfg0s9xckwhq420lzgka";
|
||||
sha256 = "16bc6ljm418kxz92gz8ldm82491mvlqamrvigyr6ff72rf7ml7ba";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/openshift/origin";
|
||||
|
||||
buildInputs = [ kerberos ];
|
||||
buildInputs = [ kerberos ncurses ];
|
||||
|
||||
nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs ./hack
|
||||
|
||||
substituteInPlace pkg/oc/clusterup/docker/host/host.go \
|
||||
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
|
||||
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
|
||||
|
||||
substituteInPlace pkg/oc/clusterup/docker/host/host.go \
|
||||
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
|
||||
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
|
||||
|
||||
substituteInPlace pkg/oc/clusterup/docker/host/host.go \
|
||||
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
|
||||
'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir'
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
@ -58,6 +46,7 @@ in buildGoPackage rec {
|
||||
# Openshift build require this variables to be set
|
||||
# unless there is a .git folder which is not the case with fetchFromGitHub
|
||||
echo "OS_GIT_VERSION=v${version}" >> os-version-defs
|
||||
echo "OS_GIT_TREE_STATE=clean" >> os-version-defs
|
||||
echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs
|
||||
echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs
|
||||
echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook
|
||||
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests
|
||||
, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
|
||||
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
|
||||
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
|
||||
@ -121,6 +121,9 @@ in stdenv.mkDerivation rec {
|
||||
autoPatchelf --no-recurse -- $out/lib/Signal/
|
||||
'';
|
||||
|
||||
# Tests if the application launches and waits for "Link your phone to Signal Desktop":
|
||||
passthru.tests.application-launch = nixosTests.signal-desktop;
|
||||
|
||||
meta = {
|
||||
description = "Private, simple, and secure messenger";
|
||||
longDescription = ''
|
||||
|
||||
@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
|
||||
let
|
||||
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
|
||||
|
||||
version = "3.5.385850.0413";
|
||||
version = "5.0.398100.0427";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
|
||||
sha256 = "049kxgkyaxknxpk0hf1a7bxn0c08dk250z3q2ba9pc1xkrn5kdnw";
|
||||
sha256 = "0b9jdicr783wagp2j79106bbk68974j3v8zg8nvky5fydl6ngjvi";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig, autoreconfHook
|
||||
{stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook
|
||||
, enableCredssp ? (!stdenv.isDarwin)
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "rdesktop";
|
||||
version = "1.8.6";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20";
|
||||
sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [pkgconfig autoreconfHook];
|
||||
buildInputs = [openssl libX11]
|
||||
++ stdenv.lib.optional enableCredssp libgssglue;
|
||||
buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls]
|
||||
++ stdenv.lib.optional enableCredssp krb5;
|
||||
|
||||
configureFlags = [
|
||||
"--with-ipv6"
|
||||
|
||||
@ -13,7 +13,7 @@ libav,
|
||||
libiio,
|
||||
libopus,
|
||||
libpulseaudio,
|
||||
libusb,
|
||||
libusb-compat-0_1,
|
||||
limesuite,
|
||||
mkDerivation,
|
||||
ocl-icd,
|
||||
@ -51,7 +51,7 @@ in mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [
|
||||
glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio
|
||||
glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio
|
||||
qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
|
||||
fftwFloat codec2' cm256cc serialdv
|
||||
];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, lndir, makeWrapper
|
||||
, fetchFromGitHub, cmake
|
||||
, libusb, pkgconfig
|
||||
, libusb-compat-0_1, pkgconfig
|
||||
, usePython ? false
|
||||
, python, ncurses, swig2
|
||||
, extraPackages ? []
|
||||
@ -25,7 +25,7 @@ in stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
|
||||
buildInputs = [ libusb ncurses ]
|
||||
buildInputs = [ libusb-compat-0_1 ncurses ]
|
||||
++ lib.optionals usePython [ python swig2 ];
|
||||
|
||||
propagatedBuildInputs = lib.optional usePython python.pkgs.numpy;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
|
||||
, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2
|
||||
, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec, lame, mpg123 }:
|
||||
, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }:
|
||||
let
|
||||
|
||||
version = "2.1";
|
||||
@ -23,7 +23,7 @@ in mkDerivation {
|
||||
faad2
|
||||
fftwSinglePrec
|
||||
lame
|
||||
libusb
|
||||
libusb-compat-0_1
|
||||
mpg123
|
||||
qtbase
|
||||
qtcharts
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fasttext";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = "fastText";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii";
|
||||
sha256 = "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, SDL2
|
||||
, libGL
|
||||
, libarchive
|
||||
, libusb
|
||||
, libusb-compat-0_1
|
||||
, qtbase
|
||||
, qmake
|
||||
, git
|
||||
@ -33,7 +33,7 @@ mkDerivation rec {
|
||||
SDL2
|
||||
libGL
|
||||
libarchive
|
||||
libusb
|
||||
libusb-compat-0_1
|
||||
qtbase
|
||||
libpng_apng
|
||||
];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
}:
|
||||
let
|
||||
majMin = stdenv.lib.versions.majorMinor version;
|
||||
version = "7.5.1";
|
||||
version = "7.6.9";
|
||||
|
||||
fahclient = stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
@ -18,7 +18,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb";
|
||||
hash = "sha256-7+RwYdMoZnJZwYFbmLxsN9ozk2P7jpOGZz9qlvTTfSY=";
|
||||
sha256 = "1v4yijjjdq9qx1fp60flp9ya6ywl9qdsgkzwmzjzp8sd5gfvhyr6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
}:
|
||||
let
|
||||
majMin = stdenv.lib.versions.majorMinor version;
|
||||
version = "7.5.1";
|
||||
version = "7.6.9";
|
||||
|
||||
python = python2.withPackages
|
||||
(
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb";
|
||||
hash = "sha256-ydN4I6vmZpI9kD+/TXxgWc+AQqIIlUvABEycWmY1tNg=";
|
||||
sha256 = "1fh7ybbp3qlqzh18c4gva3aaymv7d31mqchrv235a1axldha1s9s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
}:
|
||||
let
|
||||
majMin = stdenv.lib.versions.majorMinor version;
|
||||
version = "7.5.1";
|
||||
version = "7.6.9";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb";
|
||||
hash = "sha256-yH0zGjX8aNBEJ5lq7wWydcpp2rO+9Ah++q9eJ+ldeyk=";
|
||||
sha256 = "04wr86g11wpmsczzwzak4gvalcihb47rn3zp6qriawhxyac9nf93";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage
|
||||
, boost-build, boost_process
|
||||
, xorg_sys_opengl, tbb, ogre, tinyxml-2
|
||||
, libtar, glxinfo, libusb, libxslt, ignition
|
||||
, libtar, glxinfo, libusb-compat-0_1, libxslt, ignition
|
||||
, pythonPackages, utillinux
|
||||
|
||||
# these deps are hidden; cmake doesn't catch them
|
||||
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
tinyxml-2
|
||||
libtar
|
||||
glxinfo
|
||||
libusb
|
||||
libusb-compat-0_1
|
||||
libxslt
|
||||
ignition.math2
|
||||
sdformat
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
, rtmpSupport ? true, rtmpdump ? null
|
||||
, sambaSupport ? true, samba ? null
|
||||
, udevSupport ? true, udev ? null
|
||||
, usbSupport ? false, libusb ? null
|
||||
, usbSupport ? false, libusb-compat-0_1 ? null
|
||||
, vdpauSupport ? true, libvdpau ? null
|
||||
, useWayland ? false, wayland ? null, wayland-protocols ? null
|
||||
, waylandpp ? null, libxkbcommon ? null
|
||||
@ -39,7 +39,7 @@ assert pulseSupport -> libpulseaudio != null;
|
||||
assert rtmpSupport -> rtmpdump != null;
|
||||
assert sambaSupport -> samba != null;
|
||||
assert udevSupport -> udev != null;
|
||||
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
|
||||
assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable
|
||||
assert vdpauSupport -> libvdpau != null;
|
||||
assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
|
||||
|
||||
@ -189,7 +189,7 @@ in stdenv.mkDerivation {
|
||||
++ lib.optional rtmpSupport rtmpdump
|
||||
++ lib.optional sambaSupport samba
|
||||
++ lib.optional udevSupport udev
|
||||
++ lib.optional usbSupport libusb
|
||||
++ lib.optional usbSupport libusb-compat-0_1
|
||||
++ lib.optional vdpauSupport libvdpau
|
||||
++ lib.optionals useWayland [
|
||||
wayland
|
||||
|
||||
@ -1,6 +1,26 @@
|
||||
{ mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
|
||||
, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre
|
||||
, qwt, extra-cmake-modules }:
|
||||
{ stdenv
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qtquickcontrols
|
||||
, qtimageformats
|
||||
, qtxmlpatterns
|
||||
, ffmpeg
|
||||
, guvcview
|
||||
, cmake
|
||||
, ninja
|
||||
, libxml2
|
||||
, gettext
|
||||
, pkgconfig
|
||||
, libgphoto2
|
||||
, gphoto2
|
||||
, v4l-utils
|
||||
, libv4l
|
||||
, pcre
|
||||
, qwt
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qstopmotion";
|
||||
@ -11,11 +31,31 @@ mkDerivation rec {
|
||||
sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
|
||||
};
|
||||
|
||||
buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
|
||||
qwt qtquickcontrols qtimageformats qtxmlpatterns ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtquickcontrols
|
||||
qtimageformats
|
||||
qtxmlpatterns
|
||||
v4l-utils
|
||||
libv4l
|
||||
pcre
|
||||
ffmpeg
|
||||
guvcview
|
||||
qwt
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja
|
||||
gettext libgphoto2 gphoto2 libxml2 libv4l ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
ninja
|
||||
gettext
|
||||
libgphoto2
|
||||
gphoto2
|
||||
libxml2
|
||||
libv4l
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
@ -36,6 +76,7 @@ mkDerivation rec {
|
||||
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.leenaars ];
|
||||
broken = stdenv.isAarch64;
|
||||
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,11 +16,9 @@
|
||||
, which
|
||||
}:
|
||||
|
||||
let
|
||||
buildTags = "apparmor seccomp selinux containers_image_ostree_stub";
|
||||
in buildGoPackage rec {
|
||||
buildGoPackage rec {
|
||||
project = "cri-o";
|
||||
version = "1.17.3";
|
||||
version = "1.18.0";
|
||||
name = "${project}-${version}${flavor}";
|
||||
|
||||
goPackagePath = "github.com/${project}/${project}";
|
||||
@ -29,7 +27,7 @@ in buildGoPackage rec {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cy2lqasfn5n20vlm3ckb6myci8ya6qv08dw8fq7z4ycnm39r1a6";
|
||||
sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git pkgconfig which ];
|
||||
@ -37,13 +35,11 @@ in buildGoPackage rec {
|
||||
libseccomp libselinux lvm2 ]
|
||||
++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ];
|
||||
|
||||
BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub";
|
||||
buildPhase = ''
|
||||
pushd go/src/${goPackagePath}
|
||||
|
||||
make BUILDTAGS='${buildTags}' \
|
||||
bin/crio \
|
||||
bin/crio-status \
|
||||
bin/pinns
|
||||
make binaries BUILDTAGS="$BUILDTAGS"
|
||||
'';
|
||||
installPhase = ''
|
||||
install -Dm755 bin/crio $out/bin/crio${flavor}
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "podman";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "libpod";
|
||||
rev = "v${version}";
|
||||
sha256 = "19y48lpf7pvw5f5pzpknn92rq9xwbrpvi8mj7mc4dby6skqadrk4";
|
||||
sha256 = "0dr5vd52fnjwx3zn2nj2nlvkbvh5bg579nf3qw8swrn8i1jwxd6j";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/containers/libpod";
|
||||
|
||||
@ -3,6 +3,9 @@
|
||||
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
|
||||
, qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
|
||||
, alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch
|
||||
# If open-watcom-bin is not passed, VirtualBox will fall back to use
|
||||
# the shipped alternative sources (assembly).
|
||||
, open-watcom-bin ? null
|
||||
, makeself, perl
|
||||
, javaBindings ? true, jdk ? null # Almost doesn't affect closure size
|
||||
, pythonBindings ? false, python3 ? null
|
||||
@ -148,6 +151,7 @@ in stdenv.mkDerivation {
|
||||
${optionalString (!pulseSupport) "--disable-pulse"} \
|
||||
${optionalString (!enableHardening) "--disable-hardening"} \
|
||||
${optionalString (!enable32bitGuests) "--disable-vmmraw"} \
|
||||
${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \
|
||||
--disable-kmods
|
||||
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
|
||||
-i AutoConfig.kmk
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gala";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02g6x190lylng8d07pwx2bqcc71rq48f0dxh30mgndfii6k21qgs";
|
||||
sha256 = "03cq9ihgjasnv1n4v3dn1m3ypzj26k2ybd5b1a7yrbprb35zbrs4";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant
|
||||
, libusb, libusb1, unzip, zlib, ncurses, readline
|
||||
, libusb-compat-0_1, libusb1, unzip, zlib, ncurses, readline
|
||||
, withGui ? false, gtk2 ? null, withTeensyduino ? false
|
||||
/* Packages needed for Teensyduino */
|
||||
, upx, fontconfig, xorg, gcc
|
||||
@ -42,7 +42,7 @@ let
|
||||
glib
|
||||
gtk2
|
||||
libpng12
|
||||
libusb
|
||||
libusb-compat-0_1
|
||||
pango
|
||||
udev
|
||||
xorg.libSM
|
||||
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
|
||||
buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline
|
||||
buildInputs = [ jdk ant libusb-compat-0_1 libusb1 unzip zlib ncurses5 readline
|
||||
] ++ stdenv.lib.optionals withTeensyduino [ upx ];
|
||||
downloadSrcList = builtins.attrValues externalDownloads;
|
||||
downloadDstList = builtins.attrNames externalDownloads;
|
||||
@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
|
||||
javaPath = lib.makeBinPath [jdk];
|
||||
|
||||
# Everything else will be patched into rpath
|
||||
rpath = (lib.makeLibraryPath [zlib libusb libusb1 readline ncurses5 stdenv.cc.cc]);
|
||||
rpath = (lib.makeLibraryPath [zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc]);
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/arduino
|
||||
|
||||
@ -13,10 +13,14 @@ assert builtins.elem type [ "aspnetcore" "netcore" "sdk"];
|
||||
, curl
|
||||
}:
|
||||
let pname = if type == "aspnetcore" then "aspnetcore-runtime" else if type == "netcore" then "dotnet-runtime" else "dotnet-sdk";
|
||||
suffix = {
|
||||
x86_64-linux = "x64";
|
||||
aarch64-linux = "arm64";
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
urls = {
|
||||
aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz";
|
||||
netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz";
|
||||
sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz";
|
||||
aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz";
|
||||
netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz";
|
||||
sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-${suffix}.tar.gz";
|
||||
};
|
||||
descriptions = {
|
||||
aspnetcore = "ASP .NET Core runtime ${version}";
|
||||
@ -30,7 +34,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = builtins.getAttr type urls;
|
||||
inherit sha512;
|
||||
sha512 = sha512."${stdenv.hostPlatform.system}" or (throw "Missing hash for host system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@ -61,7 +65,7 @@ in stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://dotnet.github.io/";
|
||||
description = builtins.getAttr type descriptions;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ kuznero ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
@ -5,27 +5,37 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_
|
||||
{ callPackage }:
|
||||
let
|
||||
buildDotnet = attrs: callPackage (import ./buildDotnet.nix attrs) {};
|
||||
buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; } );
|
||||
buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; } );
|
||||
buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; } );
|
||||
in rec {
|
||||
buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
|
||||
buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; });
|
||||
buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; });
|
||||
in
|
||||
rec {
|
||||
combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {};
|
||||
|
||||
# v2.1.15 (LTS)
|
||||
|
||||
aspnetcore_2_1 = buildAspNetCore {
|
||||
version = "2.1.16";
|
||||
sha512 = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h";
|
||||
sha512 = {
|
||||
x86_64-linux = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h";
|
||||
aarch64-linux = null; # no aarch64 version of this package is available
|
||||
};
|
||||
};
|
||||
|
||||
netcore_2_1 = buildNetCore {
|
||||
version = "2.1.16";
|
||||
sha512 = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l";
|
||||
sha512 = {
|
||||
x86_64-linux = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l";
|
||||
aarch64-linux = "27ab982vz9rn2vzpq68dqfzhryfixq3s0apx7vi0cwiray3scgfmf45fm7qj63k9mvaqnk5g69i339109yasw3q5vpvpyjc1ykbi710";
|
||||
};
|
||||
};
|
||||
|
||||
sdk_2_1 = buildNetCoreSdk {
|
||||
version = "2.1.804";
|
||||
sha512 = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42";
|
||||
sha512 = {
|
||||
x86_64-linux = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42";
|
||||
aarch64-linux = "2d97xvhxnkdgghqlichkwdxxh641dzkd9hq5xgffgvbqv1qsh31k9yib2q1nsarpnbx0d758bdn2jm2wvsj7nx0gpxlb3nab0b3hc2g";
|
||||
};
|
||||
};
|
||||
|
||||
# v2.2
|
||||
@ -36,33 +46,51 @@ in rec {
|
||||
|
||||
aspnetcore_3_0 = buildAspNetCore {
|
||||
version = "3.0.3";
|
||||
sha512 = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq";
|
||||
sha512 = {
|
||||
x86_64-linux = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq";
|
||||
aarch64-linux = "2xkg4q88q5jw6jdz6cxj8vsjr475nd0fcvifkv1shdm2j9dsjy233hwpxbr140m5n5ggyh6z99238z9j4kp2az977y8y8irz8m8ppvf";
|
||||
};
|
||||
};
|
||||
|
||||
netcore_3_0 = buildNetCore {
|
||||
version = "3.0.3";
|
||||
sha512 = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx";
|
||||
sha512 = {
|
||||
x86_64-linux = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx";
|
||||
aarch64-linux = "1lp8din7d5jv5fkyq1a7m01i1xg9jwpiljvam1kcyzsnwzvi0cb4ji336cfx4lqrn95gvc75gkzi6q8b4fz0h21gvk6z6kmlcr63nyg";
|
||||
};
|
||||
};
|
||||
|
||||
sdk_3_0 = buildNetCoreSdk {
|
||||
version = "3.0.103";
|
||||
sha512 = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12";
|
||||
sha512 = {
|
||||
x86_64-linux = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12";
|
||||
aarch64-linux = "32843q2lj7dgciq62g9v1q31vwfjyv5vaxrz712d942mcg5lyzjygwri106bv4naq3a22131ldzwnsifbdn2vq1iz60raqdb7ss9vnf";
|
||||
};
|
||||
};
|
||||
|
||||
# v3.1.1 (LTS)
|
||||
|
||||
aspnetcore_3_1 = buildAspNetCore {
|
||||
version = "3.1.2";
|
||||
sha512 = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm";
|
||||
sha512 = {
|
||||
x86_64-linux = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm";
|
||||
aarch64-linux = "2sm5yf376w5dm0za3gbcj251kc909fmlasmlyn70zhqp2jiii075vcqh40racjlwlhsfydx32cw7kgnv238lad5mw5jxy143zql5xl3";
|
||||
};
|
||||
};
|
||||
|
||||
netcore_3_1 = buildNetCore {
|
||||
version = "3.1.2";
|
||||
sha512 = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14";
|
||||
sha512 = {
|
||||
x86_64-linux = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14";
|
||||
aarch64-linux = "3hf61d5adlfffy51627ypp36qc5r55g9xwgfxqd0c7vj9bqmpiph673bvqqpr189df9shxr21p94cwrc5n36z72a37vw4ic8ks2yayx";
|
||||
};
|
||||
};
|
||||
|
||||
sdk_3_1 = buildNetCoreSdk {
|
||||
version = "3.1.102";
|
||||
sha512 = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w";
|
||||
sha512 = {
|
||||
x86_64-linux = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w";
|
||||
aarch64-linux = "34k6cm69gxm7vcd9m6bp47sdx96j32z6lfhb2vjcdznc6xgs2wy8zcang3b1mjm5919dq7v6iysm6ffcpgjhhphy7prlnaqa69q5mks";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,247 +0,0 @@
|
||||
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
|
||||
, mailcap, runtimeShell
|
||||
, buildPackages, pkgsTargetTarget
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
|
||||
goBootstrap = runCommand "go-bootstrap" {} ''
|
||||
mkdir $out
|
||||
cp -rf ${buildPackages.go_bootstrap}/* $out/
|
||||
chmod -R u+w $out
|
||||
find $out -name "*.c" -delete
|
||||
cp -rf $out/bin/* $out/share/go/bin/
|
||||
'';
|
||||
|
||||
goarch = platform: {
|
||||
i686 = "386";
|
||||
x86_64 = "amd64";
|
||||
aarch64 = "arm64";
|
||||
arm = "arm";
|
||||
armv5tel = "arm";
|
||||
armv6l = "arm";
|
||||
armv7l = "arm";
|
||||
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.12.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "09cbl90maxry713wd18jdqrms3ivbvcm472csnxc78rsqhc851yy";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
nativeBuildInputs = [ perl which pkgconfig patch procps ];
|
||||
buildInputs = [ cacert pcre ]
|
||||
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
|
||||
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
||||
|
||||
depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs ./ # replace /bin/bash
|
||||
|
||||
# This source produces shell script at run time,
|
||||
# and thus it is not corrected by patchShebangs.
|
||||
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
|
||||
--replace '#!/usr/bin/env bash' '#!${runtimeShell}'
|
||||
|
||||
# Patch the mimetype database location which is missing on NixOS.
|
||||
substituteInPlace src/mime/type_unix.go \
|
||||
--replace '/etc/mime.types' '${mailcap}/etc/mime.types'
|
||||
|
||||
# Disabling the 'os/http/net' tests (they want files not available in
|
||||
# chroot builds)
|
||||
rm src/net/{listen,parse}_test.go
|
||||
rm src/syscall/exec_linux_test.go
|
||||
|
||||
# !!! substituteInPlace does not seems to be effective.
|
||||
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
|
||||
sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
|
||||
sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
|
||||
# Disable the unix socket test
|
||||
sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
|
||||
# Disable the hostname test
|
||||
sed -i '/TestHostname/areturn' src/os/os_test.go
|
||||
# ParseInLocation fails the test
|
||||
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
|
||||
# Remove the api check as it never worked
|
||||
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
|
||||
# Remove the coverage test as we have removed this utility
|
||||
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
|
||||
# Remove the timezone naming test
|
||||
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
|
||||
# Remove disable setgid test
|
||||
sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
|
||||
# Remove cert tests that conflict with NixOS's cert resolution
|
||||
sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
|
||||
# TestWritevError hangs sometimes
|
||||
sed -i '/TestWritevError/areturn' src/net/writev_test.go
|
||||
# TestVariousDeadlines fails sometimes
|
||||
sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
|
||||
|
||||
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
|
||||
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
|
||||
|
||||
# Disable cgo lookup tests not works, they depend on resolver
|
||||
rm src/net/cgo_unix_test.go
|
||||
|
||||
# Disable TestGcSys because it's flakey in our tests, but the failure is not
|
||||
# reproducible by multiple people in other environments.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/68361#issuecomment-537849272 and following
|
||||
# NOTE: Try re-enabling for releases newer than 1.12.9
|
||||
sed -i '/TestGcSys/areturn' src/runtime/gc_test.go
|
||||
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
|
||||
'' + optionalString stdenv.isAarch32 ''
|
||||
echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/race.bash --replace \
|
||||
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
|
||||
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
|
||||
sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
|
||||
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
|
||||
|
||||
sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
|
||||
sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go
|
||||
sed -i '/TestRead0/areturn' src/os/os_test.go
|
||||
sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
|
||||
|
||||
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
|
||||
sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
|
||||
|
||||
sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
|
||||
|
||||
sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
|
||||
|
||||
# TestCurrent fails because Current is not implemented on Darwin
|
||||
sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
|
||||
sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
|
||||
|
||||
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./remove-tools-1.11.patch
|
||||
./ssl-cert-file-1.12.1.patch
|
||||
./remove-test-pie.patch
|
||||
./creds-test.patch
|
||||
./go-1.9-skip-flaky-19608.patch
|
||||
./go-1.9-skip-flaky-20072.patch
|
||||
./skip-external-network-tests.patch
|
||||
./skip-nohup-tests.patch
|
||||
] ++ [
|
||||
# breaks under load: https://github.com/golang/go/issues/25628
|
||||
(if stdenv.isAarch32
|
||||
then ./skip-test-extra-files-on-aarch32.patch
|
||||
else ./skip-test-extra-files-on-386.patch)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
find . -name '*.orig' -exec rm {} ';'
|
||||
'';
|
||||
|
||||
GOOS = stdenv.targetPlatform.parsed.kernel.name;
|
||||
GOARCH = goarch stdenv.targetPlatform;
|
||||
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
|
||||
# Go will nevertheless build a for host system that we will copy over in
|
||||
# the install phase.
|
||||
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
|
||||
GOHOSTARCH = goarch stdenv.buildPlatform;
|
||||
|
||||
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
|
||||
# to be different from CC/CXX
|
||||
CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
|
||||
"${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
|
||||
else
|
||||
null;
|
||||
CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
|
||||
"${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"
|
||||
else
|
||||
null;
|
||||
|
||||
GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
|
||||
GO386 = 387; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
# Hopefully avoids test timeouts on Hydra
|
||||
GO_TEST_TIMEOUT_SCALE = 3;
|
||||
|
||||
# Indicate that we are running on build infrastructure
|
||||
# Some tests assume things like home directories and users exists
|
||||
GO_BUILDER_NAME = "nix";
|
||||
|
||||
GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
|
||||
|
||||
postConfigure = ''
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
# this is compiled into the binary
|
||||
export GOROOT_FINAL=$out/share/go
|
||||
|
||||
export PATH=$(pwd)/bin:$PATH
|
||||
|
||||
# Independent from host/target, CC should produce code for the building system.
|
||||
export CC=${buildPackages.stdenv.cc}/bin/cc
|
||||
ulimit -a
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
(cd src && ./make.bash)
|
||||
'';
|
||||
|
||||
doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
(cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
rm -r pkg/{bootstrap,obj}
|
||||
# Contains the wrong perl shebang when cross compiling,
|
||||
# since it is not used for anything we can deleted as well.
|
||||
rm src/regexp/syntax/make_perl_groups.pl
|
||||
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
|
||||
mv bin/*_*/* bin
|
||||
rmdir bin/*_*
|
||||
${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
||||
''}
|
||||
'' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
|
||||
rm -rf bin/*_*
|
||||
${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
||||
''}
|
||||
'' else "");
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $GOROOT_FINAL
|
||||
cp -a bin pkg src lib misc api doc $GOROOT_FINAL
|
||||
ln -s $GOROOT_FINAL/bin $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
branch = "1.12";
|
||||
homepage = "http://golang.org/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs Frostman ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
--- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000
|
||||
+++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000
|
||||
@@ -526,21 +526,6 @@
|
||||
})
|
||||
}
|
||||
|
||||
- // Test internal linking of PIE binaries where it is supported.
|
||||
- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() {
|
||||
- // Issue 18243: We don't have a way to set the default
|
||||
- // dynamic linker used in internal linking mode. So
|
||||
- // this test is skipped on Alpine.
|
||||
- t.tests = append(t.tests, distTest{
|
||||
- name: "pie_internal",
|
||||
- heading: "internal linking of -buildmode=pie",
|
||||
- fn: func(dt *distTest) error {
|
||||
- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
|
||||
- return nil
|
||||
- },
|
||||
- })
|
||||
- }
|
||||
-
|
||||
// sync tests
|
||||
t.tests = append(t.tests, distTest{
|
||||
name: "sync_cpu",
|
||||
@ -1,59 +0,0 @@
|
||||
diff -Naur a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
|
||||
--- a/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:33:55.920232337 -0700
|
||||
+++ b/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:34:53.323180897 -0700
|
||||
@@ -270,11 +270,20 @@
|
||||
import "C"
|
||||
import (
|
||||
"errors"
|
||||
+ "io/ioutil"
|
||||
+ "os"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
func loadSystemRoots() (*CertPool, error) {
|
||||
roots := NewCertPool()
|
||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
||||
+ data, err := ioutil.ReadFile(file)
|
||||
+ if err == nil {
|
||||
+ roots.AppendCertsFromPEM(data)
|
||||
+ return roots, nil
|
||||
+ }
|
||||
+ }
|
||||
|
||||
var data C.CFDataRef = 0
|
||||
var untrustedData C.CFDataRef = 0
|
||||
diff -Naur a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
|
||||
--- a/src/crypto/x509/root_darwin.go 2019-03-15 11:33:55.920232337 -0700
|
||||
+++ b/src/crypto/x509/root_darwin.go 2019-03-15 11:36:21.205123541 -0700
|
||||
@@ -92,6 +92,14 @@
|
||||
verifyCh = make(chan rootCandidate)
|
||||
)
|
||||
|
||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
||||
+ data, err := ioutil.ReadFile(file)
|
||||
+ if err == nil {
|
||||
+ roots.AppendCertsFromPEM(data)
|
||||
+ return roots, nil
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
// Using 4 goroutines to pipe into verify-cert seems to be
|
||||
// about the best we can do. The verify-cert binary seems to
|
||||
// just RPC to another server with coarse locking anyway, so
|
||||
diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
|
||||
--- a/src/crypto/x509/root_unix.go 2019-03-15 11:33:55.920232337 -0700
|
||||
+++ b/src/crypto/x509/root_unix.go 2019-03-15 11:37:15.737326340 -0700
|
||||
@@ -38,6 +38,13 @@
|
||||
|
||||
func loadSystemRoots() (*CertPool, error) {
|
||||
roots := NewCertPool()
|
||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
||||
+ data, err := ioutil.ReadFile(file)
|
||||
+ if err == nil {
|
||||
+ roots.AppendCertsFromPEM(data)
|
||||
+ return roots, nil
|
||||
+ }
|
||||
+ }
|
||||
|
||||
files := certFiles
|
||||
if f := os.Getenv(certFileEnv); f != "" {
|
||||
67
pkgs/development/compilers/open-watcom-bin/default.nix
Normal file
67
pkgs/development/compilers/open-watcom-bin/default.nix
Normal file
@ -0,0 +1,67 @@
|
||||
{ stdenvNoCC, fetchurl, qemu, expect, writeScript, ncurses }:
|
||||
|
||||
let
|
||||
|
||||
# We execute the installer in qemu-user, because otherwise the
|
||||
# installer fails to open itself due to a failed stat() call. This
|
||||
# seems like an incompatibility of new Linux kernels to run this
|
||||
# ancient binary.
|
||||
performInstall = writeScript "perform-ow-install" ''
|
||||
#!${expect}/bin/expect -f
|
||||
|
||||
spawn env TERMINFO=${ncurses}/share/terminfo TERM=vt100 ${qemu}/bin/qemu-i386 [lindex $argv 0]
|
||||
|
||||
# Wait for button saying "I agree" with escape sequences.
|
||||
expect "gree"
|
||||
|
||||
# Navigate to "I Agree!" and hit enter.
|
||||
send "\t\t\n"
|
||||
|
||||
expect "Install Open Watcom"
|
||||
|
||||
# Where do we want to install to.
|
||||
send "$env(out)\n"
|
||||
|
||||
expect "will be installed"
|
||||
|
||||
# Select Full Installation, Next
|
||||
send "fn"
|
||||
|
||||
expect "Setup will now copy"
|
||||
|
||||
# Next
|
||||
send "n"
|
||||
|
||||
expect "completed successfully"
|
||||
send "\n"
|
||||
'';
|
||||
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "open-watcom-bin";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}";
|
||||
sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
installPhase = ''
|
||||
cp ${src} install-bin
|
||||
chmod +x install-bin
|
||||
|
||||
${performInstall} install-bin
|
||||
'';
|
||||
|
||||
meta = with stdenvNoCC.lib; {
|
||||
description = "A C/C++ Compiler (binary distribution)";
|
||||
homepage = "http://www.openwatcom.org/";
|
||||
license = licenses.watcom;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ maintainers.blitz ];
|
||||
};
|
||||
}
|
||||
@ -4,18 +4,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unison-code-manager";
|
||||
milestone_id = "M1j";
|
||||
milestone_id = "M1l";
|
||||
version = "1.0.${milestone_id}-alpha";
|
||||
|
||||
src = if (stdenv.isDarwin) then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
|
||||
sha256 = "1pvdjmasgl22inbr8nlizsg8s5zagn8bzwhaxqmwafkpsskz0hsg";
|
||||
sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
|
||||
sha256 = "1xpblx405cp3mv0vrhcqwjlxvrhgmc77mxbvcy93srxja3qai1af";
|
||||
sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, which, coq, flocq }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-gappalib-1.4.1";
|
||||
name = "coq${coq.coq-version}-gappalib-1.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://gforge.inria.fr/frs/download.php/file/37917/gappalib-coq-1.4.1.tar.gz";
|
||||
sha256 = "0d3f23a871haglg8hq1jgxz3y5nryiwy12b5xfnfjn279jfqqjw4";
|
||||
url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz";
|
||||
sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.7" "8.8" "8.9" ];
|
||||
compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, unzip, version ? "2.7.1" }:
|
||||
{ stdenv, fetchurl, unzip, version ? "2.7.2" }:
|
||||
|
||||
let
|
||||
|
||||
@ -24,29 +24,29 @@ let
|
||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||
sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh";
|
||||
};
|
||||
"2.7.1-x86_64-linux" = fetchurl {
|
||||
"2.7.2-x86_64-linux" = fetchurl {
|
||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||
sha256 = "1zjd9hxxg1dsyzkzgqjvl933kprf8h143z5qi4mj1iczxv7zp27a";
|
||||
sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v";
|
||||
};
|
||||
"2.7.1-i686-linux" = fetchurl {
|
||||
"2.7.2-i686-linux" = fetchurl {
|
||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
|
||||
sha256 = "0cggr1jbhzahmazlhba0vw2chz9zxd98jgk6zxvxdnw5hvkx8si1";
|
||||
sha256 = "0dj01d2wwrp3cc5x73vs6fzhs6db60gkbjlrw3w9j04wcx69i38m";
|
||||
};
|
||||
"2.7.1-aarch64-linux" = fetchurl {
|
||||
"2.7.2-aarch64-linux" = fetchurl {
|
||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||
sha256 = "0m4qlc3zy87habr61npykvpclggn5k4hadl59v2b0ymvxa4h5zfh";
|
||||
sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p";
|
||||
};
|
||||
"2.8.0-dev.10.0-x86_64-linux" = fetchurl {
|
||||
"2.9.0-4.0.dev-x86_64-linux" = fetchurl {
|
||||
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||
sha256 = "17x0q94zampm99dd2sn6q1644lfwcl0ig2rdlmfzd9i4llj2ddbl";
|
||||
sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r";
|
||||
};
|
||||
"2.8.0-dev.10.0-i686-linux" = fetchurl {
|
||||
"2.9.0-4.0.dev-i686-linux" = fetchurl {
|
||||
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
|
||||
sha256 = "0hmkg4jrffzh8x2mxn8nbf7dl7k0v2vacbmxgpsl382vw9wwj96j";
|
||||
sha256 = "105wgyxmi491c7qw0z3zhn4lv52h80ngyz4ch9dyj0sq8nndz2rc";
|
||||
};
|
||||
"2.8.0-dev.10.0-aarch64-linux" = fetchurl {
|
||||
"2.9.0-4.0.dev-aarch64-linux" = fetchurl {
|
||||
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||
sha256 = "185ipcmr9h76g44kzlj5pyj99cljlap82rhd1c2larfklyj5ryvv";
|
||||
sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, libusb }:
|
||||
{ stdenv, fetchurl, libusb-compat-0_1 }:
|
||||
stdenv.mkDerivation {
|
||||
name = "garmintools-0.10";
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz";
|
||||
sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz";
|
||||
};
|
||||
buildInputs = [ libusb ];
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
meta = {
|
||||
description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface";
|
||||
homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig,
|
||||
{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig,
|
||||
boost, libtool, perlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2
|
||||
tcl libusb pkgconfig boost libtool ];
|
||||
tcl libusb-compat-0_1 pkgconfig boost libtool ];
|
||||
|
||||
configureFlags = [ "--with-perl-binding" "--with-python-binding"
|
||||
"--with-tcl-binding" "--with-rigmatrix" ];
|
||||
|
||||
@ -1,224 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8217cba..a6c1d70 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -32,7 +32,7 @@ else(APPLE)
|
||||
endif(${BUILD_FOR_ARM})
|
||||
endif(APPLE)
|
||||
|
||||
-set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-unused-parameter -Wno-null-dereference -Wno-unused-local-typedefs -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}")
|
||||
+set(CMAKE_CXX_FLAGS "--std=c++11 -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}")
|
||||
|
||||
set(TEST_BINARY "kinetic_client_test")
|
||||
set(TEST_BINARY_PATH ${kinetic_cpp_client_BINARY_DIR}/${TEST_BINARY})
|
||||
@@ -50,103 +50,16 @@ set(GENERATED_SOURCES_PATH ${kinetic_cpp_client_SOURCE_DIR}/src/main/generated)
|
||||
set(PREFIX "${CMAKE_BINARY_DIR}/vendor")
|
||||
set(EXTERNAL_PREFIX "${kinetic_cpp_client_BINARY_DIR}/vendor")
|
||||
|
||||
-include(ExternalProject)
|
||||
-
|
||||
-set(KINETIC_PROTO_VERSION "3.0.0")
|
||||
-set(KINETIC_PROTO_MD5 "85ca027b870811a297c1f6d792498934")
|
||||
-
|
||||
-ExternalProject_add(
|
||||
- kinetic-proto
|
||||
- PREFIX ${PREFIX}
|
||||
- DOWNLOAD_COMMAND curl -L https://github.com/Seagate/kinetic-protocol/archive/${KINETIC_PROTO_VERSION}.tar.gz -o kinetic-proto.tar.gz && openssl md5 kinetic-proto.tar.gz | grep -q ${KINETIC_PROTO_MD5} && rm -rf kinetic-proto && mkdir -p kinetic-proto && tar -xz --strip-components 1 -C kinetic-proto -f kinetic-proto.tar.gz
|
||||
- BUILD_IN_SOURCE 1
|
||||
- CONFIGURE_COMMAND ""
|
||||
- BUILD_COMMAND ""
|
||||
- INSTALL_COMMAND ""
|
||||
-)
|
||||
-
|
||||
-ExternalProject_add(
|
||||
- gflags
|
||||
- PREFIX ${EXTERNAL_PREFIX}
|
||||
- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gflags-2.0-no-svn-files.tar.gz"
|
||||
- URL_MD5 "9084829124e02a7e6be0f0f824523423"
|
||||
- CONFIGURE_COMMAND ../gflags/configure --prefix=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
|
||||
-)
|
||||
-
|
||||
-ExternalProject_add(
|
||||
- glog
|
||||
- PREFIX ${EXTERNAL_PREFIX}
|
||||
- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/glog-0.3.3.tar.gz"
|
||||
- URL_MD5 "a6fd2c22f8996846e34c763422717c18"
|
||||
- PATCH_COMMAND sh ${kinetic_cpp_client_SOURCE_DIR}/patches/apply-glog-patches.sh ${kinetic_cpp_client_SOURCE_DIR}
|
||||
- CONFIGURE_COMMAND ../glog/configure --prefix=${EXTERNAL_PREFIX} --with-gflags=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
|
||||
- DEPENDS gflags
|
||||
-)
|
||||
-
|
||||
-ExternalProject_add(
|
||||
- gtest
|
||||
- PREFIX ${EXTERNAL_PREFIX}
|
||||
- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gtest-1.6.0.zip"
|
||||
- URL_MD5 "4577b49f2973c90bf9ba69aa8166b786"
|
||||
- BUILD_IN_SOURCE 1
|
||||
- CONFIGURE_COMMAND ""
|
||||
- BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gtest -I../gtest/include -c ../gtest/src/gtest-all.cc && ar -rv libgtest.a gtest-all.o && ranlib libgtest.a
|
||||
- INSTALL_COMMAND ""
|
||||
-)
|
||||
-
|
||||
-ExternalProject_add(
|
||||
- gmock
|
||||
- PREFIX ${EXTERNAL_PREFIX}
|
||||
- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gmock-1.6.0.zip"
|
||||
- URL_MD5 "f547f47321ca88d3965ca2efdcc2a3c1"
|
||||
- BUILD_IN_SOURCE 1
|
||||
- CONFIGURE_COMMAND ""
|
||||
- BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gmock -I../gmock/include -I../gtest -I../gtest/include -c ../gmock/src/gmock-all.cc && ar -rv libgmock.a gmock-all.o && ranlib libgmock.a
|
||||
- INSTALL_COMMAND ""
|
||||
- DEPENDS gtest
|
||||
-)
|
||||
-
|
||||
-ExternalProject_add(
|
||||
- openssl
|
||||
- PREFIX ${EXTERNAL_PREFIX}
|
||||
- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/openssl-1.0.1g.tar.gz"
|
||||
- URL_MD5 "de62b43dfcd858e66a74bee1c834e959"
|
||||
- BUILD_IN_SOURCE 1
|
||||
- CONFIGURE_COMMAND ${OPENSSL_CONFIGURE_COMMAND} --prefix=${EXTERNAL_PREFIX} ${BUILD_PIC_COMPILER_FLAG}
|
||||
- BUILD_COMMAND touch apps/openssl && touch openssl.pc && make ${CHILD_MAKE_FLAGS} build_libs libssl.pc libcrypto.pc
|
||||
- INSTALL_COMMAND make install_sw
|
||||
-)
|
||||
-
|
||||
-# The protobuf build requires the existence of a protoc binary that can be
|
||||
-# executed on the host machine. To handle cross compilation, we always build
|
||||
-# protobuf once for the host so that we have a suitable copy of protoc.
|
||||
-ExternalProject_add(
|
||||
- protoc
|
||||
- PREFIX ${EXTERNAL_PREFIX}/host
|
||||
- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2"
|
||||
- URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4"
|
||||
- CONFIGURE_COMMAND ../protoc/configure --prefix=${EXTERNAL_PREFIX}/host --enable-static
|
||||
-)
|
||||
-
|
||||
# Protobuf code generation rules
|
||||
-set(PROTOC_PATH "${PREFIX}/host/bin/protoc")
|
||||
-set(PROTO_DIR "${CMAKE_BINARY_DIR}/vendor/src/kinetic-proto")
|
||||
+set(PROTOC_PATH "protoc")
|
||||
+set(PROTO_DIR "${CMAKE_BINARY_DIR}/kinetic-proto")
|
||||
set(PROTO_ORIG_PATH "${PROTO_DIR}/kinetic.proto")
|
||||
set(PROTO_MODIFIED_PATH "${PROTO_DIR}/kinetic_client.proto")
|
||||
-ExternalProject_add(
|
||||
- protobuf
|
||||
- PREFIX ${EXTERNAL_PREFIX}
|
||||
- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2"
|
||||
- URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4"
|
||||
- CONFIGURE_COMMAND ../protobuf/configure --prefix=${EXTERNAL_PREFIX} --enable-static --with-protoc=${PROTOC_PATH} ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
|
||||
- DEPENDS protoc
|
||||
-)
|
||||
|
||||
add_custom_command(
|
||||
COMMENT "Compiling protobuf"
|
||||
OUTPUT ${GENERATED_SOURCES_PATH}/kinetic_client.pb.h ${GENERATED_SOURCES_PATH}/kinetic_client.pb.cc
|
||||
COMMAND mkdir -p ${GENERATED_SOURCES_PATH} && sed 's/com\\.seagate\\.kinetic\\.proto/com.seagate.kinetic.client.proto/' ${PROTO_ORIG_PATH} > ${PROTO_MODIFIED_PATH} && ${PROTOC_PATH} -I=${PROTO_DIR} --cpp_out=${GENERATED_SOURCES_PATH} ${PROTO_MODIFIED_PATH}
|
||||
- DEPENDS kinetic-proto protoc protobuf
|
||||
)
|
||||
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_SOURCES_PATH})
|
||||
|
||||
@@ -157,21 +70,10 @@ include_directories(
|
||||
|
||||
src/test/mock
|
||||
src/test
|
||||
-
|
||||
- ${EXTERNAL_PREFIX}/include
|
||||
- ${EXTERNAL_PREFIX}/src/gmock/include
|
||||
- ${EXTERNAL_PREFIX}/src/gtest/include
|
||||
)
|
||||
|
||||
set(LIBRARY_DEPENDENCIES
|
||||
kinetic_client
|
||||
- ${CMAKE_BINARY_DIR}/vendor/lib/libglog.a
|
||||
- ${CMAKE_BINARY_DIR}/vendor/lib/libgflags.a
|
||||
- ${CMAKE_BINARY_DIR}/vendor/lib/libssl.a
|
||||
- ${CMAKE_BINARY_DIR}/vendor/lib/libcrypto.a
|
||||
- ${CMAKE_BINARY_DIR}/vendor/lib/libprotobuf.a
|
||||
- ${CMAKE_BINARY_DIR}/vendor/src/gtest/libgtest.a
|
||||
- ${CMAKE_BINARY_DIR}/vendor/src/gmock/libgmock.a
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
dl
|
||||
)
|
||||
@@ -180,12 +82,68 @@ set(LIBRARY_DEPENDENCIES
|
||||
# Otherwise glog uses the standard glibc unwinder and there is no dependency.
|
||||
find_library(LIBUNWIND "unwind")
|
||||
if(LIBUNWIND)
|
||||
- set(LIBRARY_DEPENDENCIES
|
||||
- ${LIBRARY_DEPENDENCIES}
|
||||
+ set(LIBRARY_DEPENDENCIES
|
||||
+ ${LIBRARY_DEPENDENCIES}
|
||||
${LIBUNWIND}
|
||||
)
|
||||
endif()
|
||||
|
||||
+find_library(LIBSSL "ssl")
|
||||
+if(LIBSSL)
|
||||
+ set(LIBRARY_DEPENDENCIES
|
||||
+ ${LIBRARY_DEPENDENCIES}
|
||||
+ ${LIBSSL}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
+find_library(LIBCRYPTO "crypto")
|
||||
+if(LIBCRYPTO)
|
||||
+ set(LIBRARY_DEPENDENCIES
|
||||
+ ${LIBRARY_DEPENDENCIES}
|
||||
+ ${LIBCRYPTO}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
+find_library(LIBPROTOBUF "protobuf")
|
||||
+if(LIBPROTOBUF)
|
||||
+ set(LIBRARY_DEPENDENCIES
|
||||
+ ${LIBRARY_DEPENDENCIES}
|
||||
+ ${LIBPROTOBUF}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
+find_library(LIBGLOG "glog")
|
||||
+if(LIBGLOG)
|
||||
+ set(LIBRARY_DEPENDENCIES
|
||||
+ ${LIBRARY_DEPENDENCIES}
|
||||
+ ${LIBGLOG}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
+find_library(LIBGFLAGS "gflags")
|
||||
+if(LIBGFLAGS)
|
||||
+ set(LIBRARY_DEPENDENCIES
|
||||
+ ${LIBRARY_DEPENDENCIES}
|
||||
+ ${LIBGFLAGS}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
+find_library(LIBGMOCK "gmock")
|
||||
+if(LIBGMOCK)
|
||||
+ set(LIBRARY_DEPENDENCIES
|
||||
+ ${LIBRARY_DEPENDENCIES}
|
||||
+ ${LIBGMOCK}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
+find_library(LIBGTEST "gtest")
|
||||
+if(LIBGTEST)
|
||||
+ set(LIBRARY_DEPENDENCIES
|
||||
+ ${LIBRARY_DEPENDENCIES}
|
||||
+ ${LIBGTEST}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
add_library(kinetic_client
|
||||
src/main/generated/kinetic_client.pb.cc
|
||||
src/main/hmac_provider.cc
|
||||
diff --git a/src/test/kinetic_cpp_client_test.cc b/src/test/kinetic_cpp_client_test.cc
|
||||
index 2079fab..c5004a2 100644
|
||||
--- a/src/test/kinetic_cpp_client_test.cc
|
||||
+++ b/src/test/kinetic_cpp_client_test.cc
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
+#include "gflags/gflags.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include "glog/logging.h"
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
{ stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog
|
||||
, gflags, gmock, gtest
|
||||
}:
|
||||
|
||||
let
|
||||
protoTar = fetchurl {
|
||||
url = "https://github.com/Seagate/kinetic-protocol/archive/3.0.0.tar.gz";
|
||||
sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "kinetic-cpp-client-2015-04-14";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/Seagate/kinetic-cpp-client.git";
|
||||
rev = "015085a5c89db0398f80923053f36b9e0611e107";
|
||||
sha256 = "0gm34sl6lyidnxgg1lrhkxkxqj8z1y2cqn7zhzz2f1k50pigi5da";
|
||||
};
|
||||
|
||||
patches = [ ./build-fix.patch ];
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p build/kinetic-proto
|
||||
tar -x --strip-components 1 -C build/kinetic-proto -f ${protoTar}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake protobuf ];
|
||||
buildInputs = [ libunwind glog gflags gmock gtest ];
|
||||
|
||||
# The headers and library include from these and there is no provided pc file
|
||||
propagatedBuildInputs = [ protobuf openssl ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=true"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# The checks cannot find libkinetic_client.so otherwise
|
||||
export LD_LIBRARY_PATH="$(pwd)"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# There is no included install script so do our best
|
||||
mkdir -p $out/lib
|
||||
cp libkinetic_client.so $out/lib
|
||||
cp -r ../include $out
|
||||
cp ../src/main/generated/kinetic_client.pb.h $out/include
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/Seagate/kinetic-cpp-client";
|
||||
description = "Code for producing C and C++ kinetic clients";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, libusb}:
|
||||
{stdenv, fetchurl, libusb-compat-0_1}:
|
||||
|
||||
with stdenv; mkDerivation rec {
|
||||
name = "libftdi-0.20";
|
||||
@ -8,9 +8,9 @@ with stdenv; mkDerivation rec {
|
||||
sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb ];
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
propagatedBuildInputs = [ libusb ];
|
||||
propagatedBuildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
# Hack to avoid TMPDIR in RPATHs.
|
||||
preFixup = ''rm -rf "$(pwd)" '';
|
||||
|
||||
@ -1,22 +1,24 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.1.0";
|
||||
version = "0.1.2";
|
||||
pname = "libmicrodns";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "videolabs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1pmf461zn35spbpbls1ih68ki7f8g8xjwhzr2csy63nnyq2k9jji";
|
||||
sha256 = "1yb0j0acidp494d28wqhzhrfski2qjb2a5mp5bq5qrpcg38zyz6i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, libusb, readline }:
|
||||
{ stdenv, fetchurl, libusb-compat-0_1, readline }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libnfc";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb readline ];
|
||||
buildInputs = [ libusb-compat-0_1 readline ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Open source library libnfc for Near Field Communication";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3,
|
||||
alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }:
|
||||
alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lirc-0.10.1";
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig help2man
|
||||
(python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
|
||||
|
||||
buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ];
|
||||
buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ];
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1
|
||||
, doxygen, libxslt
|
||||
}:
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ pcsclite libusb doxygen libxslt ];
|
||||
buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/etc
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openldap-2.4.49";
|
||||
name = "openldap-2.4.50";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
|
||||
sha256 = "0vp524rsngdcykf6ki7vprsyg7gj8z7hszg8xwxz50219fa1gcg3";
|
||||
sha256 = "1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw";
|
||||
};
|
||||
|
||||
# TODO: separate "out" and "bin"
|
||||
|
||||
@ -1,22 +1,46 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, stdenv
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "packr";
|
||||
version = "2.7.1";
|
||||
let p2 = buildGoModule rec {
|
||||
pname = "packr2";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gobuffalo";
|
||||
repo = pname;
|
||||
repo = "packr";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9";
|
||||
sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai";
|
||||
}+"/v2";
|
||||
|
||||
subPackages = [ "packr2" ];
|
||||
|
||||
modSha256 = "1xxqyn78074jna0iri7sks6b2l4sdnn5sg57n09vrrf6kh39h2y9";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The simple and easy way to embed static files into Go binaries";
|
||||
homepage = "https://github.com/gobuffalo/packr";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mmahut ];
|
||||
};
|
||||
};
|
||||
p1 = buildGoModule rec {
|
||||
pname = "packr1";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gobuffalo";
|
||||
repo = "packr";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai";
|
||||
};
|
||||
|
||||
subPackages = [ "packr" "v2/packr2" ];
|
||||
subPackages = [ "packr" ];
|
||||
|
||||
modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv";
|
||||
modSha256 = "045qfdi82yhpghjd0cimxhas4nkj7g30n9qyvkrl9ck01sahx76f";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The simple and easy way to embed static files into Go binaries";
|
||||
@ -24,4 +48,9 @@ buildGoModule rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mmahut ];
|
||||
};
|
||||
};
|
||||
in
|
||||
symlinkJoin{
|
||||
name = "packr";
|
||||
paths = [p1 p2];
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, patchelf, libusb}:
|
||||
{stdenv, fetchurl, patchelf, libusb-compat-0_1}:
|
||||
|
||||
assert stdenv ? cc && stdenv.cc.libc != null;
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ patchelf ];
|
||||
|
||||
installPhase = ''
|
||||
RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
|
||||
RPATH=${libusb-compat-0_1.out}/lib:${stdenv.cc.libc.out}/lib
|
||||
|
||||
for a in proprietary/*/Contents/Linux/*.so*; do
|
||||
if ! test -L $a; then
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }:
|
||||
{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libunicap";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ];
|
||||
buildInputs = [ libusb-compat-0_1 libraw1394 dcraw intltool perl v4l-utils ];
|
||||
|
||||
patches = [
|
||||
# Debian has a patch that fixes the build.
|
||||
|
||||
@ -61,13 +61,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.28.1";
|
||||
version = "2.28.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "rLwmo+1cE/OeRodc9EepwFQbbPsX+eeIQyNDHLMn89g=";
|
||||
sha256 = "udI1Jc/Y0iw3tdlkqf6ajOdYMEKi+NOSLnHmu8aMML0=";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isLinux [
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
{ requireFile, stdenv, unzip }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "6.0";
|
||||
pname = "amdadl-sdk";
|
||||
|
||||
src = requireFile {
|
||||
name = "ADL_SDK_6.0.zip";
|
||||
url = "http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/";
|
||||
sha256 = "429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
unpackPhase = ''
|
||||
unzip $src
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e '/include/a \#include <wchar.h>' include/adl_structures.h || die
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
#Build adlutil
|
||||
cd adlutil
|
||||
gcc main.c -o adlutil -DLINUX -ldl -I ../include/
|
||||
cd ..
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
#Install SDK
|
||||
mkdir -p $out/bin
|
||||
cp -r include "$out/"
|
||||
cp "adlutil/adlutil" "$out/bin/adlutil"
|
||||
|
||||
#Fix modes
|
||||
chmod -R 755 "$out/bin/"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "API to access display driver functionality for ATI graphics cards";
|
||||
homepage = "https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.offline ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
--- samples/Makefile 2012-11-29 05:58:48.000000000 +0100
|
||||
+++ samples/Makefile 2012-12-30 20:13:30.926576277 +0100
|
||||
@@ -3,7 +3,6 @@
|
||||
include $(DEPTH)/make/openclsdkdefs.mk
|
||||
|
||||
SUBDIRS = opencl
|
||||
-SUBDIRS += aparapi
|
||||
ifneq ($(OS), lnx)
|
||||
SUBDIRS += C++Amp
|
||||
ifeq ($(BITS), 64)
|
||||
@ -1,108 +0,0 @@
|
||||
{ stdenv, fetchurl, makeWrapper, perl, libGLU, libGL, xorg,
|
||||
version? "2.8", # What version
|
||||
samples? false # Should samples be installed
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
bits = if stdenv.hostPlatform.system == "x86_64-linux" then "64"
|
||||
else "32";
|
||||
|
||||
arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64"
|
||||
else "x86";
|
||||
|
||||
src_info = {
|
||||
"2.6" = {
|
||||
url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.6-lnx${bits}.tgz";
|
||||
x86 = "03vyvqp44f96036zsyy8n21ymbzy2bx09hlbd6ci3ikj8g7ic1dm";
|
||||
x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih";
|
||||
};
|
||||
|
||||
"2.7" = {
|
||||
url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz";
|
||||
x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b";
|
||||
x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1";
|
||||
patches = [ ./gcc-5.patch];
|
||||
};
|
||||
|
||||
"2.8" = {
|
||||
url = "https://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz";
|
||||
x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356";
|
||||
x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681";
|
||||
|
||||
# TODO: Add support for aparapi, java parallel api
|
||||
patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch];
|
||||
};
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "amdapp-sdk";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = stdenv.lib.getAttrFromPath [version "url"] src_info;
|
||||
sha256 = stdenv.lib.getAttrFromPath [version arch] src_info;
|
||||
};
|
||||
|
||||
patches = stdenv.lib.attrByPath [version "patches"] [] src_info;
|
||||
|
||||
patchFlags = [ "-p0" ];
|
||||
buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ];
|
||||
propagatedBuildInputs = [ stdenv.cc ];
|
||||
NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm";
|
||||
doCheck = false;
|
||||
|
||||
unpackPhase = ''
|
||||
tar xvzf $src
|
||||
tar xf AMD-APP-SDK-v${version}-*-lnx${bits}.tgz
|
||||
cd AMD-APP-SDK-v${version}-*-lnx${bits}
|
||||
'';
|
||||
|
||||
buildPhase = if !samples then ''echo "nothing to build"'' else null;
|
||||
|
||||
installPhase = ''
|
||||
# Install SDK
|
||||
mkdir -p $out
|
||||
cp -r {docs,include} "$out/"
|
||||
mkdir -p "$out/"{bin,lib,samples/opencl/bin}
|
||||
cp -r "./bin/${arch}/clinfo" "$out/bin/clinfo"
|
||||
cp -r "./lib/${arch}/"* "$out/lib/"
|
||||
|
||||
# Register ICD
|
||||
mkdir -p "$out/etc/OpenCL/vendors"
|
||||
echo "$out/lib/libamdocl${bits}.so" > "$out/etc/OpenCL/vendors/amd.icd"
|
||||
# The OpenCL ICD specifications: http://www.khronos.org/registry/cl/extensions/khr/cl_khr_icd.txt
|
||||
|
||||
# Install includes
|
||||
mkdir -p "$out/usr/include/"{CAL,OpenVideo}
|
||||
install -m644 './include/OpenVideo/'{OVDecode.h,OVDecodeTypes.h} "$out/usr/include/OpenVideo/"
|
||||
|
||||
${ if samples then ''
|
||||
# Install samples
|
||||
find ./samples/opencl/ -mindepth 1 -maxdepth 1 -type d -not -name bin -exec cp -r {} "$out/samples/opencl" \;
|
||||
cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin"
|
||||
for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*");
|
||||
do
|
||||
wrapProgram "$f" --prefix PATH ":" "${stdenv.cc}/bin"
|
||||
done'' else ""
|
||||
}
|
||||
|
||||
# Create wrappers
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo
|
||||
patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib $out/bin/clinfo
|
||||
|
||||
# Fix modes
|
||||
find "$out/" -type f -exec chmod 644 {} \;
|
||||
chmod -R 755 "$out/bin/"
|
||||
find "$out/samples/opencl/bin/" -type f -name ".*" -exec chmod 755 {} \;
|
||||
find "$out/samples/opencl/bin/" -type f -not -name "*.*" -exec chmod 755 {} \;
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support";
|
||||
homepage = "https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/";
|
||||
license = licenses.amd;
|
||||
maintainers = [ maintainers.offline ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
--- include/CL/cl.hpp
|
||||
+++ include/CL/cl.hpp
|
||||
@@ -201,7 +201,7 @@
|
||||
#include <functional>
|
||||
#define __CL_FUNCTION_TYPE typename std::function
|
||||
#define CL_USE_CPP_FUNCTORS
|
||||
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX)
|
||||
+#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX)
|
||||
#include <tr1/functional>
|
||||
#define __CL_FUNCTION_TYPE typename std::tr1::function
|
||||
#define CL_USE_CPP_FUNCTORS
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, libusb, readline ? null }:
|
||||
{ stdenv, fetchFromGitHub, libusb-compat-0_1, readline ? null }:
|
||||
|
||||
let
|
||||
version = "0.25";
|
||||
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb readline ];
|
||||
buildInputs = [ libusb-compat-0_1 readline ];
|
||||
makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++
|
||||
(if readline == null then [ "WITHOUT_READLINE=1" ] else []);
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv,
|
||||
fetchFromGitHub, fetchpatch,
|
||||
webos, cmake, pkgconfig,
|
||||
libusb }:
|
||||
libusb-compat-0_1 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "novacomd";
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ];
|
||||
|
||||
buildInputs = [ libusb ];
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb, openssl }:
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xpwn";
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib libpng bzip2 libusb openssl ];
|
||||
buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";
|
||||
|
||||
31
pkgs/development/python-modules/auth0-python/default.nix
Normal file
31
pkgs/development/python-modules/auth0-python/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "auth0-python";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c2fdc3ff230638a2776d2b3761e787ca93dc33a26f841504fc260f947256f453";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Auth0 Python SDK";
|
||||
homepage = "https://github.com/auth0/auth0-python";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
@ -1,30 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, unittest2
|
||||
, future
|
||||
, numpy
|
||||
, pillow
|
||||
, scipy
|
||||
, scikitlearn
|
||||
, scikitimage
|
||||
, threadpoolctl
|
||||
}:
|
||||
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "batchgenerators";
|
||||
version = "0.19.7";
|
||||
version = "0.20.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0qqzwqf5r0q6jh8avz4f9kf8x96crvdnkznhf24pbm0faf8yk67q";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MIC-DKFZ";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf";
|
||||
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future numpy scipy scikitlearn scikitimage threadpoolctl ];
|
||||
propagatedBuildInputs = [
|
||||
future numpy pillow scipy scikitlearn scikitimage threadpoolctl
|
||||
];
|
||||
|
||||
checkInputs = [ pytest unittest2 ];
|
||||
|
||||
checkPhase = "pytest tests";
|
||||
|
||||
36
pkgs/development/python-modules/cloudflare/default.nix
Normal file
36
pkgs/development/python-modules/cloudflare/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
, future
|
||||
, pyyaml
|
||||
, jsonlines
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudflare";
|
||||
version = "2.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4463d5f2927338384169315f34c2a8ac0840075b59489f8d1d773b91caba6c39";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
future
|
||||
pyyaml
|
||||
jsonlines
|
||||
];
|
||||
|
||||
# no tests associated with package
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "CloudFlare" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for the Cloudflare v4 API";
|
||||
homepage = "https://github.com/cloudflare/python-cloudflare";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,12 @@
|
||||
{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pybind11}:
|
||||
{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fasttext";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = "fastText";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii";
|
||||
};
|
||||
inherit (pkgs.fasttext) pname version src;
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
|
||||
pythonImportsCheck = [ "fasttext" ];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -1,22 +1,16 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, python, protobuf3_6 }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, python }:
|
||||
|
||||
let
|
||||
py = python.override {
|
||||
packageOverrides = self: super: {
|
||||
protobuf = super.protobuf.override {
|
||||
protobuf = protobuf3_6;
|
||||
};
|
||||
};
|
||||
};
|
||||
py = python;
|
||||
in buildPythonPackage rec {
|
||||
pname = "mysql-connector";
|
||||
version = "8.0.19";
|
||||
version = "8.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mysql";
|
||||
repo = "mysql-connector-python";
|
||||
rev = version;
|
||||
sha256 = "1jscmc5s7mwx43gvxjlqc30ylp5jjpmkqx7s3b9nllbh926p3ixg";
|
||||
sha256 = "1pm98mjbkhwawhni98cjhp0gg3mim75i0sdby77vzrlcrxajxkbw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];
|
||||
@ -33,6 +27,7 @@ in buildPythonPackage rec {
|
||||
implements the DB API v2.0 specification.
|
||||
'';
|
||||
homepage = "https://github.com/mysql/mysql-connector-python";
|
||||
changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt";
|
||||
license = [ lib.licenses.gpl2 ];
|
||||
maintainers = with lib.maintainers; [ primeos ];
|
||||
};
|
||||
|
||||
38
pkgs/development/python-modules/pylibftdi/default.nix
Normal file
38
pkgs/development/python-modules/pylibftdi/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, httpserver
|
||||
, libftdi1
|
||||
, libusb1
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylibftdi";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17c5h4xz1grynbpffngjflk3dlw2g2zbhkwb7h5v4n9rjdv41l5x";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpserver
|
||||
libftdi1
|
||||
libusb1
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pylibftdi/driver.py \
|
||||
--replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb1.so')" \
|
||||
--replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pylibftdi" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bitbucket.org/codedstructure/pylibftdi/src/default/";
|
||||
description = "Minimal pythonic wrapper to Intra2net's libftdi driver for FTDI's USB devices";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthuszagh ];
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{stdenv, fetchFromGitHub
|
||||
, buildPackages
|
||||
, pkgconfig
|
||||
, libusb, readline, libewf, perl, zlib, openssl
|
||||
, libusb-compat-0_1, readline, libewf, perl, zlib, openssl
|
||||
, libuv, file, libzip, xxHash
|
||||
, gtk2 ? null, vte ? null, gtkdialog ? null
|
||||
, python3 ? null
|
||||
@ -84,7 +84,7 @@ let
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ file readline libusb libewf perl zlib openssl libuv ]
|
||||
buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
|
||||
++ optional useX11 [ gtkdialog vte gtk2 ]
|
||||
++ optional rubyBindings [ ruby ]
|
||||
++ optional pythonBindings [ python3 ]
|
||||
|
||||
@ -5,35 +5,29 @@
|
||||
, go
|
||||
, python
|
||||
, stdenv
|
||||
, iana-etc
|
||||
, mailcap
|
||||
, tzdata
|
||||
}:
|
||||
|
||||
let
|
||||
patches = [
|
||||
./use-go-in-path.patch
|
||||
|
||||
# update rules_go to fix the build. Remove these when updating past 0.10.3
|
||||
(fetchpatch {
|
||||
url = "https://github.com/bazelbuild/bazel-watcher/commit/686130f50cea274f7453f6abc8c5249654047462.patch";
|
||||
sha256 = "0rzs01sfiinl5d3dq9sx1bhl8kkzppdwh964fr7bzafqcxv5llmb";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/bazelbuild/bazel-watcher/commit/18bdb44832ccc533e0ab3923ef80060eeb24582d.patch";
|
||||
sha256 = "0k5hvlxlg4n092d53cbfxqqhzc6f1jv4licdhhi1dhckkhb4sdk6";
|
||||
})
|
||||
];
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
name = "bazel-watcher-${version}";
|
||||
version = "0.10.3";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel-watcher";
|
||||
rev = "v${version}";
|
||||
sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v";
|
||||
sha256 = "1fc3sp79znbbq1yjap56lham72n7cap8yfghpzrzmpl5brybjkvm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go git python ];
|
||||
removeRulesCC = false;
|
||||
|
||||
bazelTarget = "//ibazel";
|
||||
|
||||
@ -55,6 +49,10 @@ buildBazelPackage rec {
|
||||
rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
|
||||
sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker
|
||||
|
||||
# Retains go build input markers
|
||||
chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker}
|
||||
rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker}
|
||||
|
||||
# Remove the gazelle tools, they contain go binaries that are built
|
||||
# non-deterministically. As long as the gazelle version matches the tools
|
||||
# should be equivalent.
|
||||
@ -62,7 +60,7 @@ buildBazelPackage rec {
|
||||
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
|
||||
'';
|
||||
|
||||
sha256 = "0cmj186n2y1g9kkdhcivmh2qvigvpnbp03m575b7hgsxi1cp3ssj";
|
||||
sha256 = "0wj573dcirssr2cmq90b4yl57mv3gsxaj1s26afvkz1dvyxmq7sz";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.222.1";
|
||||
version = "2.222.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
sha256 = "0glmx8xi99mbfr84hi4sn36qkxw00rfn8wlz5n674ygbdj1vnv2s";
|
||||
sha256 = "1087rih5cb4ici538rcgkrfhcqckbs9i2mpzd59zcx4yw91dca8m";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, yacc, flex, libusb, libelf, libftdi1, readline
|
||||
{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline
|
||||
# docSupport is a big dependency, disabled by default
|
||||
, docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
|
||||
}:
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = stdenv.lib.optionals docSupport "--enable-doc";
|
||||
|
||||
buildInputs = [ yacc flex libusb libelf libftdi1 readline ]
|
||||
buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ]
|
||||
++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub
|
||||
, gcc-arm-embedded, libftdi1, libusb, pkgconfig
|
||||
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig
|
||||
, python, pythonPackages
|
||||
}:
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
libftdi1
|
||||
libusb
|
||||
libusb-compat-0_1
|
||||
python
|
||||
pythonPackages.intelhex
|
||||
];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, libusb }:
|
||||
{ stdenv, fetchurl, libusb-compat-0_1 }:
|
||||
let
|
||||
version = "0.7.2";
|
||||
in
|
||||
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "dfu-programmer";
|
||||
inherit version;
|
||||
|
||||
buildInputs = [ libusb ];
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user