b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-07-09 12:01:18 +00:00 committed by GitHub
parent c5fd953de9 8b92746f77
commit c60d48234a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 201 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/system/boot/plymouth.nix
View file

@ -99,10 +99,12 @@ in
# Dimensions are 48x48 to match GDM logo # Dimensions are 48x48 to match GDM logo
default = "${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"; default = "${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png";
defaultText = literalExpression ''"''${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"''; defaultText = literalExpression ''"''${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"'';
example = literalExpression ''pkgs.fetchurl { example = literalExpression ''
url = "https://nixos.org/logo/nixos-hires.png"; pkgs.fetchurl {
sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; url = "https://nixos.org/logo/nixos-hires.png";
}''; sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
}
'';
description = lib.mdDoc '' description = lib.mdDoc ''
Logo which is displayed on the splash screen. Logo which is displayed on the splash screen.
''; '';

4
pkgs/applications/audio/ft2-clone/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ft2-clone"; pname = "ft2-clone";
version = "1.67"; version = "1.68";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "8bitbubsy"; owner = "8bitbubsy";
repo = "ft2-clone"; repo = "ft2-clone";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-v/yGHWd/hhE2jDdAQhyQbZOuHSS0FSG4WlVe8Oc6tMc="; sha256 = "sha256-mO8GrLyO7Zr9+lRy2WQ4OeRWDGmo22mPnZbajL78hJ8=";
}; };
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

10
pkgs/applications/audio/milkytracker/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper
, SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: , SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk";
}; };
patches = [
(fetchpatch {
name = "CVE-2022-34927.patch";
url = "https://github.com/milkytracker/MilkyTracker/commit/3a5474f9102cbdc10fbd9e7b1b2c8d3f3f45d91b.patch";
hash = "sha256-YnN1Khcbct7iG7TdwxFU1XVCeKR/Zrhe+oMepvh8cRU=";
})
];
postPatch = '' postPatch = ''
# https://github.com/milkytracker/MilkyTracker/issues/262 # https://github.com/milkytracker/MilkyTracker/issues/262
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \

4
pkgs/applications/audio/snd/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snd"; pname = "snd";
version = "23.4"; version = "23.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
sha256 = "sha256-1D/j/im1Xlx689k8zgnaRzJJYWHNviVhxyVzmLlfJps="; sha256 = "sha256-ZbGrxy494BH6QIj2sYAUEiNBsbNJHXtAVRLPVFwAcQM=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/editors/cudatext/default.nix
View file

@ -38,13 +38,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cudatext"; pname = "cudatext";
version = "1.195.0"; version = "1.196.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexey-T"; owner = "Alexey-T";
repo = "CudaText"; repo = "CudaText";
rev = version; rev = version;
hash = "sha256-7KAT7rWq4jjSz/oxw8K+WrWwJWf0Dq8cR0oyHtA4R9g="; hash = "sha256-O037+Pm/aq/9ZPMYpWlNPa9tEilatN8OJ3oBAuk4UTs=";
}; };
postPatch = '' postPatch = ''

8
pkgs/applications/editors/cudatext/deps.json generated
View file

@ -16,8 +16,8 @@
}, },
"ATSynEdit": { "ATSynEdit": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2023.05.31", "rev": "2023.07.05",
"hash": "sha256-N+ypCg9Tmg+/Y7KMXTZR4aiRqbsHZwKIUidVPthEJvI=" "hash": "sha256-+FZjmrB8t7WM3XALqT+jvTSbBYIVLav4zSSCvMr5r+U="
}, },
"ATSynEdit_Cmp": { "ATSynEdit_Cmp": {
"owner": "Alexey-T", "owner": "Alexey-T",
@ -31,8 +31,8 @@
}, },
"ATSynEdit_Ex": { "ATSynEdit_Ex": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2023.05.31", "rev": "2023.07.05",
"hash": "sha256-z0RGk0/oWTPpp/VSM4PBPLWIIQ5cVkQXlQyciW++SH0=" "hash": "sha256-dvo4lariMl/FMSp6VJEAk/Zhaz2fdBxe7aKw229DxKw="
}, },
"Python-for-Lazarus": { "Python-for-Lazarus": {
"owner": "Alexey-T", "owner": "Alexey-T",

8
pkgs/applications/graphics/entwine/default.nix
View file

@ -7,15 +7,15 @@
, openssl , openssl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "entwine"; pname = "entwine";
version = "unstable-2022-08-03"; version = "unstable-2023-04-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "connormanning"; owner = "connormanning";
repo = "entwine"; repo = "entwine";
rev = "c776d51fd6ab94705b74f78b26de7f853e6ceeae"; rev = "8bd179c38e6da1688f42376b88ff30427672c4e3";
sha256 = "sha256-dhYJhXtfMmqQLWuV3Dux/sGTsVxCI7RXR2sPlwIry0g="; sha256 = "sha256-RlNxTtqxQoniI1Ugj5ot0weu7ji3WqDJZpMu2n8vBkw=";
}; };
buildInputs = [ buildInputs = [

4
pkgs/applications/misc/syncthingtray/default.nix
View file

@ -30,14 +30,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */
}: }:
mkDerivation rec { mkDerivation rec {
version = "1.4.3"; version = "1.4.4";
pname = "syncthingtray"; pname = "syncthingtray";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Martchus"; owner = "Martchus";
repo = "syncthingtray"; repo = "syncthingtray";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-6J/P/DDD17QtXAISQn77EDIYqQu1hY7EnIX0FC6H/20="; sha256 = "sha256-i13Mt4xASneE4sBIt9fbdoFV1KnoVfaGRwQXX+1NgI4=";
}; };
buildInputs = [ buildInputs = [

10
pkgs/applications/networking/browsers/librewolf/src.json
View file

@ -1,11 +1,11 @@
{ {
"packageVersion": "114.0.2-1", "packageVersion": "115.0-1",
"source": { "source": {
"rev": "114.0.2-1", "rev": "115.0-1",
"sha256": "0snwwr15kd69p6xjbwcika8w04q0qgx6qmv5gy01y9gjc0hcv10q" "sha256": "0bnimayxsd1f2h2jx123w3kwmvyw3yp0r25714bfaf70njnrzlmw"
}, },
"firefox": { "firefox": {
"version": "114.0.2", "version": "115.0",
"sha512": "1d514d09c6b964b96c6d52d54b89a89a92d53a6fe669e16a6370346c980db4d0ac6c502fa89219c71b680566b9eb982e9b3191c21f81d7326f34f6c837c0a872" "sha512": "ed5d150e4dfdc01026beb3ae502a0b04321dd130084fdef63afce79a8a7a4898741d08f77716ba720c24f31b9c732c00ad0f1cd408b35b5eb6601a10014fb1a2"
} }
} }

4
pkgs/applications/networking/cluster/flink/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flink"; pname = "flink";
version = "1.17.0"; version = "1.17.1";
src = fetchurl { src = fetchurl {
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
sha256 = "sha256-x60Lk/xXf+Isg1J6z5qAIZ2/dbDiztPIKWrdPITp3Tg="; sha256 = "sha256-HpVDS3ydi2Z1SINAUed9lni9i8FCr0SI8yBCYP4wxyM=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/networking/cluster/kubecfg/default.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubecfg"; pname = "kubecfg";
version = "0.29.2"; version = "0.30.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubecfg"; owner = "kubecfg";
repo = "kubecfg"; repo = "kubecfg";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-toB0rRkqRTjf51g+BcMZiHjlG/slMyzA5OfO4DbTCH8="; hash = "sha256-sIT5vqcKMZvx+6rvUzH3l7aOXMWJq81Lwl9YsGwE66w=";
}; };
vendorHash = "sha256-sntlF8VCOtIB6kFJZaDs2Uu8zWZwMLcnHWuZy2D30Zg="; vendorHash = "sha256-cJFAI/W5ImWcaU6cf/BFt78qES7wQtYnR863UvGP4aM=";
ldflags = [ ldflags = [
"-s" "-s"

4
pkgs/applications/networking/cluster/temporal/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "temporal"; pname = "temporal";
version = "1.21.0"; version = "1.21.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "temporalio"; owner = "temporalio";
repo = "temporal"; repo = "temporal";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PhJLO+0JoSGS/aN6ZZoCwSypm8hihwAjsav+l4NSNZo="; hash = "sha256-fa8UQk3E1XhMqd7E9VRYOv6RLQW8smSUw48FeYBqmSU=";
}; };
vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw="; vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw=";

6
pkgs/applications/networking/cluster/werf/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "werf"; pname = "werf";
version = "1.2.241"; version = "1.2.242";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "werf"; owner = "werf";
repo = "werf"; repo = "werf";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-KEcHKMWe6t2TWbpQecpEDEdldi+9b0E5t+g+Zkhhqtw="; hash = "sha256-cYEhqoCkJtBRQuQDViA+x5Ow5bUB5Y2lZZf18cm5ig8=";
}; };
vendorHash = "sha256-iP1j11bWs5Laa1f3VEt/w+NMSWhHD8Kf4cwAZiy9sRc="; vendorHash = "sha256-tNTjPIVfviUZ4ONDyQI3M+DIzZvvPbBPdVu0Du+PIdg=";
proxyVendor = true; proxyVendor = true;

6
pkgs/applications/networking/cluster/zarf/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "zarf"; pname = "zarf";
version = "0.28.0"; version = "0.28.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "defenseunicorns"; owner = "defenseunicorns";
repo = "zarf"; repo = "zarf";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-TE7XP+qZkFxmms1iWDH8ziO8Rvkuo8cz8NdnMC/VU4s="; hash = "sha256-TgrYDLlbaYQwRpG4Vy9sZGWawbN4iS9YFVEjlB3JVfY=";
}; };
vendorHash = "sha256-5HIRwOTZwElU2Ej8EhwmTtqtL6r+Hc7Vp8XjqCulo34="; vendorHash = "sha256-dIQ+6aWI47zI++4skMFnyDYpQPcHEHSwUS9aXatY43g=";
proxyVendor = true; proxyVendor = true;
preBuild = '' preBuild = ''

6
pkgs/applications/networking/netmaker/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "netmaker"; pname = "netmaker";
version = "0.20.2"; version = "0.20.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gravitl"; owner = "gravitl";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-oxXGNmec5s4yN2SAjAUrvF2gJ9XkafwK98kDroIIssQ="; hash = "sha256-S4j9JoY3e763Jw46nCfJYdmZd8Ryao5v/zSiP1Cz9Pc=";
}; };
vendorHash = "sha256-p/MnieYNLq+mleqhqCYL9PBV2dVm+Zs945RwbdKjrus="; vendorHash = "sha256-BkBS1Gd9aZFIc1bTujYn2694SvRMF3nNCBg5i1NRwns=";
inherit subPackages; inherit subPackages;

6
pkgs/applications/networking/syncthing/default.nix
View file

@ -13,16 +13,16 @@ let
common = { stname, target, postInstall ? "" }: common = { stname, target, postInstall ? "" }:
buildGoModule rec { buildGoModule rec {
pname = stname; pname = stname;
version = "1.23.5"; version = "1.23.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-IdzgbgPpwgSDbGc2sDlQAPRWEYBRgrxs4ldP404n9FQ="; hash = "sha256-1NULZ3i3gR5RRegHJHH3OmxXU0d293GSTcky9+B4mJ4=";
}; };
vendorHash = "sha256-/mRuwBS05+6ugXNdfHJIhuOJWY7zcKvdvUdcpq4rVQ0="; vendorHash = "sha256-sj0XXEkcTfv24OuUeOoOLKHjaYMEuoh1Vg8k8T1Fp1o=";
nativeBuildInputs = lib.optionals stdenv.isDarwin [ nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when # Recent versions of macOS seem to require binaries to be signed when

4
pkgs/applications/science/biology/nest/default.nix
View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nest"; pname = "nest";
version = "3.4"; version = "3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nest"; owner = "nest";
repo = "nest-simulator"; repo = "nest-simulator";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-+wjsZxW2l0WGyGTm/6vyzPEeqCfyxJml9oP/zn6W1L0="; hash = "sha256-PPUIXlU6noJRAa/twNSKVxPgIvbWl0OillEJRDzt+4s=";
}; };
postPatch = '' postPatch = ''

4
pkgs/applications/science/biology/veryfasttree/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "veryfasttree"; pname = "veryfasttree";
version = "4.0"; version = "4.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "citiususc"; owner = "citiususc";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ue3/2UTIQA6av+66xvGApLi9x0kM5vAmGHHTrboOaeQ="; hash = "sha256-fv5ovi180Osok5GYJEidjMqmL8gZKUcxrcCQ/00lvi4=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/applications/science/math/polymake/default.nix
View file

@ -25,13 +25,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "polymake"; pname = "polymake";
version = "4.9"; version = "4.10";
src = fetchurl { src = fetchurl {
# "The minimal version is a packager friendly version which omits # "The minimal version is a packager friendly version which omits
# the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality."
url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2";
sha256 = "sha256-BMkLgms6JsWmPhi+MZv/Eqie8BKL+KaPtk3xBZSyWfM="; sha256 = "sha256-YDiyZtbUC76ZVe3oRtzPRBfkEU+qh+d1ZWFhzUyi+Pg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/video/iina/default.nix
View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iina"; pname = "iina";
version = "1.3.1"; version = "1.3.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg";
sha256 = "sha256-xkZkKiiEywUWkiFw4PbUmQsStB1iRLCNU/MY27lRjC8="; hash = "sha256-yieAcMc3rqoURsAcc8iAbe1pohlAU3r76FsgUeiNTP8=";
}; };
nativeBuildInputs = [ undmg ]; nativeBuildInputs = [ undmg ];

3
pkgs/applications/video/vlc/default.nix
View file

@ -202,10 +202,11 @@ stdenv.mkDerivation (finalAttrs: {
++ optional (waylandSupport && withQt5) qtwayland; ++ optional (waylandSupport && withQt5) qtwayland;
env = { env = {
LIVE555_PREFIX = if stdenv.hostPlatform.isAarch then null else live555;
# vlc depends on a c11-gcc wrapper script which we don't have so we need to # vlc depends on a c11-gcc wrapper script which we don't have so we need to
# set the path to the compiler # set the path to the compiler
BUILDCC = "${stdenv.cc}/bin/gcc"; BUILDCC = "${stdenv.cc}/bin/gcc";
} // lib.optionalAttrs (!stdenv.hostPlatform.isAarch) {
LIVE555_PREFIX = live555;
}; };
patches = [ patches = [

6
pkgs/applications/virtualization/docker/buildx.nix
View file

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "docker-buildx"; pname = "docker-buildx";
version = "0.11.0"; version = "0.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
repo = "buildx"; repo = "buildx";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-iO0ZcQB/sNyrZV8R7EbonMARNAdt5aMXF9h8knrccDg="; sha256 = "sha256-a33jGbafkmv55cKBCr8xlGTsD3bU/1CNyOfaXQIGMg0=";
}; };
doCheck = false; doCheck = false;
vendorSha256 = null; vendorHash = null;
ldflags = [ ldflags = [
"-w" "-s" "-w" "-s"

6
pkgs/applications/virtualization/nixpacks/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nixpacks"; pname = "nixpacks";
version = "1.9.1"; version = "1.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "railwayapp"; owner = "railwayapp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-LTZl9ErmapABeVJyaVjO9Ulq0chDoRzwPBd6GzwYioI="; sha256 = "sha256-tUL8pvUmRMTEeQpHbxaBMDuEdaEYVGmkopAhCL26CCk=";
}; };
cargoHash = "sha256-EIEfoSpNU/+GlxOd+oSw9QbURfp/yn7g13teuyjPJX0="; cargoHash = "sha256-I+ILjtnbLuxWHmw9KFMc00GWOOpY7UC8i+9nbybDPg4=";
# skip test due FHS dependency # skip test due FHS dependency
doCheck = false; doCheck = false;

4
pkgs/development/libraries/cpp-utilities/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cpp-utilities"; pname = "cpp-utilities";
version = "5.23.0"; version = "5.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Martchus"; owner = "Martchus";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gZF+dsj+KYrFklnJHT04XSGLdlEdslFmxeStz6jVl24="; sha256 = "sha256-krskfuoCRxYcAIDqrae4+yEABXXZ9Nv0BjBVwSMjC7g=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/ctranslate2/default.nix
View file

@ -17,13 +17,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ctranslate2"; pname = "ctranslate2";
version = "3.16.0"; version = "3.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenNMT"; owner = "OpenNMT";
repo = "CTranslate2"; repo = "CTranslate2";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-wQhPIjLUpeWNzUH7ZkK+l0nkiv4ncFHUys/vu/e9SOU="; hash = "sha256-6K4TQnm9va+oxwWuKfV+txF7rRBRzE6PoUEDA2v3lEM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/development/libraries/imgui/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imgui"; pname = "imgui";
version = "1.89.6"; version = "1.89.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocornut"; owner = "ocornut";
repo = "imgui"; repo = "imgui";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fxoBvJnGawbPCe+U+5biBbkN33IsWDKMSReJYJrEMMo="; sha256 = "sha256-kio1zy1DVL/Uh4eOqmHNCTE+Tb0GAIvsT4XDPkgHqYs=";
}; };
dontBuild = true; dontBuild = true;

4
pkgs/development/libraries/libdivecomputer/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libdivecomputer"; pname = "libdivecomputer";
version = "0.7.0"; version = "0.8.0";
src = fetchurl { src = fetchurl {
url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz"; url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-gNnxlOokUCA535hZhILgr8aw4zPeeds0wpstaJNNJbk="; sha256 = "sha256-J17M55I2RO1YH6q53LTxpprSUbzrByHE5fhftjFheg4=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/libraries/qtutilities/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qtutilities"; pname = "qtutilities";
version = "6.12.2"; version = "6.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Martchus"; owner = "Martchus";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YYuTDUBTNKLmieb/pDljiN0T8NdaOb2aRmwkD85ZF38="; hash = "sha256-gfGVVjtzpBGrPrp2k3fOIh54EAMSicyikF1CtaO74y8=";
}; };
buildInputs = [ qtbase cpp-utilities ]; buildInputs = [ qtbase cpp-utilities ];

4
pkgs/development/python-modules/datashader/default.nix
View file

@ -25,14 +25,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "datashader"; pname = "datashader";
version = "0.15.0"; version = "0.15.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-gbBIGnVTDnE8+s9CHaXgYspXkYMkZph/cLWXJMwDhy8="; hash = "sha256-vkgfO9WGKMuaL5SxcwMQWKG6FEYxLgRbkvftUkMwg4s=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/python-modules/django-rosetta/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-rosetta"; pname = "django-rosetta";
version = "0.9.8"; version = "0.9.9";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "mbi"; owner = "mbi";
repo = "django-rosetta"; repo = "django-rosetta";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-3AXwRxNWVkqW65xdqUwjHM1W5qhHXTjapqaM0Wmsebw="; hash = "sha256-OuKgqGYBlzQNKKAJYFhNi+LnONB/mxINMj4VBAVWjqI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -37,7 +37,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Rosetta is a Django application that facilitates the translation process of your Django projects"; description = "Rosetta is a Django application that facilitates the translation process of your Django projects";
homepage = "https://github.com/mbi/django-rosetta"; homepage = "https://github.com/mbi/django-rosetta";
changelog = "https://github.com/jazzband/django-rosetta/releases/tag/v${version}"; changelog = "https://github.com/mbi/django-rosetta/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ derdennisop ]; maintainers = with maintainers; [ derdennisop ];
}; };

2
pkgs/development/python-modules/hap-python/default.nix
View file

@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "ikalchev"; owner = "ikalchev";
repo = "HAP-python"; repo = "HAP-python";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-fAJB1gk8zTS/mW5KzWr3z26qctZc/EQlk//WM1Xwpl0="; hash = "sha256-/UBJh1m+WscN9I85/kvlNQnowNybEDyGVuQk4HBDWLE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

25
pkgs/development/python-modules/pushover/default.nix
View file

@ -1,25 +0,0 @@
{ stdenv, lib, buildPythonPackage, fetchPypi
, requests }:
buildPythonPackage rec {
pname = "python-pushover";
version = "0.4";
src = fetchPypi {
inherit pname version;
sha256 = "dee1b1344fb8a5874365fc9f886d9cbc7775536629999be54dfa60177cf80810";
};
propagatedBuildInputs = [ requests ];
# tests require network
doCheck = false;
meta = with lib; {
broken = true; # Relies on 2to3 via setuptools
description = "Bindings and command line utility for the Pushover notification service";
homepage = "https://github.com/Thibauth/python-pushover";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
};
}

12
pkgs/development/python-modules/pvlib/default.nix
View file

@ -9,6 +9,7 @@
, pytest-remotedata , pytest-remotedata
, pytest-rerunfailures , pytest-rerunfailures
, pytest-timeout , pytest-timeout
, pythonOlder
, pytz , pytz
, requests , requests
, requests-mock , requests-mock
@ -18,12 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pvlib"; pname = "pvlib";
version = "0.10.0"; version = "0.10.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi{ src = fetchPypi{
inherit pname version; inherit pname version;
hash = "sha256-K/f6tjBznXYJz+Y5tVS1Bj+DKcPtCPlwiKe/YTEsGSI="; hash = "sha256-H3wiNCmnZ6+GjXMhDbeOL98Yy7V6s2oOFAKWJCb8XCk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -48,9 +51,14 @@ buildPythonPackage rec {
requests-mock requests-mock
]; ];
pythonImportsCheck = [
"pvlib"
];
meta = with lib; { meta = with lib; {
homepage = "https://pvlib-python.readthedocs.io"; homepage = "https://pvlib-python.readthedocs.io";
description = "Simulate the performance of photovoltaic energy systems"; description = "Simulate the performance of photovoltaic energy systems";
changelog = "https://pvlib-python.readthedocs.io/en/v${version}/whatsnew.html";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ jluttine ]; maintainers = with maintainers; [ jluttine ];
}; };

4
pkgs/development/python-modules/ytmusicapi/default.nix
View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ytmusicapi"; pname = "ytmusicapi";
version = "1.1.0"; version = "1.1.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-MobeeelKkU5KFIFP/+Ny0ktzTnhKzX+fpzTuODrfjG0="; hash = "sha256-UCWNub0FErdmF3kGSIJlpIcKdPZdPzJ5y8yx9ZPBUlw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

14
pkgs/development/tools/capnproto-java/default.nix
View file

@ -2,23 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "capnproto-java"; pname = "capnproto-java";
version = "0.1.5"; version = "0.1.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "capnproto"; owner = "capnproto";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256:1512x70xa6mlg9dmr84r8xbf0jzysjal51ivhhh2ppl97yiqjgls"; hash = "sha256:IcmzI1G0mXOlpzmiyeLD7o1p/eOeVpwkiGsgy5OIjxw=";
}; };
patches = [
# Add make install rule
(fetchpatch {
url = "https://github.com/capnproto/capnproto-java/commit/e96448d3f5737db25e55cd268652712b69db5cc0.diff";
sha256 = "0f3vyap1zsxy675900pzg5ngh7bf9icllm1w04q64g8i91sdzljl";
})
];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ capnproto ]; buildInputs = [ capnproto ];
@ -30,6 +22,6 @@ stdenv.mkDerivation rec {
longDescription = "Only includes compiler plugin, the Java runtime/library that the generated code will link to must be built separately with Maven."; longDescription = "Only includes compiler plugin, the Java runtime/library that the generated code will link to must be built separately with Maven.";
homepage = "https://dwrensha.github.io/capnproto-java/index.html"; homepage = "https://dwrensha.github.io/capnproto-java/index.html";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ bhipple ]; maintainers = with maintainers; [ bhipple solson ];
}; };
} }

6
pkgs/development/tools/earthly/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "earthly"; pname = "earthly";
version = "0.7.9"; version = "0.7.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "earthly"; owner = "earthly";
repo = "earthly"; repo = "earthly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-KShHkqhPlC5MXHVd81ipacyDxWXyl3xFvWpe+7DHqsM="; sha256 = "sha256-Agg1r/5QYk5U9ZblVO/WvLCBy9od7vQuDYKOJeR93XA=";
}; };
vendorHash = "sha256-0KAnj/PizBC1obz09EAVWUPO0aFw5QUSTENMd7aIo1Y="; vendorHash = "sha256-tEhUywjJtNaWLPSRNeHTcNsPNCZtXzqjg0VG4g4N9E0=";
subPackages = [ "cmd/earthly" "cmd/debugger" ]; subPackages = [ "cmd/earthly" "cmd/debugger" ];
CGO_ENABLED = 0; CGO_ENABLED = 0;

6
pkgs/development/tools/kaf/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kaf"; pname = "kaf";
version = "0.2.3"; version = "0.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "birdayz"; owner = "birdayz";
repo = "kaf"; repo = "kaf";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5wSxaryaQ8jXwpzSltMmFRVrvaA9JMSrh8VBCnquLXE="; hash = "sha256-BH956k2FU855cKT+ftFOtRR2IjQ4sViiGy0tvrMWpEQ=";
}; };
vendorSha256 = "sha256-Jpv02h+EeRhVdi/raStTEfHitz0A71dHpWdF/zcVJVU="; vendorHash = "sha256-Y8jma4M+7ndJARfLmGCUmkIL+Pkey599dRO7M4iXU2Y=";
# Many tests require a running Kafka instance # Many tests require a running Kafka instance
doCheck = false; doCheck = false;

6
pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
View file

@ -5,16 +5,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "docker-compose-language-service"; pname = "docker-compose-language-service";
version = "0.1.3"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "microsoft"; owner = "microsoft";
repo = "compose-language-service"; repo = "compose-language-service";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-faQvUHzqtCipceGnamVQIlAWCDpo7oX01/zGz9RLjMY="; hash = "sha256-UBnABi7DMKrAFkRA8H6us/Oq4yM0mJ+kwOm0Rt8XnGw=";
}; };
npmDepsHash = "sha256-gWaZMsI1HVIXKZInfgzfH8syzOwU2C6kcKvB2M6KLX4="; npmDepsHash = "sha256-G1X9WrnwN6wM9S76PsGrPTmmiMBUKu4T2Al3HH3Wo+w=";
meta = with lib; { meta = with lib; {
description = "Language service for Docker Compose documents"; description = "Language service for Docker Compose documents";

3
pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
View file

@ -14823,9 +14823,6 @@
"python-ptrace": [ "python-ptrace": [
"setuptools" "setuptools"
], ],
"python-pushover": [
"setuptools"
],
"python-rabbitair": [ "python-rabbitair": [
"setuptools" "setuptools"
], ],

6
pkgs/development/tools/sentry-cli/default.nix
View file

@ -9,13 +9,13 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "sentry-cli"; pname = "sentry-cli";
version = "2.19.1"; version = "2.19.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "getsentry"; owner = "getsentry";
repo = "sentry-cli"; repo = "sentry-cli";
rev = version; rev = version;
sha256 = "sha256-Va9hVXsASkDCGEGGy+QdJOswHHfORDu2t2qj7lUapsc="; sha256 = "sha256-C86s/fQlQc49TP9CSzA8lPKBd2YKnuJNL//GPvxcVBU=";
}; };
doCheck = false; doCheck = false;
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
cargoHash = "sha256-CPNvLxJABgJ2HCt86v7G6ykGHPtCTpCXc832PtWaxyU="; cargoHash = "sha256-Ks0IM+iqB9b44mmg6QHTZssQd+9Giu/Be+DUKy5HImg=";
meta = with lib; { meta = with lib; {
homepage = "https://docs.sentry.io/cli/"; homepage = "https://docs.sentry.io/cli/";

10
pkgs/development/web/bun/default.nix
View file

@ -12,7 +12,7 @@
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
version = "0.6.12"; version = "0.6.13";
pname = "bun"; pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
sources = { sources = {
"aarch64-darwin" = fetchurl { "aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
sha256 = "CCfBRrvG1OFThIQ/udmXK/civUFPow7aXlrJO1o00Cg="; sha256 = "6d4pDuAJCgUIFpmp8gGLn2rHvpQ54I6vCXU2WmIYe0M=";
}; };
"aarch64-linux" = fetchurl { "aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
sha256 = "V5csrlGcxwUsKu078vIMgbWkxBa8OvFUeCvPFhcTOPE="; sha256 = "Hr3c0840fz47jDNjigTsz7HEUSP6btXVDFUUtDtdO5I=";
}; };
"x86_64-darwin" = fetchurl { "x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
sha256 = "GSzjmoBhCXj6LOUoviRhbJtftWXIYXcc6HWx9N4npMY="; sha256 = "H7pjr6ySoxYOGrOpLjzMb/b3BiG50XSmMi6atQooRN4=";
}; };
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
sha256 = "M/YDVAOXK7TUbrcey+J7plrTzTXPBOps7JPBioGew7E="; sha256 = "f3VysZdTfs4G4a48AahbaEACVpiKPG7OfbAYTCGHi1k=";
}; };
}; };
updateScript = writeShellScript "update-bun" '' updateScript = writeShellScript "update-bun" ''

6
pkgs/games/blobby/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blobby-volley"; pname = "blobby-volley";
version = "1.0"; version = "1.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.1/blobby2-linux-1.1.tar.gz";
sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; sha256 = "sha256-1WJ59Fhb1opXjOci+nAx/F2w5TnBaRhxQuPKgmmLfvQ=";
}; };
nativeBuildInputs = [ cmake pkg-config zip ]; nativeBuildInputs = [ cmake pkg-config zip ];

6
pkgs/games/minesweep-rs/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "minesweep-rs"; pname = "minesweep-rs";
version = "6.0.11"; version = "6.0.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cpcloud"; owner = "cpcloud";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-jGg6GrPDPOWvIQiZ9UJbGHLaxTxSV7EvqIcEoGrfRZ0="; hash = "sha256-vr6tfwTIDuMyyeWTPeH71ECf4PqI2+5s1Lb45Cavr+4=";
}; };
cargoHash = "sha256-IKf44wCCzXcasuimnAwnEhJGmag67rGxQE7+rBEUVOI="; cargoHash = "sha256-KHmZ37wnz8Z2dz78tiovqhNIiPcb5WBzk9plPNM/gqU=";
meta = with lib; { meta = with lib; {
description = "Sweep some mines for fun, and probably not for profit"; description = "Sweep some mines for fun, and probably not for profit";

30
pkgs/games/shattered-pixel-dungeon/default.nix
View file

@ -6,6 +6,8 @@
, perl , perl
, jre , jre
, libpulseaudio , libpulseaudio
, makeDesktopItem
, copyDesktopItems
}: }:
let let
@ -52,26 +54,52 @@ let
outputHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk="; outputHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk=";
}; };
desktopItem = makeDesktopItem {
name = "shattered-pixel-dungeon";
desktopName = "Shattered Pixel Dungeon";
comment = "An open-source traditional roguelike dungeon crawler";
icon = "shattered-pixel-dungeon";
exec = "shattered-pixel-dungeon";
terminal = false;
categories = [ "Game" "AdventureGame" ];
keywords = [ "roguelike" "dungeon" "crawler" ];
};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
inherit pname version src patches postPatch; inherit pname version src patches postPatch;
nativeBuildInputs = [ gradle perl makeWrapper ]; nativeBuildInputs = [ gradle perl makeWrapper copyDesktopItems ];
desktopItems = [ desktopItem ];
buildPhase = '' buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426 # https://github.com/gradle/gradle/issues/4426
${lib.optionalString stdenv.isDarwin "export TERM=dumb"} ${lib.optionalString stdenv.isDarwin "export TERM=dumb"}
# point to offline repo # point to offline repo
sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle
gradle --offline --no-daemon desktop:release gradle --offline --no-daemon desktop:release
runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall
install -Dm644 desktop/build/libs/desktop-${version}.jar $out/share/shattered-pixel-dungeon.jar install -Dm644 desktop/build/libs/desktop-${version}.jar $out/share/shattered-pixel-dungeon.jar
mkdir $out/bin mkdir $out/bin
makeWrapper ${jre}/bin/java $out/bin/shattered-pixel-dungeon \ makeWrapper ${jre}/bin/java $out/bin/shattered-pixel-dungeon \
--prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \
--add-flags "-jar $out/share/shattered-pixel-dungeon.jar" --add-flags "-jar $out/share/shattered-pixel-dungeon.jar"
for s in 16 32 48 64 128 256; do
install -Dm644 desktop/src/main/assets/icons/icon_$s.png \
$out/share/icons/hicolor/''${s}x$s/apps/shattered-pixel-dungeon.png
done
runHook postInstall
''; '';
passthru.tests = { passthru.tests = {

4
pkgs/games/theforceengine/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "theforceengine"; pname = "theforceengine";
version = "1.09.200"; version = "1.09.300";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "luciusDXL"; owner = "luciusDXL";
repo = "TheForceEngine"; repo = "TheForceEngine";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-r3fNhiPl6fjrIbdLoNIyTETw3lpPZCQYlTA2QJgiDgw="; sha256 = "sha256-nf5fhP68AgBESiJleeZOLXkAajS+JmHUqyj4vAt2wl4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

13
pkgs/games/xonotic/default.nix
View file

@ -97,10 +97,17 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
installPhase = ('' installPhase = (''
for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024 scalable; do install -Dm644 ../../misc/logos/xonotic_icon.svg \
install -Dm644 ../../misc/logos/xonotic_icon.svg \ $out/share/icons/hicolor/scalable/apps/xonotic.svg
$out/share/icons/hicolor/$size/xonotic.svg pushd ../../misc/logos/icons_png
for img in *.png; do
size=''${img#xonotic_}
size=''${size%.png}
dimensions="''${size}x''${size}"
install -Dm644 $img \
$out/share/icons/hicolor/$dimensions/apps/xonotic.png
done done
popd
'' + lib.optionalString withDedicated '' '' + lib.optionalString withDedicated ''
install -Dm755 darkplaces-dedicated "$out/bin/xonotic-dedicated" install -Dm755 darkplaces-dedicated "$out/bin/xonotic-dedicated"
'' + lib.optionalString withGLX '' '' + lib.optionalString withGLX ''

4
pkgs/servers/monitoring/vmagent/default.nix
View file

@ -1,13 +1,13 @@
{ lib, fetchFromGitHub, buildGoModule }: { lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec { buildGoModule rec {
pname = "vmagent"; pname = "vmagent";
version = "1.91.2"; version = "1.91.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VictoriaMetrics"; owner = "VictoriaMetrics";
repo = "VictoriaMetrics"; repo = "VictoriaMetrics";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+xc3XhHHHe8JdHhEcAEGf6hkzlhSLYjG4C9znONPYzw="; sha256 = "sha256-xW31Lm+WiJ1quMaIDa7tbZuKhILTMdUviIDTRJT1Cqg=";
}; };
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];

4
pkgs/servers/photofield/default.nix
View file

@ -9,13 +9,13 @@
let let
pname = "photofield-ui"; pname = "photofield-ui";
version = "0.10.3"; version = "0.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SmilyOrg"; owner = "SmilyOrg";
repo = "photofield"; repo = "photofield";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-OrLsthhnjX6LWehwiBDRzhCmTp3IBsbu9WKVu0zhgaQ="; hash = "sha256-kcKnE4U+XWYfKw5nZSk+xCtYdagHBMZS3hvukEL8p4M=";
}; };
webui = buildNpmPackage { webui = buildNpmPackage {

6
pkgs/servers/pocketbase/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "pocketbase"; pname = "pocketbase";
version = "0.16.5"; version = "0.16.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pocketbase"; owner = "pocketbase";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-tjrc6JF8oVqyKgiRUT7nlsuMFSSpSJnSY4pELk3csYY="; sha256 = "sha256-ZP1NaxQ7avg4ftLh9PXIEAN8iLrjsc+LcJlrIguIEN0=";
}; };
vendorHash = "sha256-4h3Q8w7emjfZkVr0xujoOUjipXnDQfHOn8Ii19cNllI="; vendorHash = "sha256-d1YGRULQh1LwQaH/44ZrBq2p8E63BhqnWzvpv7RVaqw=";
# This is the released subpackage from upstream repo # This is the released subpackage from upstream repo
subPackages = [ "examples/base" ]; subPackages = [ "examples/base" ];

4
pkgs/servers/ser2net/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ser2net"; pname = "ser2net";
version = "4.3.12"; version = "4.3.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cminyard"; owner = "cminyard";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-jF1tk/JeZ3RGHol+itwtkTF/cn5FHm/vhUgXJzi9J9E="; hash = "sha256-SAyZ1Ob6swF6i1LFLpwyfMVSi/tOAfz6aiUNOVeJIa0=";
}; };
passthru = { passthru = {

4
pkgs/shells/murex/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "murex"; pname = "murex";
version = "4.2.5110"; version = "4.3.3200";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lmorg"; owner = "lmorg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qUnOHnYEzkEQyAn1S2dWXWJIDs0UBtPXIufCzQAtZw8="; sha256 = "sha256-W0P/WZ+GC0on7ZKjGNq6UQO9iAMIo7vODn9JltfK5XY=";
}; };
vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU="; vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU=";

1
pkgs/stdenv/adapters.nix
View file

@ -105,6 +105,7 @@ rec {
name = "darwin-portable-libSystem-hook"; name = "darwin-portable-libSystem-hook";
substitutions = { substitutions = {
libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
targetPrefix = stdenv.cc.bintools.targetPrefix;
}; };
} ./darwin/portable-libsystem.sh) } ./darwin/portable-libsystem.sh)
]; ];

4
pkgs/stdenv/darwin/portable-libsystem.sh
View file

@ -6,7 +6,7 @@ fixupOutputHooks+=('fixLibsystemRefs $prefix')
fixLibsystemRefs() { fixLibsystemRefs() {
if [ -d "$1/bin" ]; then if [ -d "$1/bin" ]; then
find "$1/bin" -exec \ find "$1/bin" -type f -exec \
install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \; @targetPrefix@install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
fi fi
} }

4
pkgs/tools/audio/abcmidi/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "abcMIDI"; pname = "abcMIDI";
version = "2023.05.30"; version = "2023.06.25";
src = fetchzip { src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
hash = "sha256-aiwObK/5UhvLMPMWNlO5GaYJH9z9RHTTrRQL1IGI7i4="; hash = "sha256-Fn10QcwqKPerMh3OMJTMUQZ6nUMgBysXmxCbEOXSG0k=";
}; };
meta = with lib; { meta = with lib; {

4
pkgs/tools/graphics/vkbasalt/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "vkbasalt"; pname = "vkbasalt";
version = "0.3.2.9"; version = "0.3.2.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DadSchoorse"; owner = "DadSchoorse";
repo = "vkBasalt"; repo = "vkBasalt";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-IVlZ6o+1EEEh547rFPN7z+W+EY7MrIM/yUh6+PPkNeI="; hash = "sha256-GC6JKYnsfcUBg+CX6v7MyE4FeLmjadFwighaiyureDg=";
}; };
nativeBuildInputs = [ glslang meson ninja pkg-config ]; nativeBuildInputs = [ glslang meson ninja pkg-config ];

6
pkgs/tools/misc/cf-terraforming/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cf-terraforming"; pname = "cf-terraforming";
version = "0.12.0"; version = "0.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cf-terraforming"; repo = "cf-terraforming";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HCJYLU3eo1C06qp8sb2MsDoLrD0bDeu5WEeGCrOucn4="; sha256 = "sha256-s2xsFJ+8ivkdG2F52iRdTbJDEw8ALmFDR7Ct6d84p+s=";
}; };
vendorHash = "sha256-HLKk64PcJUjKfY4pIwI2OXnjqFF1EkYlWOi0aWOVSbk="; vendorHash = "sha256-pe5ieCstUe3ZHlJs83lzwNS2qAIhIGJG9E5P4Ri3E/s=";
ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ];
# The test suite insists on downloading a binary release of Terraform from # The test suite insists on downloading a binary release of Terraform from

4
pkgs/tools/misc/steampipe/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "steampipe"; pname = "steampipe";
version = "0.20.7"; version = "0.20.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "turbot"; owner = "turbot";
repo = "steampipe"; repo = "steampipe";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-t9RNrbW7wR2WiUacf6/U4qtcR7ZvDZ+duRQ282ScRmU="; sha256 = "sha256-neHcLO64Ik61P6R6rFL3kuKi9qRQ64f1xEqUrgUKeCg=";
}; };
vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA="; vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA=";

6
pkgs/tools/networking/frp/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "frp"; pname = "frp";
version = "0.50.0"; version = "0.51.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fatedier"; owner = "fatedier";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-QEVrABDFdHd7DdKLs/mOEmOPvNjHLBFjgdMVi3ooNv0="; sha256 = "sha256-Nng9WZlKyrEtuVQec5pcfUoZQKWN1IwZ8N7JLc+Mark=";
}; };
vendorHash = "sha256-zQMm3qOBDJuL4w/BDGKH3DbfAFn0pwuvjltYnuxxvzk="; vendorHash = "sha256-pnC4bnb/y9x6hDa6yAwNoWDUlIiAyy6LEdoISlX+S1s=";
doCheck = false; doCheck = false;

4
pkgs/tools/networking/networkmanager/dmenu/default.nix
View file

@ -4,13 +4,13 @@
let inherit (python3Packages) python pygobject3; let inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "networkmanager_dmenu"; pname = "networkmanager_dmenu";
version = "2.1.0"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "firecat53"; owner = "firecat53";
repo = "networkmanager-dmenu"; repo = "networkmanager-dmenu";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-btwiKxmb1xDtPSTOIvpHJDQ5SY1gnBWlKnYOzzSLDEY="; sha256 = "sha256-cJeDYk2BQv2ZWGC96I7lXFFYgseWj68ZfvE7ATW46U0=";
}; };
buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ]; buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ];

4
pkgs/tools/networking/pritunl-client/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "pritunl-client"; pname = "pritunl-client";
version = "1.3.3484.2"; version = "1.3.3584.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pritunl"; owner = "pritunl";
repo = "pritunl-client-electron"; repo = "pritunl-client-electron";
rev = version; rev = version;
sha256 = "sha256-thIbw/Iek2vNNmkOBHrzEhTbaOm05CsbjqORQKC2jIs="; sha256 = "sha256-wWpP2u+oQSESjkRvAn5by7efvssYtKBYg2E+FZ/+tg0=";
}; };
modRoot = "cli"; modRoot = "cli";

4
pkgs/tools/security/doppler/default.nix
View file

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
pname = "doppler"; pname = "doppler";
version = "3.63.0"; version = "3.63.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dopplerhq"; owner = "dopplerhq";
repo = "cli"; repo = "cli";
rev = version; rev = version;
sha256 = "sha256-7M/ZdeaiOWJEXEhZ0Sj8oxvMgo0mgSNmpUBWm9qxafA="; sha256 = "sha256-ESh35VSxFeg8d9cu4FJZi4m1/3cb2iRkngUDrInljV4=";
}; };
vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE="; vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE=";

4
pkgs/tools/text/a2ps/default.nix
View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "a2ps"; pname = "a2ps";
version = "4.15.4"; version = "4.15.5";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz"; url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz";
hash = "sha256-SgY/hLqJ2GvhSmcEyjX9EwCDtXLxN2tDmht5tnsgbdc="; hash = "sha256-gbsbQQTnwmOXYkUe3JeG2vPf6ziErfx9xqydII8w2n8=";
}; };
postPatch = '' postPatch = ''

1
pkgs/top-level/python-aliases.nix
View file

@ -270,6 +270,7 @@ mapAliases ({
python_mimeparse = python-mimeparse; # added 2021-10-31 python_mimeparse = python-mimeparse; # added 2021-10-31
python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03 python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03
python-Levenshtein = levenshtein; python-Levenshtein = levenshtein;
python-pushover = throw "python-pushover has been removed, since it is unmaintained and is broken"; # added 2023-07-03
python-subunit = subunit; # added 2021-09-10 python-subunit = subunit; # added 2021-09-10
pytest_xdist = pytest-xdist; # added 2021-01-04 pytest_xdist = pytest-xdist; # added 2021-01-04
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21

2
pkgs/top-level/python-packages.nix
View file

@ -10174,8 +10174,6 @@ self: super: with self; {
python-ptrace = callPackage ../development/python-modules/python-ptrace { }; python-ptrace = callPackage ../development/python-modules/python-ptrace { };
python-pushover = callPackage ../development/python-modules/pushover { };
python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };
python-rabbitair = callPackage ../development/python-modules/python-rabbitair { }; python-rabbitair = callPackage ../development/python-modules/python-rabbitair { };