diff options
Diffstat (limited to 'pkgs')
61 files changed, 1238 insertions, 395 deletions
diff --git a/pkgs/applications/audio/headset/default.nix b/pkgs/applications/audio/headset/default.nix new file mode 100644 index 0000000000000..9fbf3c08c2b79 --- /dev/null +++ b/pkgs/applications/audio/headset/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, makeWrapper +, electron +}: + +stdenv.mkDerivation rec { + pname = "headset"; + version = "4.0.0"; + + src = fetchurl { + url = "https://github.com/headsetapp/headset-electron/releases/download/v${version}/headset_${version}_amd64.deb"; + hash = "sha256-M1HMZgYczZWFq0EGlCMEGOGUNoUcmq37J8Ycen72PhM="; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper dpkg ]; + + unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/headset + cp -R usr/share/{applications,icons} $out/share + cp -R usr/lib/headset/resources/app.asar $out/share/headset/ + + makeWrapper ${electron}/bin/electron $out/bin/headset \ + --add-flags $out/share/headset/app.asar + + runHook postInstall + ''; + + meta = with lib; { + description = "A simple music player for YouTube and Reddit"; + homepage = "https://headsetapp.co/"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ muscaln ]; + }; +} diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 6c7bfff86b1b9..434be82f6fb3b 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.6"; + version = "0.9.7"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceChars ["."] ["_"] version}"; - sha256 = "sha256-8oVnUe+/y4p1WeHMEhKMIl0/ax3PT0pN4f1UJaBmZBw="; + sha256 = "sha256-PchW9cM5qEP51G9RXUZ3j/AvKqTkgNiw3esqSQqsy0M="; }; buildInputs = [ diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix new file mode 100644 index 0000000000000..7b82f2658a1c6 --- /dev/null +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -0,0 +1,71 @@ +{ lib, stdenv +, fetchurl +, gcc-unwrapped +, dpkg +, util-linux +, bash +, makeWrapper +, electron +}: + +let + inherit (stdenv.hostPlatform) system; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + sha256 = { + "x86_64-linux" = "139nlr191bsinx6ixpi2glcr03lsnzq7b0438h3245napsnjpx6p"; + }."${system}" or throwSystem; + + arch = { + "x86_64-linux" = "amd64"; + }."${system}" or throwSystem; + +in + +stdenv.mkDerivation rec { + pname = "terra-station"; + version = "1.2.0"; + + src = fetchurl { + url = "https://github.com/terra-money/station-desktop/releases/download/v${version}/Terra.Station_${version}_${arch}.deb"; + inherit sha256; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb -x $src . + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} + + cp -a usr/share/* $out/share + cp -a "opt/Terra Station/"{locales,resources} $out/share/${pname} + + substituteInPlace $out/share/applications/station-electron.desktop \ + --replace "/opt/Terra Station/station-electron" ${pname} + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + ''; + + meta = with lib; { + description = "Terra station is the official wallet of the Terra blockchain."; + homepage = "https://docs.terra.money/docs/learn/terra-station/README.html"; + license = licenses.isc; + maintainers = [ maintainers.peterwilli ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index cc62190aeb1ba..d3d0c7c2f9397 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, rustPlatform, makeWrapper }: +{ fetchzip, lib, rustPlatform, installShellFiles, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "helix"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-idItRkymr+cxk3zv2mPBR/frCGvzEUdSAhY7gghfR3M="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; postInstall = '' # not needed at runtime @@ -22,6 +22,7 @@ rustPlatform.buildRustPackage rec { mkdir -p $out/lib cp -r runtime $out/lib + installShellCompletion contrib/completion/hx.{bash,fish,zsh} ''; postFixup = '' wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index dbe745217a380..fda56c0d8cb7a 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "epick"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "vv9k"; repo = pname; rev = version; - sha256 = "sha256-sZ0ZPst6PE6KQ+pmjqLdcD7bWU/gLRsGH84PtWTLdSQ="; + sha256 = "sha256-b4if2ggJY+8CsCX8jbnnWXy16k7sfB88CLlYYCrtltk="; }; - cargoSha256 = "sha256-kMVjX4AWn8XFRzI7P9NRW8B7AHcIC8TG8LQk7tzkz5o="; + cargoSha256 = "sha256-HyGSmeLJ+2Twkg94p1QqXZDix0mU2jGFfEot6hgUg34="; nativeBuildInputs = lib.optional stdenv.isLinux python3; diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix new file mode 100644 index 0000000000000..28e736b008fb4 --- /dev/null +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -0,0 +1,39 @@ +{ lib, buildGoModule, fetchFromGitHub, pkg-config, gtk3, gtk-layer-shell }: + +buildGoModule rec { + pname = "nwg-bar"; + version = "unstable-2021-09-23"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5"; + sha256 = "sha256-piysF19WDjb/EGI9MBepYrOrQL9C1fsoq05AP8CYN58="; + }; + + patches = [ ./fix-paths.patch ]; + postPatch = '' + substituteInPlace config/bar.json --subst-var out + substituteInPlace tools.go --subst-var out + ''; + + vendorSha256 = "sha256-dgOwflNRb+11umFykozL8DQ50dLbhbMCmCyKmLlW7rw="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 gtk-layer-shell ]; + + preInstall = '' + mkdir -p $out/share/nwg-bar + cp -r config/* images $out/share/nwg-bar + ''; + + meta = with lib; { + description = + "GTK3-based button bar for sway and other wlroots-based compositors"; + homepage = "https://github.com/nwg-piotr/nwg-bar"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ sei40kr ]; + }; +} diff --git a/pkgs/applications/misc/nwg-bar/fix-paths.patch b/pkgs/applications/misc/nwg-bar/fix-paths.patch new file mode 100644 index 0000000000000..9d4e98e9a7b76 --- /dev/null +++ b/pkgs/applications/misc/nwg-bar/fix-paths.patch @@ -0,0 +1,47 @@ +diff --git a/config/bar.json b/config/bar.json +index 6c456e7..98527cb 100644 +--- a/config/bar.json ++++ b/config/bar.json +@@ -2,21 +2,21 @@ + { + "label": "Lock", + "exec": "swaylock -f -c 000000", +- "icon": "/usr/share/nwg-bar/images/system-lock-screen.svg" ++ "icon": "@out@/share/nwg-bar/images/system-lock-screen.svg" + }, + { + "label": "Logout", + "exec": "swaymsg exit", +- "icon": "/usr/share/nwg-bar/images/system-log-out.svg" ++ "icon": "@out@/share/nwg-bar/images/system-log-out.svg" + }, + { + "label": "Reboot", + "exec": "systemctl reboot", +- "icon": "/usr/share/nwg-bar/images/system-reboot.svg" ++ "icon": "@out@/share/nwg-bar/images/system-reboot.svg" + }, + { + "label": "Shutdown", + "exec": "systemctl -i poweroff", +- "icon": "/usr/share/nwg-bar/images/system-shutdown.svg" ++ "icon": "@out@/share/nwg-bar/images/system-shutdown.svg" + } + ] +\ No newline at end of file +diff --git a/tools.go b/tools.go +index f97751e..987163e 100644 +--- a/tools.go ++++ b/tools.go +@@ -45,10 +45,7 @@ func configDir() string { + } + + func getDataHome() string { +- if os.Getenv("XDG_DATA_HOME") != "" { +- return os.Getenv("XDG_DATA_HOME") +- } +- return "/usr/share/" ++ return "@out@/share/" + } + + func createDir(dir string) { diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/applications/misc/qelectrotech/default.nix new file mode 100644 index 0000000000000..038fe11763d6d --- /dev/null +++ b/pkgs/applications/misc/qelectrotech/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, mkDerivation +, fetchzip +, installShellFiles +, pkg-config +, qmake +, qtbase +, kcoreaddons +, kwidgetsaddons +}: + +mkDerivation rec { + pname = "qelectrotech"; + version = "0.8.0"; + + src = fetchzip { + url = "https://git.tuxfamily.org/qet/qet.git/snapshot/qet-${version}.tar.gz"; + sha256 = "sha256-op2vnMPF9bNnHGphWFB/HEeoThE6tX+9UvX8LWVwkzI="; + }; + + postPatch = '' + substituteInPlace qelectrotech.pro \ + --replace 'GIT_COMMIT_SHA="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --verify HEAD)\\\""' \ + 'GIT_COMMIT_SHA="\\\"${version}\\\""' \ + --replace "COMPIL_PREFIX = '/usr/local/'" \ + "COMPIL_PREFIX = '$out/'" \ + --replace "INSTALL_PREFIX = '/usr/local/'" \ + "INSTALL_PREFIX = '$out/'" + ''; + + nativeBuildInputs = [ + installShellFiles + pkg-config + qmake + ]; + + buildInputs = [ + kcoreaddons + kwidgetsaddons + qtbase + ]; + + qmakeFlags = [ + "INSTALLROOT=$(out)" + ]; + + installPhase = '' + runHook preInstall + + install -Dm555 qelectrotech $out/bin/qelectrotech + + install -Dm444 -t $out/share/applications misc/qelectrotech.desktop + install -Dm444 -t $out/share/applications misc/x-qet-titleblock.desktop + install -Dm444 -t $out/share/applications misc/x-qet-element.desktop + install -Dm444 -t $out/share/applications misc/x-qet-project.desktop + + mkdir -p $out/share/qelectrotech + cp -r elements $out/share/qelectrotech + cp -r titleblocks $out/share/qelectrotech + cp -r lang $out/share/qelectrotech + cp -r examples $out/share/qelectrotech + + mkdir -p $out/share/icons/hicolor + cp -r ico $out/share/icons/hicolor + + runHook postInstall + ''; + + meta = with lib; { + description = "Free software to create electric diagrams"; + homepage = "https://qelectrotech.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ yvesf ]; + platforms = qtbase.meta.platforms; + }; +} diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index a42ec844d115d..1deb8e7efe6e9 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -207,11 +207,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { ''; passthru = { - inherit python; - # PYTHONPATH of all dependencies used by the package - pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; - inherit path; - + inherit python path; tests = { inherit (nixosTests) paperless; }; }; diff --git a/pkgs/applications/radio/soapysdrplay/default.nix b/pkgs/applications/radio/soapysdrplay/default.nix index d205462fb6049..80c9c409e1ee2 100644 --- a/pkgs/applications/radio/soapysdrplay/default.nix +++ b/pkgs/applications/radio/soapysdrplay/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, soapysdr, sdrplay }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "soapysdr-sdrplay3"; - version = "unstable-2021-04-25"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapySDRPlay3"; - rev = "e6fdb719b611b1dfb7f26c56a4df1e241bd10129"; - sha256 = "0rrylp3ikrva227hjy60v4n6d6yvdavjsad9kszw9s948mwiashi"; + rev = "soapy-sdrplay3-${version}"; + sha256 = "sha256-WMcAw0uR2o2SrQR4mBtdVEZlJ/ZXRqwo6zMJNsB/5U4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index 6c140b03ee4b1..a4bb8c62f1c42 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk4, fftwFloat, gsl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; + buildInputs = [ itk libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEZMINC_BUILD_TOOLS=TRUE" diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index ac332f2716623..873cb28b51612 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,26 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk-unstable, vtk_8, Cocoa }: stdenv.mkDerivation rec { pname = "ANTs"; - version = "2.2.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "37ad4e20be3a5ecd26c2e4e41b49e778a0246c3d"; - sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q"; + rev = "v${version}"; + sha256 = "sha256-sRZwRRqqU0xiu4K6xlLQV4xzVNnzMlnRsk+TPiv0wD0="; }; - patches = [ - # Fix build with gcc8 - (fetchpatch { - url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch"; - sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams"; - }) - ]; - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk-unstable vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/applications/science/biology/treemix/default.nix b/pkgs/applications/science/biology/treemix/default.nix new file mode 100644 index 0000000000000..7bf966919a67e --- /dev/null +++ b/pkgs/applications/science/biology/treemix/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchurl +, zlib +, gsl +, boost +}: + +stdenv.mkDerivation rec { + pname = "treemix"; + version = "1.13"; + + src = fetchurl { + url = "https://bitbucket.org/nygcresearch/treemix/downloads/${pname}-${version}.tar.gz"; + sha256 = "1nd3rzsdgk47r8b8k43mdfvaagln533sm08s1jr0dz8km8nlym7y"; + }; + + buildInputs = [ zlib gsl boost ]; + + meta = with lib ; { + description = "Inference of patterns of population splitting and mixing from genome-wide allele frequency data"; + homepage = "https://bitbucket.org/nygcresearch/treemix/wiki/Home"; + license = licenses.gpl3Only; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 02c035914f3ac..7ae2825f175a7 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.13.0"; + version = "1.13.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "0cc262jpqp8l25p04pcqh3w671gw0p1d2zrr3d34ch8k9c6s4nzq"; + sha256 = "0k0zbh6adwr99y9aazlyvp6s1k8zaq2j6x8kqb8q9a5qjjg56lay"; }; depsBuildBuild = [ diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 70f933e7b2067..0342b6817c66a 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220807-113146-c2fee766"; + version = "20220903-194523-3bb1ed61"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-2krngcANqcwq8wNQZSz01srJ6yEOkk03QnO2sL7SuJA="; + sha256 = "sha256-R5DFBO6U1hVDCjvvNF2nDoldl+mzkrjaXR5rIPCosmM="; }; postPatch = '' @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-ZkDGCR86VSCuvVlo4Pf9Ifax2BZuBicZpB/K/7bIMls="; + cargoSha256 = "sha256-x2n8ti9zk+h2MrwDg/FgRWTQJmCAckxE2fOHgrWdayA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 74207e5bafe2f..c95a36b8380e5 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "35"; + version = "37"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-q869UCnekCHBbB0aGNmHl8Ln32hRWHLddu3oqIUinwo="; + sha256 = "sha256-dXGcdDq6RbvE8ICd2VhnyMlfOH+x2jqlG3Jerll9EE8="; }; patches = [ diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix deleted file mode 100644 index 54a3c33cd0171..0000000000000 --- a/pkgs/development/libraries/itk/4.x.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }: - -stdenv.mkDerivation rec { - pname = "itk"; - version = "4.13.3"; - - src = fetchFromGitHub { - owner = "InsightSoftwareConsortium"; - repo = "ITK"; - rev = "v${version}"; - sha256 = "067vkh39jxcvyvn69qjh4vi3wa7vdvm9m6qsg3jmnmm7gzw0kjlm"; - }; - - cmakeFlags = [ - "-DBUILD_TESTING=OFF" - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_SHARED_LIBS=ON" - "-DModule_ITKMINC=ON" - "-DModule_ITKIOMINC=ON" - "-DModule_ITKIOTransformMINC=ON" - "-DModule_ITKVtkGlue=ON" - "-DModule_ITKReview=ON" - ]; - - nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - - meta = { - description = "Insight Segmentation and Registration Toolkit"; - homepage = "https://www.itk.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/itk/5.x.nix b/pkgs/development/libraries/itk/5.x.nix new file mode 100644 index 0000000000000..e50f2bbca4949 --- /dev/null +++ b/pkgs/development/libraries/itk/5.x.nix @@ -0,0 +1,5 @@ +import ./generic.nix rec { + version = "5.2.1"; + rev = "v${version}"; + sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE="; +} diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/generic.nix index 6816c37b9be67..0d742b393b1d8 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -1,9 +1,11 @@ +{ version, rev, sourceSha256 }: + { lib, stdenv, fetchFromGitHub, cmake, makeWrapper , pkg-config, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; - version = "5.2.1"; + inherit version; itkGenericLabelInterpolatorSrc = fetchFromGitHub { owner = "InsightSoftwareConsortium"; @@ -22,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; - rev = "v${version}"; - sha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE="; + inherit rev; + sha256 = sourceSha256; }; postPatch = '' diff --git a/pkgs/development/libraries/itk/unstable.nix b/pkgs/development/libraries/itk/unstable.nix new file mode 100644 index 0000000000000..bb64d4afca9a7 --- /dev/null +++ b/pkgs/development/libraries/itk/unstable.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "unstable-2022-07-02"; + rev = "5e7aea957c82b67d4364b2b88999805616e3b01d"; + sourceSha256 = "sha256-tjkoaHCuVdvgE6X+7Kb8mt9oxINWs4R0xD9cxdEeYKk="; +} diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 0726356ae118d..b18d9a645eaf0 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ehOIWUGSPyHhNitkkA8voVciuEsCoRWv1s3MVMmOT0c="; + sha256 = "sha256-Sn03nY80UmL5oeoK6ScPye1oSUmEKxgoz2VLHcvor3U="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index ec12527b73500..723f1848c6a06 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -73,16 +73,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - # disable stackprotector on aarch64-darwin for now - # https://github.com/NixOS/nixpkgs/issues/127608 - # - # build error: - # - # /private/tmp/nix-build-openmpi-4.1.1.drv-0/ccg7QqR8.s:13:15: error: index must be an integer in range [-256, 255]. - # ldr x2, [x2, ___stack_chk_guard];momd - # - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - postInstall = '' rm -f $out/lib/*.la ''; diff --git a/pkgs/development/libraries/vtk/7.x.nix b/pkgs/development/libraries/vtk/7.x.nix deleted file mode 100644 index 615553f80f228..0000000000000 --- a/pkgs/development/libraries/vtk/7.x.nix +++ /dev/null @@ -1,22 +0,0 @@ -import ./generic.nix { - majorVersion = "7.1"; - minorVersion = "1"; - sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; - patchesToFetch = [ - { - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; - sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; - } - - { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; - sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; - } - - # Add missing include required with recent Qt. - { - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/797f28697d5ba50c1fa2bc5596af626a3c277826.diff"; - sha256 = "BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds="; - } - ]; -} diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 467abeead3e3c..b88ddee6b249b 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -96,6 +96,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ]; platforms = with platforms; unix; # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope - broken = stdenv.isDarwin && (lib.versions.major majorVersion == "7" || lib.versions.major majorVersion == "8"); + broken = stdenv.isDarwin && (lib.versions.major majorVersion == "8"); }; } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e20f45df46cbe..cb81b97d03279 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -125,7 +125,7 @@ buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/bit32-5.3.0-1.rockspec"; + url = "mirror://luarocks/bit32-5.3.0-1.rockspec"; sha256 = "1d6xdihpksrj5a3yvsvnmf3vfk15hj6f8n1rrs65m7adh87hc0yd"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -153,26 +153,34 @@ buildLuarocksPackage { }) {}; busted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua, lua_cliargs, luafilesystem, luasystem, dkjson, say, luassert, lua-term, penlight, mediator_lua +, fetchgit, luasystem, lua-term, luassert, mediator_lua, say, dkjson, penlight, luafilesystem, lua, lua_cliargs }: buildLuarocksPackage { pname = "busted"; - version = "2.0.0-1"; + version = "2.1.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/busted-2.0.0-1.rockspec"; - sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw"; + url = "mirror://luarocks/busted-2.1.1-1.rockspec"; + sha256 = "0f9iz3pa2gmb2vccvygp6zdiji7l8bap0vlgqgrcg331qsrkf70h"; }).outPath; - src = fetchurl { - url = "https://github.com/Olivine-Labs/busted/archive/v2.0.0.tar.gz"; - sha256 = "1ps7b3f4diawfj637mibznaw4x08gn567pyni0m2s50hrnw4v8zx"; - }; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lunarmodules/busted.git", + "rev": "e3ed48759b625f2e37bf02ccc057b2b98108f108", + "date": "2022-08-24T17:34:58+03:00", + "path": "/nix/store/7g9rxkyhabgx0acwmzl4r4xfh193avpw-busted", + "sha256": "0nab0s5lhk0nhh58c4jspv5sj4g7839gb5q145hrlgbsxqncp8wy", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; + propagatedBuildInputs = [ luasystem lua-term luassert mediator_lua say dkjson penlight luafilesystem lua lua_cliargs ]; meta = { - homepage = "http://olivinelabs.com/busted/"; - description = "Elegant Lua unit testing."; + homepage = "https://lunarmodules.github.io/busted/"; + description = "Elegant Lua unit testing"; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }) {}; @@ -246,7 +254,7 @@ buildLuarocksPackage { }) {}; compat53 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua +, fetchzip, lua }: buildLuarocksPackage { pname = "compat53"; @@ -255,9 +263,9 @@ buildLuarocksPackage { url = "mirror://luarocks/compat53-0.7-1.rockspec"; sha256 = "1r7a3q1cjrcmdycrv2ikgl83irjhxs53sa88v2fdpr9aaamlb101"; }).outPath; - src = fetchurl { + src = fetchzip { url = "https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.zip"; - sha256 = "1x3wv1qx7b2zlf3fh4q9pmi2xxkcdm024g7bf11rpv0yacnhran3"; + sha256 = "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"; }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -399,10 +407,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "1fac471a153b99da7f858e63edfa19ec2afee791", - "date": "2022-03-13T17:25:22+01:00", - "path": "/nix/store/4fxlwjvv07gbdi094abl59h8j5ly4ghm-digestif", - "sha256": "1mlmn3v97il5jsl28hjjgvm0dix5r6rsrdzavq25pbv0c46b3zzf", + "rev": "95b13ba7ed33605406353b200920ece08868d5a8", + "date": "2022-07-03T13:41:35+02:00", + "path": "/nix/store/k8y6gk4pqri76657c2sy4j4bkyh30jz5-digestif", + "sha256": "12pksz1l84iml7ng6yhywf0fyy8lclmcn2jjkdrh994lb7q9ya99", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -427,7 +435,7 @@ buildLuarocksPackage { pname = "dkjson"; version = "2.6-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/dkjson-2.6-1.rockspec"; + url = "mirror://luarocks/dkjson-2.6-1.rockspec"; sha256 = "1hhmgz2nixqg23shfnl0kq6wxdadx36z6hhsrz33g7idbm6rbwm1"; }).outPath; src = fetchurl { @@ -446,7 +454,7 @@ buildLuarocksPackage { }) {}; fifo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua +, fetchzip, lua }: buildLuarocksPackage { pname = "fifo"; @@ -455,9 +463,9 @@ buildLuarocksPackage { url = "mirror://luarocks/fifo-0.2-0.rockspec"; sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq"; }).outPath; - src = fetchurl { + src = fetchzip { url = "https://github.com/daurnimator/fifo.lua/archive/0.2.zip"; - sha256 = "1a028yyc1xlkaavij8rkz18dqf96risrj65xp0p72y2mhsrckdp1"; + sha256 = "1800k7h5hxsvm05bjdr65djjml678lwb0661cll78z1ys2037nzn"; }; propagatedBuildInputs = [ lua ]; @@ -470,7 +478,7 @@ buildLuarocksPackage { }) {}; fluent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, cldr, luaepnf, penlight +, fetchgit, luaepnf, cldr, lua, penlight }: buildLuarocksPackage { pname = "fluent"; @@ -493,7 +501,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua cldr luaepnf penlight ]; + propagatedBuildInputs = [ luaepnf cldr lua penlight ]; meta = { homepage = "https://github.com/alerque/fluent-lua"; @@ -512,10 +520,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "27aeb2e715c32cbb99aa0b326b31739464b61644", - "date": "2022-05-26T12:55:53+01:00", - "path": "/nix/store/bfz0bk523dk4dciiknrzvp87yvnbgcb2-gitsigns.nvim", - "sha256": "04m1767cndrx46xsa6frf77xv64hmr6w21dk2wh4s0sqjvqqm1r6", + "rev": "d7e0bcbe45bd9d5d106a7b2e11dc15917d272c7a", + "date": "2022-09-01T14:06:41+01:00", + "path": "/nix/store/3i20afjhjknqk3wggbrk3kwcbnnjqqxd-gitsigns.nvim", + "sha256": "1h4gxyamynwygxpqfib2a7sd1xbi6sh8ixg85j6qiaqqpahr0a4k", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -534,22 +542,22 @@ buildLuarocksPackage { }) {}; http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua, compat53, bit32, cqueues, luaossl, basexx, lpeg, lpeg_patterns, binaryheap, fifo +, fetchzip, luaossl, cqueues, compat53, lpeg, fifo, binaryheap, lpeg_patterns, basexx, bit32, lua }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/http-0.3-0.rockspec"; + url = "mirror://luarocks/http-0.3-0.rockspec"; sha256 = "0fn3irkf5nnmfc83alc40b316hs8l7zdq2xlaiaa65sjd8acfvia"; }).outPath; - src = fetchurl { + src = fetchzip { url = "https://github.com/daurnimator/lua-http/archive/v0.3.zip"; - sha256 = "13xyj8qx42mzn1z4lwwdfd7ha06a720q4b7d04ir6vvp2fwp3s4q"; + sha256 = "1pqxxxifl2j1cik3kgayx43v6py5jp6r22myhvxfffysb3b84a2l"; }; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; + propagatedBuildInputs = [ luaossl cqueues compat53 lpeg fifo binaryheap lpeg_patterns basexx bit32 lua ]; meta = { homepage = "https://github.com/daurnimator/lua-http"; @@ -618,7 +626,7 @@ buildLuarocksPackage { }) {}; ldoc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, penlight, markdown +, fetchgit, markdown, penlight }: buildLuarocksPackage { pname = "ldoc"; @@ -626,10 +634,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/stevedonovan/LDoc.git", - "rev": "e97398356b27473e5ba0626427daaec54f407e22", - "date": "2022-01-17T13:53:47+03:00", - "path": "/nix/store/6s0dmcz2jgjhjhakr5miq8ffgkchd0wh-LDoc", - "sha256": "13k4vi12s37izsjqcnfcliwlizr1ic0vwb0zlxcsghi31k031him", + "rev": "71dd5edbda829cd87b312956f4eae1ff8133fb14", + "date": "2022-06-17T13:41:29+03:00", + "path": "/nix/store/ywgvf4a5bdh7b7jzx8xgibch0a9kr9d2-LDoc", + "sha256": "0wwr28fl46y84p78bxaw9wsb7b4x7hmjywfdx5d70axh0amnlyrv", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -637,7 +645,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - propagatedBuildInputs = [ penlight markdown ]; + propagatedBuildInputs = [ markdown penlight ]; meta = { homepage = "https://github.com/lunarmodules/LDoc"; @@ -653,7 +661,7 @@ buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lgi-0.9.2-1.rockspec"; + url = "mirror://luarocks/lgi-0.9.2-1.rockspec"; sha256 = "1gqi07m4bs7xibsy4vx8qgyp3yb1wnh0gdq1cpwqzv35y6hn5ds3"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -839,7 +847,7 @@ buildLuarocksPackage { }) {}; lpeg_patterns = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua, lpeg +, fetchzip, lpeg, lua }: buildLuarocksPackage { pname = "lpeg_patterns"; @@ -848,12 +856,12 @@ buildLuarocksPackage { url = "mirror://luarocks/lpeg_patterns-0.5-0.rockspec"; sha256 = "1vzl3ryryc624mchclzsfl3hsrprb9q214zbi1xsjcc4ckq5qfh7"; }).outPath; - src = fetchurl { + src = fetchzip { url = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; - sha256 = "17jizbyalzdg009p3x2260bln65xf8xhv9npr0kr93kv986j463b"; + sha256 = "1s3c179a64r45ffkawv9dnxw4mzwkzj00nr9z2gs5haajgpjivw6"; }; - propagatedBuildInputs = [ lua lpeg ]; + propagatedBuildInputs = [ lpeg lua ]; meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; @@ -1104,7 +1112,7 @@ buildLuarocksPackage { }) {}; lua-lsp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, dkjson, lpeglabel, inspect +, fetchgit, dkjson, inspect, lua, lpeglabel }: buildLuarocksPackage { pname = "lua-lsp"; @@ -1127,7 +1135,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; + propagatedBuildInputs = [ dkjson inspect lua lpeglabel ]; meta = { homepage = "https://github.com/Alloyed/lua-lsp"; @@ -1229,7 +1237,7 @@ buildLuarocksPackage { }) {}; lua-resty-jwt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, lua-resty-openssl +, fetchgit, lua-resty-openssl, lua }: buildLuarocksPackage { pname = "lua-resty-jwt"; @@ -1252,7 +1260,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-resty-openssl ]; + propagatedBuildInputs = [ lua-resty-openssl lua ]; meta = { homepage = "https://github.com/cdbattags/lua-resty-jwt"; @@ -1262,7 +1270,7 @@ buildLuarocksPackage { }) {}; lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, lua-resty-http, lua-resty-session, lua-resty-jwt +, fetchgit, lua-resty-session, lua-resty-jwt, lua-resty-http, lua }: buildLuarocksPackage { pname = "lua-resty-openidc"; @@ -1285,7 +1293,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ]; + propagatedBuildInputs = [ lua-resty-session lua-resty-jwt lua-resty-http lua ]; meta = { homepage = "https://github.com/zmartzone/lua-resty-openidc"; @@ -1298,17 +1306,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit}: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.8.8-1"; + version = "0.8.10-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.8.8-1.rockspec"; - sha256 = "17arjjhrxs3sas6d65ffh8nmvb220vrhwiwac3qam42im7zc8544"; + url = "mirror://luarocks/lua-resty-openssl-0.8.10-1.rockspec"; + sha256 = "0rwqc8yy9jk419vyil3c1dc2cmlsy1yf2f8b85i1xvwd8safvc8g"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "7aad15a46bf9f5b81809be53f86ebbdb20ee2e8d", - "date": "2022-04-14T19:05:18+08:00", - "path": "/nix/store/3a8qz63k5xmkx44djm3prwhmig8wmjnf-lua-resty-openssl", - "sha256": "07h1sbfp9l04hr8h6zfgbhs9ray26gr3pa149733wzbdxfkl3bcz", + "rev": "c569d6c2ed4512f2228b61a52c9bb1949dc55f7c", + "date": "2022-06-24T12:22:19+08:00", + "path": "/nix/store/kbpwc7yhba4gqp6lkmdphkvkvhc1m4h6-lua-resty-openssl", + "sha256": "08cw03kihqa2j23p29dxli84zafpdxnx5a4zm625dqzlqnq86ajc", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1564,21 +1572,21 @@ buildLuarocksPackage { }) {}; luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, argparse, luafilesystem +, fetchgit, argparse, luafilesystem, lua }: buildLuarocksPackage { pname = "luacheck"; - version = "0.26.1-1"; + version = "1.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-0.26.1-1.rockspec"; - sha256 = "11r5g6xi1s2d7cpmz2fysfgi78wpszy58rxfkwikqpi6kyc8qmf5"; + url = "mirror://luarocks/luacheck-1.0.0-1.rockspec"; + sha256 = "0q5kqix5n016piqhasp4h22srz1lzp96cjls4fgsbirjn87gsnxv"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luacheck.git", - "rev": "2445a9dd3859655646bd6eb848459f2b46b4a3e3", - "date": "2022-04-23T17:22:03+03:00", - "path": "/nix/store/7a8qrmy41bnn1wgs93b5gi48k30v5bfj-luacheck", - "sha256": "0zrcni7p0bpqmb383608kmfyxwfxs9qa42g3sb4lhvzg2zggri5q", + "rev": "4d2979930245415e556a7c9f47b63ea038afcfee", + "date": "2022-08-24T12:50:43+03:00", + "path": "/nix/store/kfqdn4v9nzqqdw02fri10ic7v61r99n7-luacheck", + "sha256": "1dkqcaf0yrbcwbjiqbpdksj39sj8rbkd8432q568dgq2z5y9khcf", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1587,7 +1595,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua argparse luafilesystem ]; + propagatedBuildInputs = [ argparse luafilesystem lua ]; meta = { homepage = "https://github.com/lunarmodules/luacheck"; @@ -1663,7 +1671,7 @@ buildLuarocksPackage { }) {}; luadbi-mysql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luadbi +, fetchgit, luadbi, lua }: buildLuarocksPackage { pname = "luadbi-mysql"; @@ -1686,7 +1694,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua luadbi ]; + propagatedBuildInputs = [ luadbi lua ]; meta = { homepage = "https://github.com/mwild1/luadbi"; @@ -1729,7 +1737,7 @@ buildLuarocksPackage { }) {}; luadbi-sqlite3 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luadbi +, fetchgit, luadbi, lua }: buildLuarocksPackage { pname = "luadbi-sqlite3"; @@ -1752,7 +1760,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua luadbi ]; + propagatedBuildInputs = [ luadbi lua ]; meta = { homepage = "https://github.com/mwild1/luadbi"; @@ -1801,7 +1809,7 @@ buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaevent-0.4.6-1.rockspec"; + url = "mirror://luarocks/luaevent-0.4.6-1.rockspec"; sha256 = "03zixadhx4a7nh67n0sm6sy97c8i9va1a78hibhrl7cfbqc2zc7f"; }).outPath; src = fetchurl { @@ -1831,10 +1839,10 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luaexpat.git", - "rev": "7d99eec9685087e6b3a57a09d672591c2aa0f4f6", - "date": "2022-04-01T17:08:05+02:00", - "path": "/nix/store/b6jyh79ggjdqgizk9amzh74lq4lwm3nm-luaexpat", - "sha256": "0yia3xpf6pwmy10yg2dnyfg3v774jay24qfyvm9pj21h2ad7ckm1", + "rev": "10b10ca30536ee5df8c814dd18991148984efe24", + "date": "2022-08-29T13:45:12+02:00", + "path": "/nix/store/prmd5hiippdd32qa0xicbf9rw8k39md7-luaexpat", + "sha256": "0rzwrmjy2kbkvhgmprnlqmkl6kqvxqlb5kh9ww3zff0xv7xf03vb", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1953,18 +1961,18 @@ buildLuarocksPackage { }) {}; luaossl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua +, fetchzip, lua }: buildLuarocksPackage { pname = "luaossl"; - version = "20200709-0"; + version = "20220711-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luaossl-20200709-0.rockspec"; - sha256 = "0izxxrzc49q4jancza43b2y4hfvasflpcag771nrhapk1n8k45f3"; + url = "mirror://luarocks/luaossl-20220711-0.rockspec"; + sha256 = "0b68kvfz587ilmb5c1p7920kysg9q4m4fl4cz4d93jl3270mzh8y"; }).outPath; - src = fetchurl { - url = "https://github.com/wahern/luaossl/archive/rel-20200709.zip"; - sha256 = "07j1rqqypjb24x11x6v6qpwf12g0ib23qwg47sw3c2yqkbq744j4"; + src = fetchzip { + url = "https://github.com/wahern/luaossl/archive/rel-20220711.zip"; + sha256 = "1a9pgmc6fbhgh1m9ksz9fq057yzz46npqgakcsy9vngg47xacfdb"; }; propagatedBuildInputs = [ lua ]; @@ -1977,7 +1985,7 @@ buildLuarocksPackage { }) {}; luaposix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, bit32, lua +, fetchzip, bit32, lua }: buildLuarocksPackage { pname = "luaposix"; @@ -1986,9 +1994,9 @@ buildLuarocksPackage { url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; }).outPath; - src = fetchurl { + src = fetchzip { url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; - sha256 = "1xqx764ji054jphxdhkynsmwzqzkfgxqfizxkf70za6qfrvnl3yh"; + sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -2028,21 +2036,21 @@ buildLuarocksPackage { }) {}; luasec = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luasocket +, fetchgit, luasocket, lua }: buildLuarocksPackage { pname = "luasec"; - version = "1.1.0-1"; + version = "1.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasec-1.1.0-1.rockspec"; - sha256 = "1j080wx40cfxfmb42w6jf06yp2wqfnlf281lda6i7lwh4rh2800m"; + url = "mirror://luarocks/luasec-1.2.0-1.rockspec"; + sha256 = "0zavdkwd701j8zqyzrpn1n5xd242vziq2l79amjdn5mcw81nrsdf"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/brunoos/luasec", - "rev": "df27c62f4cea33cb3525fed2a4b280997ed11aad", - "date": "2022-04-13T10:46:36-03:00", - "path": "/nix/store/h9bxbfm36ab2z314lpny78jympq9cxli-luasec", - "sha256": "04zch1ims50phgzqnbpxdfnxyrr9kpb8wi5bm9hhsizrzsx637is", + "rev": "d9215ee00f6694a228daad50ee85827a4cd13583", + "date": "2022-07-30T08:42:53-03:00", + "path": "/nix/store/77m3g768a230h77nxiw23ay73aryq1zh-luasec", + "sha256": "1rz2lhf243lrsjsyjwxhijhqr88l8l8sndzzv9w4x1j0zpa9sblb", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2051,7 +2059,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua luasocket ]; + propagatedBuildInputs = [ luasocket lua ]; meta = { homepage = "https://github.com/brunoos/luasec/wiki"; @@ -2066,17 +2074,17 @@ luasocket = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luasocket"; - version = "3.0.0-1"; + version = "3.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasocket-3.0.0-1.rockspec"; - sha256 = "00j6jss7ifrqsylh1k9254i715z17j99hhawhlkmha1y6wn4glam"; + url = "mirror://luarocks/luasocket-3.1.0-1.rockspec"; + sha256 = "0wg9735cyz2gj7r9za8yi83w765g0f4pahnny7h0pdpx58pgfx4r"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luasocket.git", - "rev": "88c8a85cb6528232288ec590910b7a966aace52b", - "date": "2022-03-25T11:05:48+03:00", - "path": "/nix/store/vn80kf268mjilsnm7850ag4zhan5na2c-luasocket", - "sha256": "0263gmxdpb2snv9yrwqsg3q641a9gm6migqsmi871hrhxaq0l9c1", + "rev": "95b7efa9da506ef968c1347edf3fc56370f0deed", + "date": "2022-07-27T10:07:00+03:00", + "path": "/nix/store/r5pqxqjkdwl80nmjkv400mbls7cfymjc-luasocket", + "sha256": "13hyf9cvny0kxwyg08929kkl31w74j66fj6zg1myyjr9nh5b795h", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2106,10 +2114,10 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/keplerproject/luasql.git", - "rev": "fb70ea47433a66f9b72811cd046dd7d7418a0e89", - "date": "2022-05-29T22:25:54-03:00", - "path": "/nix/store/zkir0i3j5jxb704bi5cnn2i51niabl7c-luasql", - "sha256": "1gnp1892v0g5kzsfrg3l3ykhq81nfv11mhb0djhgrjqx7zaxi24l", + "rev": "b7da7097d91b3233156aba2e7d0c6e5590766884", + "date": "2022-07-27T13:39:06-03:00", + "path": "/nix/store/rb4i0qxm8yy552hhmxdh65sf463qn02f-luasql", + "sha256": "046zv23kk2riyiw1vngbwn2a4rkg9wm3ra2b1vmmhkr9idlncq94", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2129,26 +2137,34 @@ buildLuarocksPackage { }) {}; luassert = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua, say +, fetchgit, say, lua }: buildLuarocksPackage { pname = "luassert"; - version = "1.8.0-0"; + version = "1.9.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luassert-1.8.0-0.rockspec"; - sha256 = "1194y81nlkq4qmrrgl7z82i6vgvhqvp1p673kq0arjix8mv3zyz1"; + url = "mirror://luarocks/luassert-1.9.0-1.rockspec"; + sha256 = "1bkzr03190p33lprgy51nl84aq082fyc3f7s3wkk7zlay4byycxd"; }).outPath; - src = fetchurl { - url = "https://github.com/Olivine-Labs/luassert/archive/v1.8.0.tar.gz"; - sha256 = "0xlwlb32215524bg33svp1ci8mdvh9wykchl8dkhihpxcd526mar"; - }; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lunarmodules/luassert.git", + "rev": "8d8dc8a54cc468048a128a867f6449a6c3fdd11a", + "date": "2022-08-24T00:00:45+03:00", + "path": "/nix/store/vfcl25wxps5kvh5prjkkjlj1ga3kgw63-luassert", + "sha256": "0wlp6qdm9dkwzs8lvnj7zvmid4y12v717ywlhxn2brkbjpvl2dwf", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua say ]; + propagatedBuildInputs = [ say lua ]; meta = { - homepage = "http://olivinelabs.com/busted/"; - description = "Lua Assertions Extension"; + homepage = "https://lunarmodules.github.io/busted/"; + description = "Lua assertions extension"; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }) {}; @@ -2204,7 +2220,7 @@ buildLuarocksPackage { }) {}; luaunit = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua +, fetchzip, lua }: buildLuarocksPackage { pname = "luaunit"; @@ -2213,13 +2229,13 @@ buildLuarocksPackage { url = "mirror://luarocks/luaunit-3.4-1.rockspec"; sha256 = "111435fa8p2819vcvg76qmknj0wqk01gy9d1nh55c36616xnj54n"; }).outPath; - src = fetchurl { + src = fetchzip { url = "https://github.com/bluebird75/luaunit/releases/download/LUAUNIT_V3_4/rock-luaunit-3.4.zip"; - sha256 = "1v8nkiwz2nr242h5cl4af6vmn5gxmn94skps1qhb55ak60j20nvr"; + sha256 = "0qf07y3229lq3qq1mfkv83gzbc7dgyr67hysqjb5bbk333flv56r"; }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua lua ]; + propagatedBuildInputs = [ lua ]; meta = { homepage = "http://github.com/bluebird75/luaunit"; @@ -2314,8 +2330,8 @@ buildLuarocksPackage { }) {}; luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, cmake, fetchurl, lua -}: +, fetchurl, lua +, cmake}: buildLuarocksPackage { pname = "luv"; version = "1.43.0-0"; @@ -2340,7 +2356,7 @@ buildLuarocksPackage { }) {}; lyaml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua +, fetchzip, lua }: buildLuarocksPackage { pname = "lyaml"; @@ -2349,9 +2365,9 @@ buildLuarocksPackage { url = "mirror://luarocks/lyaml-6.2.7-1.rockspec"; sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja"; }).outPath; - src = fetchurl { + src = fetchzip { url = "http://github.com/gvvaughan/lyaml/archive/v6.2.7.zip"; - sha256 = "165mr3krf8g8070j4ax9z0j2plfbdwb8x2zk2hydpqaqa0kcdb0c"; + sha256 = "1qfvk610xgglyv9n2dp0cnh21f20q2zkl941qsv9qcbnm2f03vna"; }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -2424,7 +2440,7 @@ buildLuarocksPackage { }) {}; moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, lpeg, argparse, luafilesystem +, fetchgit, lua, luafilesystem, argparse, lpeg }: buildLuarocksPackage { pname = "moonscript"; @@ -2444,7 +2460,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua lpeg argparse luafilesystem ]; + propagatedBuildInputs = [ lua luafilesystem argparse lpeg ]; meta = { homepage = "http://moonscript.org"; @@ -2477,19 +2493,19 @@ buildLuarocksPackage { }) {}; nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua, mpack, luv, coxpcall +, fetchurl, luv, mpack, lua, coxpcall }: buildLuarocksPackage { pname = "nvim-client"; - version = "0.2.3-1"; + version = "0.2.4-1"; src = fetchurl { - url = "https://github.com/neovim/lua-client/archive/0.2.3-1.tar.gz"; - sha256 = "0w6rc7b9gmz17x4l1q2nv275bkzwvg3pfg5mzsd4wymy2iwrqphf"; + url = "https://github.com/neovim/lua-client/archive/0.2.4-1.tar.gz"; + sha256 = "0sk1lmj0r7pyj9k3p6n0wqjbd95br44ansz0ck3amp6ql8f9kprf"; }; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua mpack luv coxpcall ]; + propagatedBuildInputs = [ luv mpack lua coxpcall ]; meta = { homepage = "https://github.com/neovim/lua-client"; @@ -2500,17 +2516,17 @@ buildLuarocksPackage { penlight = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua, luafilesystem -}: +, busted}: buildLuarocksPackage { pname = "penlight"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", - "rev": "a7b9f888cd72dfa875e3b7cc3b88be632f567d79", - "date": "2022-03-24T13:21:29+01:00", - "path": "/nix/store/vk0z1hx9rwl45g3nn0f6c4m6mx8d9p65-penlight", - "sha256": "0w5w13gdbbnli23zmixy20jq6z3j5p6z3br3abpl5qh36b01i5p4", + "rev": "d5958e242b95984a278c39c63fadc5ef1258978b", + "date": "2022-08-14T10:06:20+02:00", + "path": "/nix/store/91nha43c2gdjyn8146fn9zfghlgvvdzz-penlight", + "sha256": "0bvc1a3g41mx8wlaq4ig3cl568rsysyggsr00hf7bi0ygf529sny", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2520,6 +2536,7 @@ buildLuarocksPackage { disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; + checkInputs = [ busted ]; meta = { homepage = "https://lunarmodules.github.io/penlight"; @@ -2538,10 +2555,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "54b2e3d58f567983feabaeb9408eccf6b7f32206", - "date": "2022-06-01T15:32:39+02:00", - "path": "/nix/store/j29rrzs7dsm6720rsjmzk7r1a27zv7h1-plenary.nvim", - "sha256": "1ldjdc7yq4awlllr9dcv8fnkcwgdpvj0py5mhvx3v1yjniwrkn2i", + "rev": "4b66054e75356ac0b909bbfee9c682e703f535c2", + "date": "2022-09-03T11:21:04+02:00", + "path": "/nix/store/gaphh0qlf40ryk2000plscvzcbzg0kz5-plenary.nvim", + "sha256": "1yl5m7is35bk30swr5m1pcl2i0wf8gjcnas6bpahlxqa4x0yr1x8", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2560,8 +2577,8 @@ buildLuarocksPackage { }) {}; rapidjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, cmake, fetchgit, lua -}: +, fetchgit, lua +, cmake}: buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; @@ -2591,7 +2608,7 @@ buildLuarocksPackage { }) {}; readline = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua, luaposix +, fetchurl, luaposix, lua }: buildLuarocksPackage { pname = "readline"; @@ -2606,7 +2623,7 @@ buildLuarocksPackage { }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua luaposix ]; + propagatedBuildInputs = [ luaposix lua ]; meta = { homepage = "http://pjb.com.au/comp/lua/readline.html"; @@ -2616,24 +2633,33 @@ buildLuarocksPackage { }) {}; say = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +, fetchgit, lua +, busted}: buildLuarocksPackage { pname = "say"; - version = "1.3-1"; + version = "scm-1"; - src = fetchurl { - url = "https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz"; - sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; - }; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lunarmodules/say.git", + "rev": "45a3057e68c52b34ab59ef167efeb2340e356661", + "date": "2022-08-27T11:00:01+03:00", + "path": "/nix/store/324ryi5hlaisnyp4wpd1hvzcfv508i4s-say", + "sha256": "178pdsswwnja2f106701xmdxsdijjl5smm28dhhdcmjyb4mn8cr2", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; + checkInputs = [ busted ]; meta = { - homepage = "http://olivinelabs.com/busted/"; - description = "Lua String Hashing/Indexing Library"; - license.fullName = "MIT <http://opensource.org/licenses/MIT>"; + homepage = "https://lunarmodules.github.io/say"; + description = "Lua string hashing/indexing library"; + license.fullName = "MIT"; }; }) {}; @@ -2666,13 +2692,14 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/pkulchenko/serpent"; description = "Lua serializer and pretty printer"; + maintainers = with lib.maintainers; [ lockejan ]; license.fullName = "MIT"; }; }) {}; sqlite = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, luv -}: +, plenary-nvim}: buildLuarocksPackage { pname = "sqlite"; version = "v1.2.2-0"; @@ -2694,6 +2721,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; propagatedBuildInputs = [ luv ]; + checkInputs = [ plenary-nvim ]; meta = { homepage = "https://github.com/tami5/sqlite.lua"; @@ -2711,10 +2739,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lua-stdlib/_debug.git", - "rev": "eaaa493937974889007158fa8681835b312d2a35", - "date": "2022-01-02T17:12:19-08:00", - "path": "/nix/store/qrzwpcg9airmlnayfgxspy7p7pa8csyl-_debug", - "sha256": "0nik882xm0d243ah8v2z5przcny7pfbbj529yn4qyvvz67lsfydb", + "rev": "6ab5e78ef21ad9877e9733a178df4799b983e178", + "date": "2022-06-29T11:27:54-07:00", + "path": "/nix/store/c3p5jq6bawdmfnq1ayw6d7kwwc9sqmig-_debug", + "sha256": "1q0gvwwjclf4galz9c9h2xbzh799xswr9z9b7lncmwb5ky2jwpcy", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2763,7 +2791,7 @@ buildLuarocksPackage { }) {}; stdlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua +, fetchzip, lua }: buildLuarocksPackage { pname = "stdlib"; @@ -2772,9 +2800,9 @@ buildLuarocksPackage { url = "mirror://luarocks/stdlib-41.2.2-1.rockspec"; sha256 = "0rscb4cm8s8bb8fk8rknc269y7bjqpslspsaxgs91i8bvabja6f6"; }).outPath; - src = fetchurl { + src = fetchzip { url = "http://github.com/lua-stdlib/lua-stdlib/archive/release-v41.2.2.zip"; - sha256 = "0is8i8lk4qq4afnan0vj1bwr8brialyrva7cjy43alzgwdphwynx"; + sha256 = "0ry6k0wh4vyar1z68s0qmqzkdkfn9lcznsl8av7x78qz6l16wfw4"; }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -2789,21 +2817,21 @@ buildLuarocksPackage { }) {}; tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, compat53, argparse, luafilesystem -}: +, fetchgit, argparse, compat53, luafilesystem +, dkjson}: buildLuarocksPackage { pname = "tl"; - version = "0.13.2-1"; + version = "0.14.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tl-0.13.2-1.rockspec"; - sha256 = "0a9nr03q6w1689drd0r2y8m7qbyxm8n6bkgjplwkr6c6abvbis3f"; + url = "mirror://luarocks/tl-0.14.1-1.rockspec"; + sha256 = "09nm8vgn1j33bj6612h48jqv7vd72qm06f6rly0angkpcdzb2cd7"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/teal-language/tl", - "rev": "473fef59f21e836e1337a0e3da3c759a1e3556bd", - "date": "2021-07-30T21:02:34-03:00", - "path": "/nix/store/29dm1abr2cc9zqs9n9lymg92gaxqh09g-tl", - "sha256": "1cj7ihw1kz1n1jkha6q0mq0qmlw1vi04i6pcbw3w1cdf2i4fcglh", + "rev": "2a0426ed42a3616981410bab0ef1faa55ab9795d", + "date": "2022-08-23T02:17:01-03:00", + "path": "/nix/store/50p7nazikq1n1nffl84lnh8l39nm18pq-tl", + "sha256": "04bbls8dc0jg7vbqwafn24gqna4swk3aa760i98hnrbmax39pzh2", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2811,7 +2839,8 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - propagatedBuildInputs = [ compat53 argparse luafilesystem ]; + propagatedBuildInputs = [ argparse compat53 luafilesystem ]; + checkInputs = [ dkjson ]; meta = { homepage = "https://github.com/teal-language/tl"; diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index cdef83e999e2b..d703240cec451 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -4,6 +4,7 @@ , cython , datamodeldict , fetchFromGitHub +, fetchpatch , matplotlib , numericalunits , numpy @@ -12,6 +13,7 @@ , potentials , pymatgen , pytest +, pytestCheckHook , pythonOlder , pythonAtLeast , requests @@ -21,19 +23,44 @@ }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.4.5"; pname = "atomman"; format = "setuptools"; - disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "usnistgov"; repo = "atomman"; rev = "v${version}"; - hash = "sha256-iLAB0KMtrTCyGpx+81QfHDPVDhq8OA6CDL/ipVRpyo0="; + hash = "sha256-wXz/uHjXKHVKJu/HoFF2mADSBLp6UGF9ivOp2ZOz/Ys="; }; + patches = [ + # Fix several tests that are failing on master. + # https://github.com/usnistgov/atomman/pull/9 + (fetchpatch { + name = "fix-tests-1.patch"; + url = "https://github.com/usnistgov/atomman/commit/d255977a5e0ce4584e2c886f6c55ccb9f5932731.patch"; + hash = "sha256-lBFOgcozY85JfQVsVjd51Jf9mrokwQuYdxa8l7VzkqU="; + }) + (fetchpatch { + name = "fix-tests-2.patch"; + url = "https://github.com/usnistgov/atomman/commit/de4177f28ad7c48d482cb606f323128e2fcb86aa.patch"; + hash = "sha256-+YpwdKCT/OTue3b2GOk9Jagg26r1PTTV2Zg+GGBd8sM="; + }) + (fetchpatch { + name = "fix-tests-3.patch"; + url = "https://github.com/usnistgov/atomman/commit/10b168493ee883348699f1e42680423cec84bed5.patch"; + hash = "sha256-b4f3POjiceq3xApfjnKAs9dEf1trCiTIyu7hMPL0ZTw="; + }) + (fetchpatch { + name = "fix-tests-4.patch"; + url = "https://github.com/usnistgov/atomman/commit/057d24c70427bab3c7c530251ceb5f4e27eb5c56.patch"; + hash = "sha256-FTg/GNRZ5xigGW8SpUTIw2/GEzOxwb1rsv2wGebmZOk="; + }) + ]; + propagatedBuildInputs = [ cython datamodeldict @@ -48,22 +75,25 @@ buildPythonPackage rec { xmltodict ]; + preCheck = '' + # By default, pytestCheckHook imports atomman from the current directory + # instead of from where `pip` installs it and fails due to missing Cython + # modules. Fix this by removing atomman from the current directory. + # + rm -r atomman + ''; + checkInputs = [ ase phonopy pymatgen pytest + pytestCheckHook ]; - checkPhase = '' - # pytestCheckHook doesn't work - pytest tests -k "not test_rootdir and not test_version \ - and not test_atomic_mass and not imageflags \ - and not test_build_unit and not test_set_and_get_in_units \ - and not test_set_literal and not test_scalar_model " \ - --ignore tests/plot/test_interpolate.py \ - --ignore tests/tools/test_vect_angle.py - ''; + disabledTests = [ + "test_unique_shifts_prototype" # needs network access to download database files + ]; pythonImportsCheck = [ "atomman" diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 38f146a71d137..2ae55b6bacd3c 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , hatchling @@ -14,33 +13,31 @@ , pytest-timeout , pytest-tornasync , ruamel-yaml -, strict-rfc3339 +, importlib-metadata }: buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.15.0"; + version = "2.15.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qRxRXg55caj3w8mDS3SIV/faxQL5NgS/KDmHmR/Zh+8="; + sha256 = "sha256-MFMTlw4THFkM93u2uMp+mFkbwwQRHo0QO8kdIS6UeW8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov jupyterlab_server --cov-report term-missing --cov-report term:skip-covered" "" - - # translation tests try to install additional packages into read only paths - rm -r tests/translations/ - ''; - nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ requests jsonschema json5 babel jupyter_server ]; + propagatedBuildInputs = [ + requests + jsonschema + json5 + babel + jupyter_server + ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; checkInputs = [ openapi-core @@ -50,19 +47,25 @@ buildPythonPackage rec { ruamel-yaml ]; + postPatch = '' + # translation tests try to install additional packages into read only paths + rm -r tests/translations/ + ''; + preCheck = '' export HOME=$(mktemp -d) ''; pytestFlagsArray = [ - # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives + # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. + # Use setuptools or check PEP 632 for potential alternatives. "-W ignore::DeprecationWarning" ]; __darwinAllowLocalNetworking = true; meta = with lib; { - description = "JupyterLab Server"; + description = "A set of server components for JupyterLab and JupyterLab like applications"; homepage = "https://jupyter.org"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pylibdmtx/default.nix b/pkgs/development/python-modules/pylibdmtx/default.nix new file mode 100644 index 0000000000000..2152ac54241d4 --- /dev/null +++ b/pkgs/development/python-modules/pylibdmtx/default.nix @@ -0,0 +1,47 @@ +{ fetchFromGitHub +, buildPythonPackage +, pillow +, numpy +, libdmtx +, lib +}: + +buildPythonPackage rec { + pname = "pylibdmtx"; + version = "0.1.10"; + + src = fetchFromGitHub { + owner = "NaturalHistoryMuseum"; + repo = pname; + rev = "v${version}"; + hash = "sha256-vNWzhO4V0mj4eItZ0Z5UG9RBCqprIcgMGNyIe1+mXWY="; + }; + + # Change: + # def load(): + # """Loads the libdmtx shared library. + # + # To: + # def load(): + # return cdll.LoadLibrary("/nix/store/.../lib/libdmtx.so") + # """Loads the libdmtx shared library. + postPatch = '' + sed -i '\#def load.*#a\ return cdll.LoadLibrary("${libdmtx}/lib/libdmtx.so")' \ + pylibdmtx/dmtx_library.py + + # Checks that the loader works in various scenarios, but we just + # forced it to only work one way. + rm pylibdmtx/tests/test_dmtx_library.py + ''; + + propagatedBuildInputs = [ pillow numpy ]; + + pythonImportsCheck = [ "pylibdmtx" ]; + + meta = with lib; { + description = "Read and write Data Matrix barcodes from Python 2 and 3 using the libdmtx library"; + homepage = "https://github.com/NaturalHistoryMuseum/pylibdmtx/"; + license = licenses.mit; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix new file mode 100644 index 0000000000000..4e2b9acdf64bc --- /dev/null +++ b/pkgs/development/python-modules/remi/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, matplotlib +, python-snap7 +, opencv4 +}: + +buildPythonPackage rec { + pname = "remi"; + version = "2022.7.27"; + + src = fetchFromGitHub { + owner = "rawpython"; + repo = pname; + rev = version; + hash = "sha256-VQn+Uzp6oGSit8ot0e8B0C2N41Q8+J+o91skyVN1gDA="; + }; + + preCheck = '' + # for some reason, REMI already deal with these using try blocks, but they fail + substituteInPlace test/test_widget.py \ + --replace \ + "from html_validator import " \ + "from .html_validator import " + substituteInPlace test/test_examples_app.py \ + --replace \ + "from mock_server_and_request import " \ + "from .mock_server_and_request import " \ + --replace \ + "from html_validator import " \ + "from .html_validator import " + # Halves number of warnings + substituteInPlace test/test_*.py \ + --replace \ + "self.assertEquals(" \ + "self.assertEqual(" + ''; + + checkInputs = [ + pytestCheckHook + python-snap7 + opencv4 + matplotlib + ]; + + pythonImportsCheck = [ + "remi" + "editor" + "editor.widgets" + ]; + + meta = with lib; { + description = "Pythonic, lightweight and websocket-based webui library"; + homepage = "https://github.com/rawpython/remi"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index aae1c7af173bb..95d919155cc68 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -26,6 +26,10 @@ buildGoModule rec { ./skip_test_requiring_network.patch # Skip TestWorkspaceGit which requires .git and commits. ./skip_test_requiring_dotgit.patch + # Skips the invalid_upstream test as it is flakey. Based on upstream commit + # 27930caf2eb35c2592a77f59ed5afe4d9e2fb7ea. + # This patch may be removed on the next buf update. + ./skip_test_invalid_upstream_flakey.patch ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/buf/skip_test_invalid_upstream_flakey.patch b/pkgs/development/tools/buf/skip_test_invalid_upstream_flakey.patch new file mode 100644 index 0000000000000..db62f6a402603 --- /dev/null +++ b/pkgs/development/tools/buf/skip_test_invalid_upstream_flakey.patch @@ -0,0 +1,24 @@ +diff --git a/private/bufpkg/bufstudioagent/bufstudioagent_test.go b/private/bufpkg/bufstudioagent/bufstudioagent_test.go +index 6e010937..9cacc082 100644 +--- a/private/bufpkg/bufstudioagent/bufstudioagent_test.go ++++ b/private/bufpkg/bufstudioagent/bufstudioagent_test.go +@@ -186,6 +186,19 @@ func testPlainPostHandlerErrors(t *testing.T, upstreamServer *httptest.Server) { + }) + + t.Run("invalid_upstream", func(t *testing.T) { ++ // TODO: unskip this test. This is flaky because of two reasons: ++ // ++ // 1. When a connection is closed, the underlying HTTP client does not ++ // always knows it, since the http handler implementation in go has no way ++ // of changing the connection timeout. See: ++ // https://github.com/golang/go/issues/16100 ++ // ++ // 2. The expected status code is `StatusBadGateway` since the issue ++ // happened client-side (a response never came back from the server). This ++ // is not deterministic in the business logic because we're based on the ++ // connect error code that's returned. See ++ // https://linear.app/bufbuild/issue/BSR-383/flaky-test-in-bufstudioagent-testgo ++ t.SkipNow() + listener, err := net.Listen("tcp", "127.0.0.1:") + require.NoError(t, err) + go func() { diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index b964262f56c3f..77a206545150c 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -25,15 +25,15 @@ in rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "1.4.1"; + version = "2.0.0"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - sha256 = "sha256-mRdDc4fHMkwkszY+2l8z1RSNMEQnrWI5/Y0Y2W+guQE="; + sha256 = "sha256-PBfVLqm9vEbf1tDTx4v8U1amYwC0hpYTAYcWyfHB84g="; }; - cargoSha256 = "sha256-sQ762Ss31sA5qALHzwkvwbfRXo00cCtqzQyoz3/zf6I="; + cargoSha256 = "sha256-8bvJwdZEdIChFUdTVL+EyjzqI+OAJaVMOOyspReSFzc="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index f3e5bd0337ed1..0208235de3aeb 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.2.0"; + version = "9.2.2"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-vNTL1yIGYgldjC69Yhj8fGShvfaDv5zM82cxwZMpzQw="; + sha256 = "sha256-aHsBey1WzmRhcrCeHeAeVuEvX4iaxbIb/C7N6tCOyuY="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 70df08af2de03..0817c78d48034 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "luarocks"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; - sha256 = "sha256-i0NmF268aK5lr4zjYyhk4TPUO7Zyz0Cl0fSW43Pmd1Q="; + sha256 = "sha256-G6HDap3pspeQtGDBq+ukN7kftDaT/CozMVdYM60F6HI="; }; patches = [ ./darwin-3.7.0.patch ]; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index d7dba4f59afb4..d99f203f6d27c 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -1,20 +1,24 @@ -{ luarocks, fetchFromGitHub, nix-update-script }: +{ luarocks, fetchFromGitHub, unstableGitUpdater }: luarocks.overrideAttrs(old: { pname = "luarocks-nix"; + version = "unstable-2022-09-04"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "b1ff9eeb64c7c1dc5fc177008d6f2be9191c6aa2"; - sha256 = "sha256-mkzrf/6yMyLMIEDwsuCIxi1HJvg57ybyZPXVheFAAHE="; + rev = "cfc1439a29ac666fb0fcf440224adf73004655d4"; + sha256 = "sha256-uHkE9ztOZDs2pi7to3kZ0iELRhv/gPQgTK+qyYpFZ/Y="; }; + patches = []; passthru = { - updateScript = nix-update-script { - attrPath = "luarocks-nix"; + updateScript = unstableGitUpdater { + branch = "use-fetchzip"; }; }; - meta.mainProgram = "luarocks"; + meta = { + mainProgram = "luarocks"; + }; }) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 6a442424c4f73..562bd1138dfcd 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, jdk, jre, coursier, makeWrapper }: +{ lib, stdenv, jre, coursier, makeWrapper, setJavaClassPath }: let baseName = "scalafmt"; - version = "3.4.3"; + version = "3.5.2"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -12,16 +12,15 @@ let cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "FWGvhKK/VnvetnHS35/z1errYTRZCrcfWyEAHlhKApk="; + outputHash = "sha256-1QP5a0QjYUDU3JzrIX2rM/DclRfU/ACSXVLd6C7uFCo="; }; in stdenv.mkDerivation { pname = baseName; inherit version; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk deps ]; + nativeBuildInputs = [ makeWrapper setJavaClassPath ]; + buildInputs = [ deps ]; dontUnpack = true; diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index 43feb8b7c2a85..f9a453195f740 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "blightmud"; - version = "3.5.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-DaICzwBew90YstV42wiY0IbvR1W4Hm8dzo3xY2qlMGQ="; + sha256 = "sha256-0TFJjOuaixBqpo6gHJynIbVHvI+PxRhwdubIXDcR098="; }; - cargoSha256 = "sha256-BamMTPh+GN9GG4puxyTauPhjCC8heCu1wsgFaw98s9U="; + cargoSha256 = "sha256-jTyXoEC/QBeVbAnv2BspflGP1jA9qH+NPrRAx3x2kEg="; buildFeatures = lib.optional withTTS "tts"; @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage rec { "test_gmcp_negotiation" "test_ttype_negotiation" "test_reconnect" + "test_is_connected" "test_mud" "test_server" "test_lua_script" @@ -75,7 +76,5 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ cpu ]; platforms = platforms.linux; - # See https://github.com/NixOS/nixpkgs/pull/160120 - broken = withTTS; }; } diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index c136f935e03e5..2a6ae96cef119 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,16 @@ +diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build +index b0ff5b106..13ac380d0 100644 +--- a/data/bios-settings.d/meson.build ++++ b/data/bios-settings.d/meson.build +@@ -1,5 +1,5 @@ + if build_standalone and host_machine.system() == 'linux' + install_data('README.md', +- install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d') ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'bios-settings.d') + ) + endif diff --git a/data/meson.build b/data/meson.build -index d8494020d..7c896fa0d 100644 +index 3a77a7bfc..747bd1988 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,7 +26,7 @@ endif @@ -83,7 +94,7 @@ index 1d1698a7e..5469d00a6 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index e6b717078..f8a7a7455 100644 +index e7980e965..2c66e2dc4 100644 --- a/meson.build +++ b/meson.build @@ -195,6 +195,12 @@ endif @@ -100,7 +111,7 @@ index e6b717078..f8a7a7455 100644 gio = dependency('gio-2.0', version: '>= 2.45.8') giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index 06d242371..d9e517fc0 100644 +index 6cf92e72e..2e8568292 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -121,7 +132,7 @@ index 67bd3b9d9..ad04a91b6 100644 ) endif diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index 13f03ccd4..9235ebe33 100644 +index d626c3ad3..5a2f847d5 100644 --- a/plugins/msr/meson.build +++ b/plugins/msr/meson.build @@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 541bef93a8a3b..66cfbef940bff 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -114,7 +114,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.3"; + version = "1.8.4"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -123,7 +123,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-ciIpd86KhmJRH/o8CIFWb2xFjsjWHSUNlGYRfWEiOOw="; + sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY="; }; patches = [ @@ -322,6 +322,7 @@ let passthru = { filesInstalledToEtc = [ + "fwupd/bios-settings.d/README.md" "fwupd/daemon.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index b4b8b410e5533..ae7e4b868882c 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.0.3"; + version = "1.1.1"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-VApcTYARC6NaVmwXgpzW8xRE23refGudBgPsyq7Ypig="; + sha256 = "sha256-ClVHThhcf4QkYhgJevTKroBe0z0YZX83qKFB0thH6eM="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Subtitle manager for Sonarr and Radarr"; homepage = "https://www.bazarr.media/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ d-xo ]; platforms = platforms.all; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 1406cc7d77001..41b5b2918b065 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -48,6 +48,15 @@ stdenv.mkDerivation rec { for f in "$lib/lib/"*.la "$dev/bin/"bind*-config; do sed -i "$f" -e 's|-L${openssl.dev}|-L${lib.getLib openssl}|g' done + + cat <<EOF >$out/etc/rndc.conf + include "/etc/bind/rndc.key"; + options { + default-key "rndc-key"; + default-server 127.0.0.1; + default-port 953; + }; + EOF ''; doCheck = false; # requires root and the net diff --git a/pkgs/servers/kanidm/default.nix b/pkgs/servers/kanidm/default.nix index f160886fb6400..0984a622330cd 100644 --- a/pkgs/servers/kanidm/default.nix +++ b/pkgs/servers/kanidm/default.nix @@ -17,16 +17,16 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.1.0-alpha.8"; + version = "1.1.0-alpha.9"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-zMtbE6Y9wXFPBqhmiTMJ3m6bLVZl+c6lRY39DWDlJNo="; + rev = "985462590b1c49b26a0b0ee01e24b1eb01942165"; + hash = "sha256-JtoDuA3NCKmX+wDqav30VwrLeDALYat1iKFWpbYOO1s="; }; - cargoSha256 = "sha256:1l7xqp457zfd9gfjp6f4lzgadfp6112jbip4irazw4084qwj0z6x"; + cargoSha256 = "sha256-pkBkXIG2PF5YMeighQwHwhURWbJabfveyszRIdrQjcA="; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; @@ -56,25 +56,22 @@ rustPlatform.buildRustPackage rec { pam ]; - # Failing tests, probably due to network issues - checkFlags = [ - "--skip default_entries" - "--skip oauth2_openid_basic_flow" - "--skip test_server" - "--skip test_cache" - ]; + # The UI needs to be in place before the tests are run. + postBuild = '' + # We don't compile the wasm-part form source, as there isn't a rustc for + # wasm32-unknown-unknown in nixpkgs yet. + mkdir $out + cp -r kanidmd_web_ui/pkg $out/ui + ''; preFixup = '' - installShellCompletion --bash $releaseDir/build/completions/*.bash - installShellCompletion --zsh $releaseDir/build/completions/_* + installShellCompletion \ + --bash $releaseDir/build/completions/*.bash \ + --zsh $releaseDir/build/completions/_* # PAM and NSS need fix library names mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2 mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so - - # We don't compile the wasm-part form source, as there isn't a rustc for - # wasm32-unknown-unknown in nixpkgs yet. - cp -r kanidmd_web_ui/pkg $out/ui ''; passthru.tests = { inherit (nixosTests) kanidm; }; diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix new file mode 100644 index 0000000000000..f85937576deaf --- /dev/null +++ b/pkgs/shells/carapace/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGo117Module, fetchFromGitHub }: + +buildGo117Module rec { + pname = "carapace"; + version = "0.8.10"; + + src = fetchFromGitHub { + owner = "rsteube"; + repo = "${pname}-bin"; + rev = "v${version}"; + sha256 = "0j60fvrmjm4440gj9hib2ar386zxcblw7yifigsnchr7p3i2187n"; + }; + + vendorSha256 = "1s1sws79cyz1rl63wayzf7yhb04x29a4a1mkifqnl4cc2pv806jf"; + + subPackages = [ "./cmd/carapace" ]; + + tags = [ "release" ]; + + preBuild = '' + go generate ./... + ''; + + meta = with lib; { + description = "Multi-shell multi-command argument completer"; + homepage = "https://rsteube.github.io/carapace-bin/"; + maintainers = with maintainers; [ mredaelli ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/shells/fish/plugins/bass.nix b/pkgs/shells/fish/plugins/bass.nix new file mode 100644 index 0000000000000..db2907bddf409 --- /dev/null +++ b/pkgs/shells/fish/plugins/bass.nix @@ -0,0 +1,30 @@ +{ lib, buildFishPlugin, fetchFromGitHub, python3 }: + +buildFishPlugin rec { + pname = "bass"; + version = "unstable-2021-02-18"; + + src = fetchFromGitHub { + owner = "edc"; + repo = pname; + rev = "2fd3d2157d5271ca3575b13daec975ca4c10577a"; + sha256 = "0mb01y1d0g8ilsr5m8a71j6xmqlyhf8w4xjf00wkk8k41cz3ypky"; + }; + + #buildFishplugin will only move the .fish files, but bass also relies on python + postInstall = '' + cp functions/__bass.py $out/share/fish/vendor_functions.d/ + ''; + + checkInputs = [ python3 ]; + checkPhase = '' + make test + ''; + + meta = with lib; { + description = "Fish function making it easy to use utilities written for Bash in Fish shell"; + homepage = "https://github.com/edc/bass"; + license = licenses.mit; + maintainers = with maintainers; [ beezow ]; + }; +} diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 0cc6eb6b89edf..cb2d73dacc5a1 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -8,6 +8,8 @@ lib.makeScope newScope (self: with self; { clownfish = callPackage ./clownfish.nix { }; + bass = callPackage ./bass.nix { }; + done = callPackage ./done.nix { }; # Fishtape 2.x and 3.x aren't compatible, diff --git a/pkgs/shells/zsh/zi/default.nix b/pkgs/shells/zsh/zi/default.nix new file mode 100644 index 0000000000000..b1adbe8d66162 --- /dev/null +++ b/pkgs/shells/zsh/zi/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, installShellFiles, stdenvNoCC }: + +stdenvNoCC.mkDerivation rec { + pname = "zi"; + version = "unstable-2022-04-09"; + src = fetchFromGitHub { + owner = "z-shell"; + repo = pname; + rev = "4ca4d3276ca816c3d37a31e47d754f9a732c40b9"; + sha256 = "sha256-KcDFT0is5Ef/zRo6zVfxYfBMOb5oVaVFT4EsUrfiMko="; + }; + + dontBuild = true; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + mkdir -p $out + cp -r lib zi.zsh $out + installManPage docs/man/zi.1 + installShellCompletion --zsh lib/_zi + ''; + + meta = with lib; { + homepage = "https://github.com/z-shell/zi"; + description = "A Swiss Army Knife for Zsh - Unix Shell"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + }; +} diff --git a/pkgs/tools/backup/gyb/default.nix b/pkgs/tools/backup/gyb/default.nix new file mode 100644 index 0000000000000..2c82f40f583e5 --- /dev/null +++ b/pkgs/tools/backup/gyb/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, python3 +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "gyb"; + version = "1.62"; + format = "other"; + + src = fetchFromGitHub { + owner = "GAM-team"; + repo = "got-your-back"; + rev = "v${version}"; + sha256 = "sha256-HaexQ0y5i9Q0xgjzAX6E2xeyeDvARo7/Gx3ytohRT7U="; + }; + + propagatedBuildInputs = with python3Packages; [ + google-api-python-client + google-auth + google-auth-oauthlib + google-auth-httplib2 + httplib2 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,${python3.sitePackages}} + mv gyb.py "$out/bin/gyb" + mv *.py "$out/${python3.sitePackages}/" + + runHook postInstall + ''; + + checkPhase = '' + $out/bin/gyb --help > /dev/null + ''; + + meta = with lib; { + description = '' + Got Your Back (GYB) is a command line tool for backing up your Gmail + messages to your computer using Gmail's API over HTTPS. + ''; + homepage = "https://github.com/GAM-team/got-your-back"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/tools/filesystems/afsctool/default.nix b/pkgs/tools/filesystems/afsctool/default.nix new file mode 100644 index 0000000000000..303ec05bf8349 --- /dev/null +++ b/pkgs/tools/filesystems/afsctool/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, git +, zlib +, sparsehash +, CoreServices +}: + +stdenv.mkDerivation rec { + pname = "afsctool"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "RJVB"; + repo = pname; + rev = version; + hash = "sha256-rqca7gpH46hk4MEPMHqYnteYJnGpLS/gu4XP7xWqDzo="; + }; + + nativeBuildInputs = [ pkg-config cmake git ]; + buildInputs = [ zlib sparsehash CoreServices ]; + + meta = with lib; { + description = "Utility that allows end-users to leverage HFS+/APFS compression"; + license = licenses.unfree; + maintainers = [ maintainers.viraptor ]; + platforms = platforms.darwin; + homepage = "https://github.com/RJVB/afsctool"; + }; +} diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/tools/filesystems/ceph-csi/default.nix index 28d8e36f95028..2069bd0f23ce5 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.5.1"; + version = "3.7.0"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-TKNpMRZALMBgK9kN6aVokC+JpRo18AOJIXKNb1ZGgkQ="; + sha256 = "sha256-DmYwLhJoWPsqtXQp2+vpUuEBfo7dTQkxMVa+/oR6LZk="; }; preConfigure = '' diff --git a/pkgs/tools/graphics/dippi/default.nix b/pkgs/tools/graphics/dippi/default.nix new file mode 100644 index 0000000000000..9c037d6d4a9f2 --- /dev/null +++ b/pkgs/tools/graphics/dippi/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, python3 +, vala +, glib +, gtk3 +, gtk4 +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "dippi"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "cassidyjames"; + repo = "dippi"; + rev = version; + hash = "sha256-6eZRz3/LaZwy8DzC/8q9Jrebcx86hHri6KBgThU7Dhw="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook4 + appstream-glib + desktop-file-utils + # For post_install.py + python3 + glib + gtk3 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + postPatch = '' + patchShebangs build-aux/meson/post_install.py + ''; + + postInstall = '' + ln -s $out/bin/com.github.cassidyjames.dippi $out/bin/dippi + ''; + + meta = with lib; { + description = "Calculate display info like DPI and aspect ratio"; + homepage = "https://github.com/cassidyjames/dippi"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index c25340e383501..c73598fd6ca1a 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,7 +1,5 @@ { lib, stdenv , substituteAll -, fetchurl -, fetchpatch , fetchFromGitHub , autoreconfHook , gettext @@ -60,22 +58,16 @@ in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.26"; + version = "1.5.27"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "7Vuj4Gyd+dLUoCkR4SPkfGPwVQPRo2pHk0pRAsmtjxc="; + sha256 = "sha256-DwX7SYRb18C0Lz2ySPS3yV99Q1xQezs0Ls2P7Rbtk5Q="; }; patches = [ - # Fixes systemd unit installation path https://github.com/ibus/ibus/pull/2388 - (fetchpatch { - url = "https://github.com/ibus/ibus/commit/33b4b3932bfea476a841f8df99e20049b83f4b0e.patch"; - sha256 = "kh8SBR+cqsov/B0A2YXLJVq1F171qoSRUKbBPHjPRHI="; - }) - (substituteAll { src = ./fix-paths.patch; pythonInterpreter = python3Runtime.interpreter; diff --git a/pkgs/tools/misc/dwarf2json/default.nix b/pkgs/tools/misc/dwarf2json/default.nix new file mode 100644 index 0000000000000..acad4c64bfee1 --- /dev/null +++ b/pkgs/tools/misc/dwarf2json/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "dwarf2json"; + version = "unstable-2021-04-15"; + + src = fetchFromGitHub { + owner = "volatilityfoundation"; + repo = "dwarf2json"; + rev = "e8a1ce85dc33bf2039adc7f8a5f47f3016153720"; + sha256 = "sha256-hnS00glAcj78mZp5as63CsEn+dcr+GNEkz8iC3KM0h0="; + }; + + vendorSha256 = "sha256-tgs0l+sYdAxMHwVTew++keNpDyrHmevpmOBVIiuL+34="; + + meta = with lib; { + homepage = "https://github.com/volatilityfoundation/dwarf2json"; + description = "Convert ELF/DWARF symbol and type information into vol3's intermediate JSON"; + license = licenses.vol-sl; + platforms = platforms.unix; + maintainers = with maintainers; [ arkivm ]; + }; +} diff --git a/pkgs/tools/misc/findup/default.nix b/pkgs/tools/misc/findup/default.nix new file mode 100644 index 0000000000000..0b7d687922f45 --- /dev/null +++ b/pkgs/tools/misc/findup/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, zig, testers, findup }: + +stdenv.mkDerivation rec { + pname = "findup"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "hiljusti"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-erlKIiYYlWnhoeD3FnKdxnHjfGmmJVXk44DUja5Unig="; + }; + + nativeBuildInputs = [ zig ]; + + # Builds and installs (at the same time) with Zig. + dontConfigure = true; + dontBuild = true; + + # Give Zig a directory for intermediate work. + preInstall = '' + export HOME=$TMPDIR + ''; + + installPhase = '' + runHook preInstall + zig build -Drelease-safe -Dcpu=baseline --prefix $out + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { package = findup; }; + + meta = with lib; { + homepage = "https://github.com/hiljusti/findup"; + description = "Search parent directories for sentinel files"; + license = licenses.mit; + maintainers = with maintainers; [ hiljusti ]; + }; +} diff --git a/pkgs/tools/misc/gomi/default.nix b/pkgs/tools/misc/gomi/default.nix new file mode 100644 index 0000000000000..e205216057fa5 --- /dev/null +++ b/pkgs/tools/misc/gomi/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gomi"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "b4b4r07"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-zLHP6PI2YeW1Fn6OPuMaiAPHOdudfKO4YP3XTh9HXNc="; + }; + + vendorSha256 = "sha256-7Qy7Akp/yP+XbxVQhQuUd1FZ504A3a2BLbHI3eglIqk="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Replacement for UNIX rm command"; + homepage = "https://github.com/b4b4r07/gomi"; + license = licenses.mit; + maintainers = with maintainers; [ ozkutuk ]; + }; +} diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 3568d785eecbc..c8e369e28c29c 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "sha256-YeSEaamtIjip2nLBw/1/RSkr6ZL0p1GG2pHU14Ry6XU="; + sha256 = "sha256-E0STOvHeKC5uJ4l3+UU7L1gK9oKL/EChM7yVWCPqxLg="; }; - cargoSha256 = "sha256-JsPGw5hjNy+yTZiSBeF05o9Zl6pYXxEI4kIDLY6Q54Q="; + cargoSha256 = "sha256-jO/3BGZIx7XibaAqd+vO1mwku3BG91/vkwpHvrUYV+Y="; nativeBuildInputs = [ installShellFiles pandoc ]; postInstall = '' diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index eda2619bcada4..611874ab76841 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-qx/Uz/X9ZJ4ebV+OMtXVoReh61YAp9iRcJmywGfKiUw="; + sha256 = "sha256-ko2UB7jy2sob5i/TAjjJVBuVyvqgh4awB1jEv8DplM0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index 3a7baa62bae89..56899ae3c3433 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yt+RWox+0VOw8SH7Ry/o4NHOg3IGcebVeE9OWGP17do="; + sha256 = "sha256-9/kZ9GVfLRdKxzyZ3E11aILkJWIeojt9Ew+vKktveoU="; }; nativeBuildInputs = [ cmake util-linux ]; @@ -38,6 +38,8 @@ mkDerivation rec { qtgraphicaleffects ]; + sourceRoot = "${src.name}/src"; + /* By default, the builder checks for JSON support in lsblk by running "lsblk --json", but that throws an error, as /sys/dev doesn't exist in the sandbox. This patch removes the check. */ diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 8c8972d0cb5d3..585117b5cc73e 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { pname = "chrony"; - version = "4.2"; + version = "4.3"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - sha256 = "sha256-Jz+f0Vwyjtbzpfa6a67DWkIaNKc7tyVgUymxcSBI25o="; + sha256 = "sha256-nQ2oiahl8ImlohYQ/7ZxPjyUOM4wOmO0nC+26v9biAQ="; }; postPatch = '' diff --git a/pkgs/tools/text/book-summary/default.nix b/pkgs/tools/text/book-summary/default.nix new file mode 100644 index 0000000000000..563d486b80074 --- /dev/null +++ b/pkgs/tools/text/book-summary/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, fetchpatch +}: + +rustPlatform.buildRustPackage rec { + pname = "book-summary"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dvogt23"; + repo = pname; + rev = version; + sha256 = "1dawddkpyasy22biqz35c912xqmwcx6ihpqp6cnikbdzv8ni8adr"; + }; + + cargoPatches = [ + # add Cargo.lock + # can be removed after https://github.com/dvogt23/book-summary/pull/23 gets merged + (fetchpatch { + url = "https://github.com/dvogt23/book-summary/commit/9d941a57db5cd2fd0e9813230d69eb1d166a48f8.patch"; + sha256 = "sha256-91dwJKdaLukxVZHA3RH1rxj45U/+mabFTflBaLd2rK8="; + }) + ]; + + cargoSha256 = "sha256-chuEzYUfZC/ZdWIUEmAXJAnXG2s8mCcNs6cuq8Lh5PQ="; + + meta = with lib; { + description = "Book auto-summary for gitbook and mdBook"; + homepage = "https://github.com/dvogt23/book-summary"; + license = licenses.mit; + maintainers = with teams; iog.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e68b0f4e2fdd1..c17bc68750d41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -638,12 +638,16 @@ with pkgs; umoci = callPackage ../applications/virtualization/umoci {}; + dippi = callPackage ../tools/graphics/dippi {}; + dispad = callPackage ../tools/X11/dispad { }; dupeguru = callPackage ../applications/misc/dupeguru { }; dump1090 = callPackage ../applications/radio/dump1090 { }; + dwarf2json = callPackage ../tools/misc/dwarf2json { }; + ebook2cw = callPackage ../applications/radio/ebook2cw { }; edwin = callPackage ../data/fonts/edwin { }; @@ -703,6 +707,8 @@ with pkgs; global-platform-pro = callPackage ../development/tools/global-platform-pro { }; + gomi = callPackage ../tools/misc/gomi { }; + graph-easy = callPackage ../tools/graphics/graph-easy { }; graphw00f = callPackage ../tools/security/graphw00f { }; @@ -1160,6 +1166,10 @@ with pkgs; afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; + afsctool = callPackage ../tools/filesystems/afsctool { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + agate = callPackage ../servers/gemini/agate { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2598,6 +2608,8 @@ with pkgs; harvid = callPackage ../tools/video/harvid { }; + headset = callPackage ../applications/audio/headset { }; + hilbish = callPackage ../shells/hilbish { }; hime = callPackage ../tools/inputmethods/hime {}; @@ -3052,6 +3064,8 @@ with pkgs; boringtun = callPackage ../tools/networking/boringtun { }; + book-summary = callPackage ../tools/text/book-summary { }; + bookstack = callPackage ../servers/web-apps/bookstack { }; # Upstream recommends qt5.12 and it doesn't build with qt5.15 @@ -6324,6 +6338,8 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; + findup = callPackage ../tools/misc/findup { }; + bsd-finger = callPackage ../tools/networking/bsd-finger { }; bsd-fingerd = bsd-finger.override({ buildClient = false; }); @@ -7115,6 +7131,8 @@ with pkgs; grin = callPackage ../tools/text/grin { }; + gyb = callPackage ../tools/backup/gyb { }; + igrep = callPackage ../tools/text/igrep { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12631,6 +12649,8 @@ with pkgs; zplug = callPackage ../shells/zsh/zplug { }; + zi = callPackage ../shells/zsh/zi {}; + zinit = callPackage ../shells/zsh/zinit {} ; zint = qt6Packages.callPackage ../development/libraries/zint { }; @@ -12739,6 +12759,8 @@ with pkgs; undistract-me = callPackage ../shells/bash/undistract-me { }; + carapace = callPackage ../shells/carapace { }; + dash = callPackage ../shells/dash { }; dasht = callPackage ../tools/misc/dasht { }; @@ -18853,15 +18875,16 @@ with pkgs; nodejs = nodejs-14_x; }; - itk4 = callPackage ../development/libraries/itk/4.x.nix { - stdenv = if stdenv.cc.isGNU && stdenv.system == "x86_64-linux" then gcc10Stdenv else stdenv; + itk_5 = callPackage ../development/libraries/itk/5.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - itk = callPackage ../development/libraries/itk { + itk-unstable = callPackage ../development/libraries/itk/unstable.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; + itk = itk_5; + jama = callPackage ../development/libraries/jama { }; jansson = callPackage ../development/libraries/jansson { }; @@ -21921,14 +21944,6 @@ with pkgs; vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; - vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix { - stdenv = gcc9Stdenv; - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration - IOKit CFNetwork Security ApplicationServices - CoreText IOSurface ImageIO OpenGL GLUT; - }; vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { stdenv = gcc9Stdenv; inherit (darwin) libobjc; @@ -29640,6 +29655,8 @@ with pkgs; novnc = callPackage ../applications/networking/novnc { }; + nwg-bar = callPackage ../applications/misc/nwg-bar { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; @@ -30371,6 +30388,8 @@ with pkgs; qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; + qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { }; + eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; @@ -32540,6 +32559,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + terra-station = callPackage ../applications/blockchains/terra-station { }; + tessera = callPackage ../applications/blockchains/tessera { }; vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { @@ -34009,7 +34030,6 @@ with pkgs; angsd = callPackage ../applications/science/biology/angsd { }; ants = callPackage ../applications/science/biology/ants { - stdenv = if stdenv.cc.isGNU && stdenv.system == "x86_64-linux" then gcc10Stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -34238,6 +34258,8 @@ with pkgs; tebreak = callPackage ../applications/science/biology/tebreak { }; + treemix = callPackage ../applications/science/biology/treemix { }; + trimal = callPackage ../applications/science/biology/trimal { }; truvari = callPackage ../applications/science/biology/truvari { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4319356687a71..637f9640bd57d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7868,6 +7868,8 @@ in { pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; + pylibdmtx = callPackage ../development/python-modules/pylibdmtx { }; + pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; }; @@ -9433,6 +9435,8 @@ in { remarshal = callPackage ../development/python-modules/remarshal { }; + remi = callPackage ../development/python-modules/remi { }; + renault-api = callPackage ../development/python-modules/renault-api { }; rencode = callPackage ../development/python-modules/rencode { }; |