Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
bc6ab4854e
@ -189,9 +189,9 @@ in
|
||||
grocy = handleTest ./grocy.nix {};
|
||||
grub = handleTest ./grub.nix {};
|
||||
gvisor = handleTest ./gvisor.nix {};
|
||||
hadoop.all = handleTestOn [ "x86_64-linux" ] ./hadoop/hadoop.nix {};
|
||||
hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {};
|
||||
hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {};
|
||||
hadoop.all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/hadoop.nix {};
|
||||
hadoop.hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/hdfs.nix {};
|
||||
hadoop.yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/yarn.nix {};
|
||||
haka = handleTest ./haka.nix {};
|
||||
haproxy = handleTest ./haproxy.nix {};
|
||||
hardened = handleTest ./hardened.nix {};
|
||||
|
||||
@ -1928,6 +1928,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/vim-scripts/emodeline/";
|
||||
};
|
||||
|
||||
everforest = buildVimPluginFrom2Nix {
|
||||
pname = "everforest";
|
||||
version = "2022-02-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "everforest";
|
||||
rev = "7c5e520962a57f7cd42bb0b9eab268795375d26e";
|
||||
sha256 = "IBDWDvSpUHHgE2zslYfvznHyQmisbRZsF0D80YqcKto=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/everforest/";
|
||||
};
|
||||
|
||||
falcon = buildVimPluginFrom2Nix {
|
||||
pname = "falcon";
|
||||
version = "2021-12-19";
|
||||
|
||||
@ -720,6 +720,7 @@ ryvnf/readline.vim
|
||||
saadparwaiz1/cmp_luasnip
|
||||
saecki/crates.nvim
|
||||
sainnhe/edge
|
||||
sainnhe/everforest
|
||||
sainnhe/gruvbox-material
|
||||
sainnhe/sonokai
|
||||
sakhnik/nvim-gdb
|
||||
|
||||
@ -349,6 +349,42 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
bierner.emojisense = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "emojisense";
|
||||
publisher = "bierner";
|
||||
version = "0.9.0";
|
||||
sha256 = "0gpcpwh57lqlynsrkv3smykndb46xjh7r85lb291wdklq5ahmb2j";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
bierner.markdown-checkbox = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "markdown-checkbox";
|
||||
publisher = "bierner";
|
||||
version = "0.3.1";
|
||||
sha256 = "0x57dnr6ksqxi28g1c392k04vxy0vdni9nl4xps3i5zh0pyxizhw";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
bierner.markdown-emoji = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "markdown-emoji";
|
||||
publisher = "bierner";
|
||||
version = "0.2.1";
|
||||
sha256 = "1lcg2b39jydl40wcfrbgshl2i1r58k92c7dipz0hl1fa1v23vj4v";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-tailwindcss";
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
, steam-run-native
|
||||
# needed for avoiding crash on file selector
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
@ -76,13 +78,14 @@ in stdenv.mkDerivation {
|
||||
./0001-fix-locale.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(PYTHON="python -m py_compile")
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
xorg.libX11
|
||||
libGL
|
||||
python
|
||||
|
||||
@ -1,23 +1,38 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook
|
||||
, jdk8_headless, jdk11_headless
|
||||
, bash, coreutils, which
|
||||
, bzip2, cyrus_sasl , protobuf3_7, snappy, zlib, zstd
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, autoPatchelfHook
|
||||
, jdk8_headless
|
||||
, jdk11_headless
|
||||
, bash
|
||||
, coreutils
|
||||
, which
|
||||
, bzip2
|
||||
, cyrus_sasl
|
||||
, protobuf3_7
|
||||
, snappy
|
||||
, zlib
|
||||
, zstd
|
||||
, openssl
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
|
||||
let
|
||||
common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl, nativeLibs ? [ ], libPatches ? "" }:
|
||||
common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "" }:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version jdk libPatches untarDir openssl;
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz";
|
||||
sha256 = sha256.${stdenv.system};
|
||||
};
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ optional (nativeLibs != [] || libPatches != "") [ autoPatchelfHook ];
|
||||
++ optional (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ];
|
||||
buildInputs = [ openssl ] ++ nativeLibs;
|
||||
|
||||
installPhase = ''
|
||||
@ -51,22 +66,27 @@ let
|
||||
computers, each of which may be prone to failures.
|
||||
'';
|
||||
maintainers = with maintainers; [ volth illustris ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = attrNames sha256;
|
||||
};
|
||||
|
||||
};
|
||||
in
|
||||
{
|
||||
# Different version of hadoop support different java runtime versions
|
||||
# https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions
|
||||
hadoop_3_3 = common rec {
|
||||
hadoop_3_3 =
|
||||
common
|
||||
(rec {
|
||||
pname = "hadoop";
|
||||
version = "3.3.1";
|
||||
sha256 = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd";
|
||||
untarDir = "${pname}-${version}";
|
||||
jdk = jdk11_headless;
|
||||
sha256 = rec {
|
||||
x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd";
|
||||
x86_64-darwin = x86_64-linux;
|
||||
aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz";
|
||||
aarch64-darwin = aarch64-linux;
|
||||
};
|
||||
|
||||
inherit openssl;
|
||||
# TODO: Package and add Intel Storage Acceleration Library
|
||||
nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ];
|
||||
libPatches = ''
|
||||
ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2
|
||||
@ -74,23 +94,21 @@ in
|
||||
ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/
|
||||
ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/
|
||||
ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/
|
||||
patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0
|
||||
'';
|
||||
};
|
||||
'' + optionalString stdenv.isLinux "patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0";
|
||||
jdk = jdk11_headless;
|
||||
});
|
||||
hadoop_3_2 = common rec {
|
||||
pname = "hadoop";
|
||||
version = "3.2.2";
|
||||
sha256 = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp";
|
||||
sha256.x86_64-linux = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp";
|
||||
jdk = jdk8_headless;
|
||||
# not using native libs because of broken openssl_1_0_2 dependency
|
||||
# can be manually overriden
|
||||
openssl = null;
|
||||
};
|
||||
hadoop2 = common rec {
|
||||
pname = "hadoop";
|
||||
version = "2.10.1";
|
||||
sha256 = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97";
|
||||
sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97";
|
||||
jdk = jdk8_headless;
|
||||
openssl = null;
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.9.3.1911";
|
||||
version = "5.9.6.2225";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
sha256 = "0pamn028k96z0j9xzv56szk7sy0czd9myqm4p3hps1gkczc9wzs4";
|
||||
sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, desktop-file-utils
|
||||
, makeWrapper
|
||||
, shared-mime-info
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, meson
|
||||
, gjs
|
||||
, gtk4
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
python3
|
||||
shared-mime-info # for update-mime-database
|
||||
wrapGAppsHook # for gsettings
|
||||
wrapGAppsHook4 # for gsettings
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
buildManPages {
|
||||
pname = "execline-man-pages";
|
||||
version = "2.8.1.0.3";
|
||||
sha256 = "1n7c75lmyrjzzcbwjl6fxhfs4k29qlr66r1q35799h942cn4li7v";
|
||||
version = "2.8.1.0.4";
|
||||
sha256 = "1cxi09dlzvjbilmzgmr3xvwvx0l3s1874k3gr85kbjnvp1c1r6cd";
|
||||
description = "Port of the documentation for the execline suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildManPages {
|
||||
pname = "s6-man-pages";
|
||||
version = "2.11.0.0.5";
|
||||
version = "2.11.0.1.1";
|
||||
sha256 = "03gl0vvdaqfb5hs0dfdbs9djxiyq3abcx9vwgkfw22b1rm2fa0r6";
|
||||
description = "Port of the documentation for the s6 supervision suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
buildManPages {
|
||||
pname = "s6-networking-man-pages";
|
||||
version = "2.5.0.0.2";
|
||||
sha256 = "1ix8qrivp9prw0m401d7s9vkxhw16a4sxfhrs7abf9qqhs2zkd1r";
|
||||
version = "2.5.1.0.1";
|
||||
sha256 = "1h87s3wixsms8ys7gvm1s9d8pzn73q5j4sgybpi3gmr55d4cwra4";
|
||||
description = "Port of the documentation for the s6-networking suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
||||
@ -255,8 +255,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
gitg = callPackage ./misc/gitg { };
|
||||
|
||||
libgnome-games-support = callPackage ./misc/libgnome-games-support { };
|
||||
|
||||
gnome-applets = callPackage ./misc/gnome-applets { };
|
||||
|
||||
gnome-flashback = callPackage ./misc/gnome-flashback { };
|
||||
@ -283,6 +281,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
}) // lib.optionalAttrs (config.allowAliases or true) {
|
||||
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
|
||||
|
||||
libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19
|
||||
|
||||
bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26
|
||||
evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25
|
||||
geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25
|
||||
@ -300,7 +300,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25
|
||||
gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21
|
||||
gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25
|
||||
libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-games-support’ directly."; # added 2018-03-14
|
||||
libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnome-games-support’ directly."; # added 2018-03-14
|
||||
libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25
|
||||
rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25
|
||||
networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, itstool
|
||||
, clutter-gtk
|
||||
, libgee
|
||||
, libgnome-games-support
|
||||
, gnome
|
||||
, gtk3
|
||||
}:
|
||||
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
clutter-gtk
|
||||
libgee
|
||||
gnome.libgnome-games-support
|
||||
libgnome-games-support
|
||||
gtk3
|
||||
];
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
, glib
|
||||
@ -20,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "accountsservice";
|
||||
version = "22.07.5";
|
||||
version = "22.08.8";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
|
||||
sha256 = "IdRJwN6tilQ86o8R5x6wSWwDXXMOpIOTOXowKzpMfBo=";
|
||||
sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -45,15 +44,6 @@ stdenv.mkDerivation rec {
|
||||
# Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme.
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/72396
|
||||
./drop-prefix-check-extensions.patch
|
||||
|
||||
# Work around not being able to set profile picture in GNOME Settings.
|
||||
# https://github.com/NixOS/nixpkgs/issues/85357
|
||||
# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/98
|
||||
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1629
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/1ef3add46983af875adfed5d29954cbfb184f688.patch";
|
||||
sha256 = "N4siK4SWkwYBnFa0JJUFgahi9XBkB/nS5yc+PyH3/iM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, intltool
|
||||
, meson
|
||||
@ -37,6 +38,20 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix undefined behavior
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch";
|
||||
sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk=";
|
||||
})
|
||||
|
||||
# Fix building vapi
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch";
|
||||
sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
|
||||
@ -45,15 +45,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gcr
|
||||
glib
|
||||
libsoup
|
||||
libxml2
|
||||
openssl
|
||||
p11-kit
|
||||
uhttpmock
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
libsoup
|
||||
libxml2
|
||||
gnome-online-accounts
|
||||
json-glib
|
||||
];
|
||||
|
||||
@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsigc++";
|
||||
version = "3.0.7";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "v76RwNCU6mu8bL05CbfZjGVh7qi22cDCWt2Qam6D1zM=";
|
||||
sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsigc++";
|
||||
version = "2.10.7";
|
||||
version = "2.10.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI=";
|
||||
sha256 = "sha256-I1pAvsc0bHuCtqjKrgRWNT3AbnHxS8QUvMhYrxg4cZo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
|
||||
@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpich";
|
||||
version = "4.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
|
||||
sha256 = "0r7zzcj8b9dbf5lp2d81wcvffi38c1zchkgzyxckk51adv4ijx6z";
|
||||
sha256 = "11rnljqwz6mr88ybj726mk710h7gvz20hy7labmz4jkkaa0gx8b6";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
# false build-time dependencies
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qt";
|
||||
pname = "qt" + lib.optionalString ( docs && demos && examples && developerBuild ) "-full";
|
||||
version = "4.8.7";
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
51
pkgs/development/libraries/science/math/bonmin/default.nix
Normal file
51
pkgs/development/libraries/science/math/bonmin/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gfortran
|
||||
, pkg-config
|
||||
, blas
|
||||
, bzip2
|
||||
, cbc
|
||||
, clp
|
||||
, ipopt
|
||||
, lapack
|
||||
, libamplsolver
|
||||
, zlib
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bonmin";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "Bonmin";
|
||||
rev = "releases/${version}";
|
||||
sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gfortran
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
blas
|
||||
bzip2
|
||||
cbc
|
||||
clp
|
||||
ipopt
|
||||
lapack
|
||||
libamplsolver
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems";
|
||||
homepage = "https://github.com/coin-or/Bonmin";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ aanderse ];
|
||||
};
|
||||
}
|
||||
@ -59,7 +59,9 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trilinos";
|
||||
version = "12.12.1"; # Xyce 7.4 requires version 12.12.1
|
||||
# Xyce 7.4 requires version 12.12.1
|
||||
# nixpkgs-update: no auto update
|
||||
version = "12.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trilinos";
|
||||
|
||||
@ -21,9 +21,9 @@ buildDunePackage rec {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config cppo ];
|
||||
nativeBuildInputs = [ pkg-config cppo ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims;
|
||||
buildInputs = [ dune-configurator ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims
|
||||
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
|
||||
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
|
||||
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ckcc-protocol";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "65f0313f9915b36068f6dfcab08e04671621e6227650443bc12e81997081ae7f";
|
||||
sha256 = "sha256-UVLKJHDPxi9ivY3JyIySmce0NUhxIIlIxVTdPoXMaKM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
|
||||
|
||||
@ -39,14 +39,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo=";
|
||||
hash = "sha256-d/8ucFDjMkybZ+KbZwd1RWb1hRQRKprHMxD2DNUmGTA=";
|
||||
};
|
||||
|
||||
patches = lib.optional withGdal
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, requests-mock
|
||||
, pythonOlder
|
||||
@ -13,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flipr-api";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -22,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "cnico";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn";
|
||||
sha256 = "sha256-/G92WkWUr3T5T7VVzMERFVmLDfLz6m9rlZLQZCBQbCI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -40,17 +39,10 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch";
|
||||
sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6";
|
||||
})
|
||||
pythonImportsCheck = [
|
||||
"flipr_api"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flipr_api" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for Flipr API";
|
||||
homepage = "https://github.com/cnico/flipr-api";
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-asset";
|
||||
version = "3.7.1";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "848b3028d87358666c50b36253404c15d0a83686700c4586475997b1478d71d5";
|
||||
sha256 = "sha256-4r1F7OgMS3TZdmEgXf5TtY4xv/YWInS6NyY6Ay4l8Ig=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-language";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "90af7858911f52350191575bb729305114c3c80d1f585d0f6cea39ab1ab3e409";
|
||||
sha256 = "sha256-ZqnwvpXfWGEc+yiImNGRGUXVJGiNzGFeMSmjn7MzuQE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-os-config";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ng1XmHQ4h32cyz68PjHSzfSmCB2vrwkGkzCtz4vZmcM=";
|
||||
sha256 = "sha256-1emoPnXxKRLzMQe+/ojTGvt2sYQJLSwu6N3C06p0T00=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-texttospeech";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-j2MSeQLw7udQrEqj9LtMqvaGSgTLiItdpN8dUTedYdI=";
|
||||
sha256 = "sha256-5uFtHqZJgouUBgkGNqSBFQrWaU2Gm06icDjKx57HY94=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-translate";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dJ+i8D2p5yz3jh1BwedE4/EZfsH2B3AHokuyedWK6Jc=";
|
||||
hash = "sha256-x4gSLVNo2uk93GWpvcPM20f0gJ1S3x/BVe13oNIpa0Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphql-subscription-manager";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "PyGraphqlWebsocketManager";
|
||||
rev = version;
|
||||
sha256 = "sha256-+LP+MDeHo0svoN/o0in6xtIqrfxs+UCBQRtBe4lZt+4=";
|
||||
sha256 = "sha256-18GR0OZeEh6EQT0kKCJyq7ckvKYKDJn/lugN5xlRg64=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipyparallel";
|
||||
version = "8.1.0";
|
||||
version = "8.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "63f7e136e88f890e9802522fa5475dd81e7614ba06a8cfe4f80cc3056fdb7d73";
|
||||
sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk=";
|
||||
};
|
||||
|
||||
buildInputs = [ nose ];
|
||||
|
||||
32
pkgs/development/python-modules/jupyter-lsp/default.nix
Normal file
32
pkgs/development/python-modules/jupyter-lsp/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jupyter_server
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-lsp";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jupyter_server
|
||||
];
|
||||
# tests require network
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "jupyter_lsp" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-Language Server WebSocket proxy for your Jupyter notebook or lab server";
|
||||
homepage = "https://pypi.org/project/jupyter-lsp";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
|
||||
33
pkgs/development/python-modules/jupyterlab-lsp/default.nix
Normal file
33
pkgs/development/python-modules/jupyterlab-lsp/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jupyterlab
|
||||
, jupyter-lsp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab-lsp";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8/ZGTIwpFuPiYVGZZLF+1Gc8aJcWc3BirtXdahYKwt8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jupyterlab
|
||||
jupyter-lsp
|
||||
];
|
||||
# No tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "jupyterlab_lsp" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Language Server Protocol integration for Jupyter(Lab)";
|
||||
homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nitransforms";
|
||||
version = "21.0.0";
|
||||
version = "22.0.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "njJqHqXVxldyGfmdM8GmgKdgIT4kMYLzcM5+ayR2EDo=";
|
||||
sha256 = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c=";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools-scm toml ];
|
||||
|
||||
24
pkgs/development/python-modules/pyctr/default.nix
Normal file
24
pkgs/development/python-modules/pyctr/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, pycryptodomex }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyctr";
|
||||
version = "0.6.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-05lMcsIeJIHI3LwHQTjr4M+bn1FG+GQscuGq34XxjK8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pycryptodomex ];
|
||||
|
||||
pythonImportsCheck = [ "pyctr" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to interact with Nintendo 3DS files";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rileyinman ];
|
||||
homepage = "https://github.com/ihaveamac/pyctr";
|
||||
};
|
||||
}
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gitlab";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ytEzjB/xp5GnuueZXcYh4mx3378iW63kVqzsdRJ4KCU=";
|
||||
sha256 = "sha256-j27oEQn+wjH8K3TixANbt94FSOr4LdEZ/ilN8sSlJL4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
33
pkgs/development/python-modules/rich-rst/default.nix
Normal file
33
pkgs/development/python-modules/rich-rst/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, docutils
|
||||
, rich
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rich-rst";
|
||||
version = "1.1.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wasi-master";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0g1whhw07jgy46a1x85pd23gs356j1cc229wqf5j3x4r11kin6i5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docutils rich ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "rich_rst" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A beautiful reStructuredText renderer for rich";
|
||||
homepage = "https://github.com/wasi-master/rich-rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jyooru ];
|
||||
};
|
||||
}
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-plantuml";
|
||||
version = "0.22";
|
||||
version = "0.23";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a42c7a13ab1ae9ed18e8e8b0f76b8d35dc476fdebe6e634354fe6fd0f261f686";
|
||||
sha256 = "sha256-HVVRjwqG7NbJa6j/jIhK3KBbrD5Y52ppKjzRmqf0Ks8=";
|
||||
};
|
||||
|
||||
# No tests included.
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, types-enum34
|
||||
, types-ipaddress
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-cryptography";
|
||||
version = "3.3.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fr70phvg3zc4h41mv48g04x3f20y478y01ji3w1i2mqlxskm657";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cryptography-stubs"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ types-enum34 types-ipaddress ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for cryptography";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jpetrucciani ];
|
||||
};
|
||||
}
|
||||
25
pkgs/development/python-modules/types-enum34/default.nix
Normal file
25
pkgs/development/python-modules/types-enum34/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-enum34";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0421lr89vv3fpg77kkj5nmzd7z3nmhw4vh8ibsjp6vfh86b7d73g";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"enum-python2-stubs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for enum34";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jpetrucciani ];
|
||||
};
|
||||
}
|
||||
25
pkgs/development/python-modules/types-ipaddress/default.nix
Normal file
25
pkgs/development/python-modules/types-ipaddress/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-ipaddress";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0h9q9pjvw1ap5k70ygp750d096jkzymxlhx87yh0pr9mb6zg6gd0";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ipaddress-python2-stubs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for ipaddress";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jpetrucciani ];
|
||||
};
|
||||
}
|
||||
28
pkgs/development/python-modules/types-paramiko/default.nix
Normal file
28
pkgs/development/python-modules/types-paramiko/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, types-cryptography
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-paramiko";
|
||||
version = "2.8.13";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0xk5xqhfl3xmzrnzb17c5hj5zbh7fpyfyj35zjma32iivfkqd8lp";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"paramiko-stubs"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ types-cryptography ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for paramiko";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jpetrucciani ];
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.38.3";
|
||||
version = "0.38.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = version;
|
||||
sha256 = "sha256-pLTqnIbe7rTZrQFe//0/h5Tyx0GzJW+q9mUuDNifo/0=";
|
||||
sha256 = "sha256-CLV1/maraSJ3GWnyN/0rLyEyWoQIL18rhm35llgvthw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -83,33 +83,33 @@ rec {
|
||||
headers = "0rxbij6qvi0xzcmbxf3fm1snvakaxp9c512z9ni36y98sgg4s3l8";
|
||||
};
|
||||
|
||||
electron_15 = mkElectron "15.3.7" {
|
||||
armv7l-linux = "1cc5ce2ab6d795271f54e67a78eec607c0a14761ee1177078a157abad7aa61e6";
|
||||
aarch64-linux = "caf7146c738207b78ea63e95fa055f36829bb360e2d81fce10513fae238f2750";
|
||||
x86_64-linux = "e424dded1ac545634128bfb5c6195807aa96b7761be95f52ed760886f42874cc";
|
||||
i686-linux = "9f1898f9c96672076a87ca559dd11788964347fd17316f0c24f75c9c53985ce5";
|
||||
x86_64-darwin = "282f8737fdc73a3ddc82f56b4affc9f6fefec1b233e532e08d206344b657cd8a";
|
||||
aarch64-darwin = "d64e12c680d60b535fea7de4322504db04a83e63e8557d8e9b3677a334911752";
|
||||
headers = "0nfk75r72p5dgz0rdyqfqjmlwn2wlgn7h93a1v5ghjpwn1rp89m7";
|
||||
electron_15 = mkElectron "15.4.0" {
|
||||
armv7l-linux = "40c073a3b416f83264327bdf5e33b334ffcd56a729ef237360d66f520f670d16";
|
||||
aarch64-linux = "ef18ba74b4fa34a26f9ee819bb908c60d0dd9ec2048414629979760f262d72f8";
|
||||
x86_64-linux = "5bdea4cbf5559491e9ad9f365fa6f7ec26603fd6f68bfa8848f2884ebd51662d";
|
||||
i686-linux = "636d0e28bb20ca127c9b8722fe39e7e7d95fc63bd15b156b7af563296b3d9595";
|
||||
x86_64-darwin = "8a132b2be0f27c7e8fa9a91a8b4b0fcdf3ec571c721cb5f5610dc8a6b3f0fd26";
|
||||
aarch64-darwin = "82b29c37a427464a9278d617435ca19f472b00689c9e58163e99f30b90f33046";
|
||||
headers = "0fc1sck7g160klpqzfcqv9zc45ia914mrncyma58zzcbzpk6k6yb";
|
||||
};
|
||||
|
||||
electron_16 = mkElectron "16.0.9" {
|
||||
armv7l-linux = "7071f18230f5d4bbf84d3f1955056f2a6952e5487dfdecb51708e419c0b1a594";
|
||||
aarch64-linux = "a7873d1cb2b632c9c48a6942bf4a436463c07cc488f4b0b4575e0e4a496c357d";
|
||||
x86_64-linux = "06d57bc1e59ebe046d5731d64eb67c41e793731e67aefbf33f4e3c23139285d4";
|
||||
i686-linux = "8603545bdaec512380050ce6f9f1ef283514b960c8d6c8682eaa6563d93705b2";
|
||||
x86_64-darwin = "d092af5e5fddb295e9ebb9b639006deec125b1f6b30896d22e98b84e5a74af40";
|
||||
aarch64-darwin = "62fd4d033fd0ad62d1c13ac219bd68e76b1625c305097c7aa2ab799f45c9e879";
|
||||
headers = "0d0jkjjfq32j09bjlpmx1hvi20rh8yfkfm7hfcv3xs831physbj5";
|
||||
electron_16 = mkElectron "16.0.10" {
|
||||
armv7l-linux = "1a72fe59011cfcc1f376f2948dd5a70d2f75d6c12fb682a0246d2e596227b5e0";
|
||||
aarch64-linux = "46cd1393816364a666ead410505bce4b51d68ce872446a71d16886b88c4b275a";
|
||||
x86_64-linux = "3b4779e41e27200ce5fa94d20f9df05ff5c757be6805eb0e8952fe198d66f324";
|
||||
i686-linux = "9e1426a8135d3fe195ba9fc1a5ea5ad4d5ce96bd513691897b39106698e3c3c8";
|
||||
x86_64-darwin = "00b0222efa67fbb29f723fabebc4221646ebd6d5fdc09524df9a203f63ce660c";
|
||||
aarch64-darwin = "1203f6ec4e8b97312254ceb122ca4399f39ae67bfe1636e426a798c89ec2a9ee";
|
||||
headers = "10f6px88vg6napyhniczi6l660qs4l5mm0b9gdlds4i1y94s1zrl";
|
||||
};
|
||||
|
||||
electron_17 = mkElectron "17.0.1" {
|
||||
armv7l-linux = "0867f74427152c3b4110e11c9ce38e351531554868f62665b064f3d1dae5fd00";
|
||||
aarch64-linux = "7715f7eaaa287f83b945f491c2ca1eb0befed93725d81c85d06f8584db3a6cc4";
|
||||
x86_64-linux = "de789f548d6cc2ddff8db53b3bbfaac5631e90f14506935d2d7fafedf82e5adf";
|
||||
i686-linux = "4e81ce43552f22e271527d5f7ab84db6dda61c0922f8b6350e44fa52967f2dd9";
|
||||
x86_64-darwin = "d270858938e2f0e68479d91384e6f4d01be1d4e22b305dc2023ecd1a5e113d17";
|
||||
aarch64-darwin = "aecf14a88ede956e93fee5b48b773ad4d8d6605424c9d69a45950b673c89f8ca";
|
||||
headers = "1c3fl9fxmhkhvm825vmyxm8dm89xfy4iwqrb4ifmv5cz9dh9b9a8";
|
||||
electron_17 = mkElectron "17.1.0" {
|
||||
armv7l-linux = "09d92195821aad4ac03fbc858287a7372b6aa059081bb825d267853ee1b0425d";
|
||||
aarch64-linux = "6a34d6802d44a391902f53baf0adc8b819d33e7c31b34614757b17b3223c9d1e";
|
||||
x86_64-linux = "106ec28a5969366c1e1f642cc33ac41950c68bd182db23b04d7ac6886bfe28e8";
|
||||
i686-linux = "19fe206be07a6df7f9f0ecdb411e3cafd3a53618edb19cc6adc77156f698444e";
|
||||
x86_64-darwin = "bd80d6b0b62c9bec195d264aa21a255f4324a8b56849e04972c1fcc262757c31";
|
||||
aarch64-darwin = "83fe2fc24976d09a0e0fcc3a60226f190cf9b67287fe4434d3d76d59fa45315c";
|
||||
headers = "1zv1pigfbis1bsan28wx3bgkdwjc48pjq19wmxs73kd1khsy6w8r";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,13 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitLab
|
||||
, pkg-config
|
||||
, rsync
|
||||
, libxslt
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, gtk-doc
|
||||
, docbook_xsl
|
||||
, udev
|
||||
, libgudev
|
||||
@ -15,23 +20,31 @@
|
||||
, libimobiledevice
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upower";
|
||||
version = "0.99.13";
|
||||
version = "0.99.15";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz";
|
||||
sha256 = "sha256-XK1w+RVAzH3BIcsX4K1kXl5mPIaC9gp75C7jjNeyPXo=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "upower";
|
||||
repo = "upower";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GlLy2MPip21KOabdW8Vw6NVe3xhzsd9htxQ2xO/hZ/4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
gtk-doc
|
||||
docbook_xsl
|
||||
gettext
|
||||
gobject-introspection
|
||||
libxslt
|
||||
pkg-config
|
||||
rsync
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -39,29 +52,50 @@ stdenv.mkDerivation {
|
||||
libusb1
|
||||
udev
|
||||
systemd
|
||||
]
|
||||
++ lib.optional useIMobileDevice libimobiledevice
|
||||
;
|
||||
] ++ lib.optionals useIMobileDevice [
|
||||
libimobiledevice
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
mesonFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--with-backend=linux"
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"--with-systemdutildir=${placeholder "out"}/lib/systemd"
|
||||
"--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
|
||||
"--sysconfdir=/etc"
|
||||
"-Dos_backend=linux"
|
||||
"-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d"
|
||||
];
|
||||
|
||||
doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
|
||||
|
||||
installFlags = [
|
||||
"historydir=$(TMPDIR)/foo"
|
||||
"sysconfdir=${placeholder "out"}/etc"
|
||||
];
|
||||
postPatch = ''
|
||||
patchShebangs src/linux/unittest_inspector.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Move stuff from DESTDIR to proper location.
|
||||
# We use rsync to merge the directories.
|
||||
for dir in etc var; do
|
||||
rsync --archive "${DESTDIR}/$dir" "$out"
|
||||
rm --recursive "${DESTDIR}/$dir"
|
||||
done
|
||||
for o in out dev; do
|
||||
rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")"
|
||||
rm --recursive "${DESTDIR}/''${!o}"
|
||||
done
|
||||
# Ensure the DESTDIR is removed.
|
||||
rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}"
|
||||
'';
|
||||
|
||||
# HACK: We want to install configuration files to $out/etc
|
||||
# but upower should read them from /etc on a NixOS system.
|
||||
# With autotools, it was possible to override Make variables
|
||||
# at install time but Meson does not support this
|
||||
# so we need to convince it to install all files to a temporary
|
||||
# location using DESTDIR and then move it to proper one in postInstall.
|
||||
DESTDIR = "${placeholder "out"}/dest";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://upower.freedesktop.org/";
|
||||
|
||||
@ -1,17 +1,25 @@
|
||||
{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }:
|
||||
{ lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "agate";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrubeck";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o4tjEIgDTj2EUbfaKCHZfvEKCwxNpsabU437kU+Vpnk=";
|
||||
sha256 = "sha256-nkWk/0TIAHcYQjxbg0HnT+4S4Cinl22WfqHb9U6u5eI=";
|
||||
};
|
||||
cargoSha256 = "sha256-aF86QpizJ+lMNmN9DQKA9o1QZWZObyQ3v3+HmT/s02g=";
|
||||
|
||||
cargoSha256 = "sha256-rE0I13dKbGgJmh6vF/cWvIZfqtKzzgn7pTiB3HJ7cgY=";
|
||||
patches = [
|
||||
# https://github.com/mbrubeck/agate/pull/143
|
||||
(fetchpatch {
|
||||
name = "fix-port-collision.patch";
|
||||
url = "https://github.com/mbrubeck/agate/commit/2f5d7878ec9d0dd51762c4c7680fc9f825d8ecd5.patch";
|
||||
sha256 = "sha256-NEFmfb0y97O2W96YggD+MgcN7tlFEi9T4FNzLCND77s=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "headscale";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juanfont";
|
||||
repo = "headscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nVGhLL7HN9m5zIZOFVOMYZXxUUx3WkLpeH/59kXoTHo=";
|
||||
sha256 = "sha256-9nBFBvYAhybg97oU4mi899ss4/nzBCY95KfdkSs2f8s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-v76UWaF6kdmuvABg6sDMmDpJ4HWvgliyEWAbAebK3wM=";
|
||||
vendorSha256 = "sha256-qFoSK27D6bznksdm7Fl4SsVt13g2LSwuGe0As/MUo5o=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ];
|
||||
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
, docbook_xml_dtd_412
|
||||
, libxslt
|
||||
, glib
|
||||
, withGtk4 ? false
|
||||
, gtk3
|
||||
, gtk4
|
||||
, pkg-config
|
||||
@ -49,13 +50,21 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colord
|
||||
gtk3
|
||||
] ++ (if withGtk4 then [
|
||||
gtk4
|
||||
] else [
|
||||
gtk3
|
||||
]);
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk4=${lib.boolToString withGtk4}"
|
||||
"-Dgtk3=${lib.boolToString (!withGtk4)}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.freedesktop.org/software/colord/intro.html";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amass";
|
||||
version = "3.16.0";
|
||||
version = "3.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OWASP";
|
||||
repo = "Amass";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-V3FqiAvHnd3q3yhrhDaeka22R+mBqFdPjGqY4FGCx9M=";
|
||||
sha256 = "sha256-Ml/NyxrqK17pAxUFu0U191BPdmnv4SCZPkBKLzGsk7c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0hor9Sldl8HhlKfYhWhb79wnZSMn5/Hg0Ux937qQkT4=";
|
||||
vendorSha256 = "sha256-tGIZ8D1ecLV2HNXrBvLEVVQbmwoR1arwwLZ0oTx1b7k=";
|
||||
|
||||
outputs = [ "out" "wordlists" ];
|
||||
|
||||
|
||||
@ -15,6 +15,8 @@
|
||||
, mobile-broadband-provider-info
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, withGtk4 ? false
|
||||
, gtk4
|
||||
, withGnome ? true
|
||||
, gcr
|
||||
, glib
|
||||
@ -56,6 +58,8 @@ stdenv.mkDerivation rec {
|
||||
networkmanager
|
||||
isocodes
|
||||
mobile-broadband-provider-info
|
||||
] ++ lib.optionals withGtk4 [
|
||||
gtk4
|
||||
] ++ lib.optionals withGnome [
|
||||
# advanced certificate chooser
|
||||
gcr
|
||||
@ -63,6 +67,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgcr=${lib.boolToString withGnome}"
|
||||
"-Dlibnma_gtk4=${lib.boolToString withGtk4}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4219,6 +4219,8 @@ with pkgs;
|
||||
|
||||
colord-gtk = callPackage ../tools/misc/colord-gtk { };
|
||||
|
||||
colord-gtk4 = colord-gtk.override { withGtk4 = true; };
|
||||
|
||||
colordiff = callPackage ../tools/text/colordiff { };
|
||||
|
||||
connect = callPackage ../tools/networking/connect { };
|
||||
@ -8164,6 +8166,8 @@ with pkgs;
|
||||
|
||||
libnma = callPackage ../tools/networking/networkmanager/libnma { };
|
||||
|
||||
libnma-gtk4 = libnma.override { withGtk4 = true; };
|
||||
|
||||
networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { };
|
||||
|
||||
nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { };
|
||||
@ -17984,6 +17988,8 @@ with pkgs;
|
||||
libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { };
|
||||
libgnome-keyring3 = gnome.libgnome-keyring;
|
||||
|
||||
libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { };
|
||||
|
||||
libgnomekbd = callPackage ../development/libraries/libgnomekbd { };
|
||||
|
||||
libglvnd = callPackage ../development/libraries/libglvnd { };
|
||||
@ -19662,12 +19668,12 @@ with pkgs;
|
||||
|
||||
qmake4Hook = qmake48Hook;
|
||||
|
||||
qt48Full = appendToName "full" (qt48.override {
|
||||
qt48Full = qt48.override {
|
||||
docs = true;
|
||||
demos = true;
|
||||
examples = true;
|
||||
developerBuild = true;
|
||||
});
|
||||
};
|
||||
|
||||
qt512 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.12) {
|
||||
@ -32106,6 +32112,8 @@ with pkgs;
|
||||
|
||||
blas-reference = callPackage ../development/libraries/science/math/blas { };
|
||||
|
||||
bonmin = callPackage ../development/libraries/science/math/bonmin { };
|
||||
|
||||
brial = callPackage ../development/libraries/science/math/brial { };
|
||||
|
||||
clblas = callPackage ../development/libraries/science/math/clblas {
|
||||
|
||||
@ -4332,6 +4332,8 @@ in {
|
||||
|
||||
jupyter_core = callPackage ../development/python-modules/jupyter_core { };
|
||||
|
||||
jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { };
|
||||
|
||||
jupyter_server = callPackage ../development/python-modules/jupyter_server { };
|
||||
|
||||
jupyterhub = callPackage ../development/python-modules/jupyterhub { };
|
||||
@ -4354,6 +4356,8 @@ in {
|
||||
|
||||
jupyterlab-widgets = callPackage ../development/python-modules/jupyterlab-widgets { };
|
||||
|
||||
jupyterlab-lsp = callPackage ../development/python-modules/jupyterlab-lsp { };
|
||||
|
||||
jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { };
|
||||
|
||||
jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker {
|
||||
@ -6755,6 +6759,8 @@ in {
|
||||
|
||||
pyct = callPackage ../development/python-modules/pyct { };
|
||||
|
||||
pyctr = callPackage ../development/python-modules/pyctr { };
|
||||
|
||||
pycuda = callPackage ../development/python-modules/pycuda {
|
||||
cudatoolkit = pkgs.cudatoolkit;
|
||||
inherit (pkgs.stdenv) mkDerivation;
|
||||
@ -8713,6 +8719,8 @@ in {
|
||||
|
||||
rich = callPackage ../development/python-modules/rich { };
|
||||
|
||||
rich-rst = callPackage ../development/python-modules/rich-rst { };
|
||||
|
||||
rig = callPackage ../development/python-modules/rig { };
|
||||
|
||||
ring-doorbell = callPackage ../development/python-modules/ring-doorbell { };
|
||||
@ -10137,14 +10145,22 @@ in {
|
||||
|
||||
typer = callPackage ../development/python-modules/typer { };
|
||||
|
||||
types-cryptography = callPackage ../development/python-modules/types-cryptography { };
|
||||
|
||||
types-dateutil = callPackage ../development/python-modules/types-dateutil { };
|
||||
|
||||
types-decorator = callPackage ../development/python-modules/types-decorator { };
|
||||
|
||||
types-enum34 = callPackage ../development/python-modules/types-enum34 { };
|
||||
|
||||
types-freezegun = callPackage ../development/python-modules/types-freezegun { };
|
||||
|
||||
types-futures = callPackage ../development/python-modules/types-futures { };
|
||||
|
||||
types-ipaddress = callPackage ../development/python-modules/types-ipaddress { };
|
||||
|
||||
types-paramiko = callPackage ../development/python-modules/types-paramiko { };
|
||||
|
||||
types-protobuf = callPackage ../development/python-modules/types-protobuf { };
|
||||
|
||||
types-pytz = callPackage ../development/python-modules/types-pytz { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user