mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-15 13:37:21 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
09857d1dd4
3
.github/CODEOWNERS
vendored
3
.github/CODEOWNERS
vendored
@ -252,9 +252,8 @@
|
||||
|
||||
# Go
|
||||
/doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq
|
||||
/pkgs/build-support/go @kalbasit @Mic92 @zowoq
|
||||
/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq
|
||||
/pkgs/development/go-modules @kalbasit @Mic92 @zowoq
|
||||
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
|
||||
|
||||
# GNOME
|
||||
/pkgs/desktops/gnome @jtojnar
|
||||
|
||||
3
.github/labeler.yml
vendored
3
.github/labeler.yml
vendored
@ -40,9 +40,8 @@
|
||||
|
||||
"6.topic: golang":
|
||||
- doc/languages-frameworks/go.section.md
|
||||
- pkgs/build-support/go/**/*
|
||||
- pkgs/development/compilers/go/**/*
|
||||
- pkgs/development/go-modules/**/*
|
||||
- pkgs/development/go-packages/**/*
|
||||
|
||||
"6.topic: haskell":
|
||||
- doc/languages-frameworks/haskell.section.md
|
||||
|
||||
@ -8,7 +8,7 @@ let firefoxPackage' = firefoxPackage.override (args: {
|
||||
|
||||
in
|
||||
{
|
||||
name = firefoxPackage'.unwrapped.binaryName;
|
||||
name = firefoxPackage'.unwrapped.pname;
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ eelco shlevy ];
|
||||
};
|
||||
|
||||
@ -19,20 +19,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amberol";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-27jXpx79JNF5FjVKERNrQFS7VHZHWh57jjBWvX5IRio=";
|
||||
hash = "sha256-/kZYzUzycHKre6/dvZgeqXu6mrkblftV51Z7866fZVY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-M5T+imP7up3RRiXOJRrqimcjs8r81V5jfQMjR02skko=";
|
||||
hash = "sha256-1+RWL9MD6aX+zI2rtQUQCqemCephLKGEAf5xNCb+jo4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "noise-repellent";
|
||||
version = "0.2.1";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucianodato";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE=";
|
||||
sha256 = "sha256-d8csYC3z3vXdmN/G6mAK+H8ia0vOCsoUpoA3W8/OADc=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -2,22 +2,27 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "micro";
|
||||
version = "2.0.10";
|
||||
version = "2.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyedidia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hVFmViwGXuYVAKaCkzK/LHjCi8AtLu0tsPpT61glxys=";
|
||||
sha256 = "sha256-3Rppi8UcAc4zdXOd81Y+sb5Psezx2TQsNw73WdPVMgE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
subPackages = [ "cmd/micro" ];
|
||||
|
||||
vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s=";
|
||||
vendorSha256 = "sha256-/bWIn5joZOTOtuAbljOc0NgBfjrFkbFZih+cPNHnS9w=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" "-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ];
|
||||
ldflags = let t = "github.com/zyedidia/micro/v2/internal"; in [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X ${t}/util.Version=${version}"
|
||||
"-X ${t}/util.CommitHash=${src.rev}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage assets/packaging/micro.1
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0kvmnayrwpz82jxhvi69r45nyq74v5qyx5nn8b6kz23ma02nm4y6";
|
||||
x86_64-darwin = "0w6qbybzvpb886z1y5w7q36xy176f5hagzgqddzgwbzlv3lc9i9j";
|
||||
aarch64-linux = "194bnz4rg6lpi1pcl3yknap2n1p9vyi86wd5rq4m0h8kmqg1i21w";
|
||||
aarch64-darwin = "1vhb85zbpp399qxn7b7gdvsij174x5nzp84xw57kw9pzs5dkw12g";
|
||||
armv7l-linux = "1cr3vqxl0h8a4mg920a90ykdvb3vzf8cyxls1w8m84k3b53m5qdi";
|
||||
x86_64-linux = "0vwnx7fs46fkas75pnhjc81wy3hr24k2gs82i30ailaxw5r63j81";
|
||||
x86_64-darwin = "0bxc74vfkw9zhxfahzhcghlnybvj8k15jbni489lf636a45xrlcc";
|
||||
aarch64-linux = "10z6nv67yjd15ilxgfpjf07qbdp0cbd5761a5gcymiam4r22l6hq";
|
||||
aarch64-darwin = "133nccm0hcgcd2503psxwaaq4v4l16q7w7kbcz1y5lynlvwazjrx";
|
||||
armv7l-linux = "1sx3l42ls62v3apjap25ccg4mcbi71spfj5xh7y6rffzi65xwdrv";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.69.2";
|
||||
version = "1.70.0";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, withVulkan ? stdenv.isLinux
|
||||
, alsa-lib
|
||||
, AppKit
|
||||
, dbus
|
||||
, fetchFromGitHub
|
||||
, ffmpeg_4
|
||||
, Foundation
|
||||
@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
|
||||
lib.optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++
|
||||
lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
dbus
|
||||
libX11
|
||||
libXdmcp
|
||||
libXext
|
||||
@ -95,7 +97,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ];
|
||||
configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" "--enable-dbus" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/libretro/info
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "19.0.3";
|
||||
version = "20.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "be456d396a19dcb8881ad4bff315197306ae05cca5e47332a1e5ad572948614e";
|
||||
sha256 = "sha256-O/gzXAzvaYJXpexjBSc6jNW1wX0ukwQcpFU8fq4qM4k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jquake";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip";
|
||||
sha256 = "1k12yw9fwq1z3gg0d38dxs4mmyn912zfcm6zsbjkv27q6lvhvwng";
|
||||
sha256 = "sha256-Y7yjjpptaScThiU8rHdV6cJ6FaTHOtKdsnO5y/HzoDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip copyDesktopItems ];
|
||||
|
||||
@ -19,15 +19,15 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "104.0.5112.79",
|
||||
"sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw",
|
||||
"sha256bin64": "1vagpsnjrdjcisgg7i56l3zcgvb5sg4pkaq5li500vmgcjin8irq",
|
||||
"version": "105.0.5195.19",
|
||||
"sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7",
|
||||
"sha256bin64": "15rhslgq77wiwiycf6m89vi3f5vry286b7kqfk0v5ibmcsf6clgf",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-06-08",
|
||||
"version": "2022-07-11",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3",
|
||||
"sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra"
|
||||
"rev": "9ef321772ecc161937db69acb346397e0ccc484d",
|
||||
"sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -27,7 +27,7 @@ rec {
|
||||
};
|
||||
|
||||
firefox-esr-102 = buildMozillaMach rec {
|
||||
pname = "firefox-esr";
|
||||
pname = "firefox-esr-102";
|
||||
version = "102.1.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
@ -54,7 +54,7 @@ rec {
|
||||
};
|
||||
|
||||
firefox-esr-91 = buildMozillaMach rec {
|
||||
pname = "firefox-esr";
|
||||
pname = "firefox-esr-91";
|
||||
version = "91.12.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
|
||||
@ -114,19 +114,19 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.26.1",
|
||||
"sha256": "sha256-9S+J0z9ilRqfpZv3aZe6Fv1Jyo2ShRQzeoMuRsDBiUo=",
|
||||
"rev": "v2.27.0",
|
||||
"sha256": "sha256-E8O0+OblKl1aSOXB5fnc34m+pUsfIZ6eHWoAq6HkKHs=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.26.1"
|
||||
"version": "2.27.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.16.0",
|
||||
"sha256": "sha256-b4aMwU9vDQ3t5fske5MZm5i9DJehy1WFySsJbowRjbc=",
|
||||
"rev": "v3.17.0",
|
||||
"sha256": "sha256-XeZwQxK0WhLv2Y7PFADsv4f6vO4E3/j/9HM1wJ8LXKE=",
|
||||
"vendorSha256": null,
|
||||
"version": "3.16.0"
|
||||
"version": "3.17.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
@ -411,13 +411,15 @@
|
||||
"version": "1.31.1"
|
||||
},
|
||||
"fortios": {
|
||||
"deleteVendor": true,
|
||||
"owner": "fortinetdev",
|
||||
"provider-source-address": "registry.terraform.io/fortinetdev/fortios",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-fortios",
|
||||
"rev": "v1.14.1",
|
||||
"sha256": "sha256-9e1PEg8RtJa7DR5g3cCdAhubFxt7vN5dPjaBA+F7Y4E=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.14.1"
|
||||
"rev": "v1.15.0",
|
||||
"sha256": "sha256-jXaEGWt/O0Cv15ksFax571f6aoDhVpNZSbvbOFj6TZ4=",
|
||||
"vendorSha256": "sha256-WkF2mVDrDlCefM4pjADoXsVwpa7E02c6kUyOgHxNFpo=",
|
||||
"version": "1.15.0"
|
||||
},
|
||||
"gandi": {
|
||||
"owner": "go-gandi",
|
||||
@ -677,10 +679,10 @@
|
||||
"owner": "linode",
|
||||
"provider-source-address": "registry.terraform.io/linode/linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v1.28.1",
|
||||
"sha256": "sha256-w7PvzcgyzrkxQ+I8Bjw5C3MqMmiJS5neuGipC+H+mEM=",
|
||||
"vendorSha256": "sha256-c0NtM3TkkSjrwQ9fj0XiH0BYnSsE8uzirkTv2QHzPOg=",
|
||||
"version": "1.28.1"
|
||||
"rev": "v1.29.1",
|
||||
"sha256": "sha256-eZ13kVQplnIQNT4KecUeLAfrCime1WNEdG0yuv3dBWk=",
|
||||
"vendorSha256": "sha256-PBnMIEuMGcb+qeFO4e17e9sg58DmL6BEAZJeTTVjS1g=",
|
||||
"version": "1.29.1"
|
||||
},
|
||||
"linuxbox": {
|
||||
"owner": "numtide",
|
||||
@ -1012,10 +1014,10 @@
|
||||
"owner": "scaleway",
|
||||
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.2.6",
|
||||
"sha256": "sha256-YrCpZCQGm8yFCxJRClrQJ1axFDBradJireMAW0ViLvc=",
|
||||
"rev": "v2.2.7",
|
||||
"sha256": "sha256-W100EYLKaFH9KGmSkgk0Ig2Z0R+RvYijrm3ikhEvBe8=",
|
||||
"vendorSha256": "sha256-zswPGl4a/V8tOMMUWCjxY8ubSy5GT9pP6eBpqSrAg/k=",
|
||||
"version": "2.2.6"
|
||||
"version": "2.2.7"
|
||||
},
|
||||
"secret": {
|
||||
"owner": "numtide",
|
||||
|
||||
@ -3,12 +3,12 @@ electron, libsecret }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "3.98.15";
|
||||
version = "3.98.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
|
||||
name = "tutanota-desktop-${version}.tar.gz";
|
||||
sha256 = "sha256-yuSFDLQ7ckuZYuXREbW0VvMapzO2VhVIH1Ccr1uQHmo=";
|
||||
sha256 = "sha256-rVAiutjFI3/KJZeiTy6H2IdMh+SFz9+NvEoriPTnW2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "gprojector";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz";
|
||||
sha256 = "sha256-60UT6z5aQ3Tk4EujEUp4ntB5GakFVhJzk5eytoIwf78=";
|
||||
sha256 = "sha256-6EixVNRgYnuY9INb7gAyBzo125DhPEUPD+pGxjzmhy8=";
|
||||
};
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mafft";
|
||||
version = "7.490";
|
||||
version = "7.505";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mafft.cbrc.jp/alignment/software/mafft-${version}-with-extensions-src.tgz";
|
||||
sha256 = "0hb5jzcqdnjn3micm5z301lrnyvmn9pnnnxjz4h2wa4yicyz7vnn";
|
||||
sha256 = "sha256-9Up4Zw/NmWAjO8w7PdNZ85WnHAztRae+HP6uGZUM5v8=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.12.1";
|
||||
version = "1.13.0";
|
||||
|
||||
# build stimuli file for PGO build and the script to generate it
|
||||
# independently of the foot's build, so we can cache the result
|
||||
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "dnkl";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk";
|
||||
sha256 = "0cc262jpqp8l25p04pcqh3w671gw0p1d2zrr3d34ch8k9c6s4nzq";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
@ -144,7 +144,6 @@ stdenv.mkDerivation rec {
|
||||
mesonBuildType = "release";
|
||||
|
||||
# See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options
|
||||
# TODO(@sternenseemann): install systemd user units
|
||||
mesonFlags = [
|
||||
# Use lto
|
||||
"-Db_lto=true"
|
||||
@ -154,6 +153,8 @@ stdenv.mkDerivation rec {
|
||||
"-Ddefault-terminfo=foot"
|
||||
# Tell foot to set TERMINFO and where to install the terminfo files
|
||||
"-Dcustom-terminfo-install-location=${terminfoDir}"
|
||||
# Install systemd user units for foot-server
|
||||
"-Dsystemd-units-dir=${placeholder "out"}/lib/systemd/user"
|
||||
];
|
||||
|
||||
# build and run binary generating PGO profiles,
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-cliff";
|
||||
version = "0.7.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "git-cliff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wVHL2+didmiN7UlEeIuSr+8LhkFKCOD3of4rKVg1i1o=";
|
||||
sha256 = "sha256-lRONRLTByhMalN9BKilCcQn2c9f4cxOnHJLL0l0jaOs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5jhloUnaGXXDu2LCO86SMJo8ETIxLAivv3hx9gEqtJ4=";
|
||||
cargoSha256 = "sha256-1r/k3DQ/vjIjMpOHYCRRosbZ22iAFkuq4EbZUcZoWn0=";
|
||||
|
||||
# attempts to run the program on .git in src which is not deterministic
|
||||
doCheck = false;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libspecbleach";
|
||||
version = "0.1.2";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucianodato";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WmUl8rA/+V+hv7FPG/5Or6aAQVqt1rIJtdb53KhSmuo=";
|
||||
sha256 = "sha256-Tw5nrGVAeoiMH00efJwcU+QLmKDZZTXHQPSV9x789TM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nghttp3";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EEwo4KIBNVb/O1htUN8GkuiU/P3r/DyEn6L9l1r1I6E=";
|
||||
sha256 = "sha256-q9rXvMeCXhyytiaGekRlowCYKzvq8aktfN0lk+VPG78=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchurl
|
||||
, CoreServices
|
||||
, buildPackages
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -44,6 +45,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) firefox firefox-esr-91 firefox-esr-102;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions";
|
||||
description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
, # allow FIPS mode. Note that this makes the output non-reproducible.
|
||||
# https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
|
||||
enableFIPS ? false
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
@ -186,6 +187,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
passthru.tests = lib.optionalAttrs (lib.versionOlder version "3.69") {
|
||||
inherit (nixosTests) firefox-esr-91;
|
||||
} // lib.optionalAttrs (lib.versionAtLeast version "3.69") {
|
||||
inherit (nixosTests) firefox firefox-esr-102;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS";
|
||||
description = "A set of libraries for development of security-enabled client and server applications";
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "catalogue";
|
||||
version = "2.1.0";
|
||||
version = "2.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oczi8XOKMd6yqiSz5Kieb7PoUlVcGDsOzaiivMHq7y4=";
|
||||
sha256 = "sha256-syXHdlkgi/tq8bDZOxoapBEuG7KaTFztgWdYpyLw44g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
@ -29,11 +29,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.10") [
|
||||
# https://github.com/explosion/catalogue/issues/27
|
||||
"test_entry_points"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"catalogue"
|
||||
];
|
||||
@ -43,6 +38,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/explosion/catalogue";
|
||||
changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
|
||||
41
pkgs/development/python-modules/cryptolyzer/default.nix
Normal file
41
pkgs/development/python-modules/cryptolyzer/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, certvalidator
|
||||
, attrs
|
||||
, six
|
||||
, urllib3
|
||||
, cryptoparser
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cryptolyzer";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "CryptoLyzer";
|
||||
inherit version;
|
||||
sha256 = "sha256-FbxSjKxhzlpj3IezuLCQvoeZMG1q+OE/yn5vB/XE1rI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certvalidator
|
||||
attrs
|
||||
six
|
||||
urllib3
|
||||
cryptoparser
|
||||
requests
|
||||
];
|
||||
|
||||
doCheck = false; # Tests require networking
|
||||
|
||||
pythonImportsCheck = [ "cryptolyzer" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and flexible cryptographic protocol analyzer";
|
||||
homepage = "https://gitlab.com/coroner/cryptolyzer";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ kranzes ];
|
||||
};
|
||||
}
|
||||
34
pkgs/development/python-modules/cryptoparser/default.nix
Normal file
34
pkgs/development/python-modules/cryptoparser/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, attrs
|
||||
, six
|
||||
, asn1crypto
|
||||
, python-dateutil
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cryptoparser";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kJg8d1PoGIC0feefbJM8oyXcRyMGdg1wWkQUl/nSNCo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
six
|
||||
asn1crypto
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cryptoparser" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and flexible security protocol parser and generator";
|
||||
homepage = "https://gitlab.com/coroner/cryptoparser";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ kranzes ];
|
||||
};
|
||||
}
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-reversion";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-orJqS4SxEzgTbKnWRXpK8wcJkseoliOzSQCaEj8o6h0=";
|
||||
sha256 = "sha256-JDoS7k4EwWEcDwdvv8MHTxrUCvxFrcZN5bokFMxOryk=";
|
||||
};
|
||||
|
||||
# tests assume the availability of a mysql/postgresql database
|
||||
|
||||
60
pkgs/development/python-modules/dvc-task/default.nix
Normal file
60
pkgs/development/python-modules/dvc-task/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, kombu
|
||||
, shortuuid
|
||||
, celery
|
||||
, funcy
|
||||
, pytest-celery
|
||||
, pytest-mock
|
||||
, pytest-test-utils
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-task";
|
||||
version = "0.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-LXjfFuLifgzU+3/EevycVCR7LhYBOoN6xg4YeNo5R4M=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
kombu
|
||||
shortuuid
|
||||
celery
|
||||
funcy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-celery
|
||||
pytest-mock
|
||||
pytest-test-utils
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dvc_task"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Celery task queue used in DVC";
|
||||
homepage = "https://github.com/iterative/dvc-task";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fonttools
|
||||
, openstep-plist
|
||||
, ufoLib2
|
||||
@ -16,22 +16,21 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glyphslib";
|
||||
version = "6.0.6";
|
||||
version = "6.0.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "glyphsLib";
|
||||
inherit version;
|
||||
sha256 = "sha256-F4ev+o6vwDjV2H3z+DrwQZ7VLc1cSIjCWhgY7pcse1M=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "glyphsLib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PrHK9uEgs0DcNYW6EQ5Qw29CN4R2OcxOHrMeIswsxdA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "glyphsLib" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
fonttools
|
||||
openstep-plist
|
||||
@ -44,6 +43,10 @@ buildPythonPackage rec {
|
||||
skia-pathops
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "glyphsLib" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/builder/designspace_gen_test.py" # this test tries to use non-existent font "CoolFoundry Examplary Serif"
|
||||
"tests/builder/interpolation_test.py" # this test tries to use a font that previous test should made
|
||||
|
||||
25
pkgs/development/python-modules/py-tree-sitter/default.nix
Normal file
25
pkgs/development/python-modules/py-tree-sitter/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-tree-sitter";
|
||||
version = "unstable-2022-02-08";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "py-tree-sitter";
|
||||
rev = "9c8261d36e55d9e4a6543dc9e570bfd7911ed7bf";
|
||||
sha256 = "sha256-YDe9m85LIPNumo9mrhMMotUspq/8B3t5kt2ScMJI+hY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "tree_sitter" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tree-sitter/py-tree-sitter";
|
||||
description = "Python bindings for tree-sitter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.2.27";
|
||||
version = "0.2.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NOdr/C2a4A1uC9al2gkrGKJ01/R9TUpHjwuQNpSGHCo=";
|
||||
sha256 = "sha256-f9Oq9+FiGaL71RGR2eerHM9bBbNK7ysZsCWvOZo5u8g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+TKdLtR5W4RtOs1qpA1EVc6RS6/SQT8OWNwwllSsBqQ=";
|
||||
vendorSha256 = "sha256-e++fNcgdQUPnbKVx7ncuf7NGc8eVdli5/rB7Jw+D/Ds=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dagger"
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cpm";
|
||||
version = "0.35.3";
|
||||
version = "0.35.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake";
|
||||
sha256 = "sha256-Ft9iPBo31xzFEoqSGETzOTCRULR6GqsUQYrzdNHOpiU=";
|
||||
sha256 = "sha256-Ve+NhDAiAzH4x3ZUZjQkuZ69n65ljGc2h6cR62xnf+0=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.28";
|
||||
version = "1.0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PiVHA9dcndL301xTUEG4k2hqa4X7mn909/l+oxdkhw4=";
|
||||
sha256 = "sha256-HK6FnB8S3rVTN9p7wYvmMUmdNmYQ738ua5491R6/KME=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-dfCACQszWhEnTLZFBe64CFrG+eoz0kmrquq7TnHkji4=";
|
||||
cargoSha256 = "sha256-hqg4Htf8nRRPLm9xyJgb2T8ycsPUZmrRMvk4E5f17Fc=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"1.19": {
|
||||
"url": "https://piston-data.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar",
|
||||
"sha1": "8399e1211e95faa421c1507b322dbeae86d604df",
|
||||
"version": "1.19.1",
|
||||
"url": "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar",
|
||||
"sha1": "f69c284232d7c7580bd89a5a4931c3581eae1378",
|
||||
"version": "1.19.2",
|
||||
"javaVersion": 17
|
||||
},
|
||||
"1.18": {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "rkdeveloptool";
|
||||
version = "unstable-2021-02-03";
|
||||
version = "unstable-2021-04-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockchip-linux";
|
||||
repo = "rkdeveloptool";
|
||||
rev = "e607a5d6ad3f6af66d3daf3f6370e6dc9763a20d";
|
||||
sha256 = "08m0yfds5rpr5l0s75ynfarq3hrv94l3aadld17cz5gqapqcfs2n";
|
||||
rev = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a";
|
||||
sha256 = "eIFzyoY6l3pdfCN0uS16hbVp0qzdG3MtcS1jnDX1Yk0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
# main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5
|
||||
CPPFLAGS = "-Wno-error=format-truncation";
|
||||
CPPFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rockchip-linux/rkdeveloptool";
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.3.0";
|
||||
version = "4.4.0";
|
||||
pname = "intel-cmt-cat";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-cmt-cat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9XZuSHWcAFN5otBfG8xE4gTIDixw7mYnHT/CTjyOvwo=";
|
||||
sha256 = "sha256-THP0ie9Ta0iNcAJYCRXMajqYBIFuT67kGMDakL4vIZc=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,15 +1,18 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, symlinkJoin }:
|
||||
|
||||
let
|
||||
etcdVersion = "3.5.4";
|
||||
etcdSrc = fetchFromGitHub {
|
||||
version = "3.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etcd-io";
|
||||
repo = "etcd";
|
||||
rev = "v${etcdVersion}";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mTQHxLLfNiihvHg5zaTeVNWKuzvE0KBiJdY3qMJHMCM=";
|
||||
};
|
||||
|
||||
commonMeta = with lib; {
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Distributed reliable key-value store for the most critical data of a distributed system";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://etcd.io/";
|
||||
@ -19,60 +22,50 @@ let
|
||||
|
||||
etcdserver = buildGoModule rec {
|
||||
pname = "etcdserver";
|
||||
version = etcdVersion;
|
||||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorSha256 = "sha256-4djUQvWp9hScua9l1ZTq298zWSeDYRDojEt2AWmarzw=";
|
||||
|
||||
src = etcdSrc;
|
||||
modRoot = "./server";
|
||||
|
||||
postBuild = ''
|
||||
mv $GOPATH/bin/{server,etcd}
|
||||
'';
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
# We set the GitSHA to `GitNotFound` to match official build scripts when
|
||||
# git is unavailable. This is to avoid doing a full Git Checkout of etcd.
|
||||
# User facing version numbers are still available in the binary, just not
|
||||
# the sha it was built from.
|
||||
ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
|
||||
|
||||
meta = commonMeta;
|
||||
};
|
||||
|
||||
etcdutl = buildGoModule rec {
|
||||
pname = "etcdutl";
|
||||
version = etcdVersion;
|
||||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorSha256 = "sha256-nk56XGpNsDwcGrTKithKGnPCX0NhpQmzNSXHk3vmdtg=";
|
||||
|
||||
src = etcdSrc;
|
||||
modRoot = "./etcdutl";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
meta = commonMeta;
|
||||
};
|
||||
|
||||
etcdctl = buildGoModule rec {
|
||||
pname = "etcdctl";
|
||||
version = etcdVersion;
|
||||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorSha256 = "sha256-WIMYrXfay6DMz+S/tIc/X4ffMizxub8GS1DDgIR40D4=";
|
||||
|
||||
src = etcdSrc;
|
||||
modRoot = "./etcdctl";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
meta = commonMeta;
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "etcd";
|
||||
version = etcdVersion;
|
||||
meta = commonMeta;
|
||||
name = "etcd-${version}";
|
||||
|
||||
inherit meta version;
|
||||
|
||||
passthru = { inherit etcdserver etcdutl etcdctl; };
|
||||
|
||||
paths = [
|
||||
etcdserver
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.15";
|
||||
version = "1.6.16";
|
||||
pname = "memcached";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://memcached.org/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-jXq+PWSTeO27oW9C7x1myj8qwHXy65cUXOFkOI5u1RU=";
|
||||
sha256 = "sha256-MFGpO/HdDDry0OWJ/272UR+HY4WjWxjp/4dB5KGrNNo=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "VictoriaMetrics";
|
||||
version = "1.79.0";
|
||||
version = "1.79.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+LirbGbKeazXMtgVh5kZP+KEk/fDbSxceZ26OlE0hbY=";
|
||||
sha256 = "sha256-rBR2gZ6wAt8P70MScPbktlLtXWWvqs08u786zSiFjJ0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uftp";
|
||||
version = "5.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
|
||||
sha256 = "1q08schd765fsm9647ac4ic2x70ys2x48mqz97mibdi4bbm72bsn";
|
||||
sha256 = "sha256-8ENfvI6f+hJeBWAMtsf8kz19WH9brkGyVyZ75PLODmE=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
let
|
||||
pname = "pgadmin";
|
||||
version = "6.11";
|
||||
version = "6.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
|
||||
sha256 = "sha256-1MvvQvVoWiV5hhgJUcAHbMyZzkADunLtwmszaO4EeCA=";
|
||||
sha256 = "sha256-cO7GdZDfJ0pq1jpMyrVy0UM49WhrKOIJOmMJauSkbyo=";
|
||||
};
|
||||
|
||||
yarnDeps = mkYarnModules {
|
||||
@ -72,7 +72,7 @@ let
|
||||
azure-identity
|
||||
];
|
||||
|
||||
# override necessary on pgadmin4 6.11
|
||||
# override necessary on pgadmin4 6.12
|
||||
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
|
||||
werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.0.3";
|
||||
|
||||
@ -1,9 +1,3 @@
|
||||
From 391433d020da52fba28ad08beb2cc85ffd852044 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
|
||||
Date: Wed, 23 Feb 2022 14:40:11 +0100
|
||||
Subject: [PATCH] Expose setup.py as pgadmin4-setup
|
||||
|
||||
---
|
||||
pkg/pip/setup_pip.py | 5 ++++-
|
||||
web/setup.py | 14 ++++++++------
|
||||
2 files changed, 12 insertions(+), 7 deletions(-)
|
||||
@ -25,41 +19,42 @@ index 5592d1b04..131eaa1ed 100644
|
||||
|
||||
)
|
||||
diff --git a/web/setup.py b/web/setup.py
|
||||
index 5f4257e86..df970f049 100644
|
||||
index 2204ffb..d5fda9f 100644
|
||||
--- a/web/setup.py
|
||||
+++ b/web/setup.py
|
||||
@@ -32,6 +32,10 @@ from pgadmin import create_app
|
||||
from pgadmin.utils import clear_database_servers, dump_database_servers,\
|
||||
load_database_servers
|
||||
|
||||
+# Configuration settings
|
||||
+import config
|
||||
+from pgadmin.model import SCHEMA_VERSION
|
||||
+from pgadmin.setup import db_upgrade, create_app_data_directory
|
||||
|
||||
def dump_servers(args):
|
||||
"""Dump the server groups and servers.
|
||||
@@ -139,12 +143,7 @@ def clear_servers():
|
||||
@@ -14,7 +14,6 @@ import argparse
|
||||
import os
|
||||
import sys
|
||||
import builtins
|
||||
-import config
|
||||
|
||||
# Grab the SERVER_MODE if it's been set by the runtime
|
||||
if 'SERVER_MODE' in globals():
|
||||
@@ -91,6 +90,9 @@ def load_servers(args):
|
||||
def setup_db(app):
|
||||
"""Setup the configuration database."""
|
||||
|
||||
+ # here we need an additional import, since the call to setup_db changed
|
||||
+ # https://redmine.postgresql.org/projects/pgadmin4/repository/2/revisions/3a69d50458f57d19948b867aec55c55d635a36e5/diff/web/setup.py
|
||||
+ import config
|
||||
create_app_data_directory(config)
|
||||
|
||||
print("pgAdmin 4 - Application Initialisation")
|
||||
@@ -139,8 +141,9 @@ def clear_servers():
|
||||
clear_database_servers(load_user, True)
|
||||
|
||||
|
||||
|
||||
|
||||
-if __name__ == '__main__':
|
||||
- # Configuration settings
|
||||
- import config
|
||||
- from pgadmin.model import SCHEMA_VERSION
|
||||
- from pgadmin.setup import db_upgrade, create_app_data_directory
|
||||
-
|
||||
+def main():
|
||||
# Configuration settings
|
||||
+ import config
|
||||
parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB')
|
||||
|
||||
|
||||
exp_group = parser.add_argument_group('Dump server config')
|
||||
@@ -194,3 +193,6 @@ if __name__ == '__main__':
|
||||
print(str(e))
|
||||
@@ -191,3 +194,6 @@ if __name__ == '__main__':
|
||||
else:
|
||||
setup_db()
|
||||
app = create_app()
|
||||
setup_db(app)
|
||||
+
|
||||
+if __name__ == '__main__':
|
||||
+ main()
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
@ -70,7 +70,7 @@
|
||||
"webpack": "^5.21.2",
|
||||
"webpack-bundle-analyzer": "^4.4.0",
|
||||
"webpack-cli": "^4.5.0",
|
||||
"yarn-audit-html": "^3.0.1"
|
||||
"yarn-audit-html": "^4.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/plugin-proposal-class-properties": "^7.10.4",
|
||||
@ -111,12 +111,12 @@
|
||||
"closest": "^0.0.1",
|
||||
"codemirror": "^5.59.2",
|
||||
"context-menu": "^2.0.0",
|
||||
"convert-units": "^2.3.4",
|
||||
"css-loader": "^5.0.1",
|
||||
"cssnano": "^5.0.2",
|
||||
"dagre": "^0.8.4",
|
||||
"date-fns": "^2.24.0",
|
||||
"diff-arrays-of-objects": "^1.1.8",
|
||||
"dropzone": "^5.9.3",
|
||||
"html2canvas": "^1.0.0-rc.7",
|
||||
"immutability-helper": "^3.0.0",
|
||||
"imports-loader": "^2.0.0",
|
||||
@ -124,7 +124,7 @@
|
||||
"ip-address": "^7.1.0",
|
||||
"jquery": "^3.6.0",
|
||||
"jquery-contextmenu": "^2.9.2",
|
||||
"jquery-ui": "^1.13.0",
|
||||
"jquery-ui": "^1.13.2",
|
||||
"json-bignumber": "^1.0.1",
|
||||
"jsoneditor": "^9.5.4",
|
||||
"jsoneditor-react": "^3.1.1",
|
||||
@ -132,7 +132,7 @@
|
||||
"leaflet": "^1.5.1",
|
||||
"lodash": "4.*",
|
||||
"ml-matrix": "^6.5.0",
|
||||
"moment": "^2.29.3",
|
||||
"moment": "^2.29.4",
|
||||
"moment-timezone": "^0.5.34",
|
||||
"mousetrap": "^1.6.3",
|
||||
"notificar": "^1.0.1",
|
||||
@ -150,6 +150,7 @@
|
||||
"react-data-grid": "git+https://github.com/adityatoshniwal/react-data-grid.git/#8d9bc16ddd7c419acfbbd1c1cc2b70eb9f5b453c",
|
||||
"react-dom": "^17.0.1",
|
||||
"react-draggable": "^4.4.4",
|
||||
"react-dropzone": "^14.2.1",
|
||||
"react-leaflet": "^3.2.2",
|
||||
"react-rnd": "^10.3.5",
|
||||
"react-router-dom": "^6.2.2",
|
||||
@ -165,7 +166,6 @@
|
||||
"socket.io-client": "^4.0.0",
|
||||
"split.js": "^1.5.10",
|
||||
"styled-components": "^5.2.1",
|
||||
"tablesorter": "^2.31.2",
|
||||
"tempusdominus-bootstrap-4": "^5.1.2",
|
||||
"tempusdominus-core": "^5.19.3",
|
||||
"underscore": "^1.13.1",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bluetuith";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkhz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NXQa3aOjTIcQQZNwkS5ypBp7jzUhXztJ6LgtucIEDYI=";
|
||||
sha256 = "sha256-HQIcHOZf7jDYaG4RnhWDTk6CRu55IfGZevbWixlNE2M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sCpJow5tiliiNSnKjgzxmgyHxPk8j1RdjobFwKhpU4w=";
|
||||
vendorSha256 = "sha256-/CEQfpE5ENpfWQ0OvMaG9rZ/4BtFm21JkqDZtHwzqNU=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "godns";
|
||||
version = "2.8.7";
|
||||
version = "2.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimothyYe";
|
||||
repo = "godns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BxANSw+SWOpz9vM2I3ODghOqJRi5dBr7j0YVSSBrrto=";
|
||||
sha256 = "sha256-2vjOxbfCBNBNlEUOXmmWEJYxM2aeEi3yIbJ1XsFmNNw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE=";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.33";
|
||||
version = "3.0.34";
|
||||
pname = "swagger-codegen";
|
||||
|
||||
jarfilename = "${pname}-cli-${version}.jar";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
|
||||
sha256 = "sha256-1oGir5F3wgwRQxz3eXI58wMIKYwvtHrRW4VJh0hIVyE=";
|
||||
sha256 = "sha256-C6uSqb8o6hcK7r7NxlHckMBcdMf2APK4FYRpQFMaE9Y=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "credential-detector";
|
||||
version = "1.7.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ynori7";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1g5ja32rsf1b7y9gvmy29qz2ymyyvgh53wzd6vvknfla1df0slab";
|
||||
sha256 = "sha256-zUQRzlp/7gZhCm5JYu9kYxcoFjDldCYKarRorOHa3E0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1mn3sysvdz4b94804gns1yssk2q08djq3kq3cd1h7gm942zwrnq4";
|
||||
vendorSha256 = "sha256-VWmfATUbfnI3eJbFTUp6MR1wGESuI15PHZWuon5M5rg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to detect potentially hard-coded credentials";
|
||||
|
||||
40
pkgs/tools/security/davtest/default.nix
Normal file
40
pkgs/tools/security/davtest/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib, stdenv, perl, perlPackages, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "davtest";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/davtest/davtest-${version}.tar.bz2";
|
||||
sha256 = "0kigcgv1bbnan9yr5481s4b9islmvzl2arpg1ig1i39sxrna06y7";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace davtest.pl \
|
||||
--replace "backdoors/" "$out/share/davtest/backdoors/" \
|
||||
--replace "tests/" "$out/share/davtest/tests/"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
(perl.withPackages (p: with p; [ HTTPDAV ]))
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 davtest.pl $out/bin/davtest.pl
|
||||
mkdir -p $out/share/davtest
|
||||
cp -r backdoors/ tests/ $out/share/davtest/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tests WebDAV servers by uploading test files, and then optionally testing for command execution or other actions directly on the target";
|
||||
homepage = "https://code.google.com/p/davtest/";
|
||||
mainProgram = "davtest.pl";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -17797,7 +17797,7 @@ with pkgs;
|
||||
|
||||
ganv = callPackage ../development/libraries/ganv { };
|
||||
|
||||
garble = callPackage ../build-support/go/garble.nix {
|
||||
garble = callPackage ../development/tools/garble {
|
||||
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
@ -21980,10 +21980,10 @@ with pkgs;
|
||||
stdenv = gcc8Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
|
||||
});
|
||||
buildGo117Module = callPackage ../development/go-modules/generic {
|
||||
buildGo117Module = callPackage ../build-support/go/module.nix {
|
||||
go = buildPackages.go_1_17;
|
||||
};
|
||||
buildGo117Package = callPackage ../development/go-packages/generic {
|
||||
buildGo117Package = callPackage ../build-support/go/package.nix {
|
||||
go = buildPackages.go_1_17;
|
||||
};
|
||||
|
||||
@ -21991,10 +21991,10 @@ with pkgs;
|
||||
go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
|
||||
};
|
||||
buildGo118Module = darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic {
|
||||
buildGo118Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix {
|
||||
go = buildPackages.go_1_18;
|
||||
};
|
||||
buildGo118Package = darwin.apple_sdk_11_0.callPackage ../development/go-packages/generic {
|
||||
buildGo118Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix{
|
||||
go = buildPackages.go_1_18;
|
||||
};
|
||||
|
||||
@ -22002,10 +22002,10 @@ with pkgs;
|
||||
go_1_19 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.19.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
|
||||
};
|
||||
buildGo119Module = darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic {
|
||||
buildGo119Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix {
|
||||
go = buildPackages.go_1_19;
|
||||
};
|
||||
buildGo119Package = darwin.apple_sdk_11_0.callPackage ../development/go-packages/generic {
|
||||
buildGo119Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix {
|
||||
go = buildPackages.go_1_19;
|
||||
};
|
||||
|
||||
@ -33606,6 +33606,8 @@ with pkgs;
|
||||
|
||||
dalfox = callPackage ../tools/security/dalfox { };
|
||||
|
||||
davtest = callPackage ../tools/security/davtest { };
|
||||
|
||||
dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
|
||||
|
||||
deepdiff = with python3Packages; toPythonApplication deepdiff;
|
||||
|
||||
@ -9270,6 +9270,23 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
FutureIO = buildPerlModule {
|
||||
pname = "Future-IO";
|
||||
version = "0.11";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-IO-0.11.tar.gz";
|
||||
sha256 = "sha256-dVM2JvgfdoxfIxyXAhBsJbV3KotplcqixYvMSsyRB8k=";
|
||||
};
|
||||
buildInputs = [ TestIdentity ];
|
||||
propagatedBuildInputs = [ Future StructDumb ];
|
||||
preCheck = "rm t/06connect.t"; # this test fails in sandbox
|
||||
meta = {
|
||||
description = "Future-returning IO methods";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.zakame ];
|
||||
};
|
||||
};
|
||||
|
||||
GamesSolitaireVerify = buildPerlModule {
|
||||
pname = "Games-Solitaire-Verify";
|
||||
version = "0.2403";
|
||||
|
||||
@ -2029,6 +2029,10 @@ in {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
cryptolyzer = callPackage ../development/python-modules/cryptolyzer { };
|
||||
|
||||
cryptoparser = callPackage ../development/python-modules/cryptoparser { };
|
||||
|
||||
crytic-compile = callPackage ../development/python-modules/crytic-compile { };
|
||||
|
||||
csrmesh = callPackage ../development/python-modules/csrmesh { };
|
||||
@ -2701,6 +2705,8 @@ in {
|
||||
|
||||
dvc-render = callPackage ../development/python-modules/dvc-render { };
|
||||
|
||||
dvc-task = callPackage ../development/python-modules/dvc-task { };
|
||||
|
||||
dvclive = callPackage ../development/python-modules/dvclive { };
|
||||
|
||||
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
|
||||
@ -7115,6 +7121,8 @@ in {
|
||||
|
||||
py-tes = callPackage ../development/python-modules/py-tes { };
|
||||
|
||||
py-tree-sitter = callPackage ../development/python-modules/py-tree-sitter { };
|
||||
|
||||
py-ubjson = callPackage ../development/python-modules/py-ubjson { };
|
||||
|
||||
py-zabbix = callPackage ../development/python-modules/py-zabbix { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user