Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-05-06 12:01:05 +00:00 committed by GitHub
commit 805ffdeca7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 253 additions and 176 deletions

View file

@ -38,12 +38,12 @@ Here is a simple package example.
- It uses the `fetchFromGitHub` fetcher to get its source. - It uses the `fetchFromGitHub` fetcher to get its source.
- `duneVersion = "2"` ensures that Dune version 2 is used for the - It also accept `duneVersion` parameter (valid value are `"1"`, `"2"`, and
build (this is the default; valid values are `"1"`, `"2"`, and `"3"`); `"3"`). The recommended practice it to set only if you don't want the default
note that there is also a legacy `useDune2` boolean attribute: value and/or it depends on something else like package version. You might see
set to `false` it corresponds to `duneVersion = "1"`; set to `true` it a not-supported argument `useDune2`. The behavior was `useDune2 = true;` =>
corresponds to `duneVersion = "2"`. If both arguments (`duneVersion` and `duneVersion = "2";` and `useDune2 = false;` => `duneVersion = "1";`. It was
`useDune2`) are given, the second one (`useDune2`) is silently ignored. used at the time when dune3 didn't existed.
- It sets the optional `doCheck` attribute such that tests will be run with - It sets the optional `doCheck` attribute such that tests will be run with
`dune runtest -p angstrom` after the build (`dune build -p angstrom`) is `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is
@ -71,7 +71,6 @@ Here is a simple package example.
buildDunePackage rec { buildDunePackage rec {
pname = "angstrom"; pname = "angstrom";
version = "0.15.0"; version = "0.15.0";
duneVersion = "2";
minimalOCamlVersion = "4.04"; minimalOCamlVersion = "4.04";
@ -104,8 +103,6 @@ buildDunePackage rec {
pname = "wtf8"; pname = "wtf8";
version = "1.0.2"; version = "1.0.2";
useDune2 = true;
minimalOCamlVersion = "4.02"; minimalOCamlVersion = "4.02";
src = fetchurl { src = fetchurl {

View file

@ -0,0 +1,47 @@
{ lib, stdenv, fetchurl, pkg-config, fltk13, portaudio, lame, libvorbis, libogg
, flac, libopus, libsamplerate, fdk_aac, dbus, openssl, curl }:
stdenv.mkDerivation rec {
pname = "butt";
version = "0.1.37";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
hash = "sha256-FI8xRCaGSMC6KEf5v87Q4syO3kVPWXYXgnL24+myRKo=";
};
postPatch = ''
# remove advertising
substituteInPlace src/FLTK/flgui.cpp \
--replace 'idata_radio_co_badge, 124, 61, 4,' 'nullptr, 0, 0, 0,'
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fltk13
portaudio
lame
libvorbis
libogg
flac
libopus
libsamplerate
fdk_aac
dbus
openssl
curl
];
postInstall = ''
cp -r usr/share $out/
'';
meta = {
description =
"butt (broadcast using this tool) is an easy to use, multi OS streaming tool";
homepage = "https://danielnoethen.de/butt/";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ ehmry ];
};
}

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stellar-core"; pname = "stellar-core";
version = "19.9.0"; version = "19.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stellar"; owner = "stellar";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-00bTqc3YDl/o03Y7NBsgGFwUzb2zYe/A3ccpHPIann8="; sha256 = "sha256-BcZsj2TbeJW91aiZ2I7NbDa+rgjfs6lQUsWOnhFQXtw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -522,6 +522,13 @@ let
''; '';
}); });
tokei = super.tokei.overrideAttrs (attrs: {
postPatch = attrs.postPatch or "" + ''
substituteInPlace tokei.el \
--replace 'tokei-program "tokei"' 'tokei-program "${lib.getExe pkgs.tokei}"'
'';
});
treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
# searches for Git at build time # searches for Git at build time
nativeBuildInputs = nativeBuildInputs =

View file

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "mob"; pname = "mob";
version = "4.4.0"; version = "4.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "remotemobprogramming"; owner = "remotemobprogramming";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-g2l/XeSyFem2Xi/lVgfbWW+nWHxAcQV/v+2AIqB0apM="; sha256 = "sha256-Ovp+JsNqFcOMk054khSdvPebFsv/fQD1Ghox8J3YcgA=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "spicetify-cli"; pname = "spicetify-cli";
version = "2.17.2"; version = "2.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "spicetify"; owner = "spicetify";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-WVatvMdCp4BeCe5+hz933OAJIKaR4ChR22nVrl8tmIc="; sha256 = "sha256-k9fbChpHy997Mj+U9n/iiSGDdsHZ22AoYUkCHUMGfbo=";
}; };
vendorHash = "sha256-mAtwbYuzkHUqG4fr2JffcM8PmBsBrnHWyl4DvVzfJCw="; vendorHash = "sha256-mAtwbYuzkHUqG4fr2JffcM8PmBsBrnHWyl4DvVzfJCw=";

View file

@ -22,14 +22,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "valent"; pname = "valent";
version = "unstable-2023-03-31"; version = "unstable-2023-05-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andyholmes"; owner = "andyholmes";
repo = "valent"; repo = "valent";
rev = "bb9fc25a58eeb81abea2bb651accc9538a3a82fd"; rev = "74f5d9349a60f0d9fcf88cda01713980a221d639";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-3pEPE96gFjDGesFs/EZswuv6D3JQEpnAnlCw0IWYkR0="; sha256 = "sha256-wqdujEKizrDFXtsjSTWpFgDL7MH3tsLTc7yd3LFgIQU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/andyholmes/valent/"; homepage = "https://github.com/andyholmes/valent/";
changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ gpl3Plus cc0 ]; license = with licenses; [ gpl3Plus cc0 ];
maintainers = with maintainers; [ federicoschonborn ]; maintainers = with maintainers; [ federicoschonborn aleksana ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -2,20 +2,20 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "vieb"; pname = "vieb";
version = "9.7.0"; version = "9.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Jelmerro"; owner = "Jelmerro";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-uo5V5RRDSR+f9+AqojikrlybmtcWTmB7TPXEvLG9n4E="; hash = "sha256-1G3hhqWMClxdwt3aOmnAbEV+n2ui5X6Cgf30391OVi0=";
}; };
postPatch = '' postPatch = ''
sed -i '/"electron"/d' package.json sed -i '/"electron"/d' package.json
''; '';
npmDepsHash = "sha256-RUpeqbb8bnSQ6sCYH8O9mL3Rpb+ZlcPi7fq6LlbkSic="; npmDepsHash = "sha256-t8fKbh9M63CCkxwlXj3zGvP8y5uLMqbyNd8BimBhIBc=";
dontNpmBuild = true; dontNpmBuild = true;
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;

View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudflared"; pname = "cloudflared";
version = "2023.4.2"; version = "2023.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cloudflared"; repo = "cloudflared";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-oHiaRdTEiTcGQkYoGw8TT0KZMFR8Rkce/4+cxSXAHMM="; hash = "sha256-0zUKlacB6aTj0UQ8dIQSU8F6SvVOTAU/GdbUqbJ8okI=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
pname = "bosh-cli"; pname = "bosh-cli";
version = "7.2.2"; version = "7.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudfoundry"; owner = "cloudfoundry";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-cSix1muhmPrL7fDGznkFAOAoArZoDvptli7uRo71Dlk="; sha256 = "sha256-sN6+hPH+VziXs94RkPdPlg6TKo/as4xC8Gd8MxAKluk=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cilium-cli"; pname = "cilium-cli";
version = "0.14.0"; version = "0.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cilium"; owner = "cilium";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-E/14YYX4EFakzBsaUxy1SZAaBCIKmgpWlY/9EazWWFI="; sha256 = "sha256-y7R9+YxkPWVEjcN8Czfp8UC47AAAt554XLo/nStoGLY=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubecm"; pname = "kubecm";
version = "0.22.1"; version = "0.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sunny0826"; owner = "sunny0826";
repo = "kubecm"; repo = "kubecm";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0oQOuBYCDNnOODM2ZSqTgOI+jHWuHTtsk2NfGIPMy5A="; hash = "sha256-BywtQ6YVGPz5A0GE2q0zRoBZNU6HZgVbr6H0OMR05wM=";
}; };
vendorHash = "sha256-fVPiEDB6WFu2x5EY7NjmJEEq297QxP10593cXxxv8iI="; vendorHash = "sha256-WZxjv4v2nfJjbzFfaDh2kE7ZBREB+Q8BmHhUrAiDd7g=";
ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
doCheck = false; doCheck = false;

View file

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself /* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the running in development environment and try to serve assets from the
source tree, which is not there once build completes. */ source tree, which is not there once build completes. */
version = "0.32.2"; version = "0.32.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tilt-dev"; owner = "tilt-dev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YB/stG+7gxIaB+vMx8PwmUm4W32fCNeRnVrOvOXba5k="; sha256 = "sha256-5QTZUapHhSSI+UZu77IUZdflCIm+oCu4kPQVhLHCsUQ=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -5,11 +5,11 @@
let let
pname = "zulip"; pname = "zulip";
version = "5.9.5"; version = "5.10.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
hash = "sha256-w2thmF/UA42j3u3m4L+/onilQhwMOa7IJoOMZ/ERypw="; hash = "sha256-rfFEhoykCStFCyBasQV6Cpb5ey+wvQLMXloIR0A1z7g=";
name="${pname}-${version}.AppImage"; name="${pname}-${version}.AppImage";
}; };

View file

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "netmaker"; pname = "netmaker";
version = "0.18.7"; version = "0.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gravitl"; owner = "gravitl";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-XnBz5dUBu6VqxLFsBXOvdLu/LsrfyEp9MLR/+nNggBk="; hash = "sha256-wiexultPliYD3WrLVtWUdLs762OzLAmoH66phwjOuUw=";
}; };
vendorHash = "sha256-a2ecHdxX82/JScRPGKpgEtrISD7qkPoZyv9kvO6SzaQ="; vendorHash = "sha256-Msvonap1soJExzBymouY8kZJnHT4SIwpfJjBgpkO2Rw=";
inherit subPackages; inherit subPackages;

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "treesheets"; pname = "treesheets";
version = "unstable-2023-05-03"; version = "unstable-2023-05-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aardappel"; owner = "aardappel";
repo = "treesheets"; repo = "treesheets";
rev = "b942b919a2f6b4e6d04ea62a4a82623f9e815cdd"; rev = "3694b16809daaa59b9198cd9645662e2a8cf4650";
sha256 = "rfYEpbhfWiviojqWWMhmYjpDh04hfRPGPdDQtcqhr8o="; sha256 = "NShLLBTBS88UXWWjsSeMVxj8HnnN4yA8gmz83wdpIzE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -18,11 +18,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fldigi"; pname = "fldigi";
version = "4.1.25"; version = "4.1.26";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-TsS/OS2mXwqsk+E+9MEoETIHRWks8Hg/qw8WRmAxB2M="; sha256 = "sha256-RIrTWjQPnn0I8bzV3kMQEesNaAkIQnhikLMaYivrWRc=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -3,7 +3,7 @@
{ pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args: { pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args:
let Dune = let Dune =
let dune-version = args . duneVersion or (if args.useDune2 or true then "2" else "1"); in let dune-version = args.duneVersion or "2"; in
{ "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}" { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}"
; in ; in
@ -39,7 +39,7 @@ stdenv.mkDerivation ({
strictDeps = true; strictDeps = true;
} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { } // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // {
name = "ocaml${ocaml.version}-${pname}-${version}"; name = "ocaml${ocaml.version}-${pname}-${version}";

View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "lxgw-wenkai"; pname = "lxgw-wenkai";
version = "1.250"; version = "1.300";
src = fetchurl { src = fetchurl {
url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz";
hash = "sha256-Nkd0xXYCnR0NZAk/JCxy+zOlxIxD52Px4F9o2L9mgRE="; hash = "sha256-pPN8siF/8D78sEcXoF+vZ4BIeYWyXAuk4HBQJP+G3O8=";
}; };
installPhase = '' installPhase = ''

View file

@ -43,13 +43,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gdm"; pname = "gdm";
version = "44.0"; version = "44.1";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "ziCwoiHb+M3gBktQH9jzj3ODkVKFfEU1M36wnMUvf2w="; sha256 = "aCZrOr59KPxGnQBnqsnF2rsMp5UswffCOKBJUfPcWw0=";
}; };
mesonFlags = [ mesonFlags = [

View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "engrampa"; pname = "engrampa";
version = "1.26.0"; version = "1.26.1";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1qsy0ynhj1v0kyn3g3yf62g31rwxmpglfh9xh0w5lc9j5k1b5kcp"; sha256 = "8CJBB6ek6epjCcnniqX6rIAsTPcqSawoOqnnrh6KbEo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -21,11 +21,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marco"; pname = "marco";
version = "1.26.1"; version = "1.26.2";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "tPpVUL+J1Pnv9a5ufWFQ42YaItUw1q3cZ1e86N0qXT0="; sha256 = "EvGiVP4QcvAwSIRxHgiaVoJ4CgEVk0Au043muUgOB6M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -32,13 +32,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "terra"; pname = "terra";
version = "1.0.6"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terralang"; owner = "terralang";
repo = "terra"; repo = "terra";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "1bs76ibzb469rlqs7slw8pm65csjq1nf0lqh6i9kcvbzavmdfds7"; sha256 = "0v9vpxcp9ybwnfljskqn41vjq7c0srdfv7qs890a6480pnk4kavd";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -50,6 +50,7 @@ in stdenv.mkDerivation rec {
"-DHAS_TERRA_VERSION=0" "-DHAS_TERRA_VERSION=0"
"-DTERRA_VERSION=${version}" "-DTERRA_VERSION=${version}"
"-DTERRA_LUA=luajit" "-DTERRA_LUA=luajit"
"-DTERRA_SKIP_LUA_DOWNLOAD=ON"
"-DCLANG_RESOURCE_DIR=${llvmMerged}/lib/clang/${clangVersion}" "-DCLANG_RESOURCE_DIR=${llvmMerged}/lib/clang/${clangVersion}"
] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON"; ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON";
@ -60,9 +61,6 @@ in stdenv.mkDerivation rec {
patches = [ ./nix-cflags.patch ]; patches = [ ./nix-cflags.patch ];
postPatch = '' postPatch = ''
sed -i '/file(DOWNLOAD "''${LUAJIT_URL}" "''${LUAJIT_TAR}")/d' \
cmake/Modules/GetLuaJIT.cmake
substituteInPlace src/terralib.lua \ substituteInPlace src/terralib.lua \
--subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include --subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include
''; '';

View file

@ -3,15 +3,16 @@
, makeWrapper , makeWrapper
}: }:
stdenv.mkDerivation rec { let
pname = "renpy";
# https://renpy.org/doc/html/changelog.html#versioning # https://renpy.org/doc/html/changelog.html#versioning
# base_version is of the form major.minor.patch # base_version is of the form major.minor.patch
# vc_version is of the form YYMMDDCC # vc_version is of the form YYMMDDCC
# version corresponds to the tag on GitHub # version corresponds to the tag on GitHub
base_version = "8.0.3"; base_version = "8.0.3";
vc_version = "22090809"; vc_version = "22090809";
in stdenv.mkDerivation rec {
pname = "renpy";
version = "${base_version}.${vc_version}"; version = "${base_version}.${vc_version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -46,7 +47,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace module/setup.py \ substituteInPlace module/setup.py \
--replace "@fribidi@" "${fribidi}" --replace "@fribidi@" "${fribidi.dev}"
cp tutorial/game/tutorial_director.rpy{m,} cp tutorial/game/tutorial_director.rpy{m,}
@ -87,4 +88,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ shadowrz ]; maintainers = with maintainers; [ shadowrz ];
}; };
passthru = { inherit base_version vc_version; };
} }

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dsdcc"; pname = "dsdcc";
version = "1.9.3"; version = "1.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "f4exb"; owner = "f4exb";
repo = "dsdcc"; repo = "dsdcc";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8lO2c4fkQCaVO8IM05+Rdpo6oMxoEIObBm0y08i+/0k="; sha256 = "sha256-EsjmU0LQOXnOoTFrnn63hAbvqbE6NVlSQTngot5Zuf4=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View file

@ -78,8 +78,7 @@ stdenvNoLibs.mkDerivation rec {
tm.h \ tm.h \
options.h \ options.h \
insn-constants.h \ insn-constants.h \
insn-modes.h \ insn-modes.h
gcov-iov.h
) )
mkdir -p "$buildRoot/gcc/include" mkdir -p "$buildRoot/gcc/include"
'' ''
@ -141,6 +140,9 @@ stdenvNoLibs.mkDerivation rec {
# Do not have dynamic linker without libc # Do not have dynamic linker without libc
"--enable-static" "--enable-static"
"--disable-shared" "--disable-shared"
# Avoid dependency on gcc.
"--disable-gcov"
]; ];
makeFlags = [ "MULTIBUILDTOP:=../" ]; makeFlags = [ "MULTIBUILDTOP:=../" ];

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "httplib"; pname = "httplib";
version = "0.12.2"; version = "0.12.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yhirose"; owner = "yhirose";
repo = "cpp-httplib"; repo = "cpp-httplib";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-mpHw9fzGpYz04rgnfG/qTNrXIf6q+vFfIsjb56kJsLg="; hash = "sha256-QHsa+Lmw9XTnwfyyY8b5I5PC8DFEIzwPvIdCwJWQz+I=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix { import ./generic.nix {
version = "3.89"; version = "3.89.1";
hash = "sha256-VcN6P02gENBXT7izkmTLHntM6ebClUwcfs+fQe4AvtU="; hash = "sha256-OtrtuecMPF9AYDv2CgHjNhkKbb4Bkp05XxawH+hKAVY=";
} }

View file

@ -60,6 +60,5 @@ stdenv.mkDerivation rec {
license = licenses.boost; license = licenses.boost;
maintainers = with maintainers; [ oxij ]; maintainers = with maintainers; [ oxij ];
platforms = platforms.unix; platforms = platforms.unix;
broken = true;
}; };
} }

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sentry-native"; pname = "sentry-native";
version = "0.6.1"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "getsentry"; owner = "getsentry";
repo = "sentry-native"; repo = "sentry-native";
rev = version; rev = version;
hash = "sha256-I4++of7P8AwTMh48UM+yXjbNykYwJJg1Y8bpGKKAicA="; hash = "sha256-cKDKdwkmvmB7O5tvCYtAHFdZFlcTk3I95AuA0dr+oX8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bimmer-connected"; pname = "bimmer-connected";
version = "0.13.2"; version = "0.13.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bimmerconnected"; owner = "bimmerconnected";
repo = "bimmer_connected"; repo = "bimmer_connected";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-3EKtWomzgtQlYgCQjahOEDo/yaPtprsp5WPQs/tVChU="; hash = "sha256-Cl1TxIwR90dJPe86lbULU2fYeM/KGCqQIqbQqjfAPtk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,6 +1,6 @@
{ buildPythonPackage { lib
, buildPythonPackage
, fetchPypi , fetchPypi
, lib
, distro , distro
, pysnmp , pysnmp
, python-gnupg , python-gnupg
@ -9,15 +9,19 @@
, sseclient-py , sseclient-py
, zfec , zfec
, pytestCheckHook , pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "blocksat-cli"; pname = "blocksat-cli";
version = "0.4.4"; version = "0.4.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-btwL8l5UdE9FwWXfuf1OHa8EwXDoFrh8tvOwr1yhyRg="; hash = "sha256-BLR1eivvlbSTx/jr7Rl778apPBcoFCaKOsYOqxS6Fo4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -30,7 +34,9 @@ buildPythonPackage rec {
zfec zfec
]; ];
nativeCheckInputs = [ pytestCheckHook ]; nativeCheckInputs = [
pytestCheckHook
];
disabledTestPaths = [ disabledTestPaths = [
# disable tests which require being connected to the satellite # disable tests which require being connected to the satellite
@ -42,7 +48,15 @@ buildPythonPackage rec {
"blocksatcli/api/test_order.py" "blocksatcli/api/test_order.py"
]; ];
pythonImportsCheck = [ "blocksatcli" ]; disabledTests = [
"test_monitor_get_stats"
"test_monitor_update_with_reporting_enabled"
"test_erasure_recovery"
];
pythonImportsCheck = [
"blocksatcli"
];
meta = with lib; { meta = with lib; {
description = "Blockstream Satellite CLI"; description = "Blockstream Satellite CLI";

View file

@ -10,15 +10,14 @@
, protobuf , protobuf
, cmake , cmake
, gcc , gcc
, dill , confluent-kafka
, multiprocess
, pytestCheckHook , pytestCheckHook
, pythonAtLeast , pythonAtLeast
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "bytewax"; pname = "bytewax";
version = "0.15.1"; version = "0.16.0";
format = "pyproject"; format = "pyproject";
disabled = pythonAtLeast "3.11"; disabled = pythonAtLeast "3.11";
@ -27,7 +26,7 @@ buildPythonPackage rec {
owner = "bytewax"; owner = "bytewax";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-4HZUu3WSrhxusvuVz8+8mndTu/9DML1tCH52eaWy+oE="; hash = "sha256-XdFkFhN8Z15Zw5HZ2wmnNFoTzyRtIbB7TAtOpKwuKyY=";
}; };
# Remove docs tests, myst-docutils in nixpkgs is not compatible with package requirements. # Remove docs tests, myst-docutils in nixpkgs is not compatible with package requirements.
@ -36,7 +35,7 @@ buildPythonPackage rec {
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
hash = "sha256-IfVX3k9AsqP84aagCLSwxmutUoEkP8haD+t+VY4V02U="; hash = "sha256-XGE1qPHi13/+8jjNCIgfzPudw561T0vUfJv5xnKySAg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -54,12 +53,14 @@ buildPythonPackage rec {
protobuf protobuf
]; ];
propagatedBuildInputs = [ preCheck = ''
dill export PY_IGNORE_IMPORTMISMATCH=1
multiprocess '';
];
checkInputs = [ pytestCheckHook ]; checkInputs = [
pytestCheckHook
confluent-kafka
];
meta = with lib; { meta = with lib; {
description = "Python Stream Processing"; description = "Python Stream Processing";

View file

@ -1,10 +1,10 @@
diff --git a/pyproject.toml b/pyproject.toml diff --git a/pyproject.toml b/pyproject.toml
index 9b6ee4b..4a82c15 100644 index 41b5c90..e7c7b2d 100644
--- a/pyproject.toml --- a/pyproject.toml
+++ b/pyproject.toml +++ b/pyproject.toml
@@ -56,5 +56,4 @@ testpaths = [ @@ -50,6 +50,5 @@ doctest_optionflags = "NORMALIZE_WHITESPACE"
testpaths = [
# TODO: Turn back on markdown tests once we stabilize inputs. "pytests",
"pysrc",
- "docs", - "docs",
] ]

View file

@ -17,6 +17,11 @@ buildPythonPackage rec {
rm -rf gen gen3 rm -rf gen gen3
''; '';
# Remove build tag which produces invaild version
postPatch = ''
sed -i '2d' setup.cfg
'';
nativeBuildInputs = [ nativeBuildInputs = [
SDL2.dev cython SDL2.dev cython
]; ];

View file

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-roborock"; pname = "python-roborock";
version = "0.11.0"; version = "0.13.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "humbertogontijo"; owner = "humbertogontijo";
repo = "python-roborock"; repo = "python-roborock";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-DH3JKBjBGZQjDCYzjLQc64qARALyfQZagOy7kkK7Sew="; hash = "sha256-gR8fp2ppVxc1ALRNQn+I8oXZWkQN5yd5vQlnATp6PoM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyutil"; pname = "pyutil";
version = "3.3.2"; version = "3.3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-6hbSxVtvg0Eh3rYyp0VLCg+uJdXRMLFfa+l667B2yfw="; hash = "sha256-XcPWu5xbq6u10Ldz4JQEXXVxLos0ry0psOKGAmaCZ8A=";
}; };
propagatedBuildInputs = [ simplejson ]; propagatedBuildInputs = [ simplejson ];

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rns"; pname = "rns";
version = "0.5.0"; version = "0.5.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist"; owner = "markqvist";
repo = "Reticulum"; repo = "Reticulum";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-mkCICKuo9NYkfjjbuDInq+ENwZsQJMf5C1HS+8nafJI="; hash = "sha256-yVjbYmvE6b9NZI0JYuMFjU+lh4l8Hf+pF+I/7sQNjVI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -12,15 +12,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "segyio"; pname = "segyio";
version = "1.9.9"; version = "1.9.11";
patches = [
# PR https://github.com/equinor/segyio/pull/531
(fetchpatch {
url = "https://github.com/equinor/segyio/commit/628bc5e02d0f98b89fe70b072df9b8e677622e9e.patch";
hash = "sha256-j+vqHZNfPIh+yWBgqbGD3W04FBvFiDJKnmcC/oTk3a8=";
})
];
postPatch = '' postPatch = ''
# Removing unecessary build dependency # Removing unecessary build dependency
@ -35,8 +27,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "equinor"; owner = "equinor";
repo = pname; repo = pname;
rev = version; rev = "v${version}";
hash = "sha256-L3u5BHS5tARS2aIiQbumADkuzw1Aw4Yuav8H8tRNYNg="; hash = "sha256-4izeMRgg5nJ9pRfSEMDlKSYYNWkhbKEzIz7czea6Vrc=";
}; };
nativeBuildInputs = [ cmake ninja python scikit-build ]; nativeBuildInputs = [ cmake ninja python scikit-build ];

View file

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-ujson"; pname = "types-ujson";
version = "5.7.0.1"; version = "5.7.0.5";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-VDUaYuwbZVDvsXr2PvfwwA0O+pwJnefaXGJ+HvooBVM="; hash = "sha256-f/Kmd2BI5q1qvH6+39Qq4bbABVEq/7rkTK8/selrXRI=";
}; };
doCheck = false; doCheck = false;

View file

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-urllib3"; pname = "types-urllib3";
version = "1.26.25.10"; version = "1.26.25.12";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-xEiBzen8glbQWtayH1DEaB6yAJJVI1FXCrCooGUyhtY="; hash = "sha256-oVVzVc6NNQpVXRQlifMAGQN1fS02wYpm9YjZZZu8kX0=";
}; };
# Module doesn't have tests # Module doesn't have tests

View file

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fastjsonschema , fastjsonschema
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, future-typing , future-typing
, inflection , inflection
, mypy , mypy
@ -19,17 +18,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "typical"; pname = "typical";
version = "2.8.0"; version = "2.8.1";
format = "pyproject"; format = "pyproject";
# Support for typing-extensions >= 4.0.0 on Python < 3.10 is missing
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "seandstewart"; owner = "seandstewart";
repo = "typical"; repo = "typical";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-DRjQmoZzWw5vpwIx70wQg6EO/aHqyX7RWpWZ9uOxSTg="; hash = "sha256-2t9Jhdy9NmYBNzdtjjgUnoK2RDEUsAvDkYMcBRzEcmI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -53,15 +51,6 @@ buildPythonPackage rec {
pandas pandas
]; ];
patches = [
# Switch to poetry-core, https://github.com/seandstewart/typical/pull/193
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/seandstewart/typical/commit/66b3c34f8969b7fb1f684f0603e514405bab0dd7.patch";
hash = "sha256-c7qJOtHmJRnVEGl+OADB3HpjvMK8aYDD9+0gplOn9pQ=";
})
];
disabledTests = [ disabledTests = [
# ConstraintValueError: Given value <{'key... # ConstraintValueError: Given value <{'key...
"test_tagged_union_validate" "test_tagged_union_validate"
@ -83,6 +72,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python library for runtime analysis, inference and validation of Python types"; description = "Python library for runtime analysis, inference and validation of Python types";
homepage = "https://python-typical.org/"; homepage = "https://python-typical.org/";
changelog = "https://github.com/seandstewart/typical/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ kfollesdal ]; maintainers = with maintainers; [ kfollesdal ];
}; };

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "codeql"; pname = "codeql";
version = "2.13.0"; version = "2.13.1";
dontConfigure = true; dontConfigure = true;
dontBuild = true; dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip { src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-K74o/qEC3DeR8lclJpkIXp6cAP6GLkK5QWJ6HzLxE8M="; sha256 = "sha256-RJ4ditBvMBnzY/QEU5fWQhQ/bBTpkxjbe12PwP8c1cc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -5,13 +5,13 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "devbox"; pname = "devbox";
version = "0.4.8"; version = "0.4.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jetpack-io"; owner = "jetpack-io";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-Xs7xd2U00AnYlXZv1PYHaSIYhDg+GpCHAtT2xis61vM="; hash = "sha256-JxpvUlBrC00zLEZAVVhNI0lP/whd61DcY+NZAoKR55I=";
}; };
ldflags = [ ldflags = [

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "lazygit"; pname = "lazygit";
version = "0.38.1"; version = "0.38.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jesseduffield"; owner = "jesseduffield";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-w4hdzPpv+/Uap7Uh3Op67yPYIJuWOc6ag1uMNs0uJRM="; sha256 = "sha256-HxOM2M2EoeM0IHCrFQqLdP9Rai6DbC1uRG0CiQyqRdE=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "twilio-cli"; pname = "twilio-cli";
version = "5.7.0"; version = "5.8.0";
src = fetchzip { src = fetchzip {
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
sha256 = "sha256-qlStCQKm+L50n3oFCuP+M4zzonmlx9gpDrGeNZ2Ex8A="; sha256 = "sha256-/+AmyzwuKsxfDoBn1o07sDqrLeJZPX9iJz3KTOGKQs4=";
}; };
buildInputs = [ nodejs ]; buildInputs = [ nodejs ];

View file

@ -12,15 +12,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.33.1"; version = "1.33.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GQouxU48raJUXzV6IT0LSyb7z5LuICdVKD0OHqPFtGo="; hash = "sha256-YXOo3YrycsZ8Njxx20B4ySjyfI5jiDCZenYr4ONC9fM=";
}; };
cargoHash = "sha256-PRlNp3dF9RLxmbmzD3fdso8PD/NEQIrtywHOsKcUHAA="; cargoHash = "sha256-dQwcY8OnzW6xcmQPbteN18uqgxlq52tVZWynTv6Ci9E=";
postPatch = '' postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds # upstream uses lld on aarch64-darwin for faster builds

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "flyctl"; pname = "flyctl";
version = "0.0.539"; version = "0.0.553";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "superfly"; owner = "superfly";
repo = "flyctl"; repo = "flyctl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-WsuVn6J2T60bktjU5PqLEkY2FbA1aumymDrF5p/PKTc="; hash = "sha256-EYb8v11laI3yh2hHWPsSu/eaFzRZpHSoJTltV3KCbTs=";
}; };
vendorHash = "sha256-FhJxal/pla3unlKN84qqKi7xuFXXjFz8XnZUmkohhxg="; vendorHash = "sha256-gqx7Q55AnXCUamrccm8WVxxw+YolJAEGNw5Qxr3iZK0=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -10,15 +10,15 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "urbit"; pname = "urbit";
version = "2.1"; version = "2.3";
src = fetchzip { src = fetchzip {
url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";
sha256 = { sha256 = {
x86_64-linux = "sha256-i5WofHC0aYldnA+KldeAmZQQo6yeI3yhmLHqPZOvi1c="; x86_64-linux = "sha256-7rPkEgJdCDkfz58VYOH2AH6s/048pySpmff0tfRkPqU=";
aarch64-linux = "sha256-QRarT+BtVPX7yURsqABZXcYyzqMGweIzo/MGpC2HhEo="; aarch64-linux = "sha256-8P0BNyaV+VxS2cl3ac2Ey7YC1b2A+DbfZZVpaI3agJw=";
x86_64-darwin = "sha256-JuMjYwmcArPEjcUapdkSu9FEFKK4ZfxJxmvRVOJ3w34="; x86_64-darwin = "sha256-EHYr3lG2WeHaFjO7CNcz5Ygv5MYzuFcCoX36hEXZVoo=";
aarch64-darwin = "sha256-5lpBhmdDpNVFHZ7P6TRBoFWFWKvwbJNO6ohiuoKMc6E="; aarch64-darwin = "sha256-lPuavLA73NtMC/yS/L1XwPljPnWw+9mcrw4RrqbVrnA=";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
}; };

View file

@ -26,13 +26,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sysdig"; pname = "sysdig";
version = "0.31.4"; version = "0.31.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "draios"; owner = "draios";
repo = "sysdig"; repo = "sysdig";
rev = version; rev = version;
sha256 = "sha256-9WzvO17Q4fLwJNoDLk8xN8mqIcrBhcMyxfRhUXkQ5vI="; sha256 = "sha256-RuoPqVulATtn7jSga/8fECs7weNfjt/YFh7iHmfCKjw=";
}; };
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];

View file

@ -41,14 +41,14 @@ let
in in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "gimme-aws-creds"; pname = "gimme-aws-creds";
version = "2.6.0"; # N.B: if you change this, check if overrides are still up-to-date version = "2.6.1"; # N.B: if you change this, check if overrides are still up-to-date
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nike-Inc"; owner = "Nike-Inc";
repo = "gimme-aws-creds"; repo = "gimme-aws-creds";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ojbof0Pf5oer3gFC4AlrRJICSJsQYHBQR8M+WV3VwQs="; hash = "sha256-h54miRSZWT1mG63k7imJfQU1fdVr3Zc2gcyuP5511EQ=";
}; };
nativeBuildInputs = with python.pkgs; [ nativeBuildInputs = with python.pkgs; [

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "stripe-cli"; pname = "stripe-cli";
version = "1.14.0"; version = "1.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stripe"; owner = "stripe";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-c7zfovUZMerUMbjrDPTTMuhzVKSA7VT7VYWy6MhSf88="; hash = "sha256-zP5QR1K8BAga+dEqGZKpZRYrpNLIBm6RNdf9VD9PaCk=";
}; };
vendorHash = "sha256-rjYV69BWkqIkgyeauAo4KEfbB7cxnwn3VSjLrMrCu1c="; vendorHash = "sha256-rjYV69BWkqIkgyeauAo4KEfbB7cxnwn3VSjLrMrCu1c=";
@ -29,7 +29,7 @@ buildGoModule rec {
rm pkg/cmd/resources_test.go rm pkg/cmd/resources_test.go
rm pkg/cmd/root_test.go rm pkg/cmd/root_test.go
# TODO: no clue why it's broken (1.14.0), remove for now. # TODO: no clue why it's broken (1.14.1), remove for now.
rm pkg/login/client_login_test.go rm pkg/login/client_login_test.go
rm pkg/git/editor_test.go rm pkg/git/editor_test.go
rm pkg/rpcservice/sample_create_test.go rm pkg/rpcservice/sample_create_test.go

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "syft"; pname = "syft";
version = "0.79.0"; version = "0.80.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anchore"; owner = "anchore";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-IrNOslrH2EN2q/d4m4bFbaIHvOaAjYgVRTDRMZRKefs="; hash = "sha256-q8xMa8Xw02+4w7zN1OkGbvd1NKZb3h4doFMuQzL2/x0=";
# populate values that require us to use git. By doing this in postFetch we # populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -22,7 +22,7 @@ buildGoModule rec {
}; };
# hash mismatch with darwin # hash mismatch with darwin
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-QWKcRu781cRkNSToLQvMQ4ViGYd2klBIlLkB7EyaKmI="; vendorHash = "sha256-QhxodA8Qlr33qYIrsQMKePlOcthS6cQMniHCpnewqcQ=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -1,4 +1,16 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: { lib
, stdenv
, fetchFromGitHub
, fetchpatch
, pkg-config
, yajl
, cmake
, libgcrypt
, curl
, expat
, boost
, libiberty
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.5.3"; version = "0.5.3";
@ -11,6 +23,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-P6gitA5cXfNbNDy4ohRLyXj/5dUXkCkOdE/9rJPzNCg="; sha256 = "sha256-P6gitA5cXfNbNDy4ohRLyXj/5dUXkCkOdE/9rJPzNCg=";
}; };
patches = [
# Backport gcc-12 support:
# https://github.com/vitalif/grive2/pull/363
(fetchpatch {
name = "gcc-12.patch";
url = "https://github.com/vitalif/grive2/commit/3cf1c058a3e61deb370dde36024a106a213ab2c6.patch";
hash = "sha256-v2Pb6Qvgml/fYzh/VCjOvEVnFYMkOHqROvLLe61DmKA=";
})
];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libgcrypt yajl curl expat boost libiberty ]; buildInputs = [ libgcrypt yajl curl expat boost libiberty ];
@ -21,5 +43,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "flannel"; pname = "flannel";
version = "0.21.4"; version = "0.21.5";
rev = "v${version}"; rev = "v${version}";
vendorHash = "sha256-EsHenfuqgNYTpkiGBhzUL8I7stukUgPvYov9rDs6Umo="; vendorHash = "sha256-JtDFwkYRAxpa4OBV5Tzr70DcOsp2oA3XB0PM5kGaY6Q=";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "flannel-io"; owner = "flannel-io";
repo = "flannel"; repo = "flannel";
sha256 = "sha256-aJiPtGPzgkeeRcqf9oGJhoEucINeVcaBtInxonhgqYk="; sha256 = "sha256-X8NVAaKJrJF1OCfzwcydvDPFUOhwdgGy/wfMWdhUqQ0=";
}; };
ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gobgp"; pname = "gobgp";
version = "3.13.0"; version = "3.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osrg"; owner = "osrg";
repo = "gobgp"; repo = "gobgp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qXLg/EZF2eU7BhILHO7Uu4juz0tVZLq37foQcSKv0P8="; sha256 = "sha256-R64Mm8fWZ8VZgsKcnc+ZqAk0V3L+TkpxTmSkx6+KVs0=";
}; };
vendorHash = "sha256-ofPz9IX+4ylch6Qe0ksGZqrP5x6AktqF0JAs/hLBQo0="; vendorHash = "sha256-Z7vYpDQIKc4elVBLiGtxF3D9pec4QNvWFLpux/29t1Y=";
postConfigure = '' postConfigure = ''
export CGO_ENABLED=0 export CGO_ENABLED=0

View file

@ -11,13 +11,13 @@
mkDerivation rec { mkDerivation rec {
pname = "web-eid-app"; pname = "web-eid-app";
version = "2.3.0"; version = "2.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "web-eid"; owner = "web-eid";
repo = "web-eid-app"; repo = "web-eid-app";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ktYToJ8mnDOiqOHf8iEl1CyHkJ4rAn2lbD0ikc2ctXw="; sha256 = "sha256-X6/vfCDEGXFn05DUSyy7koGVxUAPJ0lv8dnTaoansKk=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hostctl"; pname = "hostctl";
version = "1.1.3"; version = "1.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "guumaster"; owner = "guumaster";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-3CfUU74e79eilu7WP+EeoGlXUYnxmRpjb8RaH/XXjxo="; hash = "sha256-9BbPHqAZKw8Rpjpdd/e9ip3V0Eh06tEFt/skQ97ij4g=";
}; };
vendorSha256 = "sha256-3UM9w3o3qSlUvgg0k87aODJXqx1ryFvxHs6hlovBILY="; vendorHash = "sha256-+p1gIqklTyd/AU1q0zbQN4BwxOM910fBFmkqvbFAbZA=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wtwitch"; pname = "wtwitch";
version = "2.6.1"; version = "2.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "krathalan"; owner = "krathalan";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-CHIAxUF0kvt8iV5xRbX5zuOCIecH7NoviQOYiOK0CgY="; hash = "sha256-kXUocEBxEyjWOEUPVO1oPWEu7MAVoD2r4Umi1LPNKjc=";
}; };
# hardcode SCRIPT_NAME because #150841 # hardcode SCRIPT_NAME because #150841

View file

@ -3132,6 +3132,8 @@ with pkgs;
bunyan-rs = callPackage ../development/tools/bunyan-rs { }; bunyan-rs = callPackage ../development/tools/bunyan-rs { };
butt = callPackage ../applications/audio/butt { };
calcure = callPackage ../applications/misc/calcure { }; calcure = callPackage ../applications/misc/calcure { };
callaudiod = callPackage ../applications/audio/callaudiod { }; callaudiod = callPackage ../applications/audio/callaudiod { };
@ -17999,7 +18001,6 @@ with pkgs;
libgcc = callPackage ../development/libraries/gcc/libgcc { libgcc = callPackage ../development/libraries/gcc/libgcc {
stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems
gcc = gcc11; # fails to build with gcc12
}; };
# This is for e.g. LLVM libraries on linux. # This is for e.g. LLVM libraries on linux.