Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
a930a6d7ee
|
|
@ -50,32 +50,35 @@ in {
|
|||
|
||||
none = [];
|
||||
|
||||
arm = filterDoubles predicates.isAarch32;
|
||||
aarch64 = filterDoubles predicates.isAarch64;
|
||||
x86 = filterDoubles predicates.isx86;
|
||||
i686 = filterDoubles predicates.isi686;
|
||||
x86_64 = filterDoubles predicates.isx86_64;
|
||||
mips = filterDoubles predicates.isMips;
|
||||
riscv = filterDoubles predicates.isRiscV;
|
||||
vc4 = filterDoubles predicates.isVc4;
|
||||
js = filterDoubles predicates.isJavaScript;
|
||||
arm = filterDoubles predicates.isAarch32;
|
||||
aarch64 = filterDoubles predicates.isAarch64;
|
||||
x86 = filterDoubles predicates.isx86;
|
||||
i686 = filterDoubles predicates.isi686;
|
||||
x86_64 = filterDoubles predicates.isx86_64;
|
||||
mips = filterDoubles predicates.isMips;
|
||||
riscv = filterDoubles predicates.isRiscV;
|
||||
vc4 = filterDoubles predicates.isVc4;
|
||||
js = filterDoubles predicates.isJavaScript;
|
||||
|
||||
cygwin = filterDoubles predicates.isCygwin;
|
||||
darwin = filterDoubles predicates.isDarwin;
|
||||
freebsd = filterDoubles predicates.isFreeBSD;
|
||||
bigEndian = filterDoubles predicates.isBigEndian;
|
||||
littleEndian = filterDoubles predicates.isLittleEndian;
|
||||
|
||||
cygwin = filterDoubles predicates.isCygwin;
|
||||
darwin = filterDoubles predicates.isDarwin;
|
||||
freebsd = filterDoubles predicates.isFreeBSD;
|
||||
# Should be better, but MinGW is unclear.
|
||||
gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
|
||||
illumos = filterDoubles predicates.isSunOS;
|
||||
linux = filterDoubles predicates.isLinux;
|
||||
netbsd = filterDoubles predicates.isNetBSD;
|
||||
openbsd = filterDoubles predicates.isOpenBSD;
|
||||
unix = filterDoubles predicates.isUnix;
|
||||
wasi = filterDoubles predicates.isWasi;
|
||||
redox = filterDoubles predicates.isRedox;
|
||||
windows = filterDoubles predicates.isWindows;
|
||||
genode = filterDoubles predicates.isGenode;
|
||||
gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
|
||||
illumos = filterDoubles predicates.isSunOS;
|
||||
linux = filterDoubles predicates.isLinux;
|
||||
netbsd = filterDoubles predicates.isNetBSD;
|
||||
openbsd = filterDoubles predicates.isOpenBSD;
|
||||
unix = filterDoubles predicates.isUnix;
|
||||
wasi = filterDoubles predicates.isWasi;
|
||||
redox = filterDoubles predicates.isRedox;
|
||||
windows = filterDoubles predicates.isWindows;
|
||||
genode = filterDoubles predicates.isGenode;
|
||||
|
||||
embedded = filterDoubles predicates.isNone;
|
||||
embedded = filterDoubles predicates.isNone;
|
||||
|
||||
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4102,12 +4102,6 @@
|
|||
githubId = 1843676;
|
||||
name = "Jonathan Reeve";
|
||||
};
|
||||
joncojonathan = {
|
||||
email = "joncojonathan@gmail.com";
|
||||
github = "joncojonathan";
|
||||
githubId = 11414454;
|
||||
name = "Jonathan Haddock";
|
||||
};
|
||||
jonringer = {
|
||||
email = "jonringer117@gmail.com";
|
||||
github = "jonringer";
|
||||
|
|
@ -5709,6 +5703,12 @@
|
|||
githubId = 117842;
|
||||
name = "Henri Bourcereau";
|
||||
};
|
||||
mmesch = {
|
||||
email = "mmesch@noreply.github.com";
|
||||
github = "mmesch";
|
||||
githubId = 2597803;
|
||||
name = "Matthias Meschede";
|
||||
};
|
||||
mmilata = {
|
||||
email = "martin@martinmilata.cz";
|
||||
github = "mmilata";
|
||||
|
|
@ -6089,6 +6089,16 @@
|
|||
githubId = 8214542;
|
||||
name = "Nicolò Balzarotti";
|
||||
};
|
||||
NieDzejkob = {
|
||||
email = "kuba@kadziolka.net";
|
||||
github = "NieDzejkob";
|
||||
githubId = 23580910;
|
||||
name = "Jakub Kądziołka";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0xE315A75846131564";
|
||||
fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564";
|
||||
}];
|
||||
};
|
||||
NikolaMandic = {
|
||||
email = "nikola@mandic.email";
|
||||
github = "NikolaMandic";
|
||||
|
|
@ -6143,6 +6153,12 @@
|
|||
githubId = 6930756;
|
||||
name = "Nicolas Mattia";
|
||||
};
|
||||
nobbz = {
|
||||
name = "Norbert Melzer";
|
||||
email = "timmelzer+nixpkgs@gmail.com";
|
||||
github = "NobbZ";
|
||||
githubId = 58951;
|
||||
};
|
||||
nocent = {
|
||||
email = "nocent@protonmail.ch";
|
||||
github = "nocent";
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">
|
|||
console, whether device ownership is correctly maintained when switching
|
||||
between consoles, and so on. On the other hand,
|
||||
<filename
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix">nfs/simple.nix</filename>,
|
||||
which tests NFS client and server functionality in the Linux kernel
|
||||
(including whether locks are maintained across server crashes), requires
|
||||
three machines: a server and two clients.
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ in
|
|||
consul = 145;
|
||||
mailpile = 146;
|
||||
redmine = 147;
|
||||
seeks = 148;
|
||||
#seeks = 148; # removed 2020-06-21
|
||||
prosody = 149;
|
||||
i2pd = 150;
|
||||
systemd-network = 152;
|
||||
|
|
@ -497,7 +497,7 @@ in
|
|||
#consul = 145; # unused
|
||||
mailpile = 146;
|
||||
redmine = 147;
|
||||
seeks = 148;
|
||||
#seeks = 148; # removed 2020-06-21
|
||||
prosody = 149;
|
||||
i2pd = 150;
|
||||
systemd-network = 152;
|
||||
|
|
|
|||
|
|
@ -637,7 +637,6 @@
|
|||
./services/networking/gvpe.nix
|
||||
./services/networking/hans.nix
|
||||
./services/networking/haproxy.nix
|
||||
./services/networking/heyefi.nix
|
||||
./services/networking/hostapd.nix
|
||||
./services/networking/htpdate.nix
|
||||
./services/networking/hylafax/default.nix
|
||||
|
|
@ -725,7 +724,6 @@
|
|||
./services/networking/rxe.nix
|
||||
./services/networking/sabnzbd.nix
|
||||
./services/networking/searx.nix
|
||||
./services/networking/seeks.nix
|
||||
./services/networking/skydns.nix
|
||||
./services/networking/shadowsocks.nix
|
||||
./services/networking/shairport-sync.nix
|
||||
|
|
@ -1028,6 +1026,7 @@
|
|||
./virtualisation/podman.nix
|
||||
./virtualisation/qemu-guest-agent.nix
|
||||
./virtualisation/railcar.nix
|
||||
./virtualisation/spice-usb-redirection.nix
|
||||
./virtualisation/virtualbox-guest.nix
|
||||
./virtualisation/virtualbox-host.nix
|
||||
./virtualisation/vmware-guest.nix
|
||||
|
|
|
|||
|
|
@ -68,6 +68,8 @@ with lib;
|
|||
to handle FIDO security tokens, so this isn't necessary anymore.
|
||||
'')
|
||||
|
||||
(mkRemovedOptionModule [ "services" "seeks" ] "")
|
||||
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,15 @@ in {
|
|||
default = null;
|
||||
description = "the thermald manual configuration file.";
|
||||
};
|
||||
|
||||
adaptive = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable adaptive mode, only working on kernel versions greater than 5.8.
|
||||
Thermald will detect this itself, safe to enable on kernel versions below 5.8.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -39,6 +48,7 @@ in {
|
|||
--no-daemon \
|
||||
${optionalString cfg.debug "--loglevel=debug"} \
|
||||
${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
|
||||
${optionalString cfg.adaptive "--adaptive"} \
|
||||
--dbus-enable
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,29 +4,19 @@ with lib;
|
|||
|
||||
let
|
||||
cfg = config.services.monit;
|
||||
extraConfig = pkgs.writeText "monitConfig" cfg.extraConfig;
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "services" "monit" "config" ] ["services" "monit" "extraConfig" ])
|
||||
];
|
||||
|
||||
options.services.monit = {
|
||||
|
||||
enable = mkEnableOption "Monit";
|
||||
|
||||
configFiles = mkOption {
|
||||
type = types.listOf types.path;
|
||||
default = [];
|
||||
description = "List of paths to be included in the monitrc file";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
config = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = "Additional monit config as string";
|
||||
description = "monitrc content";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
@ -34,7 +24,7 @@ in
|
|||
environment.systemPackages = [ pkgs.monit ];
|
||||
|
||||
environment.etc.monitrc = {
|
||||
text = concatMapStringsSep "\n" (path: "include ${path}") (cfg.configFiles ++ [extraConfig]);
|
||||
text = cfg.config;
|
||||
mode = "0400";
|
||||
};
|
||||
|
||||
|
|
@ -53,4 +43,6 @@ in
|
|||
};
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ ryantm ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.heyefi;
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.heyefi = {
|
||||
|
||||
enable = mkEnableOption "heyefi";
|
||||
|
||||
cardMacaddress = mkOption {
|
||||
default = "";
|
||||
description = ''
|
||||
An Eye-Fi card MAC address.
|
||||
'';
|
||||
};
|
||||
|
||||
uploadKey = mkOption {
|
||||
default = "";
|
||||
description = ''
|
||||
An Eye-Fi card's upload key.
|
||||
'';
|
||||
};
|
||||
|
||||
uploadDir = mkOption {
|
||||
example = "/home/username/pictures";
|
||||
description = ''
|
||||
The directory to upload the files to.
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
default = "root";
|
||||
description = ''
|
||||
heyefi will be run under this user (user must exist,
|
||||
this can be your user name).
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.heyefi =
|
||||
{
|
||||
description = "heyefi service";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "${cfg.user}";
|
||||
Restart = "always";
|
||||
ExecStart = "${pkgs.heyefi}/bin/heyefi";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
environment.etc."heyefi/heyefi.config".text =
|
||||
''
|
||||
# /etc/heyefi/heyefi.conf: DO NOT EDIT -- this file has been generated automatically.
|
||||
cards = [["${config.services.heyefi.cardMacaddress}","${config.services.heyefi.uploadKey}"]]
|
||||
upload_dir = "${toString config.services.heyefi.uploadDir}"
|
||||
'';
|
||||
|
||||
environment.systemPackages = [ pkgs.heyefi ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -53,7 +53,7 @@ in {
|
|||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = ''
|
||||
${cfg.package}/bin/onedrive --monitor --verbose --confdir=%h/.config/%i
|
||||
${cfg.package}/bin/onedrive --monitor --confdir=%h/.config/%i
|
||||
'';
|
||||
Restart="on-failure";
|
||||
RestartSec=3;
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.seeks;
|
||||
|
||||
confDir = cfg.confDir;
|
||||
|
||||
seeks = pkgs.seeks.override { seeks_confDir = confDir; };
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.seeks = {
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = "
|
||||
Whether to enable the Seeks server.
|
||||
";
|
||||
};
|
||||
|
||||
confDir = mkOption {
|
||||
default = "";
|
||||
type = types.str;
|
||||
description = "
|
||||
The Seeks server configuration. If it is not specified,
|
||||
a default configuration is used.
|
||||
";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.seeks.enable {
|
||||
|
||||
users.users.seeks =
|
||||
{ uid = config.ids.uids.seeks;
|
||||
description = "Seeks user";
|
||||
createHome = true;
|
||||
home = "/var/lib/seeks";
|
||||
};
|
||||
|
||||
users.groups.seeks =
|
||||
{ gid = config.ids.gids.seeks;
|
||||
};
|
||||
|
||||
systemd.services.seeks =
|
||||
{
|
||||
description = "Seeks server, the p2p search engine.";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "seeks";
|
||||
ExecStart = "${seeks}/bin/seeks";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ seeks ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
24
nixos/modules/virtualisation/spice-usb-redirection.nix
Normal file
24
nixos/modules/virtualisation/spice-usb-redirection.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
options.virtualisation.spiceUSBRedirection.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Install the SPICE USB redirection helper with setuid
|
||||
privileges. This allows unprivileged users to pass USB devices
|
||||
connected to this machine to libvirt VMs, both local and
|
||||
remote. Note that this allows users arbitrary access to USB
|
||||
devices.
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf config.virtualisation.spiceUSBRedirection.enable {
|
||||
environment.systemPackages = [ pkgs.spice-gtk ]; # For polkit actions
|
||||
security.wrappers.spice-client-glib-usb-acl-helper ={
|
||||
source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper";
|
||||
capabilities = "cap_fowner+ep";
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ lib.maintainers.lheckemann ];
|
||||
}
|
||||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mamba";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = "Mamba";
|
||||
rev = "v${version}";
|
||||
sha256 = "08dcm0mmka1lbssrgck66v9l2rk3r4y63ij06aw2f9la8a84y20j";
|
||||
sha256 = "1l74ckqqrccgsdy430pfsbv4fbzny7zivx399bi2jk1lv06p4h9a";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pulseeffects";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "pulseeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg=";
|
||||
sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sonic-lineup";
|
||||
version = "1.0.1";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.soundsoftware.ac.uk/attachments/download/2610/${pname}-${version}.tar.gz";
|
||||
sha256 = "0w4v5zr81d8fh97y820r0vj1rrbl0kwgvhfkdnyl4hiabs97b1i7";
|
||||
url = "https://code.soundsoftware.ac.uk/attachments/download/2765/${pname}-${version}.tar.gz";
|
||||
sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
pfft-source = fetchFromBitbucket {
|
||||
owner = "jpommier";
|
||||
repo = "pffft";
|
||||
rev = "29e4f76ac53bef048938754f32231d7836401f79";
|
||||
rev = "74d7261be17cf659d5930d4830609406bd7553e3";
|
||||
sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1";
|
||||
};
|
||||
nanovg-source = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://wiki.gnome.org/Apps/DejaDup";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar joncojonathan ];
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,12 +44,8 @@ stdenv.mkDerivation {
|
|||
mkdir -p $out/share/applications
|
||||
mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
|
||||
|
||||
patch package-files/linux/jedit << EOF
|
||||
5a6,8
|
||||
> # specify the correct JAVA_HOME
|
||||
> JAVA_HOME=${jdk.jre.home}/jre
|
||||
>
|
||||
EOF
|
||||
# specify the correct JAVA_HOME
|
||||
sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit
|
||||
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
|
||||
mkdir -p $out/bin
|
||||
cp package-files/linux/jedit $out/bin/jedit
|
||||
|
|
|
|||
|
|
@ -268,12 +268,12 @@ in
|
|||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2020.2.1"; /* updated by script */
|
||||
version = "2020.2.3"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "1sma3ay02lajg6q1g3k05gi7jdja7cf9rxb9v0w62s6z87l719bv"; /* updated by script */
|
||||
sha256 = "1kdlmdsfxmwks3rk2dzm5q30vwzpxcwzpyjsir122k36xnqvaqxq"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
|
|
@ -281,12 +281,12 @@ in
|
|||
|
||||
datagrip = buildDataGrip rec {
|
||||
name = "datagrip-${version}";
|
||||
version = "2020.2.2"; /* updated by script */
|
||||
version = "2020.2.3"; /* updated by script */
|
||||
description = "Your Swiss Army Knife for Databases and SQL";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
||||
sha256 = "1bk6z6mirrykypb4j2wa4744v0m9y1n7973qgj6z3dsifrq9q7zc"; /* updated by script */
|
||||
sha256 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-datagrip";
|
||||
update-channel = "DataGrip RELEASE";
|
||||
|
|
@ -294,12 +294,12 @@ in
|
|||
|
||||
goland = buildGoland rec {
|
||||
name = "goland-${version}";
|
||||
version = "2020.2.2"; /* updated by script */
|
||||
version = "2020.2.3"; /* updated by script */
|
||||
description = "Up and Coming Go IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||
sha256 = "1r6bbx5hsg82l1pa3syfdi8nbsz6rrfszsw4dmwcnxvccp2hs3mh"; /* updated by script */
|
||||
sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "GoLand RELEASE";
|
||||
|
|
@ -307,12 +307,12 @@ in
|
|||
|
||||
idea-community = buildIdea rec {
|
||||
name = "idea-community-${version}";
|
||||
version = "2020.2.1"; /* updated by script */
|
||||
version = "2020.2.2"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||
sha256 = "055hy5jy5151x3gf8hn7ar36br545qr253fz9wrc3b49wydg01x1"; /* updated by script */
|
||||
sha256 = "0kbn9q7fvhrzb1w6l8i2nv4cx8qrj74jp7fidj9yk8vkv9lfijg6"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
update-channel = "IntelliJ IDEA RELEASE";
|
||||
|
|
@ -320,12 +320,12 @@ in
|
|||
|
||||
idea-ultimate = buildIdea rec {
|
||||
name = "idea-ultimate-${version}";
|
||||
version = "2020.2.1"; /* updated by script */
|
||||
version = "2020.2.2"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
|
||||
sha256 = "1g18l3malsyn7dij4w83yfcsb8msa0s89mzlld3dby8hr9bq0aqm"; /* updated by script */
|
||||
sha256 = "1196zrcbgrr9271kjrzd2mzvhvxd7hkr1d2a4ij4h8f97qmsd6r6"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea";
|
||||
update-channel = "IntelliJ IDEA RELEASE";
|
||||
|
|
@ -333,12 +333,12 @@ in
|
|||
|
||||
mps = buildMps rec {
|
||||
name = "mps-${version}";
|
||||
version = "2020.1.4"; /* updated by script */
|
||||
version = "2020.2"; /* updated by script */
|
||||
description = "Create your own domain-specific language";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz";
|
||||
sha256 = "1j5n100fl8yvfla2slm95wv499azwzzxigp1kdcaj8xbc0a0mp7c"; /* updated by script */
|
||||
url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz";
|
||||
sha256 = "06c0yv9vvz0y5njh1sghn7ijpn1d81mxsyk5xjpj29bvvg511pjs"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-mps";
|
||||
update-channel = "MPS RELEASE";
|
||||
|
|
@ -359,12 +359,12 @@ in
|
|||
|
||||
pycharm-community = buildPycharm rec {
|
||||
name = "pycharm-community-${version}";
|
||||
version = "2020.2.1"; /* updated by script */
|
||||
version = "2020.2.2"; /* updated by script */
|
||||
description = "PyCharm Community Edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "0kml58v6clqj0j0vlvghrywxym2n9h41izazzn4srn7wjj9010fa"; /* updated by script */
|
||||
sha256 = "1a1vhlc2q5n3dxli0x6ppxx3mgary4gpakcxdp9nylmixjzjph6v"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm-ce";
|
||||
update-channel = "PyCharm RELEASE";
|
||||
|
|
@ -372,12 +372,12 @@ in
|
|||
|
||||
pycharm-professional = buildPycharm rec {
|
||||
name = "pycharm-professional-${version}";
|
||||
version = "2020.2.1"; /* updated by script */
|
||||
version = "2020.2.2"; /* updated by script */
|
||||
description = "PyCharm Professional Edition";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "0ml9fg1dlfg8sdp9n8nlsj7z88dx0ac1kvlpk61p7q5di1lyxc94"; /* updated by script */
|
||||
sha256 = "0v64f5sbv1639d6fjg0shfgdy40f1xc2zbn0jqfrx6xmkg7wgsz9"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm";
|
||||
update-channel = "PyCharm RELEASE";
|
||||
|
|
@ -398,12 +398,12 @@ in
|
|||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "2020.2.1"; /* updated by script */
|
||||
version = "2020.2.2"; /* updated by script */
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
|
||||
sha256 = "1pkzql710bc4qdz5pdhh0yx9wkqx85qwkwm1jvvvxbvbsj299vcb"; /* updated by script */
|
||||
sha256 = "11v26hpf891nq5vj8i0ad4shhzpy8b7rvyrkr3l29dwfnd83lgpz"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
update-channel = "RubyMine RELEASE";
|
||||
|
|
@ -411,12 +411,12 @@ in
|
|||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2020.2.1"; /* updated by script */
|
||||
version = "2020.2.2"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "1sx67bms90fsc1bf6pqz1rd1x9aysj0xxb8d7cnclz6bv8kzhgfp"; /* updated by script */
|
||||
sha256 = "1w17cf0qj0vyizkzj1frcmi52q5qxbf31msg8df38wy2l8r0b928"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm RELEASE";
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx";
|
||||
x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll";
|
||||
x86_64-linux = "10v13j1zg1bpgmr99vqhs1gwcipvnbkln0w6yphwn9440fw9fyp4";
|
||||
x86_64-darwin = "1mgi2awrqsm11l1yb8rgmfrxvjfn9z3qvp5np76vgbaibq2ihh0k";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
|
|
@ -27,7 +27,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.48.2";
|
||||
version = "1.49.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yEd";
|
||||
version = "3.20";
|
||||
version = "3.20.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
|
||||
sha256 = "08j8lpn2nd41gavgrj03rlrxl04wcamq1y02f1x1569ykbhycb3m";
|
||||
sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, colladaSupport ? true, opencollada
|
||||
, makeWrapper
|
||||
, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
|
||||
, embree
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
|
@ -17,11 +18,11 @@ let python = python3Packages.python; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blender";
|
||||
version = "2.83.5";
|
||||
version = "2.90.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
|
||||
sha256 = "0xyawly00a59hfdb6b7va84k5fhcv2mxnzd77vs22bzi9y7sap43";
|
||||
sha256 = "08qkvgdfrqh4ljqw5m64bbki1dsfcs4xnwzq6829z3ddhiwrxw84";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
|
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
|
|||
(opensubdiv.override { inherit cudaSupport; })
|
||||
tbb
|
||||
makeWrapper
|
||||
embree
|
||||
]
|
||||
++ (if (!stdenv.isDarwin) then [
|
||||
libXi libX11 libXext libXrender
|
||||
|
|
@ -50,8 +52,11 @@ stdenv.mkDerivation rec {
|
|||
++ optional cudaSupport cudatoolkit
|
||||
++ optional colladaSupport opencollada;
|
||||
|
||||
postPatch =
|
||||
if stdenv.isDarwin then ''
|
||||
postPatch = ''
|
||||
# allow usage of dynamically linked embree
|
||||
rm build_files/cmake/Modules/FindEmbree.cmake
|
||||
'' +
|
||||
(if stdenv.isDarwin then ''
|
||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||
substituteInPlace source/creator/CMakeLists.txt \
|
||||
--replace '${"$"}{LIBDIR}/python' \
|
||||
|
|
@ -77,7 +82,7 @@ stdenv.mkDerivation rec {
|
|||
'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #'
|
||||
'' else ''
|
||||
substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
|
||||
'';
|
||||
'');
|
||||
|
||||
cmakeFlags =
|
||||
[
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ buildGoModule rec {
|
|||
inherit (src.meta) homepage;
|
||||
description = "A Go based command line tool for exercism.io";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.rbasso ];
|
||||
maintainers = [ maintainers.rbasso maintainers.nobbz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }:
|
||||
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpsprune";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jdk11 ];
|
||||
buildInputs = [ jdk ];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "gpsprune";
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
buildCommand = ''
|
||||
mkdir -p $out/bin $out/share/java
|
||||
cp -v $src $out/share/java/gpsprune.jar
|
||||
makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \
|
||||
makeWrapper ${jdk}/bin/java $out/bin/gpsprune \
|
||||
--add-flags "-jar $out/share/java/gpsprune.jar"
|
||||
mkdir -p $out/share/applications
|
||||
cp $desktopItem/share/applications"/"* $out/share/applications
|
||||
|
|
|
|||
|
|
@ -13,14 +13,13 @@ in buildPythonApplication rec {
|
|||
pname = "gramps";
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gettext ];
|
||||
buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ]
|
||||
buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ]
|
||||
# Map support
|
||||
++ stdenv.lib.optional enableOSM osm-gps-map
|
||||
# Graphviz support
|
||||
++ stdenv.lib.optional enableGraphviz graphviz
|
||||
# Ghostscript support
|
||||
++ stdenv.lib.optional enableGhostscript ghostscript
|
||||
|
||||
;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -60,6 +59,5 @@ in buildPythonApplication rec {
|
|||
description = "Genealogy software";
|
||||
homepage = "https://gramps-project.org";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ joncojonathan ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "heimer";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juzzlin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97";
|
||||
sha256 = "18paabqfxz49fahdi4fs5z870aynmyfj3xw8q768qffgc26zhl3m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ with builtins; buildDotnetPackage rec {
|
|||
|
||||
dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ];
|
||||
|
||||
postInstall =
|
||||
postInstall =
|
||||
let
|
||||
extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh;
|
||||
in
|
||||
|
|
@ -111,7 +111,7 @@ with builtins; buildDotnetPackage rec {
|
|||
meta = {
|
||||
description = "GUI password manager with strong cryptography";
|
||||
homepage = "http://www.keepass.info/";
|
||||
maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ];
|
||||
maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,21 +2,23 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "navi";
|
||||
version = "2.10.0";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denisidoro";
|
||||
repo = "navi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1fpfc3ikb6rhb8m0dp9ybh46mnqaw361rrsbv6yrivwfm3zc4w2w";
|
||||
sha256 = "0izmf4flwwn2h1wwpsnghb6rd494lj63hhsky1v9v6l1l641had4";
|
||||
};
|
||||
|
||||
cargoSha256 = "0klizxrb92h7qfxs89m08ksdq698wx4kxsdhqhr5ld9dy3b6ks32";
|
||||
cargoSha256 = "19xv9kbmxbp84lj8ycifsdr7sw9vhwgla7cdmrvlhayiq5r04xd7";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/navi --prefix PATH : ${lib.makeBinPath [ fzf wget ]}
|
||||
wrapProgram $out/bin/navi \
|
||||
--prefix PATH : "$out/bin" \
|
||||
--prefix PATH : ${lib.makeBinPath [ fzf wget ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
mkDerivationWith stdenv.mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.25.0.0";
|
||||
version = "3.25.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc";
|
||||
sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -61,6 +61,10 @@ mkDerivationWith stdenv.mkDerivation rec {
|
|||
cp -r plugins $out/lib/plugins
|
||||
cp -r patterns $out/lib/patterns
|
||||
|
||||
# workaround to fix the library browser:
|
||||
rm -r $out/lib/plugins/sqldrivers
|
||||
ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/sqldrivers
|
||||
|
||||
install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
|||
|
|
@ -8,20 +8,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snowsql";
|
||||
version = "1.2.5";
|
||||
majorVersion = "1.2";
|
||||
version = "${majorVersion}.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowflake-snowsql-1.2.5-1.x86_64.rpm";
|
||||
sha256 = "c66e2044640197f4a5b5a16b89e8e7c6a816aa539004a0fb016aab185795f2d5";
|
||||
url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm";
|
||||
sha256 = "1k9dyr4vyqivpg054kbvs0jdwhbqbmlp9lsyxgazdsviw8ch70c8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rpmextract makeWrapper ];
|
||||
|
||||
libPath =
|
||||
stdenv.lib.makeLibraryPath
|
||||
[
|
||||
openssl
|
||||
];
|
||||
libPath = stdenv.lib.makeLibraryPath [ openssl ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin/
|
||||
|
|
@ -37,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \
|
||||
--set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \
|
||||
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
|
||||
, protobuf, speechd, libXdamage, cups
|
||||
, ffmpeg_3, libxslt, libxml2, at-spi2-core
|
||||
, jre
|
||||
, jre8
|
||||
, pipewire_0_2
|
||||
|
||||
# optional dependencies
|
||||
|
|
@ -50,6 +50,8 @@ with stdenv.lib;
|
|||
# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
|
||||
|
||||
let
|
||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
|
||||
# The additional attributes for creating derivations based on the chromium
|
||||
# source tree.
|
||||
extraAttrs = buildFun base;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
|
||||
{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl
|
||||
|
||||
# default dependencies
|
||||
, bzip2, flac, speex, libopus
|
||||
, gnutar, bzip2, flac, speex, libopus
|
||||
, libevent, expat, libjpeg, snappy
|
||||
, libpng, libcap
|
||||
, xdg_utils, yasm, nasm, minizip, libwebp
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
|
||||
, protobuf, speechd, libXdamage, cups
|
||||
, ffmpeg_3, libxslt, libxml2, at-spi2-core
|
||||
, jre
|
||||
, jre8
|
||||
, pipewire_0_2
|
||||
|
||||
# optional dependencies
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
, ungoogled-chromium
|
||||
, ungoogled ? false
|
||||
|
||||
, channel
|
||||
, upstream-info
|
||||
}:
|
||||
|
||||
|
|
@ -51,6 +52,8 @@ with stdenv.lib;
|
|||
# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
|
||||
|
||||
let
|
||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
|
||||
# The additional attributes for creating derivations based on the chromium
|
||||
# source tree.
|
||||
extraAttrs = buildFun base;
|
||||
|
|
@ -110,7 +113,7 @@ let
|
|||
versionRange = min-version: upto-version:
|
||||
let inherit (upstream-info) version;
|
||||
result = versionAtLeast version min-version && versionOlder version upto-version;
|
||||
stable-version = (import ./upstream-info.nix).stable.version;
|
||||
stable-version = (importJSON ./upstream-info.json).stable.version;
|
||||
in if versionAtLeast stable-version upto-version
|
||||
then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
|
||||
result
|
||||
|
|
@ -123,10 +126,13 @@ let
|
|||
};
|
||||
base = rec {
|
||||
name = "${packageName}-unwrapped-${version}";
|
||||
inherit (upstream-info) channel version;
|
||||
inherit packageName buildType buildPath;
|
||||
inherit (upstream-info) version;
|
||||
inherit channel packageName buildType buildPath;
|
||||
|
||||
src = upstream-info.main;
|
||||
src = fetchurl {
|
||||
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
|
||||
inherit (upstream-info) sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
ninja which python2Packages.python perl pkgconfig
|
||||
|
|
@ -151,8 +157,9 @@ let
|
|||
++ optional pulseSupport libpulseaudio
|
||||
++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
|
||||
|
||||
patches = [
|
||||
patches = optionals (versionRange "68" "86") [
|
||||
./patches/nix_plugin_paths_68.patch
|
||||
] ++ [
|
||||
./patches/remove-webp-include-69.patch
|
||||
./patches/no-build-timestamps.patch
|
||||
./patches/widevine-79.patch
|
||||
|
|
@ -166,12 +173,18 @@ let
|
|||
#
|
||||
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
|
||||
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
|
||||
] ++ optionals (useVaapi) [ # Improvements for the VA-API build:
|
||||
] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
|
||||
./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
|
||||
./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
postPatch = optionalString (!versionRange "0" "86") ''
|
||||
# Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):
|
||||
substituteInPlace native_client/SConstruct \
|
||||
--replace "#! -*- python -*-" ""
|
||||
substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
|
||||
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
|
||||
'' + ''
|
||||
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
|
||||
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
|
||||
--replace \
|
||||
|
|
@ -300,8 +313,8 @@ let
|
|||
use_system_libdrm = true;
|
||||
system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
|
||||
} // optionalAttrs ungoogled {
|
||||
closure_compile = false;
|
||||
enable_hangout_services_extension = false;
|
||||
enable_js_type_check = false;
|
||||
enable_mdns = false;
|
||||
enable_nacl_nonsfi = false;
|
||||
enable_one_click_signin = false;
|
||||
|
|
@ -313,7 +326,6 @@ let
|
|||
google_api_key = "";
|
||||
google_default_client_id = "";
|
||||
google_default_client_secret = "";
|
||||
optimize_webui = false;
|
||||
safe_browsing_mode = 0;
|
||||
use_official_google_api_keys = false;
|
||||
use_unofficial_version_number = false;
|
||||
|
|
@ -366,9 +378,11 @@ let
|
|||
origRpath="$(patchelf --print-rpath "$chromiumBinary")"
|
||||
patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
};
|
||||
|
||||
# Remove some extraAttrs we supplied to the base attributes already.
|
||||
in stdenv.mkDerivation (base // removeAttrs extraAttrs [
|
||||
"name" "gnFlags" "buildTargets"
|
||||
])
|
||||
] // { passthru = base.passthru // (extraAttrs.passthru or {}); })
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10
|
||||
, makeWrapper, ed, gnugrep
|
||||
{ newScope, config, stdenv, fetchurl, makeWrapper
|
||||
, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils
|
||||
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
|
||||
, libva ? null
|
||||
, pipewire_0_2
|
||||
|
|
@ -29,24 +29,16 @@ let
|
|||
|
||||
callPackage = newScope chromium;
|
||||
|
||||
chromium = {
|
||||
chromium = rec {
|
||||
inherit stdenv llvmPackages;
|
||||
|
||||
upstream-info = (callPackage ./update.nix {}).getChannel channel;
|
||||
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
|
||||
|
||||
mkChromiumDerivation = callPackage ./common.nix ({
|
||||
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
|
||||
inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
|
||||
cupsSupport pulseSupport useOzone;
|
||||
inherit ungoogled;
|
||||
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
|
||||
gnChromium = gn.overrideAttrs (oldAttrs: {
|
||||
version = "2020-03-23";
|
||||
src = fetchgit {
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9";
|
||||
sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy";
|
||||
};
|
||||
});
|
||||
} // lib.optionalAttrs (channel == "dev") {
|
||||
gnChromium = gn.overrideAttrs (oldAttrs: {
|
||||
version = "2020-05-19";
|
||||
src = fetchgit {
|
||||
|
|
@ -55,6 +47,27 @@ let
|
|||
sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
|
||||
};
|
||||
});
|
||||
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") {
|
||||
llvmPackages = llvmPackages_11;
|
||||
gnChromium = gn.overrideAttrs (oldAttrs: {
|
||||
version = "2020-07-20";
|
||||
src = fetchgit {
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe";
|
||||
sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q";
|
||||
};
|
||||
});
|
||||
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
|
||||
llvmPackages = llvmPackages_11;
|
||||
useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
|
||||
gnChromium = gn.overrideAttrs (oldAttrs: {
|
||||
version = "2020-08-17";
|
||||
src = fetchgit {
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
rev = "6f13aaac55a977e1948910942675c69f2b4f7a94";
|
||||
sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251";
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
browser = callPackage ./browser.nix { inherit channel enableWideVine; };
|
||||
|
|
@ -66,22 +79,33 @@ let
|
|||
ungoogled-chromium = callPackage ./ungoogled.nix {};
|
||||
};
|
||||
|
||||
pkgSuffix = if channel == "dev" then "unstable" else channel;
|
||||
pkgName = "google-chrome-${pkgSuffix}";
|
||||
chromeSrc = fetchurl {
|
||||
urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
|
||||
"https://dl.google.com/linux/chrome/deb/pool/main/g"
|
||||
"http://95.31.35.30/chrome/pool/main/g"
|
||||
"http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
|
||||
"http://repo.fdzh.org/chrome/deb/pool/main/g"
|
||||
];
|
||||
sha256 = chromium.upstream-info.sha256bin64;
|
||||
};
|
||||
|
||||
mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}";
|
||||
widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation {
|
||||
widevineCdm = stdenv.mkDerivation {
|
||||
name = "chrome-widevine-cdm";
|
||||
|
||||
# The .deb file for Google Chrome
|
||||
src = upstream-info.binary;
|
||||
src = chromeSrc;
|
||||
|
||||
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
|
||||
|
||||
unpackCmd = let
|
||||
widevineCdmPath =
|
||||
if upstream-info.channel == "stable" then
|
||||
if channel == "stable" then
|
||||
"./opt/google/chrome/WidevineCdm"
|
||||
else if upstream-info.channel == "beta" then
|
||||
else if channel == "beta" then
|
||||
"./opt/google/chrome-beta/WidevineCdm"
|
||||
else if upstream-info.channel == "dev" then
|
||||
else if channel == "dev" then
|
||||
"./opt/google/chrome-unstable/WidevineCdm"
|
||||
else
|
||||
throw "Unknown chromium channel.";
|
||||
|
|
@ -191,10 +215,13 @@ in stdenv.mkDerivation {
|
|||
'' + ''
|
||||
|
||||
# libredirect causes chromium to deadlock on startup
|
||||
export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')"
|
||||
export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | ${coreutils}/bin/tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | ${coreutils}/bin/tr '\n' ':')"
|
||||
|
||||
export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
|
||||
|
||||
# Mainly for xdg-open but also other xdg-* tools:
|
||||
export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH"
|
||||
|
||||
.
|
||||
w
|
||||
EOF
|
||||
|
|
@ -214,6 +241,7 @@ in stdenv.mkDerivation {
|
|||
passthru = {
|
||||
inherit (chromium) upstream-info browser;
|
||||
mkDerivation = chromium.mkChromiumDerivation;
|
||||
inherit sandboxExecutableName;
|
||||
inherit chromeSrc sandboxExecutableName;
|
||||
updateScript = ./update.py;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"84.0.4147.89" = {
|
||||
rev = "84.0.4147.89-1";
|
||||
sha256 = "1bqvcq3dj6615198j7cz3ylyyic5zpis06capvl6ybl1na3ainb0";
|
||||
"85.0.4183.102" = {
|
||||
rev = "85.0.4183.102-1";
|
||||
sha256 = "1mdx4a5zcs3an9yx1jxx4amq8p9rcj0hv76r8y7nz6cpsfgd9n3y";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,271 +0,0 @@
|
|||
let maybePkgs = import ../../../../../. {}; in
|
||||
|
||||
{ stdenv ? maybePkgs.stdenv
|
||||
, runCommand ? maybePkgs.runCommand
|
||||
, fetchurl ? maybePkgs.fetchurl
|
||||
, writeText ? maybePkgs.writeText
|
||||
, curl ? maybePkgs.curl
|
||||
, cacert ? maybePkgs.cacert
|
||||
, nix ? maybePkgs.nix
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
|
||||
sources = if builtins.pathExists ./upstream-info.nix
|
||||
then import ./upstream-info.nix
|
||||
else {};
|
||||
|
||||
bucketURL = "https://commondatastorage.googleapis.com/"
|
||||
+ "chromium-browser-official";
|
||||
|
||||
mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz";
|
||||
|
||||
debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g";
|
||||
|
||||
getDebURL = channelName: version: arch: mirror: let
|
||||
packageSuffix = if channelName == "dev" then "unstable" else channelName;
|
||||
packageName = "google-chrome-${packageSuffix}";
|
||||
in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb";
|
||||
|
||||
# Untrusted mirrors, don't try to update from them!
|
||||
debMirrors = [
|
||||
"http://95.31.35.30/chrome/pool/main/g"
|
||||
"http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
|
||||
"http://repo.fdzh.org/chrome/deb/pool/main/g"
|
||||
];
|
||||
|
||||
in {
|
||||
getChannel = channel: let
|
||||
chanAttrs = builtins.getAttr channel sources;
|
||||
in {
|
||||
inherit channel;
|
||||
inherit (chanAttrs) version;
|
||||
|
||||
main = fetchurl {
|
||||
url = mkVerURL chanAttrs.version;
|
||||
inherit (chanAttrs) sha256;
|
||||
};
|
||||
|
||||
binary = fetchurl (let
|
||||
mkUrls = arch: let
|
||||
mkURLForMirror = getDebURL channel chanAttrs.version arch;
|
||||
in map mkURLForMirror ([ debURL ] ++ debMirrors);
|
||||
in if stdenv.is64bit && chanAttrs ? sha256bin64 then {
|
||||
urls = mkUrls "amd64";
|
||||
sha256 = chanAttrs.sha256bin64;
|
||||
} else if !stdenv.is64bit && chanAttrs ? sha256bin32 then {
|
||||
urls = mkUrls "i386";
|
||||
sha256 = chanAttrs.sha256bin32;
|
||||
} else throw "No Chrome plugins are available for your architecture.");
|
||||
};
|
||||
|
||||
update = let
|
||||
csv2nix = name: src: import (runCommand "${name}.nix" {
|
||||
src = builtins.fetchurl src;
|
||||
} ''
|
||||
esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs "
|
||||
IFS=, read -r -a headings <<< "$(head -n1 "$src")"
|
||||
echo "[" > "$out"
|
||||
tail -n +2 "$src" | while IFS=, read -r -a line; do
|
||||
echo " {"
|
||||
for idx in "''${!headings[@]}"; do
|
||||
echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});"
|
||||
done
|
||||
echo " }"
|
||||
done >> "$out"
|
||||
echo "]" >> "$out"
|
||||
'');
|
||||
|
||||
channels = lib.fold lib.recursiveUpdate {} (map (attrs: {
|
||||
${attrs.os}.${attrs.channel} = attrs // {
|
||||
history = let
|
||||
drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info";
|
||||
history = csv2nix drvName "http://omahaproxy.appspot.com/history";
|
||||
cond = h: attrs.os == h.os && attrs.channel == h.channel
|
||||
&& lib.versionOlder h.version attrs.current_version;
|
||||
# Note that this is a *reverse* sort!
|
||||
sorter = a: b: lib.versionOlder b.version a.version;
|
||||
sorted = builtins.sort sorter (lib.filter cond history);
|
||||
in map (lib.flip removeAttrs ["os" "channel"]) sorted;
|
||||
version = attrs.current_version;
|
||||
};
|
||||
}) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1"));
|
||||
|
||||
/*
|
||||
XXX: This is essentially the same as:
|
||||
|
||||
builtins.tryEval (builtins.fetchurl url)
|
||||
|
||||
... except that tryEval on fetchurl isn't working and doesn't catch
|
||||
errors for fetchurl, so we go for a different approach.
|
||||
|
||||
We only have fixed-output derivations that can have networking access, so
|
||||
we abuse SHA1 and its weaknesses to forge a fixed-output derivation which
|
||||
is not so fixed, because it emits different contents that have the same
|
||||
SHA1 hash.
|
||||
|
||||
Using this method, we can distinguish whether the URL is available or
|
||||
whether it's not based on the actual content.
|
||||
|
||||
So let's use tryEval as soon as it's working with fetchurl in Nix.
|
||||
*/
|
||||
tryFetch = url: let
|
||||
# SHA1 hash collisions from https://shattered.io/static/shattered.pdf:
|
||||
collisions = runCommand "sha1-collisions" {
|
||||
outputs = [ "out" "good" "bad" ];
|
||||
base64 = ''
|
||||
QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4
|
||||
Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0
|
||||
MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk
|
||||
0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN
|
||||
GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp
|
||||
o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ
|
||||
qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH
|
||||
MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B
|
||||
mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0
|
||||
S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC
|
||||
Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc
|
||||
upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu
|
||||
renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ
|
||||
yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL
|
||||
StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8
|
||||
wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE
|
||||
JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW
|
||||
lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU
|
||||
pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6
|
||||
rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE
|
||||
sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P
|
||||
i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl
|
||||
9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen
|
||||
r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ
|
||||
YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw
|
||||
l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM
|
||||
sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp
|
||||
V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh
|
||||
t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt
|
||||
Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1
|
||||
i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p
|
||||
y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW
|
||||
3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k
|
||||
NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA==
|
||||
'';
|
||||
} ''
|
||||
echo "$base64" | base64 -d | tar xj
|
||||
mv good.pdf "$good"
|
||||
mv bad.pdf "$bad"
|
||||
touch "$out"
|
||||
'';
|
||||
|
||||
cacheVal = let
|
||||
urlHash = builtins.hashString "sha256" url;
|
||||
timeSlice = builtins.currentTime / 600;
|
||||
in "${urlHash}-${toString timeSlice}";
|
||||
|
||||
in {
|
||||
success = import (runCommand "check-success" {
|
||||
result = stdenv.mkDerivation {
|
||||
name = "tryfetch-${cacheVal}";
|
||||
inherit url;
|
||||
|
||||
outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a";
|
||||
outputHashMode = "flat";
|
||||
outputHashAlgo = "sha1";
|
||||
|
||||
nativeBuildInputs = [ curl ];
|
||||
preferLocalBuild = true;
|
||||
|
||||
inherit (collisions) good bad;
|
||||
|
||||
buildCommand = ''
|
||||
if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \
|
||||
curl -s -L -f -I "$url" > /dev/null; then
|
||||
cp "$good" "$out"
|
||||
else
|
||||
cp "$bad" "$out"
|
||||
fi
|
||||
'';
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
};
|
||||
inherit (collisions) good;
|
||||
} ''
|
||||
if cmp -s "$result" "$good"; then
|
||||
echo true > "$out"
|
||||
else
|
||||
echo false > "$out"
|
||||
fi
|
||||
'');
|
||||
value = builtins.fetchurl url;
|
||||
};
|
||||
|
||||
fetchLatest = channel: let
|
||||
result = tryFetch (mkVerURL channel.version);
|
||||
in if result.success then result.value else fetchLatest (channel // {
|
||||
version = if channel.history != []
|
||||
then (lib.head channel.history).version
|
||||
else throw "Unfortunately there's no older version than " +
|
||||
"${channel.version} available for channel " +
|
||||
"${channel.channel} on ${channel.os}.";
|
||||
history = lib.tail channel.history;
|
||||
});
|
||||
|
||||
getHash = path: import (runCommand "gethash.nix" {
|
||||
inherit path;
|
||||
nativeBuildInputs = [ nix ];
|
||||
} ''
|
||||
sha256="$(nix-hash --flat --base32 --type sha256 "$path")"
|
||||
echo "\"$sha256\"" > "$out"
|
||||
'');
|
||||
|
||||
isLatest = channel: version: let
|
||||
ourVersion = sources.${channel}.version or null;
|
||||
in if ourVersion == null then false
|
||||
else lib.versionOlder version sources.${channel}.version
|
||||
|| version == sources.${channel}.version;
|
||||
|
||||
# We only support GNU/Linux right now.
|
||||
linuxChannels = let
|
||||
genLatest = channelName: channel: let
|
||||
newUpstream = {
|
||||
inherit (channel) version;
|
||||
sha256 = getHash (fetchLatest channel);
|
||||
};
|
||||
keepOld = let
|
||||
oldChannel = sources.${channelName};
|
||||
in {
|
||||
inherit (oldChannel) version sha256;
|
||||
} // lib.optionalAttrs (oldChannel ? sha256bin32) {
|
||||
inherit (oldChannel) sha256bin32;
|
||||
} // lib.optionalAttrs (oldChannel ? sha256bin64) {
|
||||
inherit (oldChannel) sha256bin64;
|
||||
};
|
||||
in if isLatest channelName channel.version then keepOld else newUpstream;
|
||||
in lib.mapAttrs genLatest channels.linux;
|
||||
|
||||
getLinuxFlash = channelName: channel: let
|
||||
inherit (channel) version;
|
||||
fetchArch = arch: tryFetch (getDebURL channelName version arch debURL);
|
||||
packages = lib.genAttrs ["i386" "amd64"] fetchArch;
|
||||
isNew = arch: attr: !(builtins.hasAttr attr channel)
|
||||
&& packages.${arch}.success;
|
||||
in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") {
|
||||
sha256bin32 = getHash (packages.i386.value);
|
||||
} // lib.optionalAttrs (isNew "amd64" "sha256bin64") {
|
||||
sha256bin64 = getHash (packages.amd64.value);
|
||||
};
|
||||
|
||||
newChannels = lib.mapAttrs getLinuxFlash linuxChannels;
|
||||
|
||||
dumpAttrs = indent: attrs: let
|
||||
mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val
|
||||
else "\"${lib.escape ["$" "\\" "\""] (toString val)}\"";
|
||||
mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level);
|
||||
mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n";
|
||||
attrLines = lib.mapAttrsToList mkAttr attrs;
|
||||
in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}";
|
||||
in writeText "chromium-new-upstream-info.nix" ''
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
${dumpAttrs 0 newChannels}
|
||||
'';
|
||||
}
|
||||
77
pkgs/applications/networking/browsers/ungoogled-chromium/update.py
Executable file
77
pkgs/applications/networking/browsers/ungoogled-chromium/update.py
Executable file
|
|
@ -0,0 +1,77 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python -p python3 nix
|
||||
|
||||
import csv
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
from codecs import iterdecode
|
||||
from collections import OrderedDict
|
||||
from os.path import abspath, dirname
|
||||
from urllib.request import urlopen
|
||||
|
||||
HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux'
|
||||
DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g'
|
||||
BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official'
|
||||
|
||||
JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json'
|
||||
|
||||
def load_json(path):
|
||||
with open(path, 'r') as f:
|
||||
return json.load(f)
|
||||
|
||||
def nix_prefetch_url(url, algo='sha256'):
|
||||
print(f'nix-prefetch-url {url}')
|
||||
out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])
|
||||
return out.decode('utf-8').rstrip()
|
||||
|
||||
channels = {}
|
||||
last_channels = load_json(JSON_PATH)
|
||||
|
||||
print(f'GET {HISTORY_URL}', file=sys.stderr)
|
||||
with urlopen(HISTORY_URL) as resp:
|
||||
builds = csv.DictReader(iterdecode(resp, 'utf-8'))
|
||||
for build in builds:
|
||||
channel_name = build['channel']
|
||||
|
||||
# If we've already found a newer build for this channel, we're
|
||||
# no longer interested in it.
|
||||
if channel_name in channels:
|
||||
continue
|
||||
|
||||
# If we're back at the last build we used, we don't need to
|
||||
# keep going -- there's no new version available, and we can
|
||||
# just reuse the info from last time.
|
||||
if build['version'] == last_channels[channel_name]['version']:
|
||||
channels[channel_name] = last_channels[channel_name]
|
||||
continue
|
||||
|
||||
channel = {'version': build['version']}
|
||||
suffix = 'unstable' if channel_name == 'dev' else channel_name
|
||||
|
||||
try:
|
||||
channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz')
|
||||
channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb')
|
||||
except subprocess.CalledProcessError:
|
||||
# This build isn't actually available yet. Continue to
|
||||
# the next one.
|
||||
continue
|
||||
|
||||
channels[channel_name] = channel
|
||||
|
||||
with open(JSON_PATH, 'w') as out:
|
||||
def get_channel_key(item):
|
||||
channel_name = item[0]
|
||||
if channel_name == 'stable':
|
||||
return 0
|
||||
elif channel_name == 'beta':
|
||||
return 1
|
||||
elif channel_name == 'dev':
|
||||
return 2
|
||||
else:
|
||||
print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr)
|
||||
sys.exit(1)
|
||||
sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key))
|
||||
json.dump(sorted_channels, out, indent=2)
|
||||
out.write('\n')
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/sh -e
|
||||
cd "$(dirname "$0")"
|
||||
sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)"
|
||||
cat "$sp" > upstream-info.nix
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "85.0.4183.102",
|
||||
"sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a",
|
||||
"sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm"
|
||||
},
|
||||
"beta": {
|
||||
"version": "86.0.4240.30",
|
||||
"sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl",
|
||||
"sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa"
|
||||
},
|
||||
"dev": {
|
||||
"version": "87.0.4252.0",
|
||||
"sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y",
|
||||
"sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp";
|
||||
sha256bin64 = "017ix9a74f2gzlg6in0x6fqgiw8bpk0rypr6wsqqkslywprypjd0";
|
||||
version = "84.0.4147.89";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "1dbbr7s8vbhxd0sk4k2yqp630zp1r4gzkkd2a86pzlzq2mjhsk8a";
|
||||
sha256bin64 = "0bphfwi6nkj9nzrjjaffiv27xfblgdikyifsbjl6vv2pawkh335q";
|
||||
version = "85.0.4183.15";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp";
|
||||
sha256bin64 = "1hzhgvs2ykqsncpnbnhzh09sw1vlsdfjhs06z5gc80l47brdi3wz";
|
||||
version = "84.0.4147.89";
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@ stdenv
|
|||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, fetchurl
|
||||
, jre
|
||||
, jdk8
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -31,7 +31,7 @@ let
|
|||
buildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
makeWrapper ${jre}/bin/java $out/bin/charles \
|
||||
makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \
|
||||
--add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
|
||||
|
||||
for fn in lib/*.jar; do
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk
|
||||
{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8
|
||||
# Optional, Jitsi still runs without, but you may pass null:
|
||||
, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg
|
||||
}:
|
||||
|
||||
let jdk = jdk8; in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi";
|
||||
version = "2.10.5550";
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
{ stdenv, fetchurl, file, libX11, libXScrnSaver
|
||||
, libGL, qt5, SDL, libpulseaudio
|
||||
, libXrandr, libXext, libXcursor, libXinerama, libXi
|
||||
, curl, sqlite, openssl
|
||||
, libuuid, openh264, libv4l, libxkbfile, libXv, zlib, libXmu
|
||||
, libXtst, libXdamage, pam, libXfixes, libXrender, libjpeg_original
|
||||
, ffmpeg_3
|
||||
}:
|
||||
let
|
||||
# Sky is linked to the libjpeg 8 version and checks for the version number in the code.
|
||||
libjpeg_original_fix = libjpeg_original.overrideAttrs (oldAttrs: {
|
||||
src = fetchurl{
|
||||
url = "https://www.ijg.org/files/jpegsrc.v8d.tar.gz";
|
||||
sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version_major = "2.1.7369";
|
||||
version_minor = "1";
|
||||
version = version_major + "." + version_minor;
|
||||
pname = "sky";
|
||||
unpackCmd = "ar x $curSrc; tar -xf data.tar.xz";
|
||||
src = fetchurl {
|
||||
url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb";
|
||||
sha256 = "0b3j90km3rp5bgaklxw881g0gcy09mqzbhjdfrq4s2np026ql3d9";
|
||||
};
|
||||
buildInputs = [
|
||||
file
|
||||
qt5.qtbase
|
||||
SDL
|
||||
ffmpeg_3
|
||||
sqlite
|
||||
openssl
|
||||
openh264
|
||||
pam
|
||||
curl
|
||||
libX11 libXScrnSaver libGL libpulseaudio libXrandr
|
||||
libXext libXcursor libXinerama libXi libuuid libv4l
|
||||
libxkbfile libXv zlib libXmu libXtst libXdamage
|
||||
libXfixes libXrender
|
||||
libjpeg_original_fix
|
||||
];
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
ls -al ./
|
||||
mkdir -p "$out/bin" "$out/lib" "$out/share"
|
||||
cp -a lib/sky/* $out/bin/
|
||||
cp -aR lib/sky/lib64/* "$out/lib/"
|
||||
cp -a lib/sky/man.sh "$out/bin"
|
||||
chmod +x $out/bin/sky
|
||||
cp -a share/* "$out/share"
|
||||
''
|
||||
;
|
||||
|
||||
|
||||
postFixup = ''
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-client.so.2.0.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-server.so.2.0.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-shadow.so.2.0.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp.so.2.0.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libopenh264.so.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/librdtk.so.1.1.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libSDL-1.3.so.0.0.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libsipw.so.1.0.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libwinpr.so.1.1.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libxfreerdp-client.so.2.0.0
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/sky
|
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/sky_sender
|
||||
sed -i "s#/usr/bin/sky#$out/bin/sky#g" $out/share/applications/sky.desktop
|
||||
sed -i "s#/usr/lib/sky#$out/bin/#g" $out/share/applications/sky.desktop
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Skype for business";
|
||||
longDescription = ''
|
||||
Lync & Skype for business on linux
|
||||
'';
|
||||
homepage = "https://tel.red/";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.Scriptkiddi ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -18,10 +18,16 @@
|
|||
, qtwebkit
|
||||
, qttranslations
|
||||
, substituteAll
|
||||
, withI18n ? true
|
||||
, withI18n ? false
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
let
|
||||
l10n = fetchsvn {
|
||||
url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5";
|
||||
rev = "1566642";
|
||||
sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q";
|
||||
};
|
||||
in mkDerivation rec {
|
||||
pname = "trojita";
|
||||
version = "unstable-2020-07-06";
|
||||
|
||||
|
|
@ -31,12 +37,6 @@ mkDerivation rec {
|
|||
sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn";
|
||||
};
|
||||
|
||||
l10n = fetchsvn {
|
||||
url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5";
|
||||
rev = "1566642";
|
||||
sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
# See https://github.com/NixOS/nixpkgs/issues/86054
|
||||
src = ./fix-qttranslations-path.patch;
|
||||
|
|
|
|||
|
|
@ -25,13 +25,15 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
prePatch = ''
|
||||
substituteInPlace ./setup.py \
|
||||
--replace '"progressbar2==3.41.0",' '"progressbar2==3.47.0",' \
|
||||
--replace '"pysam==0.15.2",' '"pysam==0.15.4",' \
|
||||
--replace '"pyfaidx==0.5.5.2",' '"pyfaidx==0.5.8",'
|
||||
--replace '"progressbar2==3.41.0",' '"progressbar2",' \
|
||||
--replace '"pysam==0.15.2",' '"pysam",' \
|
||||
--replace '"pyfaidx==0.5.5.2",' '"pyfaidx",' \
|
||||
--replace '"intervaltree==3.0.2",' '"intervaltree",'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Structural variant comparison tool for VCFs";
|
||||
homepage = "https://github.com/spiralgenetics/truvari";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ scalavision ];
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p "$out"/{bin,lib/java/leo3}
|
||||
cp "${jar}" "$out/lib/java/leo3/leo3.jar"
|
||||
echo "#!${runtimeShell}" > "$out/bin/leo3"
|
||||
echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3"
|
||||
echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3"
|
||||
chmod a+x "$out/bin/leo3"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
, zlib
|
||||
, gsl
|
||||
, ntl
|
||||
, jdk
|
||||
, jdk8
|
||||
, less
|
||||
}:
|
||||
|
||||
|
|
@ -61,6 +61,8 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
# dependencies.
|
||||
|
||||
let
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
|
||||
runtimepath = (lib.makeBinPath ([
|
||||
"@sage-local@"
|
||||
"@sage-local@/build"
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "2.15.4";
|
||||
version = "2.15.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0n2lrsjs3flfv7650yfhck1c96wkn41cv49440m7csy5yw16zlim";
|
||||
sha256 = "11an0hwva1jlf9y7vd9mscs4g6lzja1rwizsani6411xs6m121a3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pbr ];
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gitolite-shell \
|
||||
--prefix PATH : "${git}/bin"
|
||||
--prefix PATH : ${lib.makeBinPath [ git perl ]}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
23
pkgs/applications/version-management/gomp/default.nix
Normal file
23
pkgs/applications/version-management/gomp/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gomp";
|
||||
version = "1.1.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb";
|
||||
};
|
||||
|
||||
doCheck = false; # tests require interactive terminal
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for comparing Git branches";
|
||||
homepage = "https://github.com/MarkForged/GOMP";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "celluloid";
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "celluloid-player";
|
||||
repo = "celluloid";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jdmwljckajqb3ys8azd1nyy49nvq9kb2knrrqdcfnvzq0m5lpqr";
|
||||
hash = "sha256-fEZnH8EqU6CykgKINXnKChuBUlisroa97B1vjcx2cWA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ rec {
|
|||
sha256 = sha256;
|
||||
};
|
||||
|
||||
patches = [
|
||||
patches = lib.optional (versionAtLeast version "19.03") [
|
||||
# Replace hard-coded cross-compiler with $CC
|
||||
(fetchpatch {
|
||||
url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then
|
|||
PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
|
||||
fi
|
||||
|
||||
cInclude=0
|
||||
|
||||
source @out@/nix-support/utils.bash
|
||||
|
||||
# Flirting with a layer violation here.
|
||||
|
|
|
|||
|
|
@ -86,7 +86,9 @@ rec {
|
|||
done
|
||||
|
||||
# Create runScript and link shell
|
||||
ln -s ${runtimeShell} bin/sh
|
||||
if [ ! -e bin/sh ]; then
|
||||
ln -s ${runtimeShell} bin/sh
|
||||
fi
|
||||
mkdir -p .singularity.d
|
||||
ln -s ${runScriptFile} .singularity.d/runscript
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ stdenv.mkDerivation {
|
|||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx";
|
||||
outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://corefonts.sourceforge.net/";
|
||||
|
|
|
|||
|
|
@ -111,18 +111,18 @@ in
|
|||
};
|
||||
|
||||
noto-fonts-emoji = let
|
||||
version = "unstable-2020-08-20";
|
||||
version = "2020-09-16-unicode13_1";
|
||||
emojiPythonEnv =
|
||||
python3.withPackages (p: with p; [ fonttools nototools ]);
|
||||
in stdenv.mkDerivation {
|
||||
pname = "noto-fonts-emoji";
|
||||
inherit version;
|
||||
version = builtins.replaceStrings [ "_" ] [ "." ] version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "noto-emoji";
|
||||
rev = "1bc491419fa2925d018f27bfe702792031be0e68";
|
||||
sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy";
|
||||
rev = "v${version}";
|
||||
sha256 = "0659336dp0l2nkac153jpcb9yvp0p3dx1crcyxjd14i8cqkfi2hh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nototools";
|
||||
version = "0.2.12";
|
||||
version = "0.2.13";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "googlefonts";
|
||||
repo = "nototools";
|
||||
rev = "v${version}";
|
||||
sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5";
|
||||
sha256 = "0ggp65xgkf9y7jamncm65lkm84wapsa47abf133pcb702875v8jz";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#### APPLICATIONS
|
||||
econnman = callPackage ./econnman { };
|
||||
evisum = callPackage ./evisum { };
|
||||
terminology = callPackage ./terminology { };
|
||||
rage = callPackage ./rage { };
|
||||
ephoto = callPackage ./ephoto { };
|
||||
|
|
|
|||
29
pkgs/desktops/enlightenment/evisum/default.nix
Normal file
29
pkgs/desktops/enlightenment/evisum/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchurl, meson, ninja, pkg-config, efl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evisum";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1l8pym7738kncvic5ga03sj9d5igigvmcxa9lbg47z2yvdjwzv97";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
efl
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "System and process monitor written with EFL";
|
||||
homepage = "https://www.enlightenment.org";
|
||||
license = with licenses; [ isc ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-timepp";
|
||||
version = "unstable-2019-03-30";
|
||||
version = "unstable-2020-03-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zagortenay333";
|
||||
repo = "timepp__gnome";
|
||||
rev = "f90fb5573b37ac89fb57bf62e07d6d3bdb6a2c63";
|
||||
sha256 = "0p6rsbm6lf61vzly775qkwc2rcjjl38bkqdxnv4sccqmw2wwclnp";
|
||||
rev = "34ae477a51267cc1e85992a80cf85a1a7b7005c1";
|
||||
sha256 = "1v0xbrp0x5dwizscxh7h984pax4n92bj8iyw3qvjk27ynpxq8ag1";
|
||||
};
|
||||
|
||||
uuid = "timepp@zagortenay333";
|
||||
|
|
@ -24,6 +24,5 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/zagortenay333/timepp__gnome";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ svsdep ];
|
||||
broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Dosen't support 3.34 https://github.com/zagortenay333/timepp__gnome/issues/113
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, unzip
|
||||
, jdk
|
||||
, jdk8
|
||||
, ant
|
||||
, makeWrapper
|
||||
, jre
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
let jre = jdk8.jre; jdk = jdk8; in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jasmin";
|
||||
version = "2.4";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, fetch
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, zlib
|
||||
, ncurses
|
||||
|
|
@ -20,6 +21,15 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq";
|
||||
|
||||
patches = [
|
||||
# Fix PythonString::GetString for >=python-3.7
|
||||
(fetchpatch {
|
||||
url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch";
|
||||
sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix up various paths that assume llvm and clang are installed in the same place
|
||||
sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, fetch
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, zlib
|
||||
, ncurses
|
||||
|
|
@ -20,6 +21,15 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb";
|
||||
|
||||
patches = [
|
||||
# Fix PythonString::GetString for >=python-3.7
|
||||
(fetchpatch {
|
||||
url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch";
|
||||
sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix up various paths that assume llvm and clang are installed in the same place
|
||||
sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "28";
|
||||
|
|
@ -10,6 +10,14 @@ stdenv.mkDerivation {
|
|||
sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gnumake-4.3-fix.patch";
|
||||
url = "https://github.com/philburk/pforth/commit/457cb99f57292bc855e53abcdcb7b12d6681e847.patch";
|
||||
sha256 = "0x1bwx3pqb09ddjhmdli47lnk1ys4ny42819g17kfn8nkjs5hbx7";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "SRCDIR=." ];
|
||||
makefile = "build/unix/Makefile";
|
||||
|
||||
|
|
|
|||
|
|
@ -208,11 +208,11 @@ self: super: {
|
|||
# Generating the completions should be activated again, once we default to
|
||||
# ghc 8.10.
|
||||
hnix = dontCheck (super.hnix.override {
|
||||
# The neat-interpolation package from stack is to old for hnix.
|
||||
# https://github.com/haskell-nix/hnix/issues/676
|
||||
# Once neat-interpolation >= 0.4 is in our stack release,
|
||||
# (which should happen soon), we can remove this override
|
||||
neat-interpolation = self.neat-interpolation_0_5_1_2;
|
||||
# 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage
|
||||
neat-interpolation = self.neat-interpolation_0_5_1_2; # at least 0.5.1
|
||||
data-fix = self.data-fix_0_3_0; # at least 0.3
|
||||
prettyprinter = self.prettyprinter_1_7_0; # at least 1.7
|
||||
|
||||
});
|
||||
|
||||
# Fails for non-obvious reasons while attempting to use doctest.
|
||||
|
|
@ -1209,14 +1209,9 @@ self: super: {
|
|||
|
||||
# this will probably need to get updated with every ghcide update,
|
||||
# we need an override because ghcide is tracking haskell-lsp closely.
|
||||
ghcide = dontCheck (appendPatch (super.ghcide.override {
|
||||
ghcide = dontCheck (super.ghcide.overrideScope (self: super: {
|
||||
hie-bios = dontCheck super.hie-bios_0_7_1;
|
||||
lsp-test = dontCheck self.lsp-test_0_11_0_5;
|
||||
}) (pkgs.fetchpatch {
|
||||
# This patch loosens the hie-bios upper bound.
|
||||
# It is already merged into upstream and won‘t be needed for ghcide 0.4.0
|
||||
url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch";
|
||||
sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz";
|
||||
}));
|
||||
|
||||
# hasn‘t bumped upper bounds
|
||||
|
|
@ -1466,7 +1461,6 @@ self: super: {
|
|||
jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
|
||||
pandoc = doDistribute self.pandoc_2_10_1;
|
||||
pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2;
|
||||
pandoc-plot = doDistribute self.pandoc-plot_0_9_2_0;
|
||||
pandoc-types = doDistribute self.pandoc-types_1_21;
|
||||
rfc5051 = doDistribute self.rfc5051_0_2;
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ default-package-overrides:
|
|||
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
|
||||
# not yet available in Nixpkgs
|
||||
- gi-gdkx11 < 4
|
||||
# LTS Haskell 16.13
|
||||
# LTS Haskell 16.15
|
||||
- abstract-deque ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
- AC-Angle ==1.0
|
||||
|
|
@ -243,7 +243,7 @@ default-package-overrides:
|
|||
- asn1-encoding ==0.9.6
|
||||
- asn1-parse ==0.9.5
|
||||
- asn1-types ==0.3.4
|
||||
- assert-failure ==0.1.2.4
|
||||
- assert-failure ==0.1.2.5
|
||||
- assoc ==1.0.2
|
||||
- astro ==0.4.2.1
|
||||
- async ==2.2.2
|
||||
|
|
@ -261,12 +261,12 @@ default-package-overrides:
|
|||
- attoparsec-iso8601 ==1.0.1.0
|
||||
- attoparsec-path ==0.0.0.1
|
||||
- audacity ==0.0.2
|
||||
- aur ==7.0.3
|
||||
- aura ==3.1.8
|
||||
- aur ==7.0.4
|
||||
- aura ==3.1.9
|
||||
- authenticate ==1.3.5
|
||||
- authenticate-oauth ==1.6.0.1
|
||||
- auto ==0.4.3.1
|
||||
- autoexporter ==1.1.18
|
||||
- autoexporter ==1.1.19
|
||||
- auto-update ==0.1.6
|
||||
- avers ==0.0.17.1
|
||||
- avro ==0.5.2.0
|
||||
|
|
@ -402,7 +402,7 @@ default-package-overrides:
|
|||
- casing ==0.1.4.1
|
||||
- cassava ==0.5.2.0
|
||||
- cassava-conduit ==0.5.1
|
||||
- cassava-megaparsec ==2.0.1
|
||||
- cassava-megaparsec ==2.0.2
|
||||
- cast ==0.1.0.2
|
||||
- category ==0.2.5.0
|
||||
- cayley-client ==0.4.13
|
||||
|
|
@ -454,7 +454,7 @@ default-package-overrides:
|
|||
- clumpiness ==0.17.0.2
|
||||
- ClustalParser ==1.3.0
|
||||
- cmark ==0.6
|
||||
- cmark-gfm ==0.2.1
|
||||
- cmark-gfm ==0.2.2
|
||||
- cmark-lucid ==0.1.0.0
|
||||
- cmdargs ==0.10.20
|
||||
- codec-beam ==0.2.0
|
||||
|
|
@ -657,7 +657,7 @@ default-package-overrides:
|
|||
- distributed-closure ==0.4.2.0
|
||||
- distribution-opensuse ==1.1.1
|
||||
- distributive ==0.6.2
|
||||
- dl-fedora ==0.7.4
|
||||
- dl-fedora ==0.7.5
|
||||
- dlist ==0.8.0.8
|
||||
- dlist-instances ==0.1.1.1
|
||||
- dlist-nonempty ==0.1.1
|
||||
|
|
@ -671,7 +671,7 @@ default-package-overrides:
|
|||
- doldol ==0.4.1.2
|
||||
- do-list ==1.0.1
|
||||
- do-notation ==0.1.0.2
|
||||
- dotenv ==0.8.0.6
|
||||
- dotenv ==0.8.0.7
|
||||
- dotgen ==0.4.3
|
||||
- dotnet-timespan ==0.0.1.0
|
||||
- double-conversion ==2.0.2.0
|
||||
|
|
@ -733,7 +733,7 @@ default-package-overrides:
|
|||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.8
|
||||
- esqueleto ==3.3.3.3
|
||||
- esqueleto ==3.3.4.0
|
||||
- essence-of-live-coding ==0.1.0.3
|
||||
- essence-of-live-coding-gloss ==0.1.0.3
|
||||
- essence-of-live-coding-pulse ==0.1.0.3
|
||||
|
|
@ -760,7 +760,7 @@ default-package-overrides:
|
|||
- extended-reals ==0.2.4.0
|
||||
- extensible-effects ==5.0.0.1
|
||||
- extensible-exceptions ==0.1.1.4
|
||||
- extra ==1.7.7
|
||||
- extra ==1.7.8
|
||||
- extractable-singleton ==0.0.1
|
||||
- extrapolate ==0.4.2
|
||||
- fail ==4.9.0.0
|
||||
|
|
@ -902,8 +902,8 @@ default-package-overrides:
|
|||
- ghcid ==0.8.7
|
||||
- ghci-hexcalc ==0.1.1.0
|
||||
- ghcjs-codemirror ==0.0.0.2
|
||||
- ghc-lib ==8.10.2.20200808
|
||||
- ghc-lib-parser ==8.10.2.20200808
|
||||
- ghc-lib ==8.10.2.20200916
|
||||
- ghc-lib-parser ==8.10.2.20200916
|
||||
- ghc-lib-parser-ex ==8.10.0.16
|
||||
- ghc-parser ==0.2.2.0
|
||||
- ghc-paths ==0.1.0.12
|
||||
|
|
@ -988,7 +988,7 @@ default-package-overrides:
|
|||
- hashable-time ==0.2.0.2
|
||||
- hashids ==1.0.2.4
|
||||
- hashmap ==1.3.3
|
||||
- hashtables ==1.2.3.4
|
||||
- hashtables ==1.2.4.1
|
||||
- haskeline ==0.7.5.0
|
||||
- haskell-gi ==0.23.1
|
||||
- haskell-gi-base ==0.23.0
|
||||
|
|
@ -1130,7 +1130,7 @@ default-package-overrides:
|
|||
- html-entity-map ==0.1.0.0
|
||||
- htoml ==1.0.0.3
|
||||
- http2 ==2.0.5
|
||||
- HTTP ==4000.3.14
|
||||
- HTTP ==4000.3.15
|
||||
- http-api-data ==0.4.1.1
|
||||
- http-client ==0.6.4.1
|
||||
- http-client-openssl ==0.3.1.0
|
||||
|
|
@ -1205,7 +1205,7 @@ default-package-overrides:
|
|||
- indexed-list-literals ==0.2.1.3
|
||||
- indexed-profunctors ==0.1
|
||||
- infer-license ==0.2.0
|
||||
- inflections ==0.4.0.5
|
||||
- inflections ==0.4.0.6
|
||||
- influxdb ==1.7.1.6
|
||||
- ini ==0.4.1
|
||||
- inj ==1.0
|
||||
|
|
@ -1232,11 +1232,11 @@ default-package-overrides:
|
|||
- invertible ==0.2.0.7
|
||||
- invertible-grammar ==0.1.3
|
||||
- io-machine ==0.2.0.0
|
||||
- io-manager ==0.1.0.2
|
||||
- io-manager ==0.1.0.3
|
||||
- io-memoize ==1.1.1.0
|
||||
- io-region ==0.1.1
|
||||
- io-storage ==0.3
|
||||
- io-streams ==1.5.1.0
|
||||
- io-streams ==1.5.2.0
|
||||
- io-streams-haproxy ==1.0.1.0
|
||||
- ip6addr ==1.0.1
|
||||
- iproute ==1.7.9
|
||||
|
|
@ -1597,7 +1597,7 @@ default-package-overrides:
|
|||
- OpenGLRaw ==3.3.4.0
|
||||
- openpgp-asciiarmor ==0.1.2
|
||||
- opensource ==0.1.1.0
|
||||
- openssl-streams ==1.2.2.0
|
||||
- openssl-streams ==1.2.3.0
|
||||
- opentelemetry ==0.4.2
|
||||
- opentelemetry-extra ==0.4.2
|
||||
- opentelemetry-lightstep ==0.4.2
|
||||
|
|
@ -1782,7 +1782,7 @@ default-package-overrides:
|
|||
- pushbullet-types ==0.4.1.0
|
||||
- pusher-http-haskell ==1.5.1.14
|
||||
- pvar ==0.2.0.0
|
||||
- PyF ==0.9.0.1
|
||||
- PyF ==0.9.0.2
|
||||
- qchas ==1.1.0.1
|
||||
- qm-interpolated-string ==0.3.0.0
|
||||
- qrcode-core ==0.9.4
|
||||
|
|
@ -1793,7 +1793,7 @@ default-package-overrides:
|
|||
- quickcheck-arbitrary-adt ==0.3.1.0
|
||||
- quickcheck-assertions ==0.3.0
|
||||
- quickcheck-classes ==0.6.4.0
|
||||
- quickcheck-classes-base ==0.6.0.0
|
||||
- quickcheck-classes-base ==0.6.1.0
|
||||
- quickcheck-instances ==0.3.23
|
||||
- quickcheck-io ==0.2.0
|
||||
- quickcheck-simple ==0.1.1.1
|
||||
|
|
@ -1886,7 +1886,7 @@ default-package-overrides:
|
|||
- rhine ==0.6.0
|
||||
- rhine-gloss ==0.6.0.1
|
||||
- rigel-viz ==0.2.0.0
|
||||
- rio ==0.1.18.0
|
||||
- rio ==0.1.19.0
|
||||
- rio-orphans ==0.1.1.0
|
||||
- rio-prettyprint ==0.1.1.0
|
||||
- roc-id ==0.1.0.0
|
||||
|
|
@ -2039,7 +2039,7 @@ default-package-overrides:
|
|||
- smallcheck ==1.1.7
|
||||
- smash ==0.1.1.0
|
||||
- smash-aeson ==0.1.0.0
|
||||
- smash-lens ==0.1.0.0
|
||||
- smash-lens ==0.1.0.1
|
||||
- smash-microlens ==0.1.0.0
|
||||
- smoothie ==0.4.2.11
|
||||
- snap-blaze ==0.2.1.5
|
||||
|
|
@ -2413,7 +2413,7 @@ default-package-overrides:
|
|||
- wai-cors ==0.2.7
|
||||
- wai-enforce-https ==0.0.2.1
|
||||
- wai-eventsource ==3.0.0
|
||||
- wai-extra ==3.0.29.2
|
||||
- wai-extra ==3.0.31
|
||||
- wai-handler-launch ==3.0.3.1
|
||||
- wai-logger ==2.3.6
|
||||
- wai-middleware-caching ==0.1.0.2
|
||||
|
|
@ -2512,7 +2512,7 @@ default-package-overrides:
|
|||
- yesod-gitrev ==0.2.1
|
||||
- yesod-newsfeed ==1.7.0.0
|
||||
- yesod-persistent ==1.6.0.4
|
||||
- yesod-recaptcha2 ==1.0.0
|
||||
- yesod-recaptcha2 ==1.0.1
|
||||
- yesod-sitemap ==1.6.0
|
||||
- yesod-static ==1.6.1.0
|
||||
- yesod-test ==1.6.10
|
||||
|
|
@ -3441,6 +3441,7 @@ broken-packages:
|
|||
- bitcoin-api
|
||||
- bitcoin-api-extra
|
||||
- bitcoin-block
|
||||
- bitcoin-compact-filters
|
||||
- bitcoin-hs
|
||||
- bitcoin-rpc
|
||||
- bitcoin-script
|
||||
|
|
@ -5543,6 +5544,7 @@ broken-packages:
|
|||
- graphicstools
|
||||
- graphmod-plugin
|
||||
- graphql
|
||||
- graphql-utils
|
||||
- graphql-w-persistent
|
||||
- graphted
|
||||
- graphtype
|
||||
|
|
@ -7515,6 +7517,7 @@ broken-packages:
|
|||
- LslPlus
|
||||
- lsystem
|
||||
- ltext
|
||||
- lti13
|
||||
- ltk
|
||||
- LTS
|
||||
- lua-bc
|
||||
|
|
@ -11227,6 +11230,7 @@ broken-packages:
|
|||
- yesod-auth-ldap
|
||||
- yesod-auth-ldap-mediocre
|
||||
- yesod-auth-ldap-native
|
||||
- yesod-auth-lti13
|
||||
- yesod-auth-nopassword
|
||||
- yesod-auth-oauth2
|
||||
- yesod-auth-pam
|
||||
|
|
|
|||
|
|
@ -571,9 +571,20 @@ self: super: builtins.intersectAttrs super {
|
|||
}));
|
||||
|
||||
# Expects z3 to be on path so we replace it with a hard
|
||||
#
|
||||
# The tests expect additional solvers on the path, replace the
|
||||
# available ones also with hard coded paths, and remove the missing
|
||||
# ones from the test.
|
||||
sbv = overrideCabal super.sbv (drv: {
|
||||
postPatch = ''
|
||||
sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs'';
|
||||
sed -i -e 's|"abc"|"${pkgs.abc-verifier}/bin/abc"|' Data/SBV/Provers/ABC.hs
|
||||
sed -i -e 's|"boolector"|"${pkgs.boolector}/bin/boolector"|' Data/SBV/Provers/Boolector.hs
|
||||
sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs
|
||||
sed -i -e 's|"yices-smt2"|"${pkgs.yices}/bin/yices-smt2"|' Data/SBV/Provers/Yices.hs
|
||||
sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs
|
||||
|
||||
sed -i -e 's|\[abc, boolector, cvc4, mathSAT, yices, z3, dReal\]|[abc, boolector, cvc4, yices, z3]|' SBVTestSuite/SBVConnectionTest.hs
|
||||
'';
|
||||
});
|
||||
|
||||
# The test-suite requires a running PostgreSQL server.
|
||||
|
|
|
|||
1163
pkgs/development/haskell-modules/hackage-packages.nix
generated
1163
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -105,18 +105,6 @@ symlinkJoin {
|
|||
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
|
||||
fi
|
||||
|
||||
# ghcide 0.2.0 does package discovery without calling our ghc wrapper.
|
||||
# 2020-08-16 We can most likely remove this workaround as soon as we build ghcide with a newer hie-bios (currently we use 0.5.1 from stack)
|
||||
for prg in ghcide; do
|
||||
if [[ -x "$out/bin/$prg" ]]; then
|
||||
wrapProgram $out/bin/$prg \
|
||||
--set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \
|
||||
--set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \
|
||||
--set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \
|
||||
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
|
||||
fi
|
||||
done
|
||||
|
||||
'' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) ''
|
||||
# Work around a linker limit in macOS Sierra (see generic-builder.nix):
|
||||
local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }:
|
||||
{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase =
|
||||
let
|
||||
binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
|
||||
binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
|
||||
in
|
||||
''
|
||||
mkdir -p $out/libexec
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
|
||||
, libxml2, libxslt, ncurses, openssl, perl, autoconf
|
||||
, openjdk ? null # javacSupport
|
||||
# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
|
||||
, openjdk8 ? null # javacSupport
|
||||
, unixODBC ? null # odbcSupport
|
||||
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
|
||||
, parallelBuild ? false
|
||||
|
|
@ -17,7 +18,7 @@
|
|||
, enableThreads ? true
|
||||
, enableSmpSupport ? true
|
||||
, enableKernelPoll ? true
|
||||
, javacSupport ? false, javacPackages ? [ openjdk ]
|
||||
, javacSupport ? false, javacPackages ? [ openjdk8 ]
|
||||
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
|
||||
, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
|
||||
, preUnpack ? "", postUnpack ? ""
|
||||
|
|
@ -36,7 +37,7 @@ assert wxSupport -> (if stdenv.isDarwin
|
|||
else libGL != null && libGLU != null && wxGTK != null && xorg != null);
|
||||
|
||||
assert odbcSupport -> unixODBC != null;
|
||||
assert javacSupport -> openjdk != null;
|
||||
assert javacSupport -> openjdk8 != null;
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionals optionalAttrs optionalString;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
|
||||
{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }:
|
||||
|
||||
{
|
||||
jogl_2_3_2 =
|
||||
|
|
@ -28,7 +28,8 @@
|
|||
-exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ jdk ant git ];
|
||||
# TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731
|
||||
nativeBuildInputs = [ jdk8 ant git ];
|
||||
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
37
pkgs/development/libraries/embree/default.nix
Normal file
37
pkgs/development/libraries/embree/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
|
||||
openimageio, libjpeg, libpng, libpthreadstubs, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "embree";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "embree";
|
||||
repo = "embree";
|
||||
rev = "v${version}";
|
||||
sha256 = "0v5gqi8jp09xxcbyyknji83412bq4l0w35b6hnrqxycgdrnf7hkr";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Fix duplicate /nix/store/.../nix/store/.../ paths
|
||||
sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \
|
||||
common/cmake/embree-config.cmake
|
||||
sed -i "s|$""{EMBREE_ROOT_DIR}/||" common/cmake/embree-config.cmake
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DEMBREE_TUTORIALS=OFF"
|
||||
"-DEMBREE_RAY_MASK=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ ispc pkgconfig cmake ];
|
||||
buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "High performance ray tracing kernels from Intel";
|
||||
homepage = "https://embree.github.io/";
|
||||
maintainers = with maintainers; [ hodapp gebner ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{stdenv, fetchurl, gettext, jdk, libmatthew_java}:
|
||||
{stdenv, fetchurl, gettext, jdk8, libmatthew_java}:
|
||||
|
||||
let jdk = jdk8; in
|
||||
stdenv.mkDerivation {
|
||||
name = "dbus-java-2.7";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libgumath";
|
||||
version = "unstable-2018-11-27";
|
||||
version = "unstable-2019-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plures";
|
||||
owner = "xnd-project";
|
||||
repo = "gumath";
|
||||
rev = "5a9d27883b40432246d6a93cd6133157267fd166";
|
||||
sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w";
|
||||
rev = "360ed454105ac5615a7cb7d216ad25bc4181b876";
|
||||
sha256 = "1wprkxpmjrk369fpw8rbq51r7jvqkcndqs209y7p560cnagmsxc6";
|
||||
};
|
||||
|
||||
buildInputs = [ libndtypes libxnd ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libndtypes";
|
||||
version = "unstable-2018-11-27";
|
||||
version = "unstable-2019-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plures";
|
||||
owner = "xnd-project";
|
||||
repo = "ndtypes";
|
||||
rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a";
|
||||
sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9";
|
||||
rev = "3ce6607c96d8fe67b72cc0c97bf595620cdd274e";
|
||||
sha256 = "18303q0jfar1lmi4krp94plczb455zcgw772f9lb8xa5p0bkhx01";
|
||||
};
|
||||
|
||||
# Override linker with cc (symlink to either gcc or clang)
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libxnd";
|
||||
version = "unstable-2018-11-27";
|
||||
version = "unstable-2019-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plures";
|
||||
owner = "xnd-project";
|
||||
repo = "xnd";
|
||||
rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3";
|
||||
sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44";
|
||||
rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc";
|
||||
sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y";
|
||||
};
|
||||
|
||||
buildInputs = [ libndtypes ];
|
||||
|
|
@ -28,6 +28,14 @@ stdenv.mkDerivation {
|
|||
"--with-libs=${libndtypes}/lib"
|
||||
];
|
||||
|
||||
# other packages which depend on libxnd seem to expect overflow.h, but
|
||||
# it doesn't seem to be included in the installed headers. for now this
|
||||
# works, but the generic name of the header could produce problems
|
||||
# with collisions down the line.
|
||||
postInstall = ''
|
||||
cp libxnd/overflow.h $out/include/overflow.h
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
|
||||
pkgconfig, fontconfig, freetype, expat, freeimage, vtk }:
|
||||
pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb,
|
||||
OpenCL, Cocoa
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencascade-oce";
|
||||
version = "0.18.3";
|
||||
|
|
@ -13,13 +16,21 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkgconfig ];
|
||||
buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ];
|
||||
buildInputs = [
|
||||
libGL libGLU libXmu freetype fontconfig expat freeimage vtk
|
||||
gl2ps tbb
|
||||
]
|
||||
++ optionals stdenv.isDarwin [OpenCL Cocoa]
|
||||
;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOCE_INSTALL_PREFIX=${placeholder "out"}"
|
||||
"-DOCE_WITH_FREEIMAGE=ON"
|
||||
"-DOCE_WITH_VTK=ON"
|
||||
];
|
||||
"-DOCE_WITH_GL2PS=ON"
|
||||
"-DOCE_MULTITHREAD_LIBRARY=TBB"
|
||||
]
|
||||
++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"];
|
||||
|
||||
patches = [
|
||||
# Use fontconfig instead of hardcoded directory list
|
||||
|
|
@ -33,6 +44,10 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch";
|
||||
sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tpaviot/oce/commit/cf50d078cd5fac03a48fd204938bd240930a08dc.patch";
|
||||
sha256 = "1xv94hcvggmb1c8vqwic1aiw9jw1sxk8mqbaak9xs9ycfqdvgdyc";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -41,11 +56,11 @@ stdenv.mkDerivation rec {
|
|||
--replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = {
|
||||
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
|
||||
homepage = "https://github.com/tpaviot/oce";
|
||||
maintainers = [ maintainers.viric ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "sqlite";
|
||||
version = "3.33.0";
|
||||
|
||||
# NB! Make sure to update analyzer.nix src (in the same directory).
|
||||
# NB! Make sure to update ./tools.nix src (in the same directory).
|
||||
src = fetchurl {
|
||||
url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz";
|
||||
sha256 = "05dvdfaxd552gj5p7k0i72sfam7lykaw1g2pfn52jnppqx42qshh";
|
||||
|
|
|
|||
43
pkgs/development/libraries/sqlite/tools.nix
Normal file
43
pkgs/development/libraries/sqlite/tools.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
|
||||
|
||||
let
|
||||
archiveVersion = import ./archive-version.nix stdenv.lib;
|
||||
mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "3.33.0";
|
||||
|
||||
src = assert version == sqlite.version; fetchurl {
|
||||
url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip";
|
||||
sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation;
|
||||
|
||||
makeFlags = [ makeTarget ];
|
||||
|
||||
installPhase = "install -Dt $out/bin ${makeTarget}";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit description homepage;
|
||||
downloadPage = http://sqlite.org/download.html;
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ pesterhazy johnazoidberg ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
sqldiff = mkTool {
|
||||
pname = "sqldiff";
|
||||
makeTarget = "sqldiff";
|
||||
description = "A tool that displays the differences between SQLite databases";
|
||||
homepage = "https://www.sqlite.org/sqldiff.html";
|
||||
};
|
||||
sqlite-analyzer = mkTool {
|
||||
pname = "sqlite-analyzer";
|
||||
makeTarget = "sqlite3_analyzer";
|
||||
description = "A tool that shows statistics about SQLite databases";
|
||||
homepage = "https://www.sqlite.org/sqlanalyze.html";
|
||||
};
|
||||
}
|
||||
|
|
@ -170,6 +170,32 @@ let
|
|||
meta.broken = since "10";
|
||||
};
|
||||
|
||||
vega-cli = super.vega-cli.override {
|
||||
nativeBuildInputs = [ pkgs.pkgconfig ];
|
||||
buildInputs = with pkgs; [
|
||||
super.node-pre-gyp
|
||||
pixman
|
||||
cairo
|
||||
pango
|
||||
libjpeg
|
||||
];
|
||||
};
|
||||
|
||||
vega-lite = super.vega-lite.override {
|
||||
# npx tries to install vega from scratch at vegalite runtime if it
|
||||
# can't find it. We thus replace it with a direct call to the nix
|
||||
# derivation. This might not be necessary anymore in future vl
|
||||
# versions: https://github.com/vega/vega-lite/issues/6863.
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2pdf \
|
||||
--replace "npx -p vega vg2pdf" "${self.vega-cli}/bin/vg2pdf"
|
||||
substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2svg \
|
||||
--replace "npx -p vega vg2svg" "${self.vega-cli}/bin/vg2svg"
|
||||
substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2png \
|
||||
--replace "npx -p vega vg2png" "${self.vega-cli}/bin/vg2png"
|
||||
'';
|
||||
};
|
||||
|
||||
webtorrent-cli = super.webtorrent-cli.override {
|
||||
buildInputs = [ self.node-gyp-build ];
|
||||
};
|
||||
|
|
@ -181,6 +207,8 @@ let
|
|||
# https://sharp.pixelplumbing.com/install
|
||||
vips
|
||||
|
||||
libsecret
|
||||
self.node-gyp-build
|
||||
self.node-pre-gyp
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -139,6 +139,7 @@
|
|||
, "ocaml-language-server"
|
||||
, "parcel-bundler"
|
||||
, "parsoid"
|
||||
, "patch-package"
|
||||
, "peerflix"
|
||||
, "peerflix-server"
|
||||
, "pnpm"
|
||||
|
|
@ -198,6 +199,8 @@
|
|||
, "typescript-language-server"
|
||||
, "uglify-js"
|
||||
, "ungit"
|
||||
, "vega-cli"
|
||||
, "vega-lite"
|
||||
, "vim-language-server"
|
||||
, "vscode-css-languageserver-bin"
|
||||
, "vscode-html-languageserver-bin"
|
||||
|
|
|
|||
3142
pkgs/development/node-packages/node-packages.nix
generated
3142
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,20 +1,20 @@
|
|||
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python
|
||||
, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens
|
||||
, brotli, fontmath, mutatormath, booleanoperations
|
||||
, ufoprocessor, ufonormalizer, psautohint
|
||||
, ufoprocessor, ufonormalizer, psautohint, tqdm
|
||||
, setuptools_scm
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "afdko";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck";
|
||||
sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
|
@ -35,6 +35,7 @@ buildPythonPackage rec {
|
|||
ufoprocessor
|
||||
ufonormalizer
|
||||
psautohint
|
||||
tqdm
|
||||
];
|
||||
|
||||
# tests are broken on non x86_64
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }:
|
||||
{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "agate-sql";
|
||||
|
|
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
|||
sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ agate sqlalchemy ];
|
||||
propagatedBuildInputs = [ agate sqlalchemy crate ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Adds SQL read/write support to agate.";
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cartopy";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Cartopy";
|
||||
sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2";
|
||||
sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz";
|
||||
};
|
||||
|
||||
checkInputs = [ filelock mock pytest_4 pep8 ];
|
||||
|
|
|
|||
37
pkgs/development/python-modules/crate/default.nix
Normal file
37
pkgs/development/python-modules/crate/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ stdenv
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, urllib3
|
||||
, isPy3k
|
||||
, mock
|
||||
, sqlalchemy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "crate";
|
||||
version = "0.24.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "028q9r1qyqkq185awkazhplfy7y1081963fnjzi3kf3lxvz6yhay";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
urllib3
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
sqlalchemy
|
||||
mock
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/crate/crate-python";
|
||||
description = "A Python client library for CrateDB";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,10 +9,21 @@ buildPythonPackage rec {
|
|||
sha256 = "a7d47eae4d2a11c8cb0df10ae3d034d95b0b8cef9d060e59e7519ad1f82ffa73";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "msgpack<1.0.0" "msgpack"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ msgpack ];
|
||||
|
||||
# Tests fail because absent in package
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"fluent"
|
||||
"fluent.event"
|
||||
"fluent.handler"
|
||||
"fluent.sender"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A structured logger for Fluentd (Python)";
|
||||
|
|
|
|||
|
|
@ -21,9 +21,8 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [ boltons attrs face ];
|
||||
|
||||
checkInputs = [ pytest pyyaml ];
|
||||
checkPhase = "pytest glom/test";
|
||||
|
||||
doCheck = !isPy37; # https://github.com/mahmoud/glom/issues/72
|
||||
# test_cli.py checks the output of running "glom"
|
||||
checkPhase = "PATH=$out/bin:$PATH pytest glom/test";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/mahmoud/glom";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pytestcov
|
||||
, hyppo
|
||||
, matplotlib
|
||||
, networkx
|
||||
, numpy
|
||||
|
|
@ -14,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graspy";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -22,10 +23,11 @@ buildPythonPackage rec {
|
|||
owner = "neurodata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ss7d71lwblimg7ri88ir9w59j0ri13wl75091hjf7q0mchqr6yd";
|
||||
sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hyppo
|
||||
matplotlib
|
||||
networkx
|
||||
numpy
|
||||
|
|
@ -34,14 +36,9 @@ buildPythonPackage rec {
|
|||
seaborn
|
||||
];
|
||||
|
||||
checkInputs = [ pytest pytestcov ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# `test_autogmm` takes too long; fixed in next release (graspy/pull/328)
|
||||
pytest tests -k 'not test_autogmm'
|
||||
runHook postCheck
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook pytestcov ];
|
||||
pytestFlagsArray = [ "tests" "--ignore=docs" ];
|
||||
disabledTests = [ "gridplot_outputs" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://graspy.neurodata.io";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ buildPythonPackage
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, numba
|
||||
, ndtypes
|
||||
, xnd
|
||||
|
|
@ -25,4 +27,20 @@ buildPythonPackage {
|
|||
--replace 'add_runtime_library_dirs = ["$ORIGIN"]' \
|
||||
'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]'
|
||||
'';
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
pushd python
|
||||
mv gumath _gumath
|
||||
# minor precision issues
|
||||
substituteInPlace test_gumath.py --replace 'test_sin' 'dont_test_sin'
|
||||
python test_gumath.py
|
||||
python test_xndarray.py
|
||||
popd
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
40
pkgs/development/python-modules/hyppo/default.nix
Normal file
40
pkgs/development/python-modules/hyppo/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook , pytestcov , numba
|
||||
, numpy
|
||||
, scikitlearn
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hyppo";
|
||||
version = "0.1.3";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neurodata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0qdnb1l4hz4dgwhapz1fp9sb2vxxvr8h2ngsbvyf50h3kapcn19r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numba
|
||||
numpy
|
||||
scikitlearn
|
||||
scipy
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook pytestcov ];
|
||||
pytestFlagsArray = [ "--ignore=docs" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/neurodata/hyppo";
|
||||
description = "Indepedence testing in Python";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
|
||||
, setuptools_scm, jaraco_collections, importlib-metadata
|
||||
, setuptools_scm, jaraco_collections, importlib-metadata, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -16,6 +16,8 @@ buildPythonPackage rec {
|
|||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "irc" ];
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
|
|
@ -26,6 +28,7 @@ buildPythonPackage rec {
|
|||
pytz
|
||||
jaraco_itertools
|
||||
jaraco_collections
|
||||
toml
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -7,9 +7,12 @@
|
|||
, paramiko
|
||||
, netaddr
|
||||
, ncclient
|
||||
, ntc-templates
|
||||
, lxml
|
||||
, jinja2
|
||||
, pyyaml
|
||||
, transitions
|
||||
, yamlordereddictloader
|
||||
, nose
|
||||
}:
|
||||
|
||||
|
|
@ -22,11 +25,10 @@ buildPythonPackage rec {
|
|||
sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855";
|
||||
};
|
||||
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
scp six pyserial paramiko netaddr ncclient lxml jinja2 pyyaml
|
||||
scp six pyserial paramiko netaddr ncclient ntc-templates lxml jinja2 pyyaml transitions yamlordereddictloader
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,24 +1,31 @@
|
|||
{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k
|
||||
{ lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k
|
||||
, ipython
|
||||
, ipywidgets
|
||||
, numpy
|
||||
, pyqt5
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lightparam";
|
||||
version = "0.4.6";
|
||||
disabled = !isPy3k;
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
python = "py3";
|
||||
sha256 = "eca63016524208afb6a06db19baf659e698cce3ae2e57be15b37bc988549c631";
|
||||
src = fetchFromGitHub {
|
||||
owner = "portugueslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipython
|
||||
ipywidgets
|
||||
numpy
|
||||
pyqt5
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "lightparam" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/portugueslab/lightparam";
|
||||
description = "Another attempt at parameters in Python";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,24 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, mock }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mock-open";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
# no tests in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "nivbend";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ikhrhlkl5c7qbigpsv44jw89ws1z7j06gzyg5dh1ki533ifbjm2";
|
||||
sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm";
|
||||
};
|
||||
|
||||
patches = lib.optional (pythonOlder "3.0")
|
||||
(fetchpatch {
|
||||
name = "ascii-only.patch";
|
||||
url = "https://github.com/das-g/mock-open/commit/521ff260da127949fe4aceff1667cba223c5b07b.patch";
|
||||
sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn";
|
||||
});
|
||||
|
||||
propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ buildPythonPackage
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, numpy
|
||||
, libndtypes
|
||||
, isPy27
|
||||
|
|
@ -24,5 +26,14 @@ buildPythonPackage {
|
|||
postInstall = ''
|
||||
mkdir $out/include
|
||||
cp python/ndtypes/*.h $out/include
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
pushd python
|
||||
mv ndtypes _ndtypes
|
||||
python test_ndtypes.py
|
||||
popd
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
36
pkgs/development/python-modules/ntc-templates/default.nix
Normal file
36
pkgs/development/python-modules/ntc-templates/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, textfsm
|
||||
, pytestCheckHook
|
||||
, ruamel_yaml
|
||||
, yamllint
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ntc-templates";
|
||||
version = "1.5.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "networktocode";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0pvd9n7hcmxl9cr8m1xlqcjmy3k2hga0qmn2k3x9hripjis7pbbi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ textfsm ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ruamel_yaml yamllint ];
|
||||
|
||||
# https://github.com/networktocode/ntc-templates/issues/743
|
||||
disabledTests = [ "test_raw_data_against_mock" "test_verify_parsed_and_reference_data_exists" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "TextFSM templates for parsing show commands of network devices";
|
||||
homepage = "https://github.com/networktocode/ntc-templates";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }:
|
||||
{ lib, buildPythonPackage, fetchPypi, python, requests }:
|
||||
with lib;
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-aws4auth";
|
||||
|
|
@ -9,15 +9,12 @@ buildPythonPackage rec {
|
|||
sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce";
|
||||
};
|
||||
|
||||
postPatch = optionalString isPy3k ''
|
||||
sed "s/path_encoding_style/'path_encoding_style'/" \
|
||||
-i requests_aws4auth/service_parameters.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
# The test fail on Python >= 3 because of module import errors.
|
||||
doCheck = !isPy3k;
|
||||
checkPhase = ''
|
||||
cd requests_aws4auth
|
||||
${python.interpreter} test/requests_aws4auth_test.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Amazon Web Services version 4 authentication for the Python Requests library.";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, flask-compress
|
||||
, flask-cors
|
||||
, flask-sockets
|
||||
, imageio
|
||||
, numpy
|
||||
, scipy
|
||||
, pillow
|
||||
|
|
@ -25,7 +26,22 @@ buildPythonPackage rec {
|
|||
sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ flask flask-compress flask-cors flask-sockets numpy scipy pillow gevent wget six colorcet unidecode urllib3 ];
|
||||
propagatedBuildInputs = [
|
||||
colorcet
|
||||
flask
|
||||
flask-compress
|
||||
flask-cors
|
||||
flask-sockets
|
||||
gevent
|
||||
imageio
|
||||
numpy
|
||||
pillow
|
||||
scipy
|
||||
six
|
||||
unidecode
|
||||
urllib3
|
||||
wget
|
||||
];
|
||||
|
||||
# tests are not packaged in the released tarball
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, pythonAtLeast
|
||||
, fetchPypi
|
||||
, nose
|
||||
, forbiddenfruit
|
||||
|
|
@ -8,6 +9,8 @@
|
|||
buildPythonPackage rec {
|
||||
version = "0.1.2";
|
||||
pname = "shouldbe";
|
||||
# incompatible, https://github.com/DirectXMan12/should_be/issues/4
|
||||
disabled = pythonAtLeast "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue