diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-15 18:01:43 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-15 18:01:43 +0000 |
commit | cfaff97318c7e837697fe30dcd7d542829b3f11c (patch) | |
tree | 24ee00288549cf89b351aa0ff329903beebd0e59 /pkgs | |
parent | f16721775ee53a355733d9e18233234f6620070c (diff) | |
parent | b0228686751ade20abc10a66e5615f0b99deb215 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
51 files changed, 1046 insertions, 312 deletions
diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 84b2a2f736a16..13d0994799ab4 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -3,10 +3,13 @@ , rustPlatform , fetchFromGitHub , llvmPackages -, rocksdb +, rocksdb_6_23 , Security }: +let + rocksdb = rocksdb_6_23; +in rustPlatform.buildRustPackage rec { pname = "electrs"; version = "0.9.2"; @@ -24,12 +27,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3 - # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331 - # # link rocksdb dynamically - # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - # ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 62dcac327f781..ffd2d926b63cf 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "lnd"; - version = "0.13.3-beta"; + version = "0.13.4-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "05ai8nyrc8likq5n7i9klfi9550ki8sqklv8axjvi6ql8v9bzk61"; + sha256 = "1ykvhbl5i0kqlh0fpzpjass55clys8bpa28brg7d9fs72zv2ks6x"; }; - vendorSha256 = "0xf8395g6hifbqwbgapllx38y0759xp374sja7j1wk8sdj5ngql5"; + vendorSha256 = "13cjb188bzgd3m3p73szxffkab6l7n6wmbvqvicvi9k3mixn5qql"; - subPackages = ["cmd/lncli" "cmd/lnd"]; + subPackages = [ "cmd/lncli" "cmd/lnd" ]; preBuild = let buildVars = { diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index f7782d0a577c4..65375172f405c 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.2.4"; # When updating also update fetchedMavenDeps.sha256 + version = "21.2.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "BPcTj2YIGyP3g4qrQlDp13lziJwSUt0Zn00CayDku9g="; + sha256 = "bLZYwf6dtbzS0sWKfQQzv4NqRQZqLkJaT24eW3YOsdQ="; }; fetchedMavenDeps = stdenv.mkDerivation { diff --git a/pkgs/applications/misc/downonspot/default.nix b/pkgs/applications/misc/downonspot/default.nix new file mode 100644 index 0000000000000..4764fc4d5e638 --- /dev/null +++ b/pkgs/applications/misc/downonspot/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, makeWrapper +, alsa-lib +, lame +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "downonspot"; + version = "unstable-2021-10-13"; + + src = fetchFromGitHub { + owner = "oSumAtrIX"; + repo = "DownOnSpot"; + rev = "9d78ea2acad4dfe653a895a1547ad0abe7c5b47a"; + sha256 = "03g99yx9sldcg3i6hvpdxyk70f09f8kfj3kh283vl09b1a2c477w"; + }; + + cargoSha256 = "0k200p6wgwb60ax1r8mjn3aq08zxpkqbfqpi3b25zi3xf83my44d"; + + # fixes: error: the option `Z` is only accepted on the nightly compiler + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + openssl + alsa-lib + lame + ]; + + meta = with lib; { + description = "A Spotify downloader written in rust"; + homepage = "https://github.com/oSumAtrIX/DownOnSpot"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index b1b92ebe2d3fe..79a0758a2a5be 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -9,6 +9,7 @@ , openpyxl , xlrd , h5py +, odfpy , psycopg2 , pyshp , fonttools @@ -24,13 +25,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.6.1"; + version = "2.7"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1dmiy87x0yc0d594v3d3km13dl851mx7ym1vgh3bg91llg8ykg33"; + sha256 = "0b2h9vy0fch0bk0b33h8p4ssk3a25j67sfn0yvmxhbqjdmhlwv4h"; }; propagatedBuildInputs = [ @@ -60,6 +61,7 @@ buildPythonApplication rec { tabulate wcwidth zstandard + odfpy setuptools ] ++ lib.optionals withPcap [ dpkt dnslib ]; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index aa6f7da503fbf..462c24a62319f 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -290,7 +290,7 @@ let else for res in 16 32 48 64 128; do mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" - icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" ) + icon=$( find "${browser}/lib/" -name "default''${res}.png" ) if [ -e "$icon" ]; then ln -s "$icon" \ "$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png" fi diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index b7ff968f79bd9..071f5adfd497e 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -73,7 +73,7 @@ mkDerivation rec { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ caugner kranzes ]; + maintainers = with maintainers; [ kranzes ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 4d27907cdd182..8be72ef3d6b50 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "flex-ndax"; - version = "0.1-20210714.0"; + version = "0.2-20211111.0"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - sha256 = "16zx6kbax59rcxyz9dhq7m8yx214knz3xayna1gzb85m6maly8v8"; + sha256 = "0m2hphj0qvgq25pfm3s76naf672ll43jv7gll8cfs7276ckg1904"; }; buildInputs = [ pulseaudio ]; - vendorSha256 = "0qn8vg84j9kp0ycn24lkaqjnnk339j3vis4bn48ia3z5vfc22gi5"; + vendorSha256 = "1bf0iidb8ggzahy3fvxispf3g940mv6vj9wqd8i3rldc6ca2i3pf"; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nDAX"; diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch index 48b1263e7961a..dc76305bd7499 100644 --- a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch @@ -1,24 +1,19 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs -index c51e76d..d0a26d7 100644 +index c51e76d..ae8159e 100644 --- a/src/elan-dist/src/component/package.rs +++ b/src/elan-dist/src/component/package.rs -@@ -56,11 +56,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) +@@ -56,6 +56,30 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) entry .unpack(&full_path) .chain_err(|| ErrorKind::ExtractingPackage)?; -+ nix_patchelf_if_needed(&full_path); - } - - Ok(()) - } - -+fn nix_patchelf_if_needed(dest_path: &Path) { -+ let (is_bin, is_lib) = if let Some(p) = dest_path.parent() { -+ (p.ends_with("bin"), p.ends_with("lib")) -+ } else { -+ (false, false) -+ }; ++ nix_patch_if_needed(&full_path)?; ++ } ++ ++ Ok(()) ++} + ++fn nix_patch_if_needed(dest_path: &Path) -> Result<()> { ++ let is_bin = matches!(dest_path.parent(), Some(p) if p.ends_with("bin")); + if is_bin { + let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") + .arg("--set-interpreter") @@ -26,15 +21,15 @@ index c51e76d..d0a26d7 100644 + .arg(dest_path) + .output(); + } -+ else if is_lib { -+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") -+ .arg("--set-rpath") -+ .arg("@libPath@") -+ .arg(dest_path) -+ .output(); -+ } -+} + - #[derive(Debug)] - pub struct ZipPackage<'a>(temp::Dir<'a>); ++ if dest_path.extension() == Some(::std::ffi::OsStr::new("lld")) { ++ use std::os::unix::fs::PermissionsExt; ++ let new_path = dest_path.with_extension("orig"); ++ ::std::fs::rename(dest_path, &new_path)?; ++ ::std::fs::write(dest_path, format!(r#"#! @shell@ ++exec -a "$0" {} "$@" --dynamic-linker=@dynamicLinker@ ++"#, new_path.to_str().unwrap()))?; ++ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?; + } + Ok(()) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index a5709b69fbb84..cc4f0680de3ed 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,9 +1,5 @@ -{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl -, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: - -let - libPath = lib.makeLibraryPath [ gmp ]; -in +{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell +, openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "elan"; @@ -32,13 +28,13 @@ rustPlatform.buildRustPackage rec { (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; - libPath = "$ORIGIN/../lib:${libPath}"; + shell = runtimeShell; } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ --subst-var patchelf \ --subst-var dynamicLinker \ - --subst-var libPath + --subst-var shell '') ]; @@ -50,8 +46,6 @@ rustPlatform.buildRustPackage rec { done popd - wrapProgram $out/bin/elan --prefix "LD_LIBRARY_PATH" : "${libPath}" - # tries to create .elan export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 4bb9386a112a9..738260646f20a 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "369"; + version = "370"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "ce1qSNBkiT0hSXQaACeBqXNJb9JNUtrdNk9jQ5p2TiY="; + sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII="; }; strictDeps = true; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b95979fe88cd3..9d2b227dcbb5d 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -23,6 +23,7 @@ , libiscsiSupport ? true, libiscsi , smbdSupport ? false, samba , tpmSupport ? true +, uringSupport ? stdenv.isLinux, liburing , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (lib.optional stdenv.isx86_64 "i386-softmmu" @@ -77,7 +78,8 @@ stdenv.mkDerivation rec { ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ] ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] - ++ lib.optionals smbdSupport [ samba ]; + ++ lib.optionals smbdSupport [ samba ] + ++ lib.optionals uringSupport [ liburing ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -187,7 +189,8 @@ stdenv.mkDerivation rec { ++ lib.optional virglSupport "--enable-virglrenderer" ++ lib.optional tpmSupport "--enable-tpm" ++ lib.optional libiscsiSupport "--enable-libiscsi" - ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"; + ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" + ++ lib.optional uringSupport "--enable-linux-io-uring"; doCheck = false; # tries to access /dev dontWrapGApps = true; diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index d58e9bf9b0cb4..fd6dea1cb1d5e 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "unstable-2021-10-28"; + version = "unstable-2021-11-10"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "0d68986b6f6aa046ab13776f39cc37b67b3477ba"; - sha256 = "sha256-K1XpVoJoY8QuUdP5rKnlAs4yTn5jhh9LKZjHalliNKs="; + rev = "b0f16dad64d14f36ffe235b2e9cca96aa3ce35ba"; + sha256 = "sha256-oPgr8PDxGNqIWxWsvVr9B8oN0Io/pUuzgIkZfY/qD+o="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index ba9abc0def1d9..32c9e6f2290ac 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -129,8 +129,8 @@ in rec { }; vala_0_52 = generic { - version = "0.52.6"; - sha256 = "sha256-FNfrTZZLfDrcFuRTcTIIbdxmJO0eDruBEeKsgierOnI="; + version = "0.52.7"; + sha256 = "sha256-C7WptPbRdUmewKWAJK3ANapRcAgPUzwo2cNY0aMsU2o="; }; vala_0_54 = generic { diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index 39e8323e194c7..de0c927567d14 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -1,4 +1,4 @@ -{ cmake, fetchFromGitHub, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, cmake, stdenv }: rustPlatform.buildRustPackage rec { pname = "lunatic"; @@ -11,7 +11,17 @@ rustPlatform.buildRustPackage rec { sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r"; }; - cargoSha256 = "1rkxl27l6ydmcq3flc6qbnd7zmpkfmyc86b8q4pi7dwhqnd5g70g"; + cargoPatches = [ + # NOTE: remove on next update + # update dependencies to resolve incompatibility with rust 1.56 + (fetchpatch { + name = "update-wasmtime.patch"; + url = "https://github.com/lunatic-solutions/lunatic/commit/cd8db51732712c19a8114db290882d1bb6b928c0.patch"; + sha256 = "sha256-eyoIOTqGSU/XNfF55FG+WrQPSMvt9L/S/KBsUQB5z1k="; + }) + ]; + + cargoSha256 = "sha256-yoG4gCk+nHE8pBqV6ND9NCegx4bxbdGEU5hY5JauloM="; nativeBuildInputs = [ cmake ]; @@ -20,5 +30,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://lunatic.solutions"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index dbe01acb6dfd9..7a1ee2a2ebafc 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -7,6 +7,7 @@ let , lib , stdenv , nixosTests + , tests , fetchurl , makeWrapper , symlinkJoin @@ -31,6 +32,7 @@ let , sha256 , extraPatches ? [ ] , packageOverrides ? (final: prev: { }) + , phpAttrsOverrides ? (attrs: { }) # Sapi flags , cgiSupport ? true @@ -52,6 +54,16 @@ let }@args: let + # Compose two functions of the type expected by 'overrideAttrs' + # into one where changes made in the first are available to the second. + composeOverrides = + f: g: attrs: + let + fApplied = f attrs; + attrs' = attrs // fApplied; + in + fApplied // g attrs'; + # buildEnv wraps php to provide additional extensions and # configuration. Its usage is documented in # doc/languages-frameworks/php.section.md. @@ -129,10 +141,20 @@ let passthru = php.passthru // { buildEnv = mkBuildEnv allArgs allExtensionFunctions; withExtensions = mkWithExtensions allArgs allExtensionFunctions; + overrideAttrs = + f: + let + newPhpAttrsOverrides = composeOverrides (filteredArgs.phpAttrsOverrides or (attrs: { })) f; + php = generic (filteredArgs // { phpAttrsOverrides = newPhpAttrsOverrides; }); + in + php.buildEnv { inherit extensions extraConfig; }; phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; # Select the right php tests for the php version - tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; + tests = { + nixos = lib.recurseIntoAttrs nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; + package = tests.php; + }; inherit (php-packages) extensions buildPecl mkExtension; packages = php-packages.tools; meta = php.meta // { @@ -163,139 +185,151 @@ let mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; in - stdenv.mkDerivation { - pname = "php"; - - inherit version; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] - ++ lib.optional stdenv.isDarwin xcbuild; - - buildInputs = - # PCRE extension - [ pcre2 ] - - # Enable sapis - ++ lib.optional pearSupport [ libxml2.dev ] - - # Misc deps - ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional argon2Support libargon2 - ++ lib.optional systemdSupport systemd - ++ lib.optional valgrindSupport valgrind - ; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - configureFlags = - # Disable all extensions - [ "--disable-all" ] - - # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre2}" ] - - - # Enable sapis - ++ lib.optional (!cgiSupport) "--disable-cgi" - ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] - ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ - "--enable-libxml" - "--with-libxml-dir=${libxml2.dev}" - ] - ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" - - - # Misc flags - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional systemdSupport "--with-fpm-systemd" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" - ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" - - - # Sendmail - ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] - ; - - hardeningDisable = [ "bindnow" ]; - - preConfigure = - # Don't record the configure flags since this causes unnecessary - # runtime dependencies - '' - for i in main/build-defs.h.in scripts/php-config.in; do - substituteInPlace $i \ - --replace '@CONFIGURE_COMMAND@' '(omitted)' \ - --replace '@CONFIGURE_OPTIONS@' "" \ - --replace '@PHP_LDFLAGS@' "" - done - - export EXTENSION_DIR=$out/lib/php/extensions - '' - # PKG_CONFIG need not be a relative path - + lib.optionalString (!lib.versionAtLeast version "7.4") '' - for i in $(find . -type f -name "*.m4"); do - substituteInPlace $i \ - --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' - done - '' + '' - ./buildconf --copy --force - - if test -f $src/genfiles; then - ./genfiles - fi - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-lstdc++" "-lc++" - ''; - - postInstall = '' - test -d $out/etc || mkdir $out/etc - cp php.ini-production $out/etc/php.ini - ''; - - postFixup = '' - mkdir -p $dev/bin $dev/share/man/man1 - mv $out/bin/phpize $out/bin/php-config $dev/bin/ - mv $out/share/man/man1/phpize.1.gz \ - $out/share/man/man1/php-config.1.gz \ - $dev/share/man/man1/ - ''; - - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; - }; - - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; - - separateDebugInfo = true; - - outputs = [ "out" "dev" ]; - - passthru = { - buildEnv = mkBuildEnv { } [ ]; - withExtensions = mkWithExtensions { } [ ]; - inherit ztsSupport; - }; - - meta = with lib; { - description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net/"; - license = licenses.php301; - maintainers = teams.php.members; - platforms = platforms.all; - outputsToInstall = [ "out" "dev" ]; - }; - }; + stdenv.mkDerivation ( + let + attrs = { + pname = "php"; + + inherit version; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] + ++ lib.optional stdenv.isDarwin xcbuild; + + buildInputs = + # PCRE extension + [ pcre2 ] + + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] + + # Misc deps + ++ lib.optional apxs2Support apacheHttpd + ++ lib.optional argon2Support libargon2 + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; + + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + + configureFlags = + # Disable all extensions + [ "--disable-all" ] + + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre2}" ] + + + # Enable sapis + ++ lib.optional (!cgiSupport) "--disable-cgi" + ++ lib.optional (!cliSupport) "--disable-cli" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] + ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ + "--enable-libxml" + "--with-libxml-dir=${libxml2.dev}" + ] + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" + + + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" + ++ lib.optional cgotoSupport "--enable-re2c-cgoto" + ++ lib.optional embedSupport "--enable-embed" + ++ lib.optional (!ipv6Support) "--disable-ipv6" + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" + ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" + + + # Sendmail + ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] + ; + + hardeningDisable = [ "bindnow" ]; + + preConfigure = + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + '' + for i in main/build-defs.h.in scripts/php-config.in; do + substituteInPlace $i \ + --replace '@CONFIGURE_COMMAND@' '(omitted)' \ + --replace '@CONFIGURE_OPTIONS@' "" \ + --replace '@PHP_LDFLAGS@' "" + done + + export EXTENSION_DIR=$out/lib/php/extensions + '' + # PKG_CONFIG need not be a relative path + + lib.optionalString (!lib.versionAtLeast version "7.4") '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + '' + '' + ./buildconf --copy --force + + if test -f $src/genfiles; then + ./genfiles + fi + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-lstdc++" "-lc++" + ''; + + postInstall = '' + test -d $out/etc || mkdir $out/etc + cp php.ini-production $out/etc/php.ini + ''; + + postFixup = '' + mkdir -p $dev/bin $dev/share/man/man1 + mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/share/man/man1/phpize.1.gz \ + $out/share/man/man1/php-config.1.gz \ + $dev/share/man/man1/ + ''; + + src = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit sha256; + }; + + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + + separateDebugInfo = true; + + outputs = [ "out" "dev" ]; + + passthru = { + buildEnv = mkBuildEnv { } [ ]; + withExtensions = mkWithExtensions { } [ ]; + overrideAttrs = + f: + let + newPhpAttrsOverrides = composeOverrides phpAttrsOverrides f; + php = generic (args // { phpAttrsOverrides = newPhpAttrsOverrides; }); + in + php; + inherit ztsSupport; + }; + + meta = with lib; { + description = "An HTML-embedded scripting language"; + homepage = "https://www.php.net/"; + license = licenses.php301; + maintainers = teams.php.members; + platforms = platforms.all; + outputsToInstall = [ "out" "dev" ]; + }; + }; + in + attrs // phpAttrsOverrides attrs + ); in generic diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 794a09749c554..f5c000f2271ed 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -1,10 +1,16 @@ -{ lib, stdenv -, eigen +{ lib +, stdenv +, fetchpatch , fetchurl +, blas , cmake +, eigen , gflags , glog +, suitesparse , runTests ? false +, enableStatic ? stdenv.hostPlatform.isStatic +, withBlas ? true }: # gflags is required to run tests @@ -19,9 +25,24 @@ stdenv.mkDerivation rec { sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h"; }; + outputs = [ "out" "dev" ]; + + patches = [ + # Enable GNUInstallDirs, see: https://github.com/ceres-solver/ceres-solver/pull/706 + (fetchpatch { + url = "https://github.com/ceres-solver/ceres-solver/commit/4998c549396d36a491f1c0638fe57824a40bcb0d.patch"; + sha256 = "sha256-mF6Zh2fDVzg2kD4nI2dd9rp4NpvPErmwfdYo5JaBmCA="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optional runTests gflags; - propagatedBuildInputs = [ eigen glog ]; + propagatedBuildInputs = [ eigen glog ] + ++ lib.optionals withBlas [ blas suitesparse ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" + ]; # The Basel BUILD file conflicts with the cmake build directory on # case-insensitive filesystems, eg. darwin. diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 777beb9bc14bf..15bf77d2fc688 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,4 +1,11 @@ -{ fetchFromGitHub, lib, stdenv, cmake, openssl, zlib, libuv }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, zlib +, libuv +}: let generic = { version, sha256 }: stdenv.mkDerivation rec { @@ -64,4 +71,9 @@ in { version = "4.2.1"; sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU="; }; + + libwebsockets_4_3 = generic { + version = "4.3.0"; + sha256 = "13lxb487mqlzbsbv6fbj50r1717mfwdy87ps592lgfy3307yqpr4"; + }; } diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index f1d4bd298ded2..a2f506de0133b 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , minizip , python3 , zlib @@ -8,15 +9,23 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "sha256-j+tplk8Fdx92YKj7PnchMZWctVmBmNirUmDw5ADmJy0="; + sha256 = "sha256-Ef1CipwUEJW/VYx/q98lN0PSxj8c3DbIuql8qU6mTRs="; }; + patches = [ + # https://github.com/jmcnamara/libxlsxwriter/pull/357 + (fetchpatch { + url = "https://github.com/jmcnamara/libxlsxwriter/commit/723629976ede5e6ec9b03ef970381fed06ef95f0.patch"; + sha256 = "14aw698b5svvbhvadc2vr71isck3k02zdv8xjsa7c33n8331h20g"; + }) + ]; + nativeBuildInputs = [ python3.pkgs.pytest ]; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index ee8f4dfe2e0ae..8afcdbf33f23a 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -32,6 +32,12 @@ stdenv.mkDerivation rec { sha256 = "0jhvciaw43y6iqqk7hyxnfhn1b4bsw5fpy04s01r5pkcsjjbdbqc"; }; + # remove attempt to prevent (x86/x87-specific) extended precision use + # when SSE not detected + postPatch = lib.optionalString (!(stdenv.isi686 || stdenv.isx86_64)) '' + sed -i '/-ffloat-store/d' cmake/pcl_find_sse.cmake + ''; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ eigen diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 4c72f1527aafe..ea5ab3eadae81 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -340,6 +340,19 @@ let ''; }; + reveal-md = super.reveal-md.override ( + lib.optionalAttrs (!stdenv.isDarwin) { + nativeBuildInputs = [ pkgs.makeWrapper ]; + prePatch = '' + export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 + ''; + postInstall = '' + wrapProgram $out/bin/reveal-md \ + --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium + ''; + } + ); + ssb-server = super.ssb-server.override { buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ]; meta.broken = since "10"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ce30a571d86d9..701f187ee997f 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -239,6 +239,7 @@ , "redoc-cli" , "remod-cli" , "reveal.js" +, "reveal-md" , "rimraf" , "rollup" , { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 368ff2647358e..17d137e36bd68 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -30834,6 +30834,15 @@ let sha512 = "om8L9O5XwqeSdwl5NtHgrzK3wcF4fT9T4gb/NktoH8EyoZipas/tvUZLV48xT7fQfMYr9qvb0WEutqdf0LWSqA=="; }; }; + "highlight.js-10.7.2" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "10.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz"; + sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="; + }; + }; "highlight.js-10.7.3" = { name = "highlight.js"; packageName = "highlight.js"; @@ -37595,6 +37604,24 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; + "livereload-0.9.3" = { + name = "livereload"; + packageName = "livereload"; + version = "0.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz"; + sha512 = "q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw=="; + }; + }; + "livereload-js-3.3.2" = { + name = "livereload-js"; + packageName = "livereload-js"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz"; + sha512 = "w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA=="; + }; + }; "ln-accounting-5.0.5" = { name = "ln-accounting"; packageName = "ln-accounting"; @@ -45825,6 +45852,15 @@ let sha512 = "jB5hAtsDOhCy/FNQJwQJOrGlxLUat482Yr14rbA5l2Zb1eOeoS+ccQPO036C1+z9VDBTmOZqzh1tBbI4myzIYw=="; }; }; + "open-8.3.0" = { + name = "open"; + packageName = "open"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.3.0.tgz"; + sha512 = "7INcPWb1UcOwSQxAXTnBJ+FxVV4MPs/X++FWWBtgY69/J5lc+tCteMt/oFK1MnkyHC4VILLa9ntmwKTwDR4Q9w=="; + }; + }; "open-8.4.0" = { name = "open"; packageName = "open"; @@ -46266,6 +46302,15 @@ let sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }; }; + "opts-2.0.2" = { + name = "opts"; + packageName = "opts"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz"; + sha512 = "k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg=="; + }; + }; "ora-1.4.0" = { name = "ora"; packageName = "ora"; @@ -46752,13 +46797,13 @@ let sha512 = "RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q=="; }; }; - "p-memoize-4.0.2" = { + "p-memoize-4.0.3" = { name = "p-memoize"; packageName = "p-memoize"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.2.tgz"; - sha512 = "REJQ6EIeFmvT9O/u0H/ZVWjRII/1/0GhckleQX0yn+Uk9EdXTtmfnrfa3FwF8ZUrfUEe8NInvlRa0ZBKlMxxTA=="; + url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.3.tgz"; + sha512 = "lX9GfP1NT5jheKsmvc1071L74/Vw7vul+uZEnst7LNuMtbKlWYwKItqcLSAVUyJnrfQAqFFCJQ5bt0whrDsWQA=="; }; }; "p-pipe-3.1.0" = { @@ -46788,6 +46833,15 @@ let sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="; }; }; + "p-reflect-2.1.0" = { + name = "p-reflect"; + packageName = "p-reflect"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reflect/-/p-reflect-2.1.0.tgz"; + sha512 = "paHV8NUz8zDHu5lhr/ngGWQiW067DK/+IbJ+RfZ4k+s8y4EKyYCz8pGYWjxCg35eHztpJAt+NUgvN4L+GCbPlg=="; + }; + }; "p-retry-3.0.1" = { name = "p-retry"; packageName = "p-retry"; @@ -46815,6 +46869,15 @@ let sha512 = "e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA=="; }; }; + "p-settle-4.1.1" = { + name = "p-settle"; + packageName = "p-settle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-settle/-/p-settle-4.1.1.tgz"; + sha512 = "6THGh13mt3gypcNMm0ADqVNCcYa3BK6DWsuJWFCuEKP1rpY+OKGp7gaZwVmLspmic01+fsg/fN57MfvDzZ/PuQ=="; + }; + }; "p-some-4.1.0" = { name = "p-some"; packageName = "p-some"; @@ -51730,6 +51793,15 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; + "puppeteer-1.19.0" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.19.0.tgz"; + sha512 = "2S6E6ygpoqcECaagDbBopoSOPDv0pAZvTbnBgUY+6hq0/XDFDOLEMNlHF/SKJlzcaZ9ckiKjKDuueWI3FN/WXw=="; + }; + }; "puppeteer-1.20.0" = { name = "puppeteer"; packageName = "puppeteer"; @@ -55762,6 +55834,15 @@ let sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; }; }; + "reveal.js-4.1.3" = { + name = "reveal.js"; + packageName = "reveal.js"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.3.tgz"; + sha512 = "5VbL4nVDUedVKnOIIM3UQAIUlp+CvR/SrUkrN5GDoVfcWJAxH2oIh7PWyShy7+pE7tgkH2q+3e5EikGRpgE+oA=="; + }; + }; "reverse-http-1.3.0" = { name = "reverse-http"; packageName = "reverse-http"; @@ -58939,6 +59020,15 @@ let sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; }; }; + "spdx-license-ids-3.0.11" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; + }; + }; "spdx-license-list-6.4.0" = { name = "spdx-license-list"; packageName = "spdx-license-list"; @@ -61684,13 +61774,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.9.12" = { + "systeminformation-5.9.13" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.9.12"; + version = "5.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.12.tgz"; - sha512 = "9tCCSA5ChSWBadJrrs7GYSvCBt9oKeqBAp0tv4FaeAIrYjIJ4gxrkFc+2xdMrJd8HEGKBMD2TSTMsXhmn+dBtw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.13.tgz"; + sha512 = "AGL34jWboB7bjmNYIcJ5hbYEVYXQuLPbIq7bJg3rJJNHYZvZkQC9hH15KpH9CPg9ZxCsTqAfUNyGMv1jmv78Tw=="; }; }; "sywac-1.3.0" = { @@ -63602,6 +63692,15 @@ let sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; }; + "try-require-1.2.1" = { + name = "try-require"; + packageName = "try-require"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/try-require/-/try-require-1.2.1.tgz"; + sha1 = "34489a2cac0c09c1cc10ed91ba011594d4333be2"; + }; + }; "try-resolve-1.0.1" = { name = "try-resolve"; packageName = "try-resolve"; @@ -65978,13 +66077,13 @@ let sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; }; }; - "usb-1.9.0" = { + "usb-1.9.1" = { name = "usb"; packageName = "usb"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/usb/-/usb-1.9.0.tgz"; - sha512 = "nybH1SzvwYkRQ5s8ko9XXyZkrcWV5VWMMv7yh5H++wALhjBFjt2XBoSJWxBUdu6U/UfceQz42inhv3/maxM8jg=="; + url = "https://registry.npmjs.org/usb/-/usb-1.9.1.tgz"; + sha512 = "T6DZbJAFNcxhY1FzaYdXhV2oqoRlvLhtSSmnbFAqyCxahUkc+g0BPZVXv7hIeQQxDCAQnr4Ia8bfOk1JlzNzzw=="; }; }; "use-3.1.1" = { @@ -70210,6 +70309,15 @@ let sha1 = "e52e84fea6983b93755e9b1564dba989b006b5a5"; }; }; + "yaml-front-matter-4.1.1" = { + name = "yaml-front-matter"; + packageName = "yaml-front-matter"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-front-matter/-/yaml-front-matter-4.1.1.tgz"; + sha512 = "ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ=="; + }; + }; "yaml-include-1.2.1" = { name = "yaml-include"; packageName = "yaml-include"; @@ -97645,7 +97753,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.9.12" + sources."systeminformation-5.9.13" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -98047,7 +98155,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -98444,7 +98552,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -102052,7 +102160,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { @@ -104272,7 +104380,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-1.0.1" sources."split-on-first-1.1.0" sources."split2-3.2.2" @@ -106234,7 +106342,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -108206,7 +108314,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -108926,7 +109034,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -109490,11 +109598,13 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-4.0.0" - (sources."p-memoize-4.0.2" // { + (sources."p-memoize-4.0.3" // { dependencies = [ sources."mimic-fn-3.1.0" ]; }) + sources."p-reflect-2.1.0" + sources."p-settle-4.1.1" sources."p-timeout-4.1.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -109594,7 +109704,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-1.0.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -111853,7 +111963,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -112667,7 +112777,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.9.12" + sources."systeminformation-5.9.13" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -116267,7 +116377,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -116315,6 +116425,290 @@ in bypassCache = true; reconstructLock = true; }; + reveal-md = nodeEnv.buildNodePackage { + name = "reveal-md"; + packageName = "reveal-md"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.2.0.tgz"; + sha512 = "vd3fS4qP/g7pUwLhbPUONK6YKPcgD3cxExDeZFOq+LRZqLgRWxnzXWMCIPsszvMCo0+n+hXEadNqrf9QrVeWkw=="; + }; + dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."accepts-1.3.7" + sources."agent-base-4.3.0" + sources."ansi-align-3.0.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."anymatch-3.1.2" + sources."argparse-1.0.10" + sources."array-flatten-1.1.1" + sources."async-limiter-1.0.1" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."boxen-5.1.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.2" + sources."bytes-3.1.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."camelcase-6.2.0" + sources."chalk-4.1.2" + sources."chokidar-3.5.2" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.1" + sources."clone-response-1.0.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-6.2.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-5.0.1" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.3" + sources."crypto-random-string-2.0.0" + sources."debug-4.3.2" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.1.3" + sources."define-lazy-prop-2.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dot-prop-5.3.0" + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-goat-2.1.1" + sources."escape-html-1.0.3" + sources."esprima-4.0.1" + sources."etag-1.8.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."extract-zip-1.7.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."fd-slicer-1.1.0" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."fs-extra-10.0.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."get-stream-4.1.0" + sources."glob-7.2.0" + sources."glob-parent-5.1.2" + sources."global-dirs-3.0.0" + sources."got-9.6.0" + sources."graceful-fs-4.2.8" + sources."has-flag-4.0.0" + sources."has-yarn-2.1.0" + sources."highlight.js-10.7.2" + sources."http-cache-semantics-4.1.0" + sources."http-errors-1.7.2" + (sources."https-proxy-agent-2.2.4" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."iconv-lite-0.4.24" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-2.0.0" + sources."ipaddr.js-1.9.1" + sources."is-binary-path-2.1.0" + sources."is-ci-2.0.0" + sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.3" + sources."is-installed-globally-0.4.0" + sources."is-npm-5.0.0" + sources."is-number-7.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.3" + sources."is-typedarray-1.0.0" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" + sources."js-yaml-3.14.1" + sources."json-buffer-3.0.0" + sources."jsonfile-6.1.0" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" + sources."livereload-0.9.3" + sources."livereload-js-3.3.2" + sources."lodash-4.17.21" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."mustache-4.2.0" + sources."negotiator-0.6.2" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.1" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."open-8.3.0" + sources."opts-2.0.2" + sources."p-cancelable-1.1.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."pend-1.2.0" + sources."picomatch-2.3.0" + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."proxy-addr-2.0.7" + sources."proxy-from-env-1.1.0" + sources."pump-3.0.0" + sources."pupa-2.1.1" + (sources."puppeteer-1.19.0" // { + dependencies = [ + sources."mime-2.6.0" + sources."ws-6.2.2" + ]; + }) + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."readable-stream-2.3.7" + sources."readdirp-3.6.0" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" + sources."responselike-1.0.2" + sources."reveal.js-4.1.3" + sources."rimraf-2.7.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."semver-7.3.5" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + sources."safe-buffer-5.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."signal-exit-3.0.5" + sources."sprintf-js-1.0.3" + sources."statuses-1.5.0" + sources."string-width-4.2.3" + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-7.2.0" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."try-require-1.2.1" + sources."type-fest-0.20.2" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + sources."unique-string-2.0.0" + sources."universalify-2.0.0" + sources."unpipe-1.0.0" + sources."update-notifier-5.1.0" + sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" + sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."ws-7.5.5" + sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" + sources."yaml-front-matter-4.1.1" + sources."yargs-parser-20.2.9" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "reveal.js on steroids! Get beautiful reveal.js presentations from your Markdown files."; + homepage = "https://github.com/webpro/reveal-md#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; @@ -118828,7 +119222,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -120471,7 +120865,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -120686,10 +121080,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.0.1"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.0.1.tgz"; - sha512 = "ZcAkmFLVCultmwkQUjxKzxW/o5+CzNmDk6TPJj/d4Y7ipTGGrewIWmNm+InjdSr04PR5/yynsAJeYJY/wisdMg=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.1.0.tgz"; + sha512 = "IedkssuNVA11+v++2PIV2OHOU5A3SfRcXVi56vZVSsMhGrgtwmmit69jeM+08/Tun5DTBe7BuH1Zp1mMLmtKLA=="; }; dependencies = [ sources."@babel/code-frame-7.16.0" @@ -120859,7 +121253,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."specificity-0.4.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -121880,7 +122274,7 @@ in sources."node-addon-api-4.2.0" sources."node-gyp-build-4.3.0" sources."q-1.5.1" - sources."usb-1.9.0" + sources."usb-1.9.1" ]; buildInputs = globalBuildInputs; meta = { @@ -122164,7 +122558,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" (sources."string-width-1.0.2" // { dependencies = [ @@ -122560,7 +122954,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -126639,7 +127033,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -129428,7 +129822,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" sources."ssri-8.0.1" diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index 14b60f5514357..8bf2b5863f08d 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,14 +12,16 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "2.7.5"; + version = "2.7.6"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-CAYyVNVq1rZZ/AYOAE8bfd7f94+PlAsnFRdguparNtY="; + sha256 = "sha256-U5XigLFkpRoIXcFB4dpxi8pxqcmmb20sv9i9J70s0C0="; }; propagatedBuildInputs = [ @@ -34,7 +36,9 @@ buildPythonPackage rec { respx ]; - pythonImportsCheck = [ "haphilipsjs" ]; + pythonImportsCheck = [ + "haphilipsjs" + ]; meta = with lib; { description = "Python library to interact with Philips TVs with jointSPACE API"; diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index b6cfbc51cac06..caf98c4206022 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -18,6 +18,13 @@ buildPythonPackage rec { checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; + postFixup = '' + # Remove until fixed by upstream + # https://github.com/jupyter/nbclient/pull/173#issuecomment-968760082 + rm $out/bin/.jupyter-run-wrapped + rm $out/bin/jupyter-run + ''; + meta = with lib; { homepage = "https://github.com/jupyter/nbclient"; description = "A client library for executing notebooks"; diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 007e605709c3c..9906be5154f4c 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyefergy"; - version = "0.1.3"; + version = "0.1.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - sha256 = "sha256-TGvS/ntIRbkcMsD5y0QdqyLE2dcPUbX3d79jHc3ddd0="; + sha256 = "sha256-X/dWEBg3WG6SmMore5otLL4iIueGUS5KgjCPYoMSNd0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index 953f381ff498c..99506de1026a1 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -15,15 +15,16 @@ buildPythonPackage rec { pname = "pyflunearyou"; - version = "2.0.2"; + version = "2021.10.0"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "07n2dvnfpfglpdlnwzj4dy41x2zc07ia2krvxdarnv8wzap30y23"; + sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; }; nativeBuildInputs = [ @@ -44,11 +45,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples directory as the files are prefixed with test_. - # disabledTestFiles doesn't seem to work here - disabledTestPaths = [ "examples/" ]; + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_. + "examples/" + ]; - pythonImportsCheck = [ "pyflunearyou" ]; + pythonImportsCheck = [ + "pyflunearyou" + ]; meta = with lib; { description = "Python library for retrieving UV-related information from Flu Near You"; diff --git a/pkgs/development/python-modules/slugid/default.nix b/pkgs/development/python-modules/slugid/default.nix new file mode 100644 index 0000000000000..34f394bee3029 --- /dev/null +++ b/pkgs/development/python-modules/slugid/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "slugid"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "taskcluster"; + repo = "slugid.py"; + rev = "v${version}"; + sha256 = "McBxGRi8KqVhe2Xez5k4G67R5wBCCoh41dRsTKW4xMA="; + }; + + doCheck = false; # has no tests + + pythonImportsCheck = [ + "slugid" + ]; + + meta = with lib; { + description = "URL-safe base64 UUID encoder for generating 22 character slugs"; + homepage = "https://github.com/taskcluster/slugid.py"; + license = licenses.mpl20; + maintainers = with maintainers; [ milahu ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 384d7e3902eda..a8c451ebf9a90 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.61.0"; + version = "2.62.0"; src = fetchPypi { inherit pname version; - sha256 = "8131addd3512a22c4c539dda2d869a8f488e06f1b02d1f3a5f0f4848fc56184e"; + sha256 = "1fb51d67a961ea889c5be324f020535ed511c6f483bd13a07f48f6e369fa8df0"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 18ca9313f035b..efde42b51954f 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.15"; + version = "0.0.16"; src = fetchPypi { inherit pname version; - sha256 = "1yvgnmds034z28mscff0amm0g47ni0753nshvrq2swdpipymiwz0"; + sha256 = "690387117f3341354fddd0957913158d1319c207755c0cc54a614f80248887b2"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 8101986f854ff..d7ca6c23e4ce3 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0DF+/lQpsQKO5omBKJAe3gBjQ6QQb50IdRSacIRL/JA="; + sha256 = "c8fcd3700d8f4b7880a669f28c44f784422da1dbfe59fb175f155703817695ed"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index d5b40471c7a5b..d17eabb8c35bc 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "0dw4q4yf86wwkm38bpsjf0yfzai46icvaly861ymh5v9f90q60jw"; + sha256 = "05dg835mmpzf7k2jn101l7x7cnra1kldwbgf19zblym5lfn21zhf"; }; nativeBuildInputs = [ libpng ninja which ] diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index d0c8f26f8aaee..4e93f1369dd39 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "traits"; - version = "6.3.0"; + version = "6.3.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "770241df047feb9e3ed4c26a36c2468a5b754e6082a78eeb737f058bd45344f5"; + sha256 = "4520ef4a675181f38be4a5bab1b1d5472691597fe2cfe4faf91023e89407e2c6"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index 0cc08a9bf2ce9..55cb45b712c3c 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.2"; + version = "8.3"; src = fetchPypi { inherit pname version; - sha256 = "4d54ddb506c90b5a5bba3a96a1cfb0bb07127909e19046a71d689ddfb18c3617"; + sha256 = "371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db"; }; propagatedBuildInputs = [ bracex ]; diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 680e37e7a8f57..1f9aad67f19db 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.11.1"; + version = "0.12.0"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "30771f3ec2a4281cd05c277a90f7dc94ded97d6dc1e1decdf4fe452dbbacc283"; + sha256 = "d7ce0d719fd218fee5983442fe93a33a21a6be6a736915a7ffbe75369714e9ce"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 917fbf34d0c93..30b17f6897a93 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.64"; + version = "0.1.66"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "bde7ff6c04b7179881c15753460c600c4bd877dc9f33cdc98da68e7e1ebbc5a2"; + sha256 = "9ea6fd18319fd898a8428a4a3d67171812b54779e330ead4d4ed0c59eb311be5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 8c1010552206f..634ff5ec54e18 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.4.9"; + version = "1.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9c75540d41f6dcfd19f2f70fbe8346406e026a016aae56b87c207a0b4ff571e0"; + sha256 = "68c70e1b6a2ce5c2c0ee64ba9c63efc9ab6e6f8acb2f51e19d570b0287e61cc9"; }; propagatedBuildInputs = [ httpx ]; diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index 6829df668b2f0..cd40f800c1b49 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "youtube-transcript-api"; - version = "0.4.1"; + version = "0.4.2"; # PyPI tarball is missing some test files src = fetchFromGitHub { owner = "jdepoix"; repo = "youtube-transcript-api"; rev = "v${version}"; - sha256 = "1gpk13j1n2bifwsg951gmrfnq8kfxjr15rq46dxn1bhyk9hr1zql"; + sha256 = "04x7mfp4q17w3n8dnklbxblz22496g7g4879nz0wzgijg3m6cwlp"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 229cc9dd4d82c..d0b7bbdca9db1 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+5c8baeToaT4k/2VSK/XQki0NPsWTnS6Ap3NpWvj+yI="; + sha256 = "sha256-rdtFzHpOvv1uJBigJWenWyIZF/wpYP7iBW2FCsfq2d4="; }; - cargoSha256 = "sha256-uIcP5ZNb8K5pySw0Qq46hev9VUbq8XVqmzBBGPagUfE="; + cargoSha256 = "sha256-/4ZW1FIfK51ak2EIV6dYY3XpucPPR+OZySPWwcKP4v0="; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index a434501d51262..49c64c9378d30 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20211031"; + version = "20211114"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "13sxb2ar4gypiv0l87lr7hf3qjccwgsg1r92adv9jvrfxcv36pbn"; + sha256 = "1dz10d958hz7qbh77hxf2k6sc7y9nkvlmr2469hv6gwgqs6dq1vi"; }; # For pod2man during the build process. diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index b10f8919af7a5..475541231b16e 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,35 +1,35 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub -, packr , pkg-config , bzip2 , lz4 -, rocksdb +, rocksdb_6_23 , snappy , zeromq , zlib , nixosTests }: +let + rocksdb = rocksdb_6_23; +in buildGoModule rec { pname = "blockbook"; - version = "0.3.4"; - commit = "eb4e10a"; + version = "0.3.6"; + commit = "5f8cf45"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs"; + sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; }; - runVend = true; - vendorSha256 = "0p7vyw61nwvmaz7gz2bdh9fi6wp62i2vnzw6iz2r8cims4sbz53b"; + vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz"; - doCheck = false; - - nativeBuildInputs = [ packr pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; @@ -39,11 +39,14 @@ buildGoModule rec { "-X github.com/trezor/blockbook/common.buildDate=unknown" ]; + tags = [ "rocksdb_6_16" ]; + preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++" - packr clean && packr + buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}") + buildFlagsArray+=("-ldflags=${lib.concatStringsSep " " ldflags}") ''; subPackages = [ "." ]; @@ -64,8 +67,5 @@ buildGoModule rec { license = licenses.agpl3; maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; - # go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x - # issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617 - broken = true; }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1ebac5327339c..9c36a023b4606 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGo117Module rec { pname = "grafana"; - version = "8.2.3"; + version = "8.2.4"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGo117Module rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-GC4pHwthsXu/+dXb1cBk5bC0O6NnyiChC+UWleq7JzA="; + sha256 = "sha256-dOV22xwdNLt0TnONzyDw0skGKuAYmiHafhFwhtRMN5M="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-LOswYw0P3dy6arrmUbnzBU0ie2YcPtk6xqtp9CowG2s="; + sha256 = "sha256-nfHUpAnFc2lDGAoHB1fJjF08ndfNlaMJAlsMH+TJNy0="; }; - vendorSha256 = "sha256-yZbdUiuRNFRaXduOYps5ygiaUgvNXw+Ah4wZrfYcJlY="; + vendorSha256 = "sha256-VvmSNSChbxeLWEQDE4JPfoZckQZ7nG7ElupNCc175Fk="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index d1ec7169e1709..e3ef7839c4b4d 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -37,6 +37,8 @@ with pkgs; cross = callPackage ./cross {}; + php = recurseIntoAttrs (callPackages ./php {}); + rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; diff --git a/pkgs/test/php/default.nix b/pkgs/test/php/default.nix new file mode 100644 index 0000000000000..3c6c8f61b6dba --- /dev/null +++ b/pkgs/test/php/default.nix @@ -0,0 +1,116 @@ +{ lib +, php +, runCommand +}: + +let + runTest = name: body: runCommand name { } '' + testFailed= + checking() { + echo -n "Checking $1... " > /dev/stderr + } + ok() { + echo ok > /dev/stderr + } + nok() { + echo fail > /dev/stderr + testFailed=1 + } + + ${body} + + if test -n "$testFailed"; then + exit 1 + fi + + touch $out + ''; + + check = cond: if cond then "ok" else "nok"; +in +{ + withExtensions-enables-previously-disabled-extensions = runTest "php-test-withExtensions-enables-previously-disabled-extensions" '' + php="${php}" + + checking "that imagick is not present by default" + $php/bin/php -r 'exit(extension_loaded("imagick") ? 1 : 0);' && ok || nok + + phpWithImagick="${php.withExtensions ({ all, ... }: [ all.imagick ])}" + checking "that imagick extension is present when enabled" + $phpWithImagick/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok + ''; + + overrideAttrs-preserves-enabled-extensions = + let + customPhp = + (php.withExtensions ({ all, ... }: [ all.imagick ])).overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oApee-was-here" + ''; + }); + in + runTest "php-test-overrideAttrs-preserves-enabled-extensions" '' + php="${customPhp}" + phpUnwrapped="${customPhp.unwrapped}" + + checking "if overrides took hold" + test -f "$phpUnwrapped/oApee-was-here" && ok || nok + + checking "if imagick extension is still present" + $php/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok + + checking "if imagick extension is linked against the overridden PHP" + echo $php + $php/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok + ''; + + unwrapped-overrideAttrs-stacks = + let + customPhp = + lib.pipe php.unwrapped [ + (pkg: pkg.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oAs-first" + ''; + })) + + (pkg: pkg.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oAs-second" + ''; + })) + ]; + in + runTest "php-test-unwrapped-overrideAttrs-stacks" '' + checking "if first override remained" + ${check (builtins.match ".*oAs-first.*" customPhp.postInstall != null)} + + checking "if second override is there" + ${check (builtins.match ".*oAs-second.*" customPhp.postInstall != null)} + ''; + + wrapped-overrideAttrs-stacks = + let + customPhp = + lib.pipe php [ + (pkg: pkg.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oAs-first" + ''; + })) + + (pkg: pkg.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oAs-second" + ''; + })) + ]; + in + runTest "php-test-wrapped-overrideAttrs-stacks" '' + checking "if first override remained" + ${check (builtins.match ".*oAs-first.*" customPhp.unwrapped.postInstall != null)} + + checking "if second override is there" + ${check (builtins.match ".*oAs-second.*" customPhp.unwrapped.postInstall != null)} + ''; +} diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix index 77f2ad26de1de..b298078aae353 100644 --- a/pkgs/tools/admin/netplan/default.nix +++ b/pkgs/tools/admin/netplan/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { repo = "netplan"; rev = version; hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE="; - fetchSubmodules = false; }; nativeBuildInputs = [ @@ -39,12 +38,14 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace netplan/cli/utils.py --replace "/lib/netplan/generate" "$out/lib/netplan/generate" - substituteInPlace netplan/cli/utils.py --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\"" + substituteInPlace netplan/cli/utils.py \ + --replace "/lib/netplan/generate" "$out/lib/netplan/generate" \ + --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\"" - substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ - --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ - --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' + substituteInPlace Makefile \ + --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ + --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ + --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81 sed -e "s/-Werror//g" -i Makefile diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 266b85c54c54c..a4680dff6f641 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.unx --replace "gcc" "clang" + ''; + makefile = "Makefile.unx"; makeFlags = [ "ZPATH=${zlib.static}/lib" ]; @@ -21,10 +25,11 @@ stdenv.mkDerivation rec { cp pngcheck $out/bin/pngcheck ''; - meta = { + meta = with lib; { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; - license = lib.licenses.free; - platforms = with lib.platforms; linux; + license = licenses.free; + platforms = with platforms; [ unix ]; + maintainers = with maintainers; [ starcraft66 ]; }; } diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 53e49cc02ca2c..4f6d4d983eb83 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -11,6 +11,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-YFs2AOMGp0WNrceK14AnigZdJl+UsQdUchpxaI7HSXw="; + prePatch = '' + rm .cargo/config.toml + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 512381d67f290..7228fb84cb72d 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,23 +2,27 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloudsql-proxy"; rev = "v${version}"; - sha256 = "sha256-Xgz8ku6szzbgL3cyiggHJYaj4aUhaqgIOUnwKUE1AeY="; + sha256 = "sha256-x44nG5M2ycBaf/Fbw5crmAV//yv/WtIYbTjJ7/6TnoI="; }; subPackages = [ "cmd/cloud_sql_proxy" ]; - vendorSha256 = "sha256-7KiLJoQ0xH35ae4NGODF4t1S9h86L0TJbCqFVm+bBmk="; + vendorSha256 = "sha256-Uw8YJ1qzLYlTkx6wR/FKeDRHGSwZm2za/c0f/OKHiE0="; + + # Disables tests that require running fuse with a hardcoded path + doCheck = false; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; license = licenses.asl20; maintainers = with maintainers; [ nicknovitski ]; + mainProgram = "cloud_sql_proxy"; }; } diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 9c5a4b1568be7..3c64f4240ea89 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "less"; - version = "590"; + version = "596"; src = fetchurl { url = "https://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba"; + sha256 = "sha256-QhqP1ZfnIELu/P6OV2NnerxL6EM/bA321zmhbMDk1cM="; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccbbd61141091..71ff541a13945 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4601,6 +4601,8 @@ with pkgs; dorkscout = callPackage ../tools/security/dorkscout { }; + downonspot = callPackage ../applications/misc/downonspot { }; + sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; slade = callPackage ../applications/misc/slade { @@ -7313,8 +7315,9 @@ with pkgs; inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_2; - libwebsockets = libwebsockets_4_2; + libwebsockets_4_2 + libwebsockets_4_3; + libwebsockets = libwebsockets_4_3; licensee = callPackage ../tools/package-management/licensee { }; @@ -9038,6 +9041,8 @@ with pkgs; reuse = callPackage ../tools/package-management/reuse { }; + inherit (nodePackages) reveal-md; + rewritefs = callPackage ../os-specific/linux/rewritefs { }; rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; @@ -19321,6 +19326,17 @@ with pkgs; rocksdb_lite = rocksdb.override { enableLite = true; }; + rocksdb_6_23 = rocksdb.overrideAttrs (old: rec { + pname = "rocksdb"; + version = "6.23.3"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; + }; + }); + rotate-backups = callPackage ../tools/backup/rotate-backups { }; rote = callPackage ../development/libraries/rote { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fbc2e17dbd94b..840a7fbe1f6c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8633,6 +8633,8 @@ in { slowapi = callPackage ../development/python-modules/slowapi { }; + slugid = callPackage ../development/python-modules/slugid { }; + sly = callPackage ../development/python-modules/sly { }; smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { }; |