mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge staging-next into staging
This commit is contained in:
commit
d002d690a2
1
.gitattributes
vendored
1
.gitattributes
vendored
|
@ -1,4 +1,5 @@
|
|||
**/deps.nix linguist-generated
|
||||
**/deps.json linguist-generated
|
||||
**/node-packages.nix linguist-generated
|
||||
|
||||
pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
|
||||
|
|
|
@ -2233,6 +2233,12 @@
|
|||
github = "scaredmushroom";
|
||||
githubId = 45340040;
|
||||
};
|
||||
CaptainJawZ = {
|
||||
email = "CaptainJawZ@outlook.com";
|
||||
name = "Danilo Reyes";
|
||||
github = "CaptainJawZ";
|
||||
githubId = 43111068;
|
||||
};
|
||||
carlosdagos = {
|
||||
email = "m@cdagostino.io";
|
||||
github = "carlosdagos";
|
||||
|
|
|
@ -16,11 +16,12 @@ in
|
|||
group.
|
||||
'';
|
||||
};
|
||||
package = mkPackageOption pkgs "flashrom" { };
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.flashrom ];
|
||||
environment.systemPackages = [ pkgs.flashrom ];
|
||||
services.udev.packages = [ cfg.package ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
users.groups.flashrom = { };
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
@ -1,27 +1,27 @@
|
|||
-----BEGIN RSA PRIVATE KEY-----
|
||||
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
|
||||
-----END RSA PRIVATE KEY-----
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
@ -1,27 +1,27 @@
|
|||
-----BEGIN RSA PRIVATE KEY-----
|
||||
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
|
||||
-----END RSA PRIVATE KEY-----
|
||||
|
|
|
@ -10,7 +10,11 @@ let
|
|||
domain = conf.domain;
|
||||
in mkDerivation {
|
||||
name = "test-certs";
|
||||
buildInputs = [ minica ];
|
||||
buildInputs = [ (minica.overrideAttrs (old: {
|
||||
prePatch = ''
|
||||
sed -i 's_NotAfter: time.Now().AddDate(2, 0, 30),_NotAfter: time.Now().AddDate(20, 0, 0),_' main.go
|
||||
'';
|
||||
})) ];
|
||||
phases = [ "buildPhase" "installPhase" ];
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
@ -1,78 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, openssl
|
||||
, db48
|
||||
, boost
|
||||
, zlib
|
||||
, miniupnpc
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, util-linux
|
||||
, protobuf
|
||||
, qrencode
|
||||
, libevent
|
||||
, withGui
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-classic";
|
||||
version = "1.3.8uahf";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoinclassic";
|
||||
repo = "bitcoinclassic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fVmFD1B4kKoejd2cmPPF5TJJQTAA6AVsGlVY8IIUNK4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
db48
|
||||
boost
|
||||
zlib
|
||||
miniupnpc
|
||||
util-linux
|
||||
protobuf
|
||||
libevent
|
||||
] ++ lib.optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
|
||||
++ lib.optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
|
||||
CXXFLAGS = [ "-std=c++14" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Peer-to-peer electronic cash system (Classic client)";
|
||||
longDescription = ''
|
||||
Bitcoin is a free open source peer-to-peer electronic cash system that is
|
||||
completely decentralized, without the need for a central server or trusted
|
||||
parties. Users hold the crypto keys to their own money and transact directly
|
||||
with each other, with the help of a P2P network to check for double-spending.
|
||||
|
||||
Bitcoin Classic stands for the original Bitcoin as Satoshi described it,
|
||||
"A Peer-to-Peer Electronic Cash System". We are writing the software that
|
||||
miners and users say they want. We will make sure it solves their needs, help
|
||||
them deploy it, and gracefully upgrade the bitcoin network's capacity
|
||||
together. The data shows that Bitcoin can grow, on-chain, to welcome many
|
||||
more users onto our coin in a safe and distributed manner. In the future we
|
||||
will continue to release updates that are in line with Satoshi’s whitepaper &
|
||||
vision, and are agreed upon by the community.
|
||||
'';
|
||||
homepage = "https://bitcoinclassic.com/";
|
||||
maintainers = with maintainers; [ jefdaj ];
|
||||
license = licenses.mit;
|
||||
broken = stdenv.isDarwin;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -1,72 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, openssl
|
||||
, boost
|
||||
, libb2
|
||||
, libevent
|
||||
, autoreconfHook
|
||||
, db4
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, hexdump
|
||||
, zeromq
|
||||
, libsodium
|
||||
, withGui
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, wrapQtAppsHook ? null
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BTCGPU";
|
||||
repo = "BTCGPU";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1tFoUNsCPJkHSmNRl5gE3n2EQD6RZSry1zIM5hiTzEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
hexdump
|
||||
] ++ optionals withGui [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
boost
|
||||
libevent
|
||||
db4
|
||||
zeromq
|
||||
libsodium
|
||||
libb2
|
||||
] ++ optionals withGui [
|
||||
qtbase
|
||||
qttools
|
||||
protobuf
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
] ++ optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "BTG is a cryptocurrency with Bitcoin fundamentals, mined on common GPUs instead of specialty ASICs";
|
||||
homepage = "https://bitcoingold.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.mmahut ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -25,23 +25,21 @@
|
|||
|
||||
with lib;
|
||||
let
|
||||
version = "23.0";
|
||||
majorVersion = versions.major version;
|
||||
desktop = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop";
|
||||
# c2e5f3e is the last commit when the debian/bitcoin-qt.desktop file was changed
|
||||
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/c2e5f3e20a8093ea02b73cbaf113bc0947b4140e/debian/bitcoin-qt.desktop";
|
||||
sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
inherit version;
|
||||
version = "24.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05";
|
||||
sha256 = "9cfa4a9f4acb5093e85b8b528392f0f05067f3f8fafacd4dcfe8a396158fd9f4";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
|
@ -19,15 +19,15 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "digibyte";
|
||||
version = "7.17.2";
|
||||
version = "7.17.3";
|
||||
|
||||
name = pname + toString (optional (!withGui) "d") + "-" + version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
owner = "digibyte-core";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04czj7mx3wpbx4832npk686p9pg5zb6qwlcvnmvqf31hm5qylbxj";
|
||||
sha256 = "zPwnC2qd28fA1saG4nysPlKU1nnXhfuSG3DpCY6T+kM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
, protobuf
|
||||
, hexdump
|
||||
, zeromq
|
||||
, gmp
|
||||
, withGui
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
|
@ -19,15 +20,15 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vertcoin";
|
||||
version = "0.15.0.1";
|
||||
version = "0.18.0";
|
||||
|
||||
name = pname + toString (optional (!withGui) "d") + "-" + version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname + "-project";
|
||||
repo = pname + "-core";
|
||||
rev = version;
|
||||
sha256 = "09q7qicw52gv225hq6wlpsf4zr4hjc8miyim5cygi5nxxrlw7kd3";
|
||||
rev = "2bd6dba7a822400581d5a6014afd671fb7e61f36";
|
||||
sha256 = "ua9xXA+UQHGVpCZL0srX58DDUgpfNa+AAIKsxZbhvMk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
|
|||
libevent
|
||||
db4
|
||||
zeromq
|
||||
gmp
|
||||
] ++ optionals withGui [
|
||||
qtbase
|
||||
qttools
|
||||
|
|
|
@ -2451,6 +2451,16 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
sonarsource.sonarlint-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "sonarlint-vscode";
|
||||
publisher = "sonarsource";
|
||||
version = "3.12.0";
|
||||
sha256 = "sha256-vVOmqb0iEIGgN+LkJfazNN+KNWvnWRbIsqetXfeabJU=";
|
||||
};
|
||||
meta.license = lib.licenses.lgpl3Only;
|
||||
};
|
||||
|
||||
spywhere.guides = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "guides";
|
||||
|
|
|
@ -19,19 +19,19 @@
|
|||
assert withIcons -> withNerdIcons == false;
|
||||
assert withNerdIcons -> withIcons == false;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nnn";
|
||||
version = "4.6";
|
||||
version = "4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+EAKOXZp1kxA2X3e16ItjPT7Sa3WZuP2oxOdXkceTIY=";
|
||||
repo = "nnn";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ttG0aEqMlNyJaMhcVfrxbxlrhr1GSydrV58CYSq4CTM=";
|
||||
};
|
||||
|
||||
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
|
||||
preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h";
|
||||
preBuild = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} src/nnn.h";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ];
|
||||
buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts;
|
||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts";
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ]
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
++ lib.optionals withIcons [ "O_ICONS=1" ]
|
||||
++ lib.optionals withNerdIcons [ "O_NERD=1" ];
|
||||
|
||||
|
@ -61,4 +61,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jfrankenau Br1ght0ne ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
48
pkgs/applications/misc/furtherance/default.nix
Normal file
48
pkgs/applications/misc/furtherance/default.nix
Normal file
|
@ -0,0 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, appstream-glib, desktop-file-utils
|
||||
, glib, libadwaita, meson, ninja, pkg-config, wrapGAppsHook4, dbus , gtk4, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "furtherance";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lakoliu";
|
||||
repo = "Furtherance";
|
||||
rev = "v${version}";
|
||||
sha256 = "xshZpwL5AQvYSPoyt9Qutaym5IGBQHWwz4ev3xnVcSk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "J/e8NYd9JjmANj+4Eh3/Uq2/vS711CwERgmJ7i5orNw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.rust.rustc
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
sqlite
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Track your time without being tracked";
|
||||
homepage = "https://github.com/lakoliu/Furtherance";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ CaptainJawZ ];
|
||||
};
|
||||
}
|
|
@ -29,18 +29,19 @@
|
|||
, traySupport ? true, libdbusmenu-gtk3
|
||||
, udevSupport ? true, udev
|
||||
, upowerSupport ? true, upower
|
||||
, wireplumberSupport ? true, wireplumber
|
||||
, withMediaPlayer ? false, glib, gobject-introspection, python3, playerctl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waybar";
|
||||
version = "0.9.15";
|
||||
version = "0.9.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = version;
|
||||
sha256 = "sha256-u2nEMS0lJ/Kf09+mWYWQLji9MVgjYAfUi5bmPEfTfFc=";
|
||||
sha256 = "sha256-hcU0ijWIN7TtIPkURVmAh0kanQWkBUa22nubj7rSfBs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -67,7 +68,8 @@ stdenv.mkDerivation rec {
|
|||
++ optional swaySupport sway
|
||||
++ optional traySupport libdbusmenu-gtk3
|
||||
++ optional udevSupport udev
|
||||
++ optional upowerSupport upower;
|
||||
++ optional upowerSupport upower
|
||||
++ optional wireplumberSupport wireplumber;
|
||||
|
||||
checkInputs = [ catch2_3 ];
|
||||
doCheck = runTests;
|
||||
|
@ -86,6 +88,7 @@ stdenv.mkDerivation rec {
|
|||
sndio = sndioSupport;
|
||||
tests = runTests;
|
||||
upower_glib = upowerSupport;
|
||||
wireplumber = wireplumberSupport;
|
||||
}
|
||||
) ++ [
|
||||
"-Dsystemd=disabled"
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
{ lib, stdenv, python3Packages, fetchFromGitHub, fetchurl, sd, curl, pkg-config, openssl, rustPlatform, fetchYarnDeps, yarn, nodejs, fixup_yarn_lock }:
|
||||
|
||||
let
|
||||
deps = import ./deps.nix { inherit lib fetchurl; };
|
||||
version = deps.version;
|
||||
versionHash = deps.versionHash;
|
||||
inherit (lib.importJSON ./deps.json) links version versionHash;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
|
@ -83,9 +81,7 @@ let
|
|||
# with filesystem paths for the curl calls.
|
||||
postUnpack = ''
|
||||
mkdir $sourceRoot/hack_pydeps
|
||||
( cd $sourceRoot/hack_pydeps
|
||||
${deps.links}
|
||||
)
|
||||
${lib.concatStrings (map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links)}
|
||||
sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py
|
||||
'';
|
||||
|
||||
|
|
78
pkgs/applications/version-management/sapling/deps.json
generated
Normal file
78
pkgs/applications/version-management/sapling/deps.json
generated
Normal file
|
@ -0,0 +1,78 @@
|
|||
{
|
||||
"links": [
|
||||
{
|
||||
"sha256": "0dgg5x4nvdpfiz552diy11xg72y14s38hjz9qxygafnfgybg6hab",
|
||||
"url": "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "0dq9f7irmml1nm9a2rx8dd6m2dqmzjj1x40mk0rg619wrdfsaj0b",
|
||||
"url": "https://files.pythonhosted.org/packages/39/7b/88dbb785881c28a102619d46423cb853b46dbccc70d3ac362d99773a78ce/pexpect-4.8.0-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "0r4xy2sqwyhwlwj81zvhzbnx7a7r4xdz9xyzzkjczlx7gk1cig1d",
|
||||
"url": "https://files.pythonhosted.org/packages/23/6a/210816c943c9aeeb29e4e18a298f14bf0e118fe222a23e13bfcc2d41b0a4/ipython-7.16.1-py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw",
|
||||
"url": "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip"
|
||||
},
|
||||
{
|
||||
"sha256": "16sgpg57kxx5jh467d9qwc2hwshfvdbl0xkafdp3qspvbfp46qc0",
|
||||
"url": "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "1qn3bnyd7gdwkyk8nvlhiy3c6zbwjd49fjxj0gp8xxi9faiysiwz",
|
||||
"url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "0mfj5d1bgpy1clfgwrkmjqm2pv70pm01jp4iyyhphc96kyifdg7v",
|
||||
"url": "https://files.pythonhosted.org/packages/4c/1c/ff6546b6c12603d8dd1070aa3c3d273ad4c07f5771689a7b69a550e8c951/backcall-0.2.0-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "0yxz45fzjsq6zh5f9cjl0gf4vfg1l7rd79zyb3ih544layjg3ff8",
|
||||
"url": "https://files.pythonhosted.org/packages/4e/78/56aa1b5f4d8ac548755ae767d84f0be54fdd9d404197a3d9e4659d272348/setuptools-57.0.0-py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "1177pfa343r378020a85l3b16ak479qgyvh8k5719fgbkhm81d5y",
|
||||
"url": "https://files.pythonhosted.org/packages/59/7c/e39aca596badaf1b78e8f547c807b04dae603a433d3e7a7e04d67f2ef3e5/wcwidth-0.2.5-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "1r55ffffaq4q3dpvha7iipgxlqwvjg5cklf9izr42xj5rr226r26",
|
||||
"url": "https://files.pythonhosted.org/packages/87/61/2dfea88583d5454e3a64f9308a686071d58d59a55db638268a6413e1eb6d/prompt_toolkit-2.0.10-py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "08v36wa0kckc892bk4nypl6sszbysarm8jhslviz1agp2sf1jp3f",
|
||||
"url": "https://files.pythonhosted.org/packages/6a/36/b1b9bfdf28690ae01d9ca0aa5b0d07cb4448ac65fb91dc7e2d094e3d992f/decorator-5.0.9-py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "0mnzcb714ynl1qlv9dwnh50rv75mmj18ywaxbl8xzm3l9m0syjcn",
|
||||
"url": "https://files.pythonhosted.org/packages/9a/41/220f49aaea88bc6fa6cba8d05ecf24676326156c23b991e80b3f2fc24c77/pickleshare-0.7.5-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "13iv73575lilrm01ffhr8y8sxn8kxhvfqsgwckbr919725280vnn",
|
||||
"url": "https://files.pythonhosted.org/packages/a6/c9/be11fce9810793676017f79ffab3c6cb18575844a6c7b8d4ed92f95de604/Pygments-2.9.0-py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "0i7ycyjad9kq6lgq5ih7j8xsm639z24250s6d17pp781v6hwdd3h",
|
||||
"url": "https://files.pythonhosted.org/packages/ca/ab/872a23e29cec3cf2594af7e857f18b687ad21039c1f9b922fac5b9b142d5/traitlets-4.3.3-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa",
|
||||
"url": "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "1f7sc4ydjj33gadcgfz8fcx02d1wm2frlqwzdik1krlr6wikgpbj",
|
||||
"url": "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl"
|
||||
},
|
||||
{
|
||||
"sha256": "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm",
|
||||
"url": "https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57/ipdb-0.13.9.tar.gz"
|
||||
},
|
||||
{
|
||||
"sha256": "04m31z011arz2b70rwwkhvzkb9d4yxcfbxpw27d6fa3n79a7sdxg",
|
||||
"url": "https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b/Cython-0.29.26.tar.gz"
|
||||
}
|
||||
],
|
||||
"version": "0.1.20221118-210929-cfbb68aa",
|
||||
"versionHash": "5535144625961033752"
|
||||
}
|
104
pkgs/applications/version-management/sapling/deps.nix
generated
104
pkgs/applications/version-management/sapling/deps.nix
generated
|
@ -1,104 +0,0 @@
|
|||
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||
# Generated by `gen-deps`
|
||||
|
||||
{ lib, fetchurl }:
|
||||
let
|
||||
ptyprocess = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl";
|
||||
sha256 = "0dgg5x4nvdpfiz552diy11xg72y14s38hjz9qxygafnfgybg6hab";
|
||||
};
|
||||
pexpect = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/39/7b/88dbb785881c28a102619d46423cb853b46dbccc70d3ac362d99773a78ce/pexpect-4.8.0-py2.py3-none-any.whl";
|
||||
sha256 = "0dq9f7irmml1nm9a2rx8dd6m2dqmzjj1x40mk0rg619wrdfsaj0b";
|
||||
};
|
||||
ipython = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/23/6a/210816c943c9aeeb29e4e18a298f14bf0e118fe222a23e13bfcc2d41b0a4/ipython-7.16.1-py3-none-any.whl";
|
||||
sha256 = "0r4xy2sqwyhwlwj81zvhzbnx7a7r4xdz9xyzzkjczlx7gk1cig1d";
|
||||
};
|
||||
simplegeneric = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
|
||||
sha256 = "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw";
|
||||
};
|
||||
toml = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl";
|
||||
sha256 = "16sgpg57kxx5jh467d9qwc2hwshfvdbl0xkafdp3qspvbfp46qc0";
|
||||
};
|
||||
colorama = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl";
|
||||
sha256 = "1qn3bnyd7gdwkyk8nvlhiy3c6zbwjd49fjxj0gp8xxi9faiysiwz";
|
||||
};
|
||||
backcall = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/4c/1c/ff6546b6c12603d8dd1070aa3c3d273ad4c07f5771689a7b69a550e8c951/backcall-0.2.0-py2.py3-none-any.whl";
|
||||
sha256 = "0mfj5d1bgpy1clfgwrkmjqm2pv70pm01jp4iyyhphc96kyifdg7v";
|
||||
};
|
||||
setuptools = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/4e/78/56aa1b5f4d8ac548755ae767d84f0be54fdd9d404197a3d9e4659d272348/setuptools-57.0.0-py3-none-any.whl";
|
||||
sha256 = "0yxz45fzjsq6zh5f9cjl0gf4vfg1l7rd79zyb3ih544layjg3ff8";
|
||||
};
|
||||
wcwidth = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/59/7c/e39aca596badaf1b78e8f547c807b04dae603a433d3e7a7e04d67f2ef3e5/wcwidth-0.2.5-py2.py3-none-any.whl";
|
||||
sha256 = "1177pfa343r378020a85l3b16ak479qgyvh8k5719fgbkhm81d5y";
|
||||
};
|
||||
prompt_toolkit = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/87/61/2dfea88583d5454e3a64f9308a686071d58d59a55db638268a6413e1eb6d/prompt_toolkit-2.0.10-py3-none-any.whl";
|
||||
sha256 = "1r55ffffaq4q3dpvha7iipgxlqwvjg5cklf9izr42xj5rr226r26";
|
||||
};
|
||||
decorator = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/6a/36/b1b9bfdf28690ae01d9ca0aa5b0d07cb4448ac65fb91dc7e2d094e3d992f/decorator-5.0.9-py3-none-any.whl";
|
||||
sha256 = "08v36wa0kckc892bk4nypl6sszbysarm8jhslviz1agp2sf1jp3f";
|
||||
};
|
||||
pickleshare = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/9a/41/220f49aaea88bc6fa6cba8d05ecf24676326156c23b991e80b3f2fc24c77/pickleshare-0.7.5-py2.py3-none-any.whl";
|
||||
sha256 = "0mnzcb714ynl1qlv9dwnh50rv75mmj18ywaxbl8xzm3l9m0syjcn";
|
||||
};
|
||||
Pygments = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/a6/c9/be11fce9810793676017f79ffab3c6cb18575844a6c7b8d4ed92f95de604/Pygments-2.9.0-py3-none-any.whl";
|
||||
sha256 = "13iv73575lilrm01ffhr8y8sxn8kxhvfqsgwckbr919725280vnn";
|
||||
};
|
||||
traitlets = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/ca/ab/872a23e29cec3cf2594af7e857f18b687ad21039c1f9b922fac5b9b142d5/traitlets-4.3.3-py2.py3-none-any.whl";
|
||||
sha256 = "0i7ycyjad9kq6lgq5ih7j8xsm639z24250s6d17pp781v6hwdd3h";
|
||||
};
|
||||
six = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl";
|
||||
sha256 = "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa";
|
||||
};
|
||||
ipython_genutils = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl";
|
||||
sha256 = "1f7sc4ydjj33gadcgfz8fcx02d1wm2frlqwzdik1krlr6wikgpbj";
|
||||
};
|
||||
ipdb = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57/ipdb-0.13.9.tar.gz";
|
||||
sha256 = "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm";
|
||||
};
|
||||
Cython = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b/Cython-0.29.26.tar.gz";
|
||||
sha256 = "04m31z011arz2b70rwwkhvzkb9d4yxcfbxpw27d6fa3n79a7sdxg";
|
||||
};
|
||||
in
|
||||
{
|
||||
links = ''
|
||||
ln -s ${ptyprocess} ptyprocess-0.7.0-py2.py3-none-any.whl
|
||||
ln -s ${pexpect} pexpect-4.8.0-py2.py3-none-any.whl
|
||||
ln -s ${ipython} ipython-7.16.1-py3-none-any.whl
|
||||
ln -s ${simplegeneric} simplegeneric-0.8.1.zip
|
||||
ln -s ${toml} toml-0.10.2-py2.py3-none-any.whl
|
||||
ln -s ${colorama} colorama-0.4.4-py2.py3-none-any.whl
|
||||
ln -s ${backcall} backcall-0.2.0-py2.py3-none-any.whl
|
||||
ln -s ${setuptools} setuptools-57.0.0-py3-none-any.whl
|
||||
ln -s ${wcwidth} wcwidth-0.2.5-py2.py3-none-any.whl
|
||||
ln -s ${prompt_toolkit} prompt_toolkit-2.0.10-py3-none-any.whl
|
||||
ln -s ${decorator} decorator-5.0.9-py3-none-any.whl
|
||||
ln -s ${pickleshare} pickleshare-0.7.5-py2.py3-none-any.whl
|
||||
ln -s ${Pygments} Pygments-2.9.0-py3-none-any.whl
|
||||
ln -s ${traitlets} traitlets-4.3.3-py2.py3-none-any.whl
|
||||
ln -s ${six} six-1.16.0-py2.py3-none-any.whl
|
||||
ln -s ${ipython_genutils} ipython_genutils-0.2.0-py2.py3-none-any.whl
|
||||
ln -s ${ipdb} ipdb-0.13.9.tar.gz
|
||||
ln -s ${Cython} Cython-0.29.26.tar.gz
|
||||
'';
|
||||
|
||||
version = "0.1.20221118-210929-cfbb68aa";
|
||||
|
||||
versionHash = "5535144625961033752";
|
||||
}
|
|
@ -1,87 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" nixpkgs-fmt
|
||||
|
||||
# vim: set syntax=python:
|
||||
|
||||
import hashlib
|
||||
import json
|
||||
import re
|
||||
import struct
|
||||
import subprocess
|
||||
|
||||
import requests
|
||||
|
||||
gen_file = "deps.nix"
|
||||
repo = "facebook/sapling"
|
||||
source_file = "eden/scm/setup.py"
|
||||
|
||||
# Fetch the latest stable release metadata from GitHub
|
||||
latest = requests.get(f"https://api.github.com/repos/{repo}/releases/latest").text
|
||||
latest = json.loads(latest)
|
||||
|
||||
# Find latest's git tag which corresponds to the Sapling version. Also needed
|
||||
# is a hash of the version, so calculate that here. Taken from Sapling source
|
||||
# `$root/eden/scm/setup_with_version.py`.
|
||||
version = str(latest["tag_name"])
|
||||
version_hash = str(
|
||||
struct.unpack(">Q", hashlib.sha1(version.encode("ascii")).digest()[:8])[0]
|
||||
)
|
||||
|
||||
# Fetch the `setup.py` source and look for instances of assets being downloaded
|
||||
# from files.pythonhosted.org.
|
||||
source = requests.get(
|
||||
f"https://raw.githubusercontent.com/{repo}/{version}/{source_file}"
|
||||
).text
|
||||
matches = re.findall(
|
||||
r'(https://files\.pythonhosted\.org/packages/.*?/.*?/.*?/)(.*?)(-.*?)"', source
|
||||
)
|
||||
|
||||
# For each matched asset URL, prefetch said asset and build the corresponding
|
||||
# Nix code needed to call `fetchurl` and perform symlinks in the actual build.
|
||||
assets = ""
|
||||
links = ""
|
||||
for m in matches:
|
||||
sha256 = (
|
||||
subprocess.Popen(
|
||||
["nix-prefetch-url", "--type", "sha256", f"{m[0]}{m[1]}{m[2]}"],
|
||||
text=True,
|
||||
stdout=subprocess.PIPE,
|
||||
)
|
||||
.stdout.read()
|
||||
.strip()
|
||||
)
|
||||
assets += """ {} = fetchurl {{
|
||||
url = "{}{}{}";
|
||||
sha256 = "{}";
|
||||
}};\n""".format(
|
||||
m[1], m[0], m[1], m[2], sha256
|
||||
)
|
||||
links += " ln -s ${{{}}} {}{}\n".format(m[1], m[1], m[2])
|
||||
assets = assets.strip()
|
||||
links = links.strip()
|
||||
|
||||
# Render an autogenerated Nix file with the fetched dependency and version
|
||||
# information for import in the main derivation.
|
||||
out = f"""
|
||||
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||
# Generated by `gen-deps`
|
||||
|
||||
{{ lib, fetchurl }}:
|
||||
let
|
||||
{assets}
|
||||
in
|
||||
{{
|
||||
links = ''
|
||||
{links}
|
||||
'';
|
||||
|
||||
version = "{version}";
|
||||
|
||||
versionHash = "{version_hash}";
|
||||
}}
|
||||
"""
|
||||
with open(gen_file, "w+") as f:
|
||||
f.write(out.strip())
|
||||
|
||||
# Formamt the generated Nix file, which also serves as a syntax sanity check.
|
||||
subprocess.run(["nixpkgs-fmt", gen_file], check=True)
|
42
pkgs/applications/version-management/sapling/gen-deps.py
Executable file
42
pkgs/applications/version-management/sapling/gen-deps.py
Executable file
|
@ -0,0 +1,42 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests ])"
|
||||
import json
|
||||
import re
|
||||
from hashlib import sha1
|
||||
from struct import unpack
|
||||
from subprocess import run
|
||||
|
||||
from requests import get
|
||||
|
||||
# Fetch the latest stable release metadata from GitHub
|
||||
latestTag = get("https://api.github.com/repos/facebook/sapling/releases/latest").json()[
|
||||
"tag_name"
|
||||
]
|
||||
|
||||
|
||||
def nixPrefetchUrl(url):
|
||||
return run(
|
||||
["nix-prefetch-url", "--type", "sha256", url],
|
||||
check=True,
|
||||
text=True,
|
||||
capture_output=True,
|
||||
).stdout.rstrip()
|
||||
|
||||
|
||||
# Fetch the `setup.py` source and look for instances of assets being downloaded
|
||||
# from files.pythonhosted.org.
|
||||
setupPy = get(
|
||||
f"https://github.com/facebook/sapling/raw/{latestTag}/eden/scm/setup.py"
|
||||
).text
|
||||
foundUrls = re.findall(r'(https://files\.pythonhosted\.org/packages/[^\s]+)"', setupPy)
|
||||
|
||||
dataDeps = {
|
||||
"links": [{"url": url, "sha256": nixPrefetchUrl(url)} for url in foundUrls],
|
||||
"version": latestTag,
|
||||
# Find latest's git tag which corresponds to the Sapling version. Also
|
||||
# needed is a hash of the version, so calculate that here. Taken from
|
||||
# Sapling source `$root/eden/scm/setup_with_version.py`.
|
||||
"versionHash": str(unpack(">Q", sha1(latestTag.encode("ascii")).digest()[:8])[0]),
|
||||
}
|
||||
|
||||
open("deps.json", "w").write(json.dumps(dataDeps, indent=2, sort_keys=True) + "\n")
|
|
@ -26,13 +26,29 @@
|
|||
, makeWrapper
|
||||
, sqlite
|
||||
, enableInstaller ? false
|
||||
, enableMacOSGuests ? false, fetchFromGitHub, gnutar, unzip
|
||||
}:
|
||||
|
||||
let
|
||||
vmware-unpack-env = buildFHSUserEnv rec {
|
||||
name = "vmware-unpack-env";
|
||||
targetPkgs = pkgs: [ zlib ];
|
||||
# macOS - versions
|
||||
fusionVersion = "13.0.0";
|
||||
fusionBuild = "20802013";
|
||||
unlockerVersion = "3.0.4";
|
||||
|
||||
# macOS - ISOs
|
||||
darwinIsoSrc = fetchurl {
|
||||
url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/x86/core/com.vmware.fusion.zip.tar";
|
||||
sha256 = "sha256-cSboek+nhkVj8rjdic6yzWQfjXiiLlch6gBWn73BzRU=";
|
||||
};
|
||||
|
||||
# macOS - Unlocker
|
||||
unlockerSrc = fetchFromGitHub {
|
||||
owner = "paolo-projects";
|
||||
repo = "unlocker";
|
||||
rev = "${unlockerVersion}";
|
||||
sha256 = "sha256-kpvrRiiygfjQni8z+ju9mPBVqy2gs08Wj4cHxE9eorQ=";
|
||||
};
|
||||
|
||||
gdbm3 = gdbm.overrideAttrs (old: rec {
|
||||
version = "1.8.3";
|
||||
|
||||
|
@ -46,11 +62,16 @@ let
|
|||
cp .libs/libgdbm*.so* $out/lib/
|
||||
'';
|
||||
});
|
||||
|
||||
vmware-unpack-env = buildFHSUserEnv rec {
|
||||
name = "vmware-unpack-env";
|
||||
targetPkgs = pkgs: [ zlib ];
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vmware-workstation";
|
||||
version = "16.2.3";
|
||||
build = "19376536";
|
||||
version = "17.0.0";
|
||||
build = "20800274";
|
||||
|
||||
buildInputs = [
|
||||
libxslt
|
||||
|
@ -73,15 +94,35 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ]
|
||||
++ lib.optionals enableInstaller [ sqlite bzip2 ];
|
||||
++ lib.optionals enableInstaller [ sqlite bzip2 ]
|
||||
++ lib.optionals enableMacOSGuests [ gnutar unzip ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
|
||||
sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM=";
|
||||
url = "https://download3.vmware.com/software/WKST-1700-LX/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
|
||||
sha256 = "sha256-kBTocGb1tg5i+dvWmOaPfPUHxrWcX8/obeKqRGR+mRA=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked"
|
||||
|
||||
${lib.optionalString enableMacOSGuests ''
|
||||
mkdir -p fusion/
|
||||
tar -xvpf "${darwinIsoSrc}" -C fusion/
|
||||
unzip "fusion/com.vmware.fusion.zip" \
|
||||
"payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \
|
||||
"payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \
|
||||
-d fusion/
|
||||
''}
|
||||
'';
|
||||
|
||||
patchPhase = lib.optionalString enableMacOSGuests ''
|
||||
cp -R "${unlockerSrc}" unlocker/
|
||||
|
||||
substituteInPlace unlocker/unlocker.py --replace \
|
||||
"/usr/lib/vmware/bin/" "$out/lib/vmware/bin"
|
||||
|
||||
substituteInPlace unlocker/unlocker.py --replace \
|
||||
"/usr/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" "$out/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
@ -226,6 +267,14 @@ stdenv.mkDerivation rec {
|
|||
unpacked/vmware-tools-solaris/solaris.iso \
|
||||
$out/lib/vmware/isoimages/
|
||||
|
||||
${lib.optionalString enableMacOSGuests ''
|
||||
echo "Installing VMWare Tools for MacOS"
|
||||
cp -v \
|
||||
"fusion/payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \
|
||||
"fusion/payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \
|
||||
$out/lib/vmware/isoimages/
|
||||
''}
|
||||
|
||||
## VMware Player Application
|
||||
echo "Installing VMware Player Application"
|
||||
unpacked="unpacked/vmware-player-app"
|
||||
|
@ -290,9 +339,9 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/include/
|
||||
cp -r $unpacked/include/* $out/include/
|
||||
|
||||
## VMware VIX Workstation-16.0.0 Library
|
||||
echo "Installing VMware VIX Workstation-16.0.0 Library"
|
||||
unpacked="unpacked/vmware-vix-lib-Workstation1600"
|
||||
## VMware VIX Workstation-17.0.0 Library
|
||||
echo "Installing VMware VIX Workstation-17.0.0 Library"
|
||||
unpacked="unpacked/vmware-vix-lib-Workstation1700"
|
||||
cp -r $unpacked/lib/* $out/lib/vmware-vix/
|
||||
|
||||
## VMware VProbes component for Linux
|
||||
|
@ -327,6 +376,11 @@ stdenv.mkDerivation rec {
|
|||
sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib"
|
||||
done
|
||||
|
||||
${lib.optionalString enableMacOSGuests ''
|
||||
echo "Running VMWare Unlocker to enable macOS Guests"
|
||||
python3 unlocker/unlocker.py
|
||||
''}
|
||||
|
||||
# SUID hack
|
||||
wrapProgram $out/lib/vmware/bin/vmware-vmx
|
||||
rm $out/lib/vmware/bin/vmware-vmx
|
||||
|
@ -339,6 +393,6 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ deinferno ];
|
||||
maintainers = with maintainers; [ cawilliamson deinferno ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, mkCoqDerivation, coq, mathcomp-algebra,
|
||||
coq-elpi, mathcomp-zify, version ? null }:
|
||||
|
||||
with lib; mkCoqDerivation {
|
||||
namePrefix = [ "coq" "mathcomp" ];
|
||||
pname = "algebra-tactics";
|
||||
owner = "math-comp";
|
||||
inherit version;
|
||||
|
||||
defaultVersion = with versions;
|
||||
switch [ coq.coq-version mathcomp-algebra.version ] [
|
||||
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; }
|
||||
] null;
|
||||
|
||||
release."1.0.0".sha256 = "sha256-kszARPBizWbxSQ/Iqpf2vLbxYc6AjpUCLnSNlPcNfls=";
|
||||
|
||||
propagatedBuildInputs = [ mathcomp-algebra coq-elpi mathcomp-zify ];
|
||||
|
||||
meta = {
|
||||
description = "Ring and field tactics for Mathematical Components";
|
||||
maintainers = with maintainers; [ cohencyril ];
|
||||
};
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, bison
|
||||
, cmake
|
||||
, doxygen
|
||||
|
@ -61,15 +62,24 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
version = "3.5.2";
|
||||
version = "3.6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jtAFI1J64ZaTqIljqQL1xOiTGC79AZWcIgidozWczMM=";
|
||||
hash = "sha256-Yx7tmj2Y26FE5rzN+w1gg/7yRckNo6gLudrAPRoCro4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/OSGeo/gdal/pull/6754
|
||||
(fetchpatch {
|
||||
name = "skip-test-failing-on-macos.patch";
|
||||
url = "https://github.com/OSGeo/gdal/commit/65b2b12fa6638653f54d3ca0f8066225597832b9.patch";
|
||||
hash = "sha256-zpj4jMp01Oz+Zk1b59qdoVxhkwWmTN9bwoKwbau2ADY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
|
|
|
@ -68,6 +68,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
./quark_init_on_demand.patch
|
||||
./gobject_init_on_demand.patch
|
||||
|
||||
# Fix error about missing sentinel in glib/tests/cxx.cpp
|
||||
# These two commits are part of already merged glib MRs 3033 and 3031:
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3033
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066.patch";
|
||||
sha256 = "OfD5zO/7JIgOMLc0FAgHV9smWugFJuVPHCn9jTsMQJg=";
|
||||
})
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3031
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4.patch";
|
||||
sha256 = "v28Yk+R0kN9ssIcvJudRZ4vi30rzQEE8Lsd1kWp5hbM=";
|
||||
})
|
||||
] ++ [
|
||||
./glib-appinfo-watch.patch
|
||||
./schema-override-variable.patch
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lerc";
|
||||
version = "3.0";
|
||||
version = "4.0.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
@ -14,9 +15,18 @@ stdenv.mkDerivation rec {
|
|||
owner = "esri";
|
||||
repo = "lerc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QO5+ouQy5nOcAgvxMeBDoSBP+G3ClDjXipnkuSIDcP0=";
|
||||
hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Esri/lerc/pull/227
|
||||
(fetchpatch {
|
||||
name = "use-cmake-install-full-dir.patch";
|
||||
url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch";
|
||||
hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
{ buildDunePackage, ocplib-json-typed, js_of_ocaml }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "ocplib-json-typed-browser";
|
||||
inherit (ocplib-json-typed) version src;
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ];
|
||||
|
||||
meta = {
|
||||
description = "A Json_repr interface over JavaScript's objects";
|
||||
inherit (ocplib-json-typed.meta) homepage license maintainers;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
{ buildDunePackage, ocplib-json-typed, ocplib-endian }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "ocplib-json-typed-bson";
|
||||
inherit (ocplib-json-typed) version useDune2 src;
|
||||
|
||||
propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ];
|
||||
|
||||
meta = {
|
||||
description = "A Json_repr compatible implementation of the JSON compatible subset of BSON";
|
||||
inherit (ocplib-json-typed.meta) homepage license maintainers;
|
||||
};
|
||||
}
|
|
@ -1,22 +0,0 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, uri }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ocplib-json-typed";
|
||||
version = "0.7.1";
|
||||
useDune2 = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "OCamlPro";
|
||||
repo = "ocplib-json-typed";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ uri ];
|
||||
|
||||
meta = {
|
||||
description = "A collection of type-aware JSON utilities for OCaml";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
inherit (src.meta) homepage;
|
||||
};
|
||||
}
|
|
@ -0,0 +1,51 @@
|
|||
From eca202d2893c9f2f91628ad6244b52cf7880bfcf Mon Sep 17 00:00:00 2001
|
||||
From: Graham Bennett <graham@grahambennett.org>
|
||||
Date: Mon, 21 Nov 2022 15:39:54 +0000
|
||||
Subject: [PATCH] Revert "fix yarn warning from d3-color (#27139)"
|
||||
|
||||
This reverts commit b9e133e40c2848b0d555051a99bf8d2816fd28a7.
|
||||
---
|
||||
airflow/www/package.json | 3 ---
|
||||
airflow/www/yarn.lock | 13 +++++++++----
|
||||
2 files changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/airflow/www/package.json b/airflow/www/package.json
|
||||
index f694089ee6..3d37ad4c46 100644
|
||||
--- a/airflow/www/package.json
|
||||
+++ b/airflow/www/package.json
|
||||
@@ -120,8 +120,5 @@
|
||||
"redoc": "^2.0.0-rc.72",
|
||||
"type-fest": "^2.17.0",
|
||||
"url-search-params-polyfill": "^8.1.0"
|
||||
- },
|
||||
- "resolutions": {
|
||||
- "d3-color": "^3.1.0"
|
||||
}
|
||||
}
|
||||
diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock
|
||||
index bafd63a368..dad0ebabab 100644
|
||||
--- a/airflow/www/yarn.lock
|
||||
+++ b/airflow/www/yarn.lock
|
||||
@@ -4518,10 +4518,15 @@ d3-collection@1, d3-collection@^1.0.4:
|
||||
resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
|
||||
integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
|
||||
|
||||
-d3-color@1, "d3-color@1 - 2", d3-color@^3.1.0:
|
||||
- version "3.1.0"
|
||||
- resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
|
||||
- integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
|
||||
+d3-color@1:
|
||||
+ version "1.4.1"
|
||||
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
|
||||
+ integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
|
||||
+
|
||||
+"d3-color@1 - 2":
|
||||
+ version "2.0.0"
|
||||
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e"
|
||||
+ integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==
|
||||
|
||||
d3-contour@1:
|
||||
version "1.3.2"
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -78,15 +78,16 @@
|
|||
, enabledProviders ? []
|
||||
}:
|
||||
let
|
||||
version = "2.4.1";
|
||||
version = "2.4.3";
|
||||
|
||||
airflow-src = fetchFromGitHub rec {
|
||||
owner = "apache";
|
||||
repo = "airflow";
|
||||
rev = "refs/tags/${version}";
|
||||
# Required because the GitHub archive tarballs don't appear to include tests
|
||||
leaveDotGit = true;
|
||||
sha256 = "sha256-HpPL/ocV7hRhYXsjfXMYvlP83Vh15kXyjBgubsaqaE8=";
|
||||
# Download using the git protocol rather than using tarballs, because the
|
||||
# GitHub archive tarballs don't appear to include tests
|
||||
forceFetchGit = true;
|
||||
sha256 = "sha256-7E7Em6ZCWjxJiDKQ0j/vozUo58XsAxv8uW0dVVST4Ak=";
|
||||
};
|
||||
|
||||
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
|
||||
|
@ -225,7 +226,7 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "colorlog>=4.0.2, <5.0" "colorlog" \
|
||||
--replace "flask-login>=0.6.2" "flask-login" \
|
||||
--replace "flask-appbuilder==4.1.4" "flask-appbuilder>=4.1.3" \
|
||||
--replace "pathspec~=0.9.0" "pathspec"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# Fix failing test on Hydra
|
||||
|
@ -283,11 +284,9 @@ buildPythonPackage rec {
|
|||
cd ./pkgs/development/python-modules/apache-airflow
|
||||
curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/yarn.lock
|
||||
curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/package.json
|
||||
# Note: for 2.3.4 a manual change was needed to get a fully resolved URL for
|
||||
# caniuse-lite@1.0.30001312 (with the sha after the #). The error from yarn
|
||||
# was 'Can't make a request in offline mode' from yarn. Corrected install by
|
||||
# manually running yarn add caniuse-lite@1.0.30001312 and copying the
|
||||
# requisite section from the generated yarn.lock.
|
||||
# Revert this commit which seems to break with our version of yarn
|
||||
# https://github.com/apache/airflow/commit/b9e133e40c2848b0d555051a99bf8d2816fd28a7
|
||||
patch -p3 < 0001-Revert-fix-yarn-warning-from-d3-color-27139.patch
|
||||
yarn2nix > yarn.nix
|
||||
|
||||
# update provider dependencies
|
||||
|
@ -298,8 +297,8 @@ buildPythonPackage rec {
|
|||
# You can (manually) test the web UI as follows:
|
||||
#
|
||||
# nix shell .#python3Packages.apache-airflow
|
||||
# airflow db reset # WARNING: this will wipe any existing db state you might have!
|
||||
# airflow db init
|
||||
# airflow reset -y # WARNING: this will wipe any existing db state you might have!
|
||||
# airflow standalone
|
||||
#
|
||||
# Then navigate to the localhost URL using the credentials printed, try
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -7166,14 +7166,7 @@ json5@^1.0.1:
|
|||
dependencies:
|
||||
minimist "^1.2.0"
|
||||
|
||||
json5@^2.1.2:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
|
||||
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
|
||||
dependencies:
|
||||
minimist "^1.2.5"
|
||||
|
||||
json5@^2.2.1:
|
||||
json5@^2.1.2, json5@^2.2.1:
|
||||
version "2.2.1"
|
||||
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
|
||||
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
|
||||
|
@ -7258,9 +7251,9 @@ loader-runner@^4.2.0:
|
|||
integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
|
||||
|
||||
loader-utils@^1.4.0:
|
||||
version "1.4.0"
|
||||
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
|
||||
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
|
||||
version "1.4.1"
|
||||
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
|
||||
integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
|
||||
dependencies:
|
||||
big.js "^5.2.2"
|
||||
emojis-list "^3.0.0"
|
||||
|
@ -7606,7 +7599,12 @@ minimist-options@4.1.0:
|
|||
is-plain-obj "^1.1.0"
|
||||
kind-of "^6.0.3"
|
||||
|
||||
minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
|
||||
minimist@^1.2.0:
|
||||
version "1.2.7"
|
||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
|
||||
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
|
||||
|
||||
minimist@^1.2.5, minimist@^1.2.6:
|
||||
version "1.2.6"
|
||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
|
||||
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
|
||||
|
|
|
@ -7121,14 +7121,6 @@
|
|||
sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "json5___json5_2.2.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "json5___json5_2.2.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz";
|
||||
sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "json5___json5_2.2.1.tgz";
|
||||
path = fetchurl {
|
||||
|
@ -7242,11 +7234,11 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "loader_utils___loader_utils_1.4.0.tgz";
|
||||
name = "loader_utils___loader_utils_1.4.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "loader_utils___loader_utils_1.4.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz";
|
||||
sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
|
||||
name = "loader_utils___loader_utils_1.4.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz";
|
||||
sha512 = "1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -7673,6 +7665,14 @@
|
|||
sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "minimist___minimist_1.2.7.tgz";
|
||||
path = fetchurl {
|
||||
name = "minimist___minimist_1.2.7.tgz";
|
||||
url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz";
|
||||
sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "minimist___minimist_1.2.6.tgz";
|
||||
path = fetchurl {
|
||||
|
|
45
pkgs/development/python-modules/ariadne/default.nix
Normal file
45
pkgs/development/python-modules/ariadne/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, freezegun
|
||||
, graphql-core
|
||||
, lib
|
||||
, opentracing
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, snapshottest
|
||||
, starlette
|
||||
, typing-extensions
|
||||
, werkzeug
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ariadne";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirumee";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HiIg+80vaMzQdqF2JKzP7oZzfpqSTrumXmUHGLT/wF8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ graphql-core starlette typing-extensions ];
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
opentracing
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
snapshottest
|
||||
werkzeug
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for implementing GraphQL servers using schema-first approach";
|
||||
homepage = "https://ariadnegraphql.org";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
|
@ -35,10 +35,11 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://github.com/altdesktop/python-dbus-next";
|
||||
description = "A zero-dependency DBus library for Python with asyncio support";
|
||||
homepage = "https://github.com/altdesktop/python-dbus-next";
|
||||
changelog = "https://github.com/altdesktop/python-dbus-next/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -77,6 +77,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for Dropbox's HTTP-based Core and Datastore APIs";
|
||||
homepage = "https://github.com/dropbox/dropbox-sdk-python";
|
||||
changelog = "https://github.com/dropbox/dropbox-sdk-python/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
|
|
|
@ -58,6 +58,8 @@ buildPythonPackage rec {
|
|||
disabledTests = [
|
||||
# Some tests access network, others test packaging
|
||||
"http" "https" "wheel"
|
||||
# https://github.com/Toblerity/Fiona/issues/1164
|
||||
"test_no_append_driver_cannot_append"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "imap-tools";
|
||||
version = "0.57.0";
|
||||
version = "1.0.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "ikvk";
|
||||
repo = "imap_tools";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-plJ+X4RtZT77fWEAXAsyi5YnonjaWfZfKbSNFKE1DKc=";
|
||||
hash = "sha256-JAMEJv0Vc5iunuKusyD+rxLiubEIDgHsr7FrMZgLy9Q=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -91,9 +91,10 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Open-source Dropbox client for macOS and Linux";
|
||||
homepage = "https://maestral.app";
|
||||
changelog = "https://github.com/samschott/maestral/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg sfrijters ];
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://maestral.app";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15,7 +15,8 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind";
|
||||
homepage = "https://pypi.python.org/pypi/pyprof2calltree/";
|
||||
homepage = "https://github.com/pwaller/pyprof2calltree";
|
||||
changelog = "https://github.com/pwaller/pyprof2calltree/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
|
|
|
@ -24,8 +24,9 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "survey" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Exahilosys/survey";
|
||||
description = "A simple library for creating beautiful interactive prompts";
|
||||
homepage = "https://github.com/Exahilosys/survey";
|
||||
changelog = "https://github.com/Exahilosys/survey/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
|
|
|
@ -21,8 +21,9 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "tap" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/python-tap/tappy";
|
||||
description = "A set of tools for working with the Test Anything Protocol (TAP) in Python";
|
||||
homepage = "https://github.com/python-tap/tappy";
|
||||
changelog = "https://tappy.readthedocs.io/en/latest/releases.html";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
|
|
|
@ -19,8 +19,9 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "wrapio" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Exahilosys/wrapio";
|
||||
description = "Handling event-based streams";
|
||||
homepage = "https://github.com/Exahilosys/wrapio";
|
||||
changelog = "https://github.com/Exahilosys/wrapio/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
|
|
|
@ -21,8 +21,9 @@ buildPythonPackage rec {
|
|||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Shoobx/xmldiff";
|
||||
description = "Creates diffs of XML files";
|
||||
homepage = "https://github.com/Shoobx/xmldiff";
|
||||
changelog = "https://github.com/Shoobx/xmldiff/blob/master/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
|
|
|
@ -511,7 +511,7 @@ let
|
|||
nat = [ pkgs.which ];
|
||||
nat_templatebrains = [ pkgs.which ];
|
||||
pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
|
||||
bigmemory = [ pkgs.libuuid.dev ];
|
||||
bigmemory = lib.optionals stdenv.isLinux [ pkgs.libuuid.dev ];
|
||||
clustermq = [ pkgs.pkg-config ];
|
||||
RMark = [ pkgs.which ];
|
||||
RPushbullet = [ pkgs.which ];
|
||||
|
|
|
@ -46,7 +46,6 @@
|
|||
, cacert
|
||||
, glibcLocales
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
|
@ -127,23 +126,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hydra";
|
||||
version = "2022-10-22";
|
||||
version = "2022-11-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "312cb42275e593eea5c44d8430ab09375fdb2fdb";
|
||||
sha256 = "sha256-ablHzPwN2Pvju0kyo8N5Wavqkl60gKHCPLnruwqvwTg=";
|
||||
rev = "14d4624dc20956ec9ff54882e70c5c0bc377921a";
|
||||
sha256 = "sha256-xY3CDFjLG3po2tdaTZToqZmLCQnSwsUqAn8sIXFrybw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/NixOS/hydra/pull/1215: scmdiff: Hardcode --git-dir
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/hydra/commit/b6ea85a601ddac9cb0716d8cb4d446439fa0778f.patch";
|
||||
sha256 = "sha256-QHjwLYQucdkBs6OsFI8kWo5ugkPXXlTgdbGFxKBHAHo=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
libpqxx
|
||||
|
|
|
@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "mkubecek";
|
||||
repo = "vmware-host-modules";
|
||||
rev = "w${vmware-workstation.version}-k5.18";
|
||||
sha256 = "sha256-sAeCjaSrBXGP5szfCY5CpMrGwzCw4aM67EN+YfA3AWA=";
|
||||
rev = "w${vmware-workstation.version}";
|
||||
sha256 = "sha256-EHMiSmljpUjYuZH6r/0Vk5OVGeyQyNngy0AVJO/48a0=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mkubecek/vmware-host-modules";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.19";
|
||||
broken = (kernel.kernelOlder "5.5" && kernel.isHardened);
|
||||
maintainers = with maintainers; [ deinferno ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -58,7 +58,6 @@ python3.pkgs.buildPythonPackage rec {
|
|||
changelog = "https://github.com/mautrix/facebook/releases/tag/v${version}";
|
||||
description = "A Matrix-Facebook Messenger puppeting bridge";
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kevincox ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgvector";
|
||||
version = "0.3.0";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgvector";
|
||||
repo = "pgvector";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oKEh0Pmhue9GyBbxHrc/xWSLmUfAzCoQU6jYdJCEgm4=";
|
||||
sha256 = "sha256-I+MIQjZNsKHLsiCtvip73fA2LYPR7PVFgTBNtn+CtFE=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "GUI configuration tool for openbox";
|
||||
homepage = "http://openbox.org/wiki/ObConf";
|
||||
changelog = "http://openbox.org/wiki/ObConf:Changelog";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.sfrijters ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
@ -1,4 +1,18 @@
|
|||
{ lib, stdenv, fetchFromSourcehut, fetchpatch, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, fetchpatch
|
||||
, pixman
|
||||
, libpng
|
||||
, libjpeg
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grim";
|
||||
|
@ -29,6 +43,7 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
scdoc
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format";
|
||||
homepage = "https://github.com/stevengj/h5utils";
|
||||
changelog = "https://github.com/NanoComp/h5utils/releases/tag/${version}";
|
||||
license = with licenses; [ mit gpl2 ];
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
|
|
|
@ -15,7 +15,7 @@ let
|
|||
python pytest nose cryptography pyyaml requests mock requests-mock
|
||||
python-dateutil setuptools;
|
||||
|
||||
version = "4.14";
|
||||
version = "4.15";
|
||||
|
||||
in
|
||||
|
||||
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "sha256-jfrzgWlEoct8BJLkteWlYjXR/D4J+ShQhsNPBCN+zeQ=";
|
||||
hash = "sha256-l8cdJWJbIAkp1RRfq1Q5ugJKinIwudd2Ke6esK/hNjc=";
|
||||
};
|
||||
|
||||
pythonPaths = [ cryptography pyyaml requests ];
|
||||
|
|
|
@ -132,6 +132,12 @@ mapAliases ({
|
|||
bird2 = bird; # Added 2022-02-21
|
||||
bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21
|
||||
bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21
|
||||
bitcoin-classic = throw "bitcoin-classic has been removed: the Bitcoin Classic project has closed down, https://bitcoinclassic.com/news/closing.html"; # Added 2022-11-24
|
||||
bitcoind-classic = throw "bitcoind-classic has been removed: the Bitcoin Classic project has closed down, https://bitcoinclassic.com/news/closing.html"; # Added 2022-11-24
|
||||
bitcoin-gold = throw "bitcoin-gold has been removed since it's unnmaintained and will stop building with Qt > 5.14"; # Added 2022-11-24
|
||||
bitcoind-gold = throw "bitcoin-gold has been removed since it's unnmaintained: https://github.com/BTCGPU/BTCGPU/graphs/code-frequency"; # Added 2022-11-24
|
||||
digibyte = throw "digibyte has been removed since it's unnmaintained and will stop building with Qt > 5.14"; # Added 2022-11-24
|
||||
digibyted = throw "digibyted has been removed since it's unnmaintained: https://github.com/digibyte/digibyte/graphs/code-frequency"; # Added 2022-11-24
|
||||
bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22
|
||||
blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01
|
||||
bluezFull = bluez; # Added 2019-12-03
|
||||
|
|
|
@ -28300,6 +28300,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
furtherance = callPackage ../applications/misc/furtherance { };
|
||||
|
||||
gg-scm = callPackage ../applications/version-management/git-and-tools/gg { };
|
||||
|
||||
gigalixir = callPackage ../tools/misc/gigalixir { };
|
||||
|
@ -33553,7 +33555,7 @@ with pkgs;
|
|||
withGui = false;
|
||||
};
|
||||
|
||||
bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited {
|
||||
bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
|
||||
withGui = true;
|
||||
};
|
||||
|
@ -33562,24 +33564,6 @@ with pkgs;
|
|||
withGui = false;
|
||||
};
|
||||
|
||||
bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic {
|
||||
boost = boost165;
|
||||
withGui = true;
|
||||
};
|
||||
bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic {
|
||||
boost = boost165;
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold {
|
||||
boost = boost165;
|
||||
withGui = true;
|
||||
};
|
||||
bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold {
|
||||
boost = boost165;
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
btcpayserver = callPackage ../applications/blockchains/btcpayserver { };
|
||||
|
||||
charge-lnd = callPackage ../applications/blockchains/charge-lnd { };
|
||||
|
@ -33589,15 +33573,6 @@ with pkgs;
|
|||
dcrd = callPackage ../applications/blockchains/dcrd { };
|
||||
dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
|
||||
|
||||
digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte {
|
||||
withGui = true;
|
||||
boost = boost170;
|
||||
};
|
||||
digibyted = callPackage ../applications/blockchains/digibyte {
|
||||
withGui = false;
|
||||
boost = boost170;
|
||||
};
|
||||
|
||||
dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin {
|
||||
boost = boost165;
|
||||
withGui = true;
|
||||
|
@ -33742,7 +33717,7 @@ with pkgs;
|
|||
|
||||
tessera = callPackage ../applications/blockchains/tessera { };
|
||||
|
||||
vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin {
|
||||
vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin {
|
||||
boost = boost165;
|
||||
withGui = true;
|
||||
};
|
||||
|
|
|
@ -82,6 +82,7 @@ let
|
|||
mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
|
||||
mathcomp-word = callPackage ../development/coq-modules/mathcomp-word {};
|
||||
mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {};
|
||||
mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {};
|
||||
mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {};
|
||||
metacoq = callPackage ../development/coq-modules/metacoq { };
|
||||
metacoq-template-coq = self.metacoq.template-coq;
|
||||
|
|
|
@ -1056,12 +1056,6 @@ let
|
|||
|
||||
ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { };
|
||||
|
||||
ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { };
|
||||
|
||||
ocplib-json-typed-browser = callPackage ../development/ocaml-modules/ocplib-json-typed/browser.nix { };
|
||||
|
||||
ocplib-json-typed-bson = callPackage ../development/ocaml-modules/ocplib-json-typed/bson.nix { };
|
||||
|
||||
ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
|
||||
|
||||
ocsigen-ppx-rpc = callPackage ../development/ocaml-modules/ocsigen-ppx-rpc { };
|
||||
|
|
|
@ -578,6 +578,8 @@ self: super: with self; {
|
|||
|
||||
aria2p = callPackage ../development/python-modules/aria2p { };
|
||||
|
||||
ariadne = callPackage ../development/python-modules/ariadne { };
|
||||
|
||||
arnparse = callPackage ../development/python-modules/arnparse { };
|
||||
|
||||
arrayqueues = callPackage ../development/python-modules/arrayqueues { };
|
||||
|
|
Loading…
Reference in a new issue