diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index dabcdc486688..9bf7e4aab814 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -25,7 +25,7 @@ let DOMAIN = ${cfg.domain} HTTP_ADDR = ${cfg.httpAddress} HTTP_PORT = ${toString cfg.httpPort} - ROOT_URL = ${cfg.rootUrl} + EXTERNAL_URL = ${cfg.rootUrl} [session] COOKIE_NAME = session diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index f6d797a4f83f..ecc2ccf875f2 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -48,13 +48,13 @@ let } else portaudio; in stdenv'.mkDerivation rec { pname = "musescore"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "sha256-CqW1f0VsF2lW79L3FY2ev+6FoHLbYOJ9LWHeBlWegeU="; + sha256 = "sha256-jXievVIA0tqLdKLy6oPaOHPIbDoFstveEQBri9M0Aoo="; }; patches = [ # Upstream from some reason wants to install qml files from qtbase in diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/applications/editors/tijolo/default.nix index fbed493f2f8c..c3605691ad86 100644 --- a/pkgs/applications/editors/tijolo/default.nix +++ b/pkgs/applications/editors/tijolo/default.nix @@ -11,13 +11,13 @@ }: crystal.buildCrystalPackage rec { pname = "tijolo"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "hugopl"; repo = "tijolo"; rev = "v${version}"; - hash = "sha256-15not/B+O+wIZ/fvLFy26/dyvq0E+bZUeoSZ6HxMMKg="; + hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo="; }; nativeBuildInputs = [ wrapGAppsHook ] @@ -27,7 +27,7 @@ crystal.buildCrystalPackage rec { buildTargets = [ "all" ]; doCheck = false; - shardsFile = ./tijolo-shards.nix; + shardsFile = ./shards.nix; installTargets = [ "install" "install-fonts"]; doInstallCheck = false; diff --git a/pkgs/applications/editors/tijolo/tijolo-shards.nix b/pkgs/applications/editors/tijolo/shards.nix similarity index 100% rename from pkgs/applications/editors/tijolo/tijolo-shards.nix rename to pkgs/applications/editors/tijolo/shards.nix diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 2a5dd7463d4d..fb4e484dc572 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -11,6 +11,7 @@ let suffix = { x86_64-linux = "AppImage"; x86_64-darwin = "dmg"; + aarch64-darwin = "dmg"; }.${system} or throwSystem; src = fetchurl { @@ -18,6 +19,7 @@ let sha256 = { x86_64-linux = "sha256-r64+y+LfMrJnUdabVdak5+LQB50YLOuMXftlZ4s3C/w="; x86_64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg="; + aarch64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg="; }.${system} or throwSystem; }; @@ -37,7 +39,7 @@ let homepage = "https://joplinapp.org"; license = licenses.agpl3Plus; maintainers = with maintainers; [ hugoreeves qjoly ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; }; linux = appimageTools.wrapType2 rec { diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index 63372498136d..56294db5f9a6 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.7"; + version = "1.6.9"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-5166P44HSRKQ0pCh1BCPd1ZUryh/IBDumcnLYA+CSBY="; + sha256 = "sha256-92FT0LLo5kw4uCTNVnY+TLegOG5Xs8WWUocU8yb/HJ4="; }; - vendorSha256 = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; + vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; ldflags = [ "-s" "-w" "-X 'github.com/transifex/cli/internal/txlib.Version=${version}'" diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix index c30fc4beaa73..f970fe377640 100644 --- a/pkgs/applications/misc/ttdl/default.nix +++ b/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-46oqQaDYFxpSjqFdP2V0aBP1S6BDG+hSO/V76WwCzAQ="; + sha256 = "sha256-er2IDPVFbcuT0COBCpBymNVBKtETdWjzR2330WUBp6U="; }; - cargoHash = "sha256-Kol7pCHq91zOE9boRatv12pgh/rfra5snUe3HNho1DU="; + cargoHash = "sha256-WcqkvnXRgsDJM7p2WGa5lmeeuwNwBy2ZQATVkTHRX7Q="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 294f034925d4..8dad70a3dce2 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.16.5"; + version = "1.16.6"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-OLKUw0qimt0WgcW26T4IWVK16nDGSmqHSuSJ8tHhbsE="; + hash = "sha256-avBZnQi1xuyrJX7YG+8O3+122Of11innCCr5sPYyySg="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index ad50617e9e65..7d9db57ddae1 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.155.0"; + version = "0.155.1"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-9YOgpXiZegimS81owjHW/in0NbxMTL+DQEgSBWdW7Rs="; + sha256 = "sha256-6y+7Jrs/sIpxJjO9Zzv2ht1RprrqcBjwyOsCnqDHxUY="; }; - vendorHash = "sha256-ioZJr3v/8HhOEJJZpsCw5Gkbg9XvMMEOugyfRhevWBc="; + vendorHash = "sha256-MCx+6K3CqVfFEYgkxT1sFvy0vshpKwW07AUngEG2muk="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 589893a24e2f..93986c101b6b 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.18.1"; + version = "5.18.2"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-E4DPJDBa/WX5JVsWgqdEv/O/XCvHDLyaL+nSMmw6Npg="; + sha256 = "sha256-PouKOIyKv7mxlBZJYCBppADdkf/XD28gavozCFFcO24="; }; vendorHash = "sha256-okqDtxSKVLlmnm5JdCKSvRZkXTsghi/L5R9TX10WWjY="; diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 459208f411cc..bce79d704537 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -74,6 +74,7 @@ let "email" = "someone@nixos.org"; "phone" = "+31 71 452 5670"; "country" = "nl"; + "street" = "Hogeweide 346"; "state" = "Province of Utrecht"; "city" = "Utrecht"; "product" = "DaVinci Resolve"; @@ -98,7 +99,7 @@ let curl \ --retry 3 --retry-delay 3 \ - --header "Host: sw.blackmagicdesign.com" \ + --header "Host: sw.cloud.blackmagicdesign.com" \ --header "Upgrade-Insecure-Requests: 1" \ --header "$USERAGENT" \ --header "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8" \ diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index 9960248b0d75..ffaf8aeb7824 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenvNoCC, fetchzip, version ? "3.300" }: +{ lib, stdenvNoCC, fetchzip, version ? "4.000" }: let new = lib.versionAtLeast version "3.000"; hash = { "2.100" = "sha256-d2UyOOOnmE1afCwyIrM1bL3lQC7XRwh03hzetk/4V30="; "3.300" = "sha256-LaaA6DWAE2dcwVVX4go9cJaiuwI6efYbPk82ym3W3IY="; + "4.000" = "sha256-FhgHlHCfojIl3Y11EDYhNTmLYwQ60OrwnA9nbZbZGJE="; }."${version}"; pname = "scheherazade${lib.optionalString new "-new"}"; in diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index a29f45a4e7a5..753938e95aa3 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -6,11 +6,11 @@ gccStdenv.mkDerivation { pname = "gambit-bootstrap"; - version = "4.9.3"; + version = "4.9.5"; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; - sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; + url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz"; + sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw="; }; buildInputs = [ autoconf ]; diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 029225629154..9481078fd941 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,5 +1,5 @@ { gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, - src, version, git-version, + src, version, git-version, stampYmd ? 0, stampHms ? 0, gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, @@ -26,6 +26,7 @@ gccStdenv.mkDerivation rec { bootstrap = gambit-support.gambit-bootstrap; nativeBuildInputs = [ git autoconf ]; + # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. @@ -39,11 +40,14 @@ gccStdenv.mkDerivation rec { "--enable-targets=${gambit-params.targets}" "--enable-single-host" "--enable-c-opt=${optimizationSetting}" + "--enable-c-opt-rts=-O2" "--enable-gcc-opts" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-openssl" + #"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" + # "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing # "--enable-guide" @@ -58,9 +62,9 @@ gccStdenv.mkDerivation rec { # "--enable-coverage" # "--enable-inline-jumps" # "--enable-char-size=1" # default is 4 - ] ++ - # due not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 - lib.optional (!gccStdenv.isDarwin) "--enable-poll"; + ] ++ gambit-params.extraOptions + # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 + ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; configurePhase = '' export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ @@ -71,31 +75,35 @@ gccStdenv.mkDerivation rec { XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ${gambit-params.fix-stamp git-version} + ${gambit-params.fixStamp git-version stampYmd stampHms} ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags} # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - --replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}" \ - --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" + ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) + ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ + --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" ./config.status ''; buildPhase = '' - # Make bootstrap compiler, from release bootstrap + # The MAKEFLAGS setting is a workaround for https://github.com/gambit/gambit/issues/833 + export MAKEFLAGS="--output-sync=recurse" + echo "Make bootstrap compiler, from release bootstrap" mkdir -p boot cp -rp ${bootstrap}/gambit/. boot/. chmod -R u+w boot cd boot cp ../gsc/makefile.in ../gsc/*.scm gsc/ + echo > include/stamp.h # No stamp needed for the bootstrap compiler ./configure for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done cd .. cp boot/gsc/gsc gsc-boot - # Now use the bootstrap compiler to build the real thing! + echo "Now use the bootstrap compiler to build the real thing!" make -j$NIX_BUILD_CORES from-scratch ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"} ''; @@ -107,6 +115,7 @@ gccStdenv.mkDerivation rec { ''; doCheck = true; + dontStrip = true; meta = gambit-support.meta; } diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 8f77daa4173b..cb4f5f9501ca 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./build.nix rec { - version = "4.9.3"; + version = "4.9.5"; git-version = version; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; - sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; + url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz"; + sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw="; }; } diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix index be745367ec03..f78c99a50700 100644 --- a/pkgs/development/compilers/gambit/gambit-support.nix +++ b/pkgs/development/compilers/gambit/gambit-support.nix @@ -3,37 +3,38 @@ rec { stable-params = { stable = true; - defaultRuntimeOptions = "f8,-8,t8"; - buildRuntimeOptions = "f8,-8,t8"; - fix-stamp = git-version : ""; - targets = "java,js,php,python,ruby"; - modules = false; - }; - - unstable-params = { - stable = false; defaultRuntimeOptions = "iL,fL,-L,tL"; buildRuntimeOptions = "i8,f8,-8,t8"; - fix-stamp = git-version : '' + targets = "js"; # arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64 + #fixStamp = _: _: _: ""; + fixStamp = git-version: stampYmd: stampHms: '' + echo "Fixing timestamp recipe in Makefile" substituteInPlace configure \ --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; + substituteInPlace include/makefile.in \ + --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;"; ''; - targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest - modules = false; + modules = true; + extraOptions = []; + }; + + unstable-params = stable-params // { + stable = false; + extraOptions = ["--enable-trust-c-tco"]; }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; gambit-bootstrap = import ./bootstrap.nix ( pkgs ); - meta = { + meta = with lib; { description = "Optimizing Scheme to C compiler"; homepage = "http://gambitscheme.org"; - license = lib.licenses.lgpl21; # dual, also asl20 - # NB regarding platforms: continuously tested on Linux, - # tested on macOS once in a while, *should* work everywhere. - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thoughtpolice raskin fare ]; + license = licenses.lgpl21Only; # dual, also asl20 + # NB regarding platforms: continuously tested on Linux x86_64 and regularly tested on macOS x86_64. + # *should* work everywhere. + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index a689991a1e13..26761d67d35d 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,15 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-09-20"; - git-version = "4.9.3-1234-g6acd87df"; + version = "unstable-2023-07-30"; + git-version = "4.9.5-3-ge059fffd"; + stampYmd = 20230730; + stampHms = 151945; src = fetchFromGitHub { - owner = "feeley"; + owner = "gambit"; repo = "gambit"; - rev = "6acd87dfa95bfca33082a431e72f023345dc07ee"; - sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r"; + rev = "e059fffdfbd91e27c350ff2ebd671adefadd5212"; + sha256 = "0q7hdfchl6lw53xawmmjvhyjdmqxjdsnzjqv9vpkl2qa4vyir5fs"; }; gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index f6ea2f018244..4c439717bacd 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitHub, fetchpatch , cmake , enableShared ? !stdenv.hostPlatform.isStatic @@ -69,5 +69,12 @@ in fmt_10 = generic { version = "10.0.0"; sha256 = "sha256-sVY2TVPS/Zx32p5XIYR6ghqN4kOZexzH7Cr+y8sZXK8="; + patches = [ + # fixes a test failure on pkgsMusl.fmt + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/eaa6307691a9edb9e2f2eacf70500fc6989b416c.diff"; + hash = "sha256-PydnmOn/o9DexBViFGUUAO9KFjVS6CN8GVDHcl/+K8g="; + }) + ]; }; } diff --git a/pkgs/development/ocaml-modules/rfc7748/default.nix b/pkgs/development/ocaml-modules/rfc7748/default.nix index b15ad8684eab..0cc59fa3e7c5 100644 --- a/pkgs/development/ocaml-modules/rfc7748/default.nix +++ b/pkgs/development/ocaml-modules/rfc7748/default.nix @@ -1,6 +1,7 @@ { lib , buildDunePackage , fetchFromGitHub +, fetchpatch , ocaml , ounit @@ -18,6 +19,12 @@ buildDunePackage rec { sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4="; }; + # Compatibility with OCaml 5.0 + patches = fetchpatch { + url = "https://github.com/burgerdev/ocaml-rfc7748/commit/f66257bae0317c7b24c4b208ee27ab6eb68460e4.patch"; + hash = "sha256-780yy8gLOwwf7xIKIIIaoGpDPcY7+dZ0jPS4nrkH2s8="; + }; + minimalOCamlVersion = "4.05"; propagatedBuildInputs = [ zarith ]; diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix index 623f21748a87..1ef11e363ff8 100644 --- a/pkgs/development/ocaml-modules/sosa/default.nix +++ b/pkgs/development/ocaml-modules/sosa/default.nix @@ -2,9 +2,8 @@ , findlib, ocaml, ocamlbuild }: -if lib.versionOlder ocaml.version "4.02" -then throw "sosa is not available for OCaml ${ocaml.version}" -else +lib.throwIf (lib.versionOlder ocaml.version "4.02") + "sosa is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-sosa"; @@ -17,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; }; + postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") '' + for p in functors list_of of_mutable + do + substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib. + done + ''; + nativeBuildInputs = [ ocaml ocamlbuild findlib ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix index b3c8c241ae41..e75a2036642f 100644 --- a/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -1,13 +1,15 @@ -{ buildDunePackage, xenstore_transport, xenstore, lwt }: +{ buildDunePackage, camlp-streams, xenstore_transport, xenstore, lwt }: buildDunePackage { pname = "xenstore-tool"; inherit (xenstore_transport) src version; - duneVersion = "3"; + postPatch = '' + substituteInPlace cli/dune --replace 'libraries ' 'libraries camlp-streams ' + ''; - buildInputs = [ xenstore_transport xenstore lwt ]; + buildInputs = [ camlp-streams xenstore_transport xenstore lwt ]; meta = xenstore_transport.meta // { description = "Command line tool for interfacing with xenstore"; diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix new file mode 100644 index 000000000000..1e3375b28bd1 --- /dev/null +++ b/pkgs/development/python-modules/coredis/default.nix @@ -0,0 +1,59 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, async-timeout +, deprecated +, pympler +, wrapt +, pytestCheckHook +, redis +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "coredis"; + version = "4.14.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "alisaifee"; + repo = pname; + rev = version; + hash = "sha256-pHCQ5dePk2VhYNf/Ka+sovIn2OAVYHnLQhPFVjKmgb4="; + }; + + postPatch = '' + substituteInPlace pytest.ini --replace "-K" "" + ''; + + propagatedBuildInputs = [ + async-timeout + deprecated + pympler + wrapt + ]; + + pythonImportsCheck = [ "coredis" ]; + + nativeCheckInputs = [ + pytestCheckHook + redis + pytest-asyncio + ]; + + # all other tests require docker + pytestFlagsArray = [ + "tests/test_lru_cache.py" + "tests/test_parsers.py" + "tests/test_retry.py" + "tests/test_utils.py" + ]; + + meta = with lib; { + changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst"; + homepage = "https://github.com/alisaifee/coredis"; + description = "An async redis client with support for redis server, cluster & sentinel"; + license = licenses.mit; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 5b99b49c5499..43d99563a47c 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.10.2"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-W7aCSekm6vZSlEAgwgrwmUBV2/jCiBol7JyNMYUVpPY="; + hash = "sha256-4qRMET04JLVuDRfQtv/uQquf76iU00rnsWNaUXj1Gfw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/py-radix-sr/default.nix b/pkgs/development/python-modules/py-radix-sr/default.nix new file mode 100644 index 000000000000..f76f12708f83 --- /dev/null +++ b/pkgs/development/python-modules/py-radix-sr/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py-radix-sr"; + version = "1.0.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "SEKOIA-IO"; + repo = "py-radix"; + rev = "v${version}"; + hash = "sha256-aHV+NvPR4Gyk6bEpCftgBylis9rU7BWLpBMatjP4QmE="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "name='py-radix'" "name='py-radix-sr'" + ''; + + pythonImportsCheck = [ "radix" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Python radix tree for IPv4 and IPv6 prefix matching"; + homepage = "https://github.com/SEKOIA-IO/py-radix"; + license = with licenses; [ isc bsdOriginal ]; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index c7b277a60989..bb178a572415 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -1,16 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, cython +, packaging +, setuptools +, numpy +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyemd"; - version = "0.5.1"; + version = "1.0.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70"; + hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4="; }; - propagatedBuildInputs = [ numpy ]; - buildInputs = [ cython ]; + nativeBuildInputs = [ + cython + packaging + setuptools + ]; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index d95678f7fc6b..8d16f6921d2f 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -448,7 +448,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux ++ darwin; - broken = !(xlaSupport -> cudaSupport); + broken = !(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11"; } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 3c18e7cbdc03..b732988db39d 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -6,7 +6,6 @@ , asn1crypto , cffi , cryptography -, ibm-sw-tpm2 , pkgconfig # see nativeBuildInputs , pkg-config # see nativeBuildInputs , pycparser @@ -15,6 +14,8 @@ , pyyaml , setuptools-scm , tpm2-tss +, tpm2-tools +, swtpm }: buildPythonPackage rec { @@ -40,8 +41,22 @@ buildPythonPackage rec { url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch"; sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o="; }) + + # Lookup tcti via getinfo not system's ld_library_path + # https://github.com/tpm2-software/tpm2-pytss/pull/525 + (fetchpatch { + url = "https://github.com/tpm2-software/tpm2-pytss/commit/97289a08ddf44f7bdccdd122d6055c69e12dc584.patch"; + sha256 = "sha256-VFq3Hv4I8U8ifP/aSjyu0BiW/4jfPlRDKqRcqUGw6UQ="; + }) + + # Fix hardcoded `fapi-config.json` configuration path + ./fapi-config.patch ]; + postPatch = '' + sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py + ''; + nativeBuildInputs = [ cffi pkgconfig # this is the Python module @@ -60,12 +75,12 @@ buildPythonPackage rec { pyyaml ]; - # https://github.com/tpm2-software/tpm2-pytss/issues/341 - doCheck = false; + doCheck = true; nativeCheckInputs = [ - ibm-sw-tpm2 pytestCheckHook + tpm2-tools + swtpm ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch b/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch new file mode 100644 index 000000000000..f6245ef30467 --- /dev/null +++ b/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch @@ -0,0 +1,12 @@ +diff --git a/src/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py +index 916eda6..1afba3f 100644 +--- a/src/tpm2_pytss/FAPI.py ++++ b/src/tpm2_pytss/FAPI.py +@@ -23,6 +23,7 @@ logger = logging.getLogger(__name__) + + FAPI_CONFIG_ENV = "TSS2_FAPICONF" + FAPI_CONFIG_PATHS = [ ++ "@TPM2_TSS@/etc/tpm2-tss/fapi-config.json", + "/etc/tpm2-tss/fapi-config.json", + "/usr/local/etc/tpm2-tss/fapi-config.json", + ] diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index 25110ee53268..1db4f31e79a7 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.33"; + version = "1.4.39"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-PE5TYzfO2/3DehCVmo9mNNXgghnNR02frqRe6I0EfFY="; + hash = "sha256-eawsTvPJwWKDSZd/2XBneitoydSRxEAU5RAPZgE6NSo="; fetchSubmodules = true; }; - vendorHash = "sha256-qnn+2aUpYQYg31p+rAHTGHgrwfEHRtZECOg9oIERrrc="; + vendorHash = "sha256-uHTYp8PBXdQ2w+kjxLVvUOzOvDfXF53lcBriK8sif7A="; buildInputs = [ alsa-lib diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index 2376dddbb34a..6813e773a959 100644 --- a/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.8"; + version = "3.4.9"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-R/OWZekAGtDxE71MrzjWsdpaWGBu0c+VP0VkPro6GEo="; + sha256 = "sha256-GZccOlp9zZMqtv3+u8JnKFfIe8sjwbZBLkDk8lt3CGk="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 343bff9e3f85..9646886a6de1 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8812au"; - version = "${kernel.version}-unstable-2023-07-20"; + version = "${kernel.version}-unstable-2023-07-22"; src = fetchFromGitHub { owner = "morrownr"; repo = "8812au-20210629"; - rev = "51338202d21a63202b324afd22bd361141c8c5e5"; - hash = "sha256-NIdKUP5t/dzQ9xIG5Kc6eRudr6vTpCafunXZHZLcoL8="; + rev = "b5f4e6e894eca8fea38661e2fc22a2570e0274ad"; + hash = "sha256-3uPowesJVh/cnagMz/Uadb+U5rDUAWfU39tZaDNCoqg="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 5c2aa97048dd..2775b1801889 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2023-07-20"; + version = "${kernel.version}-unstable-2023-07-23"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "28bcb8b3eb4a531727c7a48001fa91903492fd1a"; - sha256 = "sha256-LeCPu9ypJUdKV4lwJIy934g+VqD1S6P0fgnczTI3z7c="; + rev = "83db18e610845df9434a628ca3feb9004296b307"; + sha256 = "sha256-as3S7WQkug3suJ5ovUbRu/UzO5GDrGLdgkiWrCrvztk="; }; hardeningDisable = [ "pic" ]; @@ -34,6 +34,6 @@ stdenv.mkDerivation { homepage = "https://github.com/morrownr/88x2bu-20210702"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ otavio ralith ]; + maintainers = with maintainers; [ otavio ]; }; } diff --git a/pkgs/servers/misc/irrd/default.nix b/pkgs/servers/misc/irrd/default.nix new file mode 100644 index 000000000000..1ba0c158331f --- /dev/null +++ b/pkgs/servers/misc/irrd/default.nix @@ -0,0 +1,159 @@ +{ lib +, python3 +, fetchPypi +, git +, postgresql +, postgresqlTestHook +, redis +}: + +let + py = python3.override { + packageOverrides = final: prev: { + sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; + }; + doCheck = false; + }); + starlette = prev.starlette.overridePythonAttrs (oldAttrs: rec { + version = "0.20.4"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-QvzzEi+Zj+/OPixa1+Xtvw8Cz2hdZGqDoI1ARyavUIQ="; + }; + nativeBuildInputs = with final; [ + setuptools + ]; + doCheck = false; + }); + ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec { + version = "0.17.1"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-B98wl/NkNOyq99AKsVQem9TZ0meOnvg7IdWIEAI2vy8="; + }; + nativeBuildInputs = with final; [ + setuptools + ]; + doCheck = false; + }); + alembic = prev.alembic.overridePythonAttrs (lib.const { + doCheck = false; + }); + beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec { + version = "0.8.0"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-1E2VUbvte/qIZ1Mk+E77mqhXOE1E6fsh61MPCgutuBU="; + }; + doCheck = false; + }); + }; + }; +in + +py.pkgs.buildPythonPackage rec { + pname = "irrd"; + version = "4.3.0.post1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-hayfdcYAgIopfUiAR/AUWMuTzwpXvXuq6iPp9uhWN1M="; + }; + + patches = [ + ./irrd-asgiref-3.8.0.diff + ]; + + pythonRelaxDeps = true; + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + postPatch = '' + substituteInPlace setup.py --replace psycopg2-binary psycopg2 + ''; + + nativeCheckInputs = [ + git + redis + postgresql + postgresqlTestHook + ] ++ (with py.pkgs; [ + pytest-asyncio + pytest-freezegun + pytestCheckHook + ]); + + propagatedBuildInputs = with py.pkgs; [ + python-gnupg + passlib + bcrypt + ipy + ordered-set + beautifultable + pyyaml + datrie + setproctitle + python-daemon + pid + py.pkgs.redis + hiredis + coredis + requests + pytz + ariadne + uvicorn + starlette + psutil + asgiref + pydantic + typing-extensions + py-radix-sr + psycopg2 + sqlalchemy + alembic + ujson + wheel + websockets + ] ++ py.pkgs.uvicorn.optional-dependencies.standard; + + preCheck = '' + redis-server & + REDIS_PID=$! + + while ! redis-cli --scan ; do + echo waiting for redis + sleep 1 + done + + export IRRD_DATABASE_URL="postgres:///$PGDATABASE" + export IRRD_REDIS_URL="redis://localhost/1" + ''; + + postCheck = '' + kill $REDIS_PID + ''; + + # skip tests that require internet access + disabledTests = [ + "test_020_dash_o_noop" + "test_050_non_json_response" + ]; + + meta = with lib; { + changelog = "https://irrd.readthedocs.io/en/v${version}/releases/"; + description = "An Internet Routing Registry database server, processing IRR objects in the RPSL format"; + license = licenses.mit; + homepage = "https://github.com/irrdnet/irrd"; + maintainers = with maintainers; [ netali yuka ]; + }; +} + diff --git a/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff b/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff new file mode 100644 index 000000000000..0b81cbc6613d --- /dev/null +++ b/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff @@ -0,0 +1,51 @@ +diff --git a/irrd/server/graphql/schema_builder.py b/irrd/server/graphql/schema_builder.py +index 65ddf5d..b3b385a 100644 +--- a/irrd/server/graphql/schema_builder.py ++++ b/irrd/server/graphql/schema_builder.py +@@ -31,32 +31,32 @@ def build_executable_schema(): + """ + schema = SchemaGenerator() + +- schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, False)) +- schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, False)) ++ schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False)) ++ schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False)) + +- schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, False)) +- schema.query_type.set_field("databaseStatus", sta(resolve_database_status, False)) +- schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, False)) +- schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, False)) +- schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, False)) ++ schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, thread_sensitive=False)) ++ schema.query_type.set_field("databaseStatus", sta(resolve_database_status, thread_sensitive=False)) ++ schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, thread_sensitive=False)) ++ schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, thread_sensitive=False)) ++ schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, thread_sensitive=False)) + +- schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, False)) +- schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, False)) ++ schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, thread_sensitive=False)) ++ schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, thread_sensitive=False)) + for object_type in schema.object_types: + if "adminCObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, False)) ++ object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, thread_sensitive=False)) + for object_type in schema.object_types: + if "techCObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, False)) ++ object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, thread_sensitive=False)) + for object_type in schema.object_types: + if "mbrsByRefObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, False)) ++ object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, thread_sensitive=False)) + for object_type in schema.object_types: + if "memberOfObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, False)) ++ object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, thread_sensitive=False)) + for object_type in schema.object_types: + if "membersObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, False)) ++ object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, thread_sensitive=False)) + + @schema.asn_scalar_type.value_parser + def parse_asn_scalar(value): diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index a65243cee534..db2af919a02b 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -11,13 +11,13 @@ }: let - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; rev = version; - hash = "sha256-gp1TeYHwH7ffaSMifdURb2p+U8u6Xs4JU4b4qACEIDw="; + hash = "sha256-6eKTgEZ+YLoSmPQWBS95fJ+ioIxeTVlT+moqslByPPw="; }; # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles @@ -42,7 +42,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-/jsBFGH/rYSovidmvIf7xpuHpxdW8QFYC08PNi38LH8="; + outputHash = "sha256-Ga+tl4oZlum43tdfez1oWGMHZAfyePGl47S+9NRRvW8="; }; in stdenv.mkDerivation { diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index e95535056b81..9cebe31dd7b8 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -9,17 +9,18 @@ , xorg , darwin , nix-update-script +, alsa-lib }: stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - hash = "sha256-1HWWrBI96znHctoMhQyO46Jmbg1jXPcvkDdwiWwp4KE="; + hash = "sha256-UlN2BjtzS54oImAGM2Kl+j/LwfAyDXtbEMhsijBh/yg="; }; postPatch = '' @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { wayland-protocols wayland xorg.libX11 + alsa-lib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/tools/misc/shadowenv/Cargo.lock.patch b/pkgs/tools/misc/shadowenv/Cargo.lock.patch new file mode 100644 index 000000000000..d1866991cea7 --- /dev/null +++ b/pkgs/tools/misc/shadowenv/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git c/Cargo.lock i/Cargo.lock +index fb6ef6e..347b404 100644 +--- c/Cargo.lock ++++ i/Cargo.lock +@@ -1168,7 +1168,7 @@ dependencies = [ + + [[package]] + name = "shadowenv" +-version = "2.1.0" ++version = "2.1.1" + dependencies = [ + "atty", + "blake2", diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 51bb84cc065c..12723000cef7 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - hash = "sha256-11Zce3eehyuDOl2zYl0sf/yh8SOOnu8W/CrL18e3zzw="; + hash = "sha256-NKqoeJ2sejbe7Gghk3H7oJtP16SX1PcIIjsh/bZdTfQ="; }; - cargoHash = "sha256-eo+/mZ6QFoXgIT1uT65TVR65xWBm/Cw5yBzvRUVgQUY="; + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoHash = "sha256-CGAwb+UduM2QKne2bPntOcFnaUQN/3uUANc6z7f/Oig="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/twspace-crawler/default.nix b/pkgs/tools/misc/twspace-crawler/default.nix index 693bd8794e02..aa34fdbc41e5 100644 --- a/pkgs/tools/misc/twspace-crawler/default.nix +++ b/pkgs/tools/misc/twspace-crawler/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "twspace-crawler"; - version = "1.12.6"; + version = "1.12.7"; src = fetchFromGitHub { owner = "HitomaruKonpaku"; repo = "twspace-crawler"; - rev = "fc415f4b889f93bdbf357e14f1a6bf3fc146aac9"; # version not tagged - hash = "sha256-25/VFbf6UJJKnDDCXuIfWSEgVD24SB3feLV0zF8DlBs="; + rev = "bc1626996076f4e73890dc80b2fe99d578a7c641"; # version not tagged + hash = "sha256-/2wdl7VCcO8WRAYFtr1wtu80TwyLI3Hi8XzmrzOzhUQ="; }; - npmDepsHash = "sha256-4ZNFuOCdCh+H8tH8qKr2569wDFPOxaLfqmA6N3FNP84="; + npmDepsHash = "sha256-pPpUQ6o0P7iTcdLwWqwItJFVhYH9rC+bLKo4Gz7DiRE="; meta = with lib; { description = "Script to monitor & download Twitter Spaces 24/7"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9aff39355b93..bb3d519858ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9220,6 +9220,8 @@ with pkgs; iroh = callPackage ../applications/networking/iroh { }; + irrd = callPackage ../servers/misc/irrd { }; + ised = callPackage ../tools/misc/ised { }; isl = isl_0_20; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7db66d4e3b4..49742de01c07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2177,6 +2177,8 @@ self: super: with self; { coreapi = callPackage ../development/python-modules/coreapi { }; + coredis = callPackage ../development/python-modules/coredis { }; + coreschema = callPackage ../development/python-modules/coreschema { }; cornice = callPackage ../development/python-modules/cornice { }; @@ -7223,6 +7225,8 @@ self: super: with self; { py-expression-eval = callPackage ../development/python-modules/py-expression-eval { }; + py-radix-sr = callPackage ../development/python-modules/py-radix-sr { }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; oasatelematics = callPackage ../development/python-modules/oasatelematics { };