mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
0327923ced
@ -48,8 +48,8 @@ let
|
||||
x86_64-darwin-version = "4.38.121";
|
||||
x86_64-darwin-sha256 = "1w0s6j8z8961sv4y00jxpy5gjlj0dswyxs15c7isb26ii11nn1i2";
|
||||
|
||||
x86_64-linux-version = "4.38.121";
|
||||
x86_64-linux-sha256 = "0qp7wxmdg2lpvbx7gshgbqxf7jjvgnwx20cfjwgw6wwzanb0gi96";
|
||||
x86_64-linux-version = "4.38.125";
|
||||
x86_64-linux-sha256 = "sha256-BJeFXZ8STbMCmGvYRoFsfsyIpGukQkuwv0m2NzE+89c=";
|
||||
|
||||
aarch64-darwin-version = "4.38.121";
|
||||
aarch64-darwin-sha256 = "161z947p7a2d7584hybl77chab8y027cqpph2hd2s4b5k6bchkj5";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.65.2";
|
||||
version = "1.66.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UBGFY6MamoQyzPmjmz6TmeiF8DTXV/Lpl5HFbxMUPE8=";
|
||||
hash = "sha256-PwsqED6jIiPapthdhl7XxGwp+H3gjGfn2DGl1mWuano=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VPCTyJI02KL6Gn+gdTy36uEbDI71ORrSZnXuWqP0KrM=";
|
||||
vendorHash = "sha256-mJT5gqMCe1NuUBoSRqYTp64UK2vZ+GJwgnb0ILQPkno=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ascii-draw";
|
||||
version = "0.3.2";
|
||||
version = "0.3.4";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nokse22";
|
||||
repo = "ascii-draw";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-opjYgLfHfKSbipB1HRxfBkgp+9c4yqIL1fiUOcFmCMc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-S5tFK+mJeWtkdS2WjE+lZ2Gfg4N1S0a29AbbcGeKSD0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,13 +14,13 @@ let
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "blockbench";
|
||||
version = "4.10.0";
|
||||
version = "4.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JannisX11";
|
||||
repo = "blockbench";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pycRC+ZpN2P5Z66/aGA4gykLF7IwdeToRadaJSA1L9w=";
|
||||
hash = "sha256-LuWxjBsOBo6tSlSGaDWrNYcTerIpU+rw3r+zN6gtYb0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-4/9LRXDUVd/8cAxfbyAj9so13bvKe/A9uu0mEYehlj4=";
|
||||
hash = "sha256-T1M+AwKc7O7Ex6mzBtYBwhOXHkggO5CsjddmZhBpxfQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyprland";
|
||||
version = "2.2.20";
|
||||
version = "2.3.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.10";
|
||||
@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "hyprland-community";
|
||||
repo = "pyprland";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/eJ3emWI2l9jYgD7RX6tGUy6wHHQ25qS6Xd1x1uWZ1w=";
|
||||
hash = "sha256-3Y+5tOKd4Z7xwTU4OoEQffw70kb29wxKFC9Oh0bCO4k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cairo
|
||||
, libxkbcommon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, buildDocs ? true
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cairo,
|
||||
libxkbcommon,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
scdoc,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
buildDocs ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -24,9 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-2M8f3kN6tihwKlUCp2Qowv5xD6Ufb71AURXqwQShlXI=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
@ -46,13 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
mesonFlags = [ (lib.mesonEnable "man-pages" buildDocs) ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/emersion/slurp/releases/tag/v${finalAttrs.version}";
|
||||
description = "Select a region in a Wayland compositor";
|
||||
inherit (wayland.meta) platforms;
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "https://github.com/emersion/slurp";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "slurp";
|
||||
maintainers = with maintainers; [ buffet nickcao ];
|
||||
maintainers = with lib.maintainers; [
|
||||
buffet
|
||||
nickcao
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -1,20 +1,18 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, undmg
|
||||
, writeShellApplication
|
||||
, curl
|
||||
, jq
|
||||
, common-updater-scripts
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
undmg,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stats";
|
||||
version = "2.10.13";
|
||||
version = "2.10.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
|
||||
hash = "sha256-AzH1rZFqEH8sovZZfJykvsEmCedEZWigQFHWHl6/PdE=";
|
||||
hash = "sha256-WJBn98C5uV9EmeEM+Zieztuof1CW80co8wrLntY7D0E=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@ -30,23 +28,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = lib.getExe (writeShellApplication {
|
||||
name = "stats-update-script";
|
||||
runtimeInputs = [ curl jq common-updater-scripts ];
|
||||
text = ''
|
||||
set -euo pipefail
|
||||
url="$(curl --silent "https://api.github.com/repos/exelban/stats/tags?per_page=1")"
|
||||
version="$(echo "$url" | jq -r '.[0].name' | cut -c 2-)"
|
||||
update-source-version stats "$version" --file=./pkgs/by-name/st/stats/package.nix
|
||||
'';
|
||||
});
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "macOS system monitor in your menu bar";
|
||||
homepage = "https://github.com/exelban/stats";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
donteatoreo
|
||||
emilytrau
|
||||
Enzime
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ emilytrau Enzime donteatoreo ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.66.3";
|
||||
version = "1.66.4";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "tailscale-nginx-auth";
|
||||
@ -11,7 +11,7 @@ buildGoModule {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dFyXOoN4YZfN3G1XfHK1/8M1ROwW9Q9eCl/NjTdfD4Q=";
|
||||
hash = "sha256-ETBca3qKO2iS30teIF5sr/oyJdRSKFqLFVO3+mmm7bo=";
|
||||
};
|
||||
vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw=";
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-Ky5JyocpI9JKvhmmhk0Cg/Eo7icmo6FQAT639cGIGrA=",
|
||||
"version": "0.2024.05.07.08.02.stable_02"
|
||||
"hash": "sha256-XRwnT73kCv4mO2DKkuFQ8qwpIIH9iyRTrJEZUi6tscU=",
|
||||
"version": "0.2024.05.14.08.01.stable_04"
|
||||
},
|
||||
"linux": {
|
||||
"hash": "sha256-zUbWNgiupBoFWoN3I726FejGtGne9dctaiGlPBbj5KU=",
|
||||
"version": "0.2024.05.07.08.02.stable_02"
|
||||
"hash": "sha256-16ZMzvdkAAf9xSiL7TCaiJwEMd+jbOYIL/xiF2Todbw=",
|
||||
"version": "0.2024.05.14.08.01.stable_04"
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wit-bindgen";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wit-bindgen";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lH5ejZEEtGJbqBTAm0VO2ww+fh+fAtuRlTLfc58WFxc=";
|
||||
hash = "sha256-ckzS3hMdBHllpbzPq4MZ3K6L1fKEgcgI2nnpzSI1ky4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bBA2AE8tN2J6SryZSBpDhFUxnMhWQmaqmU71QaTAYzY=";
|
||||
cargoHash = "sha256-BKNgPr5Yj+B0nAQEJdh6gat91WZ73sDSBgKDPrhn6bo=";
|
||||
|
||||
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
|
||||
# However, GitHub Actions ensures a proper build.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ mkDerivation }:
|
||||
mkDerivation {
|
||||
version = "1.16.2";
|
||||
sha256 = "sha256-NUYYxf73Fuk3FUoVFKTo6IN9QCTvzz5wNshIf/nitJA=";
|
||||
version = "1.16.3";
|
||||
sha256 = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU=";
|
||||
# https://hexdocs.pm/elixir/1.16.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
|
||||
minimumOTPVersion = "24";
|
||||
escriptPath = "lib/elixir/scripts/generate_app.escript";
|
||||
|
||||
@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/fedora-modularity/libmodulemd/commit/29c339a31b1c753dcdef041e5c2e0e600e48b59d.patch";
|
||||
hash = "sha256-uniHrQdbcXlJk2hq106SgV/E330LfxDc07E4FbOMLr0=";
|
||||
})
|
||||
# Adapt to GLib 2.80.1 documentation
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/fedora-modularity/libmodulemd/commit/f3336199b4e69af3305f156abc7533bed9e9a762.patch";
|
||||
hash = "sha256-Rvg+/KTKiEBXVEK7tlcTDf53HkaW462g/rg1rHPzaZA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{ lib, buildDunePackage, fetchFromGitHub, ocaml_pcre }:
|
||||
{ lib, buildDunePackage, fetchFromGitHub, re }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "duppy";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
minimalOCamlVersion = "4.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-duppy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5U/CNQ88Wi/AgJEoFeS9O0zTPiD9ysJNQohRVJdyH9w=";
|
||||
sha256 = "sha256-rVdfAMu26YgS/TZk2XPqaR6KTDLbh9Elkf8rjhSnNO4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ocaml_pcre ];
|
||||
propagatedBuildInputs = [ re ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/savonet/ocaml-duppy";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
rec {
|
||||
version = "1.1.8";
|
||||
version = "1.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-ffmpeg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XqZATaxpW0lEdrRTXVTc0laQAx437+eoa/zOzZV1kHk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Tr0YhoaaUSOlA7vlhAjPyFJI/iL7Z54oO27RnG7d+nA=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
23
pkgs/development/ocaml-modules/gd/default.nix
Normal file
23
pkgs/development/ocaml-modules/gd/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, gd }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gd";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-gd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-78cqxVEappTybRLk7Y6vW1POvZKFIxtGNVcmkKq9GEE=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ gd ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/savonet/ocaml-gd";
|
||||
description = "OCaml bindings for gd";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ dandellion ];
|
||||
};
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, ocaml, gd, freetype, findlib, zlib, libpng, libjpeg }:
|
||||
|
||||
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
|
||||
"gd4o is not available for OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-gd4o";
|
||||
version = "1.0a5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gd4o/gd4o/1.0%20Alpha%205/gd4o-1.0a5.tar.gz";
|
||||
sha256 = "1vbyakz7byvxmqf3hj68rw15b4kb94ppcnhvmjv38rsyg05bc47s";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib libjpeg libpng ];
|
||||
propagatedBuildInputs = [ gd zlib freetype ];
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $OCAMLFIND_DESTDIR/stublibs
|
||||
'';
|
||||
|
||||
buildFlags = [ "all" "opt" ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make test.opt
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sourceforge.net/projects/gd4o/";
|
||||
description = "OCaml wrapper for the GD graphics library";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ dandellion ];
|
||||
};
|
||||
}
|
||||
@ -3,25 +3,27 @@
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, dune-configurator
|
||||
, re
|
||||
, xmlplaylist
|
||||
, ocaml_pcre
|
||||
, ocamlnet
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lastfm";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-lastfm";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sz400ny9h7fs20k7600q475q164x49ba30ls3q9y35rhm3g2y2b";
|
||||
sha256 = "sha256-1te9B2+sUmkT/i2K5ueswWAWpvJf9rXob0zR4CMOJlg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ xmlplaylist ocaml_pcre ocamlnet ];
|
||||
propagatedBuildInputs = [
|
||||
re
|
||||
xmlplaylist
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/savonet/ocaml-lastfm";
|
||||
|
||||
@ -2,13 +2,15 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mad";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-mad";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iJjANV2M68v3C3db1n9Y8V6yJKuDBDSjtMteamndN7U=";
|
||||
sha256 = "sha256-rSFzWyUYTrGL7GvVsY5qKdCXqY/XJQkuBerexG838jc=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
||||
@ -1,20 +1,29 @@
|
||||
{ lib, fetchurl, ocaml, buildDunePackage, benchmark }:
|
||||
{ lib, fetchurl, fetchpatch, ocaml, buildDunePackage
|
||||
, version ? if lib.versionAtLeast ocaml.version "5.0" then "0.6.3" else "0.6.2"
|
||||
, benchmark
|
||||
}:
|
||||
|
||||
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
|
||||
"rope is not available for OCaml ${ocaml.version}"
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage {
|
||||
pname = "rope";
|
||||
version = "0.6.2";
|
||||
inherit version;
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz";
|
||||
sha256 = "15cvfa0s1vjx7gjd07d3fkznilishqf4z4h2q5f20wm9ysjh2h2i";
|
||||
hash = {
|
||||
"0.6.2" = "sha256:15cvfa0s1vjx7gjd07d3fkznilishqf4z4h2q5f20wm9ysjh2h2i";
|
||||
"0.6.3" = "sha256-M14fiP9BDiz3WEoMqAJqZaXk4PoZ8Z1YjOk+F97z05Y=";
|
||||
}."${version}";
|
||||
};
|
||||
|
||||
buildInputs = [ benchmark ] ;
|
||||
|
||||
patches = lib.optional (version == "0.6.3") (fetchpatch {
|
||||
url = "https://github.com/Chris00/ocaml-rope/commit/be53daa18dd3d1450a92881b33c997eafb1dc958.patch";
|
||||
hash = "sha256-fHJNfD1ph3+QLmVJ8C4hhJ8hvrWIh7D0EL0XhOW2yqQ=";
|
||||
});
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Chris00/ocaml-rope";
|
||||
description = "Ropes (“heavyweight strings”) in OCaml";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tsdl-image";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
@ -17,7 +17,7 @@ buildDunePackage rec {
|
||||
owner = "sanette";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-khLhVJuiLNNWw76gTeg4W32v5XbkwAg11bIOWl67u2k=";
|
||||
hash = "sha256-mgTFwkuFJVwJmHrzHSdNh8v4ehZIcWemK+eLqjglw5o=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
buildDunePackage rec {
|
||||
minimalOCamlVersion = "4.03";
|
||||
pname = "uri";
|
||||
version = "4.2.0";
|
||||
version = "4.4.0";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65";
|
||||
};
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cld2-cffi";
|
||||
version = "0.1.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0rvcdx4fdh5yk4d2nlddq1q1r2r0xqp86hpmbdn447pdcj1r8a9s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six cffi ];
|
||||
nativeCheckInputs = [ nose ];
|
||||
|
||||
# gcc doesn't approve of this code, so disable -Werror
|
||||
env.NIX_CFLAGS_COMPILE = "-w" + lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing";
|
||||
|
||||
checkPhase = "nosetests -v";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CFFI bindings around Google Chromium's embedded compact language detection library (CLD2)";
|
||||
homepage = "https://github.com/GregBowyer/cld2-cffi";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "proboscis";
|
||||
version = "1.2.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ nose ];
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG";
|
||||
homepage = "https://pypi.python.org/pypi/proboscis";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidfuzz";
|
||||
version = "3.8.1";
|
||||
version = "3.9.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "maxbachmann";
|
||||
repo = "RapidFuzz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ljuqezL/Iu4VQelPi7KApBknDrWzikX7FD5iw5NcOL4=";
|
||||
hash = "sha256-HwTVaPFVktdt1/MfNYajRqVr9uSg6oc++yVvY0WC9AQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.17.2";
|
||||
version = "2.17.3";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
hash = "sha256-l1O3VrO1Ndfp1QIsDmTAhAiUpoOc7+TkQETsoo7m460=";
|
||||
hash = "sha256-g/+Hf+4cOkud+Gfj/2rqlZ6duzn3A3fkF6mXjXjTypA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vscode-langservers-extracted";
|
||||
version = "4.9.0";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4qAQa8Pt7Br0T770ck2F912ZddrzgTKEliSAP/qLvgE=";
|
||||
hash = "sha256-3m9+HZY24xdlLcFKY/5DfvftqprwLJk0vve2ZO1aEWk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-2rRyg+UO3wnq5CuG5q87YOdGng9zBTh9aXueB0xf8ps=";
|
||||
npmDepsHash = "sha256-XGlFtmikUrnnWXsAYzTqw2K7Y2O0bUtYug0xXFIASBQ=";
|
||||
|
||||
buildPhase =
|
||||
let
|
||||
|
||||
885
pkgs/development/tools/rye/Cargo.lock
generated
885
pkgs/development/tools/rye/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -12,13 +12,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rye";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "rye";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sgA+Tp4Qysd07+1iNDgn9Hw0nDN8l6/fD41rE5QqWzY=";
|
||||
hash = "sha256-M5TJXyh1fNigHOuBpEpnUeOWboZWxZ9bGrBuMB1oHgE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, buildGo122Module, fetchFromGitHub, testers, flyctl, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, flyctl, installShellFiles, gitUpdater }:
|
||||
|
||||
buildGo122Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.2.52";
|
||||
version = "0.2.55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BCnMXyS94tuD+Un1DLqs3mdGi7XrVBoZGJ/XkpACOQI";
|
||||
hash = "sha256-yCRaF600UrDmazsgTRp/grWtkULeSQedE5m69K6h/4Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eTiY65VGFBgGzCOrnp/WbOo9Lbdk4PYwT7CppjsZ4WE=";
|
||||
vendorHash = "sha256-1hlWyr41t8J4naN5QbEtfCv3npe/kvMH5NKKaxYvLYk=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -34,8 +34,20 @@ buildGo122Module rec {
|
||||
HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
postCheck = ''
|
||||
go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z'"
|
||||
checkFlags = [
|
||||
# these tests require network
|
||||
"-skip=TestToTestMachineConfig"
|
||||
];
|
||||
|
||||
# We override checkPhase to be able to test ./... while using subPackages
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# We do not set trimpath for tests, in case they reference test assets
|
||||
export GOFLAGS=''${GOFLAGS//-trimpath/}
|
||||
|
||||
buildGoDir test ./...
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
@ -46,6 +58,14 @@ buildGo122Module rec {
|
||||
ln -s $out/bin/flyctl $out/bin/fly
|
||||
'';
|
||||
|
||||
# Upstream tags every PR merged with release tags like
|
||||
# v2024.5.20-pr3545.4. We ignore all revisions containing a '-'
|
||||
# to skip these releases.
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
ignoredVersions = "-";
|
||||
};
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = flyctl;
|
||||
command = "HOME=$(mktemp -d) flyctl version";
|
||||
@ -57,7 +77,7 @@ buildGo122Module rec {
|
||||
downloadPage = "https://github.com/superfly/flyctl";
|
||||
homepage = "https://fly.io/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ adtya jsierles techknowlogick ];
|
||||
maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood ];
|
||||
mainProgram = "flyctl";
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.9.0";
|
||||
version = "10.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KdgloTp/mlkPJpjqYJk4Wa7fhgIuwFpAkeIKNxwTfFk=";
|
||||
hash = "sha256-InuaitDoSuE091PG5OwSo/DNplitpIcOgZQ4Dcyz2iI=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-gjk+igFRVauDRC44YrZUB6uDNAfqnjDcqDPcAWUBhkc=";
|
||||
vendorHash = "sha256-Tt+Be5zsngQokC18cvQ+r5EU1h8FXQ7kfzbRFBse5TQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.66.3";
|
||||
version = "1.66.4";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "tailscale";
|
||||
@ -22,7 +22,7 @@ buildGoModule {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dFyXOoN4YZfN3G1XfHK1/8M1ROwW9Q9eCl/NjTdfD4Q=";
|
||||
hash = "sha256-ETBca3qKO2iS30teIF5sr/oyJdRSKFqLFVO3+mmm7bo=";
|
||||
};
|
||||
vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw=";
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/lang/dune \
|
||||
--replace "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)"
|
||||
--replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)"
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
@ -72,6 +72,7 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.duppy
|
||||
ocamlPackages.mm
|
||||
ocamlPackages.ocurl
|
||||
ocamlPackages.ocaml_pcre
|
||||
ocamlPackages.cry
|
||||
ocamlPackages.camomile
|
||||
ocamlPackages.uri
|
||||
@ -98,8 +99,9 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.fdkaac
|
||||
ocamlPackages.flac
|
||||
ocamlPackages.frei0r
|
||||
ocamlPackages.gd4o
|
||||
ocamlPackages.gd
|
||||
ocamlPackages.graphics
|
||||
# ocamlPackages.gstreamer # Broken but advertised feature
|
||||
ocamlPackages.imagelib
|
||||
ocamlPackages.inotify
|
||||
ocamlPackages.ladspa
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.6.15";
|
||||
version = "9.6.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sRRL2+LgWowUFSiTHZudJqX404y36cko1i3WFd6kGV4=";
|
||||
sha256 = "sha256-rAOWiu0f9f1v1oD5HI/kl1knoHkU2LgS3D2qsdd98y4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VELBEnWdPfznlBdAdnHWyWZngPBQ+INNr+xfNQMw8yk=";
|
||||
vendorHash = "sha256-SxdN1IyQd/DLI8ZXyCWsW3JLi4dlGSvpr+ub/Oqkw70=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -4683,8 +4683,6 @@ with pkgs;
|
||||
|
||||
shotman = callPackage ../tools/wayland/shotman { };
|
||||
|
||||
slurp = callPackage ../tools/wayland/slurp { };
|
||||
|
||||
sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
|
||||
wlroots = wlroots_0_17;
|
||||
};
|
||||
@ -4701,9 +4699,7 @@ with pkgs;
|
||||
|
||||
wayland-utils = callPackage ../tools/wayland/wayland-utils { };
|
||||
|
||||
wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_5_0;
|
||||
};
|
||||
wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { };
|
||||
|
||||
waylogout = callPackage ../tools/wayland/waylogout { };
|
||||
|
||||
|
||||
@ -566,7 +566,8 @@ let
|
||||
|
||||
gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { };
|
||||
|
||||
gd4o = callPackage ../development/ocaml-modules/gd4o { };
|
||||
gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead";
|
||||
gd = callPackage ../development/ocaml-modules/gd { inherit (pkgs) gd; };
|
||||
|
||||
gen = callPackage ../development/ocaml-modules/gen { };
|
||||
|
||||
|
||||
@ -85,6 +85,7 @@ mapAliases ({
|
||||
cchardet = faust-cchardet; # added 2023-03-02
|
||||
cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07
|
||||
class-registry = phx-class-registry; # added 2021-10-05
|
||||
cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
|
||||
cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09
|
||||
codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02
|
||||
ColanderAlchemy = colanderalchemy; # added 2023-02-19
|
||||
@ -328,6 +329,7 @@ mapAliases ({
|
||||
postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
|
||||
powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
|
||||
privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31
|
||||
proboscis = throw "proboscis has been removed since it has not been maintained for 11 years"; # added 2024-05-20
|
||||
prometheus_client = prometheus-client; # added 2021-06-10
|
||||
prompt_toolkit = prompt-toolkit; # added 2021-07-22
|
||||
protonup = protonup-ng; # Added 2022-11-06
|
||||
|
||||
@ -2188,8 +2188,6 @@ self: super: with self; {
|
||||
|
||||
classify-imports = callPackage ../development/python-modules/classify-imports { };
|
||||
|
||||
cld2-cffi = callPackage ../development/python-modules/cld2-cffi { };
|
||||
|
||||
cle = callPackage ../development/python-modules/cle { };
|
||||
|
||||
clean-fid = callPackage ../development/python-modules/clean-fid { };
|
||||
@ -10357,8 +10355,6 @@ self: super: with self; {
|
||||
|
||||
prison = callPackage ../development/python-modules/prison { };
|
||||
|
||||
proboscis = callPackage ../development/python-modules/proboscis { };
|
||||
|
||||
process-tests = callPackage ../development/python-modules/process-tests { };
|
||||
|
||||
procmon-parser = callPackage ../development/python-modules/procmon-parser { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user