diff options
Diffstat (limited to 'pkgs')
21 files changed, 157 insertions, 185 deletions
diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index e383333c42086..404ece153b1c0 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -1,21 +1,32 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch +, gitUpdater , cmake , python3 }: stdenv.mkDerivation rec { pname = "box64"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ptitSeb"; repo = pname; rev = "v${version}"; - hash = "sha256-6k8Enbafnj19ATtgmw8W7LxtRpM3Ousj1bpZbbtq8TM="; + hash = "sha256-eMp2eSWMRJQvLRQKUirBua6Kt7ZtyebfUnKIlibkNFU="; }; + patches = [ + # Fix mmx & cppThreads tests on x86_64 + # Remove when version > 0.2.0 + (fetchpatch { + url = "https://github.com/ptitSeb/box64/commit/3819aecf078fcf47b2bc73713531361406a51895.patch"; + hash = "sha256-11hy5Ol5FSE/kNJmXAIwNLbapldhlZGKtOLIoL6pYrg="; + }) + ]; + nativeBuildInputs = [ cmake python3 @@ -56,6 +67,10 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://box86.org/"; description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems"; diff --git a/pkgs/applications/emulators/proton-caller/default.nix b/pkgs/applications/emulators/proton-caller/default.nix index 22bc7054da388..4b5da92d1d611 100644 --- a/pkgs/applications/emulators/proton-caller/default.nix +++ b/pkgs/applications/emulators/proton-caller/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "proton-caller"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "caverym"; repo = pname; rev = version; - sha256 = "sha256-eyHFKAGx8du4osoGDsMFzVE/TC/ZMPsx6mrWUPDCLJ4="; + sha256 = "sha256-fN/8woLkTFD0aGILwweHhpey3cGQw2NolvpOmdkEEGA="; }; - cargoSha256 = "sha256-/4+r5rvRUqQL8EVIg/22ZytXyE4+SV4UEcXiEw4795U="; + cargoSha256 = "sha256-2zczu9MtsDDbfjbmLXCiPJrxNoNNBN0KAGeN+a53SRg="; meta = with lib; { description = "Run Windows programs with Proton"; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 8cc32b8e3b319..4070556cdce6f 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "107.0.1-2", + "packageVersion": "108.0-1", "source": { - "rev": "107.0.1-2", - "sha256": "1s009nbsqihmhnaa20j9g1qyifl3kgsbpgxc8ms5ahx3j97hbpk5" + "rev": "108.0-1", + "sha256": "1gfqxlcgf7qxgisbj565ndrfhkk68py2jpwrx7k2j7zpszkb2f4m" }, "firefox": { - "version": "107.0.1", - "sha512": "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea" + "version": "108.0", + "sha512": "fa800f62cca395a51b9a04373a27be48fc3860208e34ecf74d908127638d1eb8c41cf9898be6896777d408127d5c4b7104d9ee89c97da923b2dc6ea32186187e" } } diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index bbea935af9a3b..ae7753d758a88 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -5,7 +5,7 @@ let rev = "5b97033257d0276c7b0d1b20412667a69d79261e"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.56.12"; # Do not forget to update `rev` above + version = "0.56.13"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,7 +20,7 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-i+fg5tPkpnNl1Oef1KPmhHC+5t4y9vvfRpw9DHbsf4w="; + sha256 = "sha256-T0G0S8bj0QO1/eC/XMwiJ0ZcJC6KYB6gmj/bq2yYgAE="; }; vendorSha256 = "sha256-SRR4TmNHbMOOMv6AXv/Qpn2KUQh+ZsFlzc5DpdyPLEU="; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index d4a3028b8943f..8fe04cf43ed96 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -5,10 +5,12 @@ let _build = "484"; version = "${_version}-${_build}"; - swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux" - else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" - else if stdenv.hostPlatform.system == "x86_64-darwin" then "macos64" - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + swtSystem = + if stdenv.hostPlatform.system == "i686-linux" then "linux" + else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" + else if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm64" + else if stdenv.hostPlatform.system == "x86_64-darwin" then "macos64" + else throw "Unsupported system: ${stdenv.hostPlatform.system}"; desktopItem = makeDesktopItem { name = "jameica"; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; src = fetchFromGitHub { owner = "willuhn"; @@ -79,7 +81,7 @@ stdenv.mkDerivation rec { binaryBytecode # source bundles dependencies as jars ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; maintainers = with maintainers; [ flokli r3dl3g ]; }; } diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index e204e04008ca8..fc3b7216b7a2d 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,148 +1,44 @@ -{ fetchurl, lib, stdenv, mkDerivation, dpkg, which -, makeWrapper -, alsa-lib -, desktop-file-utils -, dbus -, libcap -, fontconfig -, freetype -, gcc +{ lib +, fetchurl +, appimageTools , gconf -, glib -, icu -, libxml2 -, libxslt -, orc -, nss -, nspr -, qtbase -, qtsvg -, qtdeclarative -, qtwebchannel -, qtquickcontrols -, qtwebkit -, qtwebengine -, sqlite -, xorg -, zlib -# The provided wrapper does this, but since we don't use it -# we emulate the behavior. The downside is that this -# will leave entries on your system after uninstalling mendeley. -# (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u') -, autorunLinkHandler ? true -# Update script -, writeScript -, runtimeShell +, imagemagick }: let - arch32 = "i686-linux"; + name = "mendeley"; + version = "2.80.1"; - arch = if stdenv.hostPlatform.system == arch32 - then "i386" - else "amd64"; - - shortVersion = "1.19.5-stable"; - - version = "${shortVersion}_${arch}"; - - url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; - sha256 = if stdenv.hostPlatform.system == arch32 - then "01x83a44qlxi937b128y8y0px0q4w37g72z652lc42kv50dhyy3f" - else "1cagqq0xziznaj97z30bqfhrwjv3a4h83ckhwigq35nhk1ggq1ry"; - - deps = [ - qtbase - qtsvg - qtdeclarative - qtwebchannel - qtquickcontrols - qtwebkit - qtwebengine - alsa-lib - dbus - freetype - fontconfig - gcc.cc - gconf - glib - icu - libcap - libxml2 - libxslt - nspr - nss - orc - sqlite - xorg.libX11 - xorg.xcbutilkeysyms - xorg.libxcb - xorg.libXcomposite - xorg.libXext - xorg.libXrender - xorg.libXi - xorg.libXcursor - xorg.libXtst - xorg.libXrandr - xorg.xcbutilimage - zlib - ]; - -in - -mkDerivation { - pname = "mendeley"; - inherit version; + executableName = "${name}-reference-manager"; src = fetchurl { - url = url; - sha256 = sha256; + url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-2.80.1-x86_64.AppImage"; + sha256 = "sha256-uqmu7Yf4tXDlNGkeEZut4m339S6ZNKhAmej+epKLB/8="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ dpkg which ] ++ deps; - - propagatedUserEnvPkgs = [ gconf ]; - - dontUnpack = true; - - dontWrapQtApps = true; - - installPhase = '' - dpkg-deb -x $src $out - mv $out/opt/mendeleydesktop/{bin,lib,share} $out - - interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) - patchelf --set-interpreter $interpreter \ - --set-rpath ${lib.makeLibraryPath deps}:$out/lib \ - $out/bin/mendeleydesktop - - wrapQtApp $out/bin/mendeleydesktop \ - --add-flags "--unix-distro-build" \ - ${lib.optionalString autorunLinkHandler # ignore errors installing the link handler - ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''} + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src; - # Remove bundled qt bits - rm -rf $out/lib/qt - rm $out/bin/qt* $out/bin/Qt* + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${executableName} + install -m 444 -D ${appimageContents}/${executableName}.desktop $out/share/applications/${executableName}.desktop + ${imagemagick}/bin/convert ${appimageContents}/${executableName}.png -resize 512x512 ${name}_512.png + install -m 444 -D ${name}_512.png $out/share/icons/hicolor/512x512/apps/${executableName}.png - # Patch up link handler script - wrapProgram $out/bin/install-mendeley-link-handler.sh \ - --prefix PATH ':' ${lib.makeBinPath [ which gconf desktop-file-utils ] } + substituteInPlace $out/share/applications/${executableName}.desktop \ + --replace 'Exec=AppRun' 'Exec=${executableName}' ''; - dontStrip = true; - dontPatchELF = true; - - updateScript = import ./update.nix { inherit writeScript runtimeShell; }; - meta = with lib; { homepage = "https://www.mendeley.com"; description = "A reference manager and academic social network"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ dtzWill ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ dtzWill atila ]; }; } diff --git a/pkgs/development/libraries/cpp-jwt/default.nix b/pkgs/development/libraries/cpp-jwt/default.nix new file mode 100644 index 0000000000000..c2c24238b1501 --- /dev/null +++ b/pkgs/development/libraries/cpp-jwt/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, cmake, openssl, gtest, nlohmann_json }: + +stdenv.mkDerivation rec { + pname = "cpp-jwt"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "arun11299"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk="; + }; + + cmakeFlags = [ + "-DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=OFF" + "-DCPP_JWT_BUILD_EXAMPLES=OFF" + ]; + + nativeBuildInputs = [ cmake gtest ]; + + buildInputs = [ openssl nlohmann_json ]; + + doCheck = true; + + meta = { + description = "JSON Web Token library for C++"; + homepage = "https://github.com/arun11299/cpp-jwt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index 663a119224b98..0387679835e53 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "13-2.2.0"; + version = "14-3.0.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs="; + sha256 = "sha256-rICN8fkPcYw32N6TdpbrszGUoRzwQdfRSW6A0AC8toM="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 1a77aa0ca1693..e0bc6992afb1d 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.10"; + version = "0.2.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AlJ61Sp6HSy6nJ6trVF2OD9ziSIW241peRXcda3xWnQ="; + hash = "sha256-JUcqODJo4F+gIa9kznWyUW65MGkSrVRlOWvjBNQip3A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 8907cb456846f..03ff7c6ed2406 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.17"; + version = "4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C2SWuX6Lt4R62rkNJ9qOoVK50j+TUkhoGUw+seWjTQw="; + hash = "sha256-GmDM+90joF3+IHjUibeNZX54z6jR8rCC+R/fcJ03dHM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index a6dc63b8e3fe1..9f2e895ce6cf3 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -20,15 +20,15 @@ buildPythonPackage rec { pname = "phik"; - version = "0.12.2"; + version = "0.12.3"; disabled = !isPy3k; format = "pyproject"; src = fetchFromGitHub { owner = "KaveIO"; repo = "PhiK"; - rev = "v${version}"; - hash = "sha256-nr3804MLIBPFw/PlJ9B8xKFFGI5LDp8m2gLtJB7YcEE="; + rev = "refs/tags/v${version}"; + hash = "sha256-9o3EDhgmne2J1QfzjjNQc1mUcyCzoVrCnWXqjWkiZU0="; }; checkInputs = [ diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix index 7d3808f554c08..dcea47449cabc 100644 --- a/pkgs/development/tools/misc/pwninit/default.nix +++ b/pkgs/development/tools/misc/pwninit/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "pwninit"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "io12"; repo = "pwninit"; rev = version; - sha256 = "sha256-XKDYJH2SG3TkwL+FN6rXDap8la07icR0GPFiYcnOHeI="; + sha256 = "sha256-Tskbwavr+MFa8wmwaFGe7o4/6ZpZqczzwOnqFR66mmM="; }; buildInputs = [ openssl xz ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; doCheck = false; # there are no tests to run - cargoSha256 = "sha256-2HCHiU309hbdwohUKVT3TEfGvOfxQWtEGj7FIS8OS7s="; + cargoSha256 = "sha256-LPypmFeF9NZOX1ogpIqc++Pun7pInKzpxYiGUvSUcso="; meta = { description = "Automate starting binary exploit challenges"; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index d60aa24f9c0a8..c68410063aa20 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.124.0"; + version = "0.125.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-bNMUUohiMa/fSP1HjrB0UR3kWh+HNqqqpLcraw6UNjs="; + sha256 = "sha256-B765hV5hs5FfpzkRwQY9szu6l8ImDTUoEl77IcgRngA="; }; - vendorSha256 = "sha256-cd4oAS81zUMImCkFsTIcgYJDB2pvMWYRnTPFkznSr+I="; + vendorSha256 = "sha256-YOytSBJDktWIwN1vhD1imIZVTg6t+Lmfg4cFtE3lys4="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index fc98bff40f983..f03b522e70a2b 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -33,7 +33,6 @@ buildGoModule rec { ); meta = with lib; { - broken = stdenv.isDarwin; description = "Docker and OCI Registry Client in Go and tooling using those libraries"; homepage = "https://github.com/regclient/regclient"; license = licenses.asl20; diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 91d8a8ccf962e..edc2d5bc44c0e 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2022-05-07"; + version = "${kernel.version}-unstable-2022-12-07"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821cu-20210118"; - rev = "14aac4269afe5d21d1cc0032bdc1426128f83734"; - hash = "sha256-TLakNRhHvYAbK0slKsFgSjqJdxVStzZhi1EEajmr7hg="; + rev = "7b8c45a270454f05e2dbf3beeb4afcf817db65da"; + hash = "sha256-Dg+At0iHvi4pl8umhQyml1bODhkeK8YWYpEckqqzNcQ="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/servers/ma1sd/default.nix index dbdb8a828e396..3c8ddc799e813 100644 --- a/pkgs/servers/ma1sd/default.nix +++ b/pkgs/servers/ma1sd/default.nix @@ -1,25 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, jre +, git +, gradle +, perl +, makeWrapper +}: let pname = "ma1sd"; - version = "2.4.0"; - rev = version; + version = "2.5.0"; src = fetchFromGitHub { - inherit rev; owner = "ma1uta"; repo = "ma1sd"; - hash = "sha256-8UnhrGa8KKmMAAkzUXztMkxgYOX8MU1ioXuEStGi4Vc="; + rev = version; + hash = "sha256-K3kaujAhWsRQuTMW3SZOnE7Rmu8+tDXaxpLrb45OI4A="; }; + patches = [ + # https://github.com/ma1uta/ma1sd/pull/122 + (fetchpatch { + name = "java-16-compatibility.patch"; + url = "https://github.com/ma1uta/ma1sd/commit/be2e2e97ce21741ca6a2e29a06f5748f45dd414e.patch"; + hash = "sha256-dvCeK/0InNJtUG9CWrsg7BE0FGWtXuHo3TU0iFFUmIk="; + }) + ]; deps = stdenv.mkDerivation { pname = "${pname}-deps"; - inherit src version; - nativeBuildInputs = [ gradle_6 perl git ]; + inherit src version patches; + nativeBuildInputs = [ gradle perl git ]; buildPhase = '' - export MA1SD_BUILD_VERSION=${rev} + export MA1SD_BUILD_VERSION=${version} export GRADLE_USER_HOME=$(mktemp -d); gradle --no-daemon build -x test ''; @@ -35,21 +51,26 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0x2wmmhjgnb6p72d3kvnv2vg52l0c4151rs4jrazs9rvxjfc88dr"; + outputHash = "sha256-Px8FLnREBC6pADcEPn/GfhrtGnmZqjXIX7l1xPjiCvQ="; }; in stdenv.mkDerivation { - inherit pname src version; - nativeBuildInputs = [ gradle_6 perl makeWrapper ]; + inherit pname src version patches; + nativeBuildInputs = [ gradle perl makeWrapper ]; buildInputs = [ jre ]; + postPatch = '' + substituteInPlace build.gradle \ + --replace 'gradlePluginPortal()' "" \ + --replace 'mavenCentral()' "mavenLocal(); maven { url '${deps}' }" + ''; + buildPhase = '' runHook preBuild - export MA1SD_BUILD_VERSION=${rev} + export MA1SD_BUILD_VERSION=${version} export GRADLE_USER_HOME=$(mktemp -d) - sed -ie "s#jcenter()#mavenLocal(); maven { url '${deps}' }#g" build.gradle gradle --offline --no-daemon build -x test runHook postBuild ''; @@ -64,6 +85,7 @@ stdenv.mkDerivation { meta = with lib; { description = "a federated matrix identity server; fork of mxisd"; homepage = "https://github.com/ma1uta/ma1sd"; + changelog = "https://github.com/ma1uta/ma1sd/releases/tag/${version}"; sourceProvenance = with sourceTypes; [ fromSource binaryBytecode # deps diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 3b362b4bdeee5..e9b4093249c53 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPackages , autoreconfHook +, pkg-config , fetchurl , fetchpatch , libedit @@ -37,12 +38,16 @@ stdenv.mkDerivation rec { strictDeps = true; # configure.ac patched; remove on next release - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libedit ]; configureFlags = [ "--with-libedit" ]; + preConfigure = lib.optional stdenv.hostPlatform.isStatic '' + export LIBS="$(pkg-config --libs --static libedit)" + ''; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 24ae9154a68df..de23fbb5ab801 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.33.5"; + version = "2.34.1"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-Hj124GzJV5WNGJHvgelem5B/Ru+F/ILzsX2X8gs7Jww="; + sha256 = "sha256-67LkMbs3JGpkwMHGWJf03yy8aGfSVb64TF4DPLlLMgY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index d0fb19e15a84b..2d33db2e67b71 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-12-02T23-48-47Z"; + version = "2022-12-13T00-23-28Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-6OPc56QN5va0S1iFbwA+qlF+AXUFxb//MYb55eRMsF0="; + sha256 = "sha256-wRkpc1S9booT9jVrDdmuj1eQInXafax2ZGvHgcuoiTA="; }; - vendorSha256 = "sha256-janS8S3ezloT0M92dGe3x4WZb1cN8hmreVin6sjtPU4="; + vendorSha256 = "sha256-D3d+aSEe1d1Tw0//L8MGuZHt5GjURTn3Vni9l4BafEI="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 1461a8d17e37a..09cca7d2eef22 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3370.14"; + version = "1.3.3373.6"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-/HXnD2P2fsNxWXMe5U7SUgxzOaHokktTogYIdiH8Kk8="; + sha256 = "sha256-Ttg6SNDcNIQlbNnKQY32hmsrgLhzHkeQfwlmCHe0bI0="; }; modRoot = "cli"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d694e02a85af7..20f3f144d80ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18768,6 +18768,8 @@ with pkgs; boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found }; + cpp-jwt = callPackage ../development/libraries/cpp-jwt { }; + ubus = callPackage ../development/libraries/ubus { }; uci = callPackage ../development/libraries/uci { }; |