colin/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-01-29 06:01:23 +00:00 committed by GitHub
commit 04f965695c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 360 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View File

@ -485,6 +485,7 @@ in {
opensmtpd = handleTest ./opensmtpd.nix {};
opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {};
openssh = handleTest ./openssh.nix {};
octoprint = handleTest ./octoprint.nix {};
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
opentabletdriver = handleTest ./opentabletdriver.nix {};

61
nixos/tests/octoprint.nix Normal file
View File

@ -0,0 +1,61 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
let
apikey = "testapikey";
in
{
name = "octoprint";
meta.maintainers = with lib.maintainers; [ gador ];
nodes.machine = { pkgs, ... }: {
environment.systemPackages = with pkgs; [ jq ];
services.octoprint = {
enable = true;
extraConfig = {
server = {
firstRun = false;
};
api = {
enabled = true;
key = apikey;
};
plugins = {
# these need internet access and pollute the output with connection failed errors
_disabled = [ "softwareupdate" "announcements" "pluginmanager" ];
};
};
};
};
testScript = ''
import json
@polling_condition
def octoprint_running():
machine.succeed("pgrep octoprint")
with subtest("Wait for octoprint service to start"):
machine.wait_for_unit("octoprint.service")
machine.wait_until_succeeds("pgrep octoprint")
with subtest("Wait for final boot"):
# this appears whe octoprint is almost finished starting
machine.wait_for_file("/var/lib/octoprint/uploads")
# octoprint takes some time to start. This makes sure we'll retry just in case it takes longer
# retry-all-errors in necessary, since octoprint will report a 404 error when not yet ready
curl_cmd = "curl --retry-all-errors --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 \
--retry-max-time 40 -X GET --header 'X-API-Key: ${apikey}' "
# used to fail early, in case octoprint first starts and then crashes
with octoprint_running: # type: ignore[union-attr]
with subtest("Check for web interface"):
machine.wait_until_succeeds("curl -s localhost:5000")
with subtest("Check API"):
version = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/version"))
server = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/server"))
assert version["server"] == str("${pkgs.octoprint.version}")
assert server["safemode"] == None
'';
})

4
pkgs/applications/misc/crow-translate/default.nix
View File

@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "crow-translate";
version = "2.10.1";
version = "2.10.3";
src = fetchzip {
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
hash = "sha256-xRXNT/IybcynS5S71XFFsx3PoLXDBcKuz81ybxoVtV4=";
hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ=";
};
patches = [

19
pkgs/applications/misc/octoprint/default.nix
View File

@ -5,6 +5,7 @@
, python3
, substituteAll
, nix-update-script
, nixosTests
# To include additional plugins, pass them here as an overlay.
, packageOverrides ? self: super: { }
}:
@ -14,6 +15,21 @@ let
self = py;
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
[
(
# with version 3 of flask-limiter octoprint 1.8.6 fails to start with
# TypeError: Limiter.__init__() got multiple values for argument 'key_func'
self: super: {
flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec {
version = "2.6.2";
src = fetchFromGitHub {
owner = "alisaifee";
repo = "flask-limiter";
rev = version;
sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew=";
};
});
}
)
# Built-in dependency
(
self: super: {
@ -202,6 +218,9 @@ let
passthru = {
python = self.python;
updateScript = nix-update-script { };
tests = {
inherit (nixosTests) octoprint;
};
};
meta = with lib; {

6
pkgs/applications/networking/cluster/talosctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "talosctl";
version = "1.3.2";
version = "1.3.3";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
hash = "sha256-o037LemAZhsHVIfAU0yVoNNbJ6g8ehlA4lFLN78Q8dY=";
hash = "sha256-tkgWrNew0dLBPQ2G96RdFoFDyPm4nOwgkkH/3DpBnRg=";
};
vendorHash = "sha256-HPuVDfVxbHbNaCRg/D4VeW0finbFB4eageiAzoax1wk=";
vendorHash = "sha256-mFuXRMIzEf4bx9jnQlFwFBpBDVXQ99jz2OGojp1EEh0=";
ldflags = [ "-s" "-w" ];

4
pkgs/applications/version-management/lefthook/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lefthook";
version = "1.2.7";
version = "1.2.8";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-bsPTOv1s/kU6UUxmmPpYC5Y9/YeR6LnuL09j1x5e3Es=";
sha256 = "sha256-hW3zKco0c90eIwWefHLABAZGUc2fGHsGnyPaSa/zGuQ=";
};
vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI=";

11
pkgs/applications/video/mpv/default.nix
View File

@ -80,17 +80,17 @@
let
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (self: {
pname = "mpv";
version = "0.35.0";
version = "0.35.1";
outputs = [ "out" "dev" "man" ];
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o=";
rev = "v${self.version}";
sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM=";
};
postPatch = ''
@ -216,8 +216,9 @@ in stdenv.mkDerivation rec {
mpv is a free and open-source general-purpose video player, based on the
MPlayer and mplayer2 projects, with great improvements above both.
'';
changelog = "https://github.com/mpv-player/mpv/releases/tag/v${self.version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];
platforms = platforms.unix;
};
}
})

1
pkgs/data/fonts/cozette/default.nix
View File

@ -12,7 +12,6 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 *.otf -t $out/share/fonts/opentype
install -Dm644 *.bdf -t $out/share/fonts/misc

1
pkgs/data/fonts/d2coding/default.nix
View File

@ -13,7 +13,6 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts
install -Dm644 */*-all.ttc -t $out/share/fonts/truetype/
runHook postInstall

1
pkgs/data/fonts/eb-garamond/default.nix
View File

@ -12,7 +12,6 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/{doc,fonts}
install -Dm644 otf/*.otf -t $out/share/fonts/opentype
install -Dm644 Changes README.markdown README.xelualatex -t $out/share/doc/${pname}-${version}

3
pkgs/data/fonts/fira-code/default.nix
View File

@ -14,8 +14,7 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts
cp variable_ttf/*-VF.ttf $out/share/fonts/truetype
install -Dm644 variable_ttf/*-VF.ttf -t $out/share/fonts/truetype
runHook postInstall
'';

1
pkgs/data/fonts/gentium-book-basic/default.nix
View File

@ -12,7 +12,6 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/{doc,fonts}
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 FONTLOG.txt GENTIUM-FAQ.txt -t $out/share/doc/${pname}-${version}

1
pkgs/data/fonts/hanazono/default.nix
View File

@ -13,7 +13,6 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/{doc,fonts}
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 *.txt -t $out/share/doc/hanazono

3
pkgs/data/fonts/wqy-zenhei/default.nix
View File

@ -12,8 +12,7 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts
install -m644 *.ttc $out/share/fonts/
install -Dm644 *.ttc -t $out/share/fonts/
runHook postInstall
'';

6
pkgs/data/misc/colemak-dh/default.nix
View File

@ -9,14 +9,12 @@ stdenvNoCC.mkDerivation rec {
src = fetchFromGitHub {
owner = "ColemakMods";
repo = "mod-dh";
repo = "mod-dh";
rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09";
sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks=";
sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks=";
sparseCheckout = [ "console" ];
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
runHook preInstall

4
pkgs/development/libraries/belle-sip/default.nix
View File

@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "belle-sip";
version = "5.1.55";
version = "5.2.16";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-wMf570/RP2Q4yluedECs+AKoH92PQQ8yVY+eBGGSAP4=";
sha256 = "sha256-LMbQz22ENTT27jr9tGakzNjidC5nfCuLDMZ6sFwtRKI=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/igraph/default.nix
View File

@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 &&
stdenv.mkDerivation rec {
pname = "igraph";
version = "0.10.3";
version = "0.10.4";
src = fetchFromGitHub {
owner = "igraph";
repo = pname;
rev = version;
hash = "sha256-+U8bo68Q6XX3p2sZiIChjidcRwA10gv9eWccRt4MoYM=";
hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk=";
};
postPatch = ''

4
pkgs/development/python-modules/google-cloud-resource-manager/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "1.8.0";
version = "1.8.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-O1g8NcpvQn+3eyD1yqZ43aM6+eubVQGzLAt9DuI2Aqc=";
hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/igraph/default.nix
View File

@ -10,15 +10,17 @@
buildPythonPackage rec {
pname = "igraph";
version = "0.10.3";
version = "0.10.4";
disabled = pythonOlder "3.7";
format = "setuptools";
src = fetchFromGitHub {
owner = "igraph";
repo = "python-igraph";
rev = version;
hash = "sha256-j7c1CtZ796EYMsS11kd8YED7pPolskgT+611uvePTsA=";
rev = "refs/tags/${version}";
hash = "sha256-DR4D12J/BKFpF4hMHfitNmwDZ7UEo+pI0tvEa1T5GTY=";
};
postPatch = ''

4
pkgs/development/python-modules/pytest-subprocess/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pytest-subprocess";
version = "1.4.2";
version = "1.5.0";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "aklajnert";
repo = "pytest-subprocess";
rev = "refs/tags/${version}";
hash = "sha256-8Of3/RltijfF5MXtVazGzIqpmRIhreT26kLNjzXLF1k=";
hash = "sha256-u9d9RhbikOyknMWs18j2efYJb9YdHsQrp31LfcbudoA=";
};
buildInputs = [

2
pkgs/development/python-modules/python-rapidjson/default.nix
View File

@ -25,6 +25,8 @@ let
hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4=";
})
];
# valgrind_unittest failed
cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ];
});
in buildPythonPackage rec {
version = "1.9";

6
pkgs/development/python-modules/servefile/default.nix
View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "servefile";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "sebageek";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/ZEMZIH/ImuZ2gh5bwB0FlaWnG/ELxfBGEJ2SuNSEb8=";
rev = "refs/tags/v${version}";
sha256 = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU=";
};
propagatedBuildInputs = [ pyopenssl ];

4
pkgs/development/python-modules/tensorflow/bin.nix
View File

@ -18,7 +18,7 @@
, wheel
, opt-einsum
, backports_weakref
, tensorflow-estimator
, tensorflow-estimator-bin
, tensorboard
, cudaSupport ? false
, cudaPackages ? {}
@ -76,7 +76,7 @@ in buildPythonPackage {
opt-einsum
google-pasta
wrapt
tensorflow-estimator
tensorflow-estimator-bin
tensorboard
keras-applications
keras-preprocessing

6
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -6,7 +6,7 @@
, numpy, tensorboard, absl-py
, packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta
, opt-einsum, astunparse, h5py
, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator
, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator-bin
, dill, flatbuffers-python, portpicker, tblib, typing-extensions
# Common deps
, git, pybind11, which, binutils, glibcLocales, cython, perl, coreutils
@ -98,7 +98,7 @@ let
six
tblib
tensorboard
tensorflow-estimator
tensorflow-estimator-bin
termcolor
typing-extensions
wheel
@ -479,7 +479,7 @@ in buildPythonPackage {
packaging
protobuf-python
six
tensorflow-estimator
tensorflow-estimator-bin
termcolor
typing-extensions
wrapt

4
pkgs/development/python-modules/types-docutils/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-docutils";
version = "0.19.1.1";
version = "0.19.1.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-vgpRuhx90hXZ0t9m1oReY8EAm0u/TFvrh6DZdFzbqWI=";
hash = "sha256-yj0hNUhK21LdBCu929bt3LvajGCLo/Xl+Qi9VI/8s5k=";
};
# Module doesn't have tests

4
pkgs/development/python-modules/types-python-dateutil/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-python-dateutil";
version = "2.8.19.5";
version = "2.8.19.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0=";
hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I=";
};
# Modules doesn't have tests

6
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -26,7 +26,7 @@
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb
, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml
}@args:
let
@ -544,6 +544,10 @@ in
];
};
psych = attrs: {
buildInputs = [ libyaml ];
};
puma = attrs: {
buildInputs = [ openssl ];
};

4
pkgs/development/tools/ddosify/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddosify";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-peqLeZ8RxkvaqUER2FBQeTdy1AQ/+Bcz9gGOGz1CACc=";
sha256 = "sha256-tw6rrhFhuIsVAj5IqSHGHSYheDqGENLDxiJr+PQno1U=";
};
vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY=";

6
pkgs/development/tools/devbox/default.nix
View File

@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "devbox";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "jetpack-io";
repo = pname;
rev = version;
hash = "sha256-n2zFfa+UlrAOvBtqF+FkF+oSF1t/7Hg79um7Rl8yTCc=";
hash = "sha256-AvLTDuODn0tcG13lJ9MiN8DgnKzdIzZL1eLnFuEleRw=";
};
ldflags = [
@ -23,7 +23,7 @@ buildGoModule rec {
# integration tests want file system access
doCheck = false;
vendorHash = "sha256-pZ9s2i62uMebGLpWerOkSJLxShD06vY4MybqM9ZcdGc=";
vendorHash = "sha256-IJay/CDWq9/6P4+qbNleUp4rzTas0LW9zbsV9QN+ufI=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/development/tools/go-swag/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-swag";
version = "1.8.9";
version = "1.8.10";
src = fetchFromGitHub {
owner = "swaggo";
repo = "swag";
rev = "v${version}";
sha256 = "sha256-8UnDrWZ0gQlhPQLDqA5DLBBeHqQFlNxK7+y4qlUk/fI=";
sha256 = "sha256-PDK1TI99/8hAuyK4NOb357WZG0JBno8er8HMfus5V7Q=";
};
vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ=";
vendorHash = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ=";
subPackages = [ "cmd/swag" ];

4
pkgs/development/tools/misc/circleci-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.23117";
version = "0.1.23241";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-w7vBDJnkfpdOaNJWlo0fCRvdqEzImCn9y22Xflg/aH0=";
sha256 = "sha256-GpW7mSmUSp1lLgPJmSGmAzYTn2vPsJKorTNQVAHKwU0=";
};
vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY=";

2
pkgs/development/tools/ofono-phonesim/default.nix
View File

@ -11,7 +11,7 @@ mkDerivation {
version = "unstable-2019-11-18";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git";
url = "https://git.kernel.org/pub/scm/network/ofono/phonesim.git";
rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541";
sha256 = "1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp";
};

6
pkgs/development/tools/rust/cargo-tauri/default.nix
View File

@ -16,20 +16,20 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "tauri";
version = "1.2.3";
version = "1.2.4";
src = fetchFromGitHub {
owner = "tauri-apps";
repo = pname;
rev = "tauri-v${version}";
sha256 = "sha256-4v0ZlFBVBB+0xWbTRncVwELaZWLKyCmIceTfseXvS8s=";
sha256 = "sha256-BzstYoRZuZTNAkVGqPGYrd/AiWEhoH6t/XezDaFdmVo=";
};
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
sourceRoot = "source/tooling/cli";
cargoSha256 = "sha256-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g=";
cargoHash = "sha256-t5MlJpQOA5T/EwbPoSD95kATGReiZTmq+JkbDVbRj+0=";
buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ]
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];

26
pkgs/development/tools/rust/rustfilt/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "rustfilt";
version = "0.2.1";
src = fetchFromGitHub {
owner = "luser";
repo = pname;
rev = version;
hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ=";
};
cargoSha256 = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE=";
meta = with lib; {
description = "Demangle Rust symbol names using rustc-demangle";
homepage = "https://github.com/luser/rustfilt";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ wykurz ];
mainProgram = "rustfilt";
};
}

47
pkgs/games/teeworlds/default.nix
View File

@ -1,6 +1,8 @@
{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib
, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils
, nixosTests
, Carbon
, Cocoa
}:
stdenv.mkDerivation rec {
@ -15,26 +17,57 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# Can't use fetchpatch or fetchpatch2 because of https://github.com/NixOS/nixpkgs/issues/32084
# Using fetchurl instead is also not a good idea, see https://github.com/NixOS/nixpkgs/issues/32084#issuecomment-727223713
./rename-VERSION-to-VERSION.txt.patch
];
postPatch = ''
# set compiled-in DATA_DIR so resources can be found
substituteInPlace src/engine/shared/storage.cpp \
--replace '#define DATA_DIR "data"' \
'#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"'
# Quote nonsense is a workaround for https://github.com/NixOS/nix/issues/661
substituteInPlace 'other/bundle/client/Info.plist.in' \
--replace ${"'"}''${TARGET_CLIENT}' 'teeworlds' \
--replace ${"'"}''${PROJECT_VERSION}' '${version}'
'';
nativeBuildInputs = [ cmake pkg-config icoutils ];
buildInputs = [
python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optionals stdenv.isLinux [
icoutils
];
postInstall = ''
buildInputs = [
python3 libGLU SDL2 lua5_3 zlib freetype wavpack
] ++ lib.optionals stdenv.isLinux [
alsa-lib
libX11
] ++ lib.optionals stdenv.isDarwin [
Carbon
Cocoa
];
postInstall = lib.optionalString stdenv.isLinux ''
# Convert and install desktop icon
mkdir -p $out/share/pixmaps
icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico
# Install menu item
install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications/teeworlds.app/Contents/MacOS"
mkdir -p "$out/Applications/teeworlds.app/Contents/Resources"
cp '../other/icons/teeworlds.icns' "$out/Applications/teeworlds.app/Contents/Resources/"
cp '../other/bundle/client/Info.plist.in' "$out/Applications/teeworlds.app/Contents/Info.plist"
cp '../other/bundle/client/PkgInfo' "$out/Applications/teeworlds.app/Contents/"
ln -s "$out/bin/teeworlds" "$out/Applications/teeworlds.app/Contents/MacOS/"
ln -s "$out/share/teeworlds/data" "$out/Applications/teeworlds.app/Contents/Resources/data"
'';
passthru.tests.teeworlds = nixosTests.teeworlds;
@ -51,7 +84,7 @@ stdenv.mkDerivation rec {
homepage = "https://teeworlds.com/";
license = "BSD-style, see `license.txt'";
maintainers = with lib.maintainers; [ astsmtl ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ astsmtl Luflosi ];
platforms = lib.platforms.unix;
};
}

33
pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch Normal file
View File

@ -0,0 +1,33 @@
From 86d6687ef07f7f05457a7f67537b650656b13820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20M=C3=BCller?= <robert.mueller@uni-siegen.de>
Date: Fri, 15 Oct 2021 23:45:50 +0200
Subject: [PATCH] rename VERSION to VERSION.txt:
Fixes compilation on systems with case insensitive file names where the standard library includes the version file source code.
---
src/engine/external/json-parser/{VERSION => VERSION.txt} | 0
src/engine/external/pnglite/{VERSION => VERSION.txt} | 0
src/engine/external/wavpack/{VERSION => VERSION.txt} | 0
src/engine/external/zlib/{VERSION => VERSION.txt} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename src/engine/external/json-parser/{VERSION => VERSION.txt} (100%)
rename src/engine/external/pnglite/{VERSION => VERSION.txt} (100%)
rename src/engine/external/wavpack/{VERSION => VERSION.txt} (100%)
rename src/engine/external/zlib/{VERSION => VERSION.txt} (100%)
diff --git a/src/engine/external/json-parser/VERSION b/src/engine/external/json-parser/VERSION.txt
similarity index 100%
rename from src/engine/external/json-parser/VERSION
rename to src/engine/external/json-parser/VERSION.txt
diff --git a/src/engine/external/pnglite/VERSION b/src/engine/external/pnglite/VERSION.txt
similarity index 100%
rename from src/engine/external/pnglite/VERSION
rename to src/engine/external/pnglite/VERSION.txt
diff --git a/src/engine/external/wavpack/VERSION b/src/engine/external/wavpack/VERSION.txt
similarity index 100%
rename from src/engine/external/wavpack/VERSION
rename to src/engine/external/wavpack/VERSION.txt
diff --git a/src/engine/external/zlib/VERSION b/src/engine/external/zlib/VERSION.txt
similarity index 100%
rename from src/engine/external/zlib/VERSION
rename to src/engine/external/zlib/VERSION.txt

2
pkgs/os-specific/linux/blktrace/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.3.0";
# Official source
# "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git"
# "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git"
src = fetchurl {
url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2";
sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY=";

4
pkgs/os-specific/linux/error-inject/default.nix
View File

@ -10,7 +10,7 @@
version = "4cbe46321b4a81365ff3aafafe63967264dbfec5";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git";
url = "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git";
rev = version;
sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z";
};
@ -40,7 +40,7 @@
version = "9bd5e2c7886fca72f139cd8402488a2235957d41";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git";
rev = version;
sha256 = "0bh6mzpk2mr4xidkammmkfk21b4dbq793qjg25ryyxd1qv0c6cg4";
};

2
pkgs/os-specific/linux/libtraceevent/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.6.2";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
rev = "libtraceevent-${version}";
sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc=";
};

2
pkgs/os-specific/linux/libtracefs/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
version = "1.6.4";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";
url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";
rev = "libtracefs-${version}";
sha256 = "sha256-fWop0EMkoVulLBzU7q8x1IhMtdnEJ89wMz0cz964F6s=";
};

2
pkgs/os-specific/linux/trace-cmd/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
version = "3.1.6";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "trace-cmd-v${version}";
sha256 = "sha256-qjfeomeExjsx/6XrUaGm5szbL7XVlekGd4Hsuncv8NY=";
};

6
pkgs/servers/kapowbang/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "kapowbang";
version = "0.7.0";
version = "0.7.1";
subPackages = [ "." ];
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "BBVA";
repo = "kapow";
rev = "v${version}";
sha256 = "sha256-0ftdc3ol1g0WnZgicXl46Xpph4cUYk/G/eeu+9JnPyA=";
sha256 = "sha256-HUZ1Uf8Z2YbYvqKEUHckKAZ5q+C83zafi3UjemqHFM4=";
};
vendorSha256 = "sha256-41Jk3aTe4EA5dwkriEo48QNJg2k3T/R/8i8XWcURcG8=";
vendorHash = "sha256-vvC9l/6b7AIEmCMVdeKMyi9ThIcAzjtV+uaQ4oSJZuU=";
doCheck = false;

4
pkgs/servers/snappymail/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "snappymail";
version = "2.24.6";
version = "2.25.0";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
sha256 = "sha256-CGpPmarY990084/Whkk3YjzupPqU4FqAfpTXNFXIAH4=";
sha256 = "sha256-obPWI6tvZx8HEWvNUw9euJav1ncbBYtXwY7SgEurkdQ=";
};
sourceRoot = "snappymail";

6
pkgs/tools/graphics/gifski/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "gifski";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = "gifski";
rev = version;
sha256 = "sha256-iG7XaPBNTmt/yNMeSY8UKwesFJFUECAsOYQ0idegk1w=";
sha256 = "sha256-JJSAU9z3JOlvfW6AW/P/KrjhOcD0ax8TmqgqM48rlAo=";
};
cargoHash = "sha256-7bjsxbUsHjsVER0HaQ+x0dkaAI2sb7if8mS6JwQIbzc=";
cargoHash = "sha256-UV2iQFbeGvJs8kEowYRNv8DxEGwaIWL1/3A2oUCcauw=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];

6
pkgs/tools/misc/opentelemetry-collector/default.nix
View File

@ -12,17 +12,17 @@ let
in
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.69.1";
version = "0.70.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
sha256 = "sha256-p/epsqaDQNPS2gd3fN/Ny0XtGIeoKI7hdZVI1bqvg4s=";
sha256 = "sha256-r7Pw2zBRwaDMXZ7j8hNT1+a9sSWZpl0+8Y4rtIveoPY=";
};
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
vendorHash = "sha256-AIn38bjnYX9gAaKXTyIA7Lv5/oRzy3BMK5Q+9JvapFI=";
vendorHash = "sha256-HyI3ETQQJE6bAhC2W7UfO9yqfoxu8aITcmIJmrOZpbM=";
preBuild = ''
# set the build version, can't be done via ldflags

2
pkgs/tools/misc/xfstests/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "2022.09.04";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";
url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";
rev = "v${version}";
sha256 = "sha256-hPFoqNmB8pewvBN1nzVMkTrMHCo0xc8tmmIODaiDeRw=";
};

2
pkgs/tools/networking/mmsd/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "unstable-2019-07-15";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git";
url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git";
rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c";
sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b";
};

2
pkgs/tools/networking/ofono/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git";
url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git";
rev = version;
sha256 = "sha256-T8rfReruvHGQCN9IDGIrFCoNjFKKMnUGPKzxo2HTZFQ=";
};

7
pkgs/tools/networking/openvpn/default.nix
View File

@ -5,7 +5,6 @@
, iproute2
, lzo
, openssl
, openssl_1_1
, pam
, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
, systemd
@ -74,12 +73,6 @@ let
in
{
openvpn_24 = generic {
version = "2.4.12";
sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6";
extraBuildInputs = [ openssl_1_1 ];
};
openvpn = generic {
version = "2.5.8";
sha256 = "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6";

60
pkgs/tools/nix/nix-init/default.nix Normal file
View File

@ -0,0 +1,60 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, makeWrapper
, pkg-config
, zstd
, stdenv
, darwin
, nix
, nurl
, callPackage
, spdx-license-list-data
}:
rustPlatform.buildRustPackage rec {
pname = "nix-init";
version = "0.1.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-init";
rev = "v${version}";
hash = "sha256-97aAlH03H8xTVhp45FwecNb7i/ZUtJG9OOYBx8Sf+YI=";
};
cargoHash = "sha256-uvn1cP6aIxfPKG/QLtHBd6fHjl7JNRtkZ4gIG2tpHVg=";
nativeBuildInputs = [
installShellFiles
makeWrapper
pkg-config
];
buildInputs = [
zstd
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
postInstall = ''
wrapProgram $out/bin/nix-init \
--prefix PATH : ${lib.makeBinPath [ nix nurl ]}
installManPage artifacts/nix-init.1
installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init
'';
GEN_ARTIFACTS = "artifacts";
NIX_LICENSES = callPackage ./license.nix { };
SPDX_LICENSE_LIST_DATA = "${spdx-license-list-data.json}/json/details";
ZSTD_SYS_USE_PKG_CONFIG = true;
meta = with lib; {
description = "Command line tool to generate Nix packages from URLs";
homepage = "https://github.com/nix-community/nix-init";
changelog = "https://github.com/nix-community/nix-init/blob/${src.rev}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [ figsoda ];
};
}

23
pkgs/tools/nix/nix-init/license.nix Normal file
View File

@ -0,0 +1,23 @@
# vendored from src/licenses.nix
{ lib, writeText }:
let
inherit (builtins) concatLists concatStringsSep length;
inherit (lib) flip licenses mapAttrsToList optional;
inserts = concatLists
(flip mapAttrsToList licenses
(k: v: optional (v ? spdxId) '' xs.insert("${v.spdxId}", "${k}");''));
in
writeText "license.rs" ''
fn get_nix_licenses() -> rustc_hash::FxHashMap<&'static str, &'static str> {
let mut xs = std::collections::HashMap::with_capacity_and_hasher(
${toString (length inserts)},
Default::default(),
);
${concatStringsSep "\n " inserts}
xs
}
''

4
pkgs/tools/package-management/nix-update/default.nix
View File

@ -8,14 +8,14 @@
buildPythonApplication rec {
pname = "nix-update";
version = "0.14.0";
version = "0.15.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
sha256 = "sha256-7HZ5LEQAhA1TXQZVfeUGOruwgqJBkSFtmDLR8PLSiOw=";
sha256 = "sha256-Q3yExefODBrrziRnCYETrJgSn42BOR7ZsL8pu3q5D/w=";
};
makeWrapperArgs = [

2
pkgs/tools/security/efitools/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
];
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git";
rev = "v${version}";
sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i";
};

6
pkgs/tools/text/mdbook-katex/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-katex";
version = "0.3.3";
version = "0.3.4";
src = fetchCrate {
inherit pname version;
hash = "sha256-PmNoux12A6MBlviyCy9kjGUHigBDxCiiqXlwf6Sc76I=";
hash = "sha256-Bc9nUY2XyNlgOI436omg885Qm0BtqcrFsJz6qr2Zhys=";
};
cargoHash = "sha256-YSLJsiIkoeSAh3oUMkbk5jSW0NMdJLB6YsOt1YlGyfs=";
cargoHash = "sha256-pH5ZN6bTjstrSTv0hdOoyWAdRLRjALarML3ZVoYvGRI=";
OPENSSL_DIR = "${lib.getDev openssl}";
OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";

1
pkgs/top-level/aliases.nix
View File

@ -1087,6 +1087,7 @@ mapAliases ({
opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22
openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22
openssl_3_0 = openssl_3; # Added 2022-06-27
openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23
orchis = orchis-theme; # Added 2021-06-09
osxfuse = macfuse-stubs; # Added 2021-03-20
otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02

9
pkgs/top-level/all-packages.nix
View File

@ -10428,7 +10428,6 @@ with pkgs;
opentsdb = callPackage ../tools/misc/opentsdb {};
inherit (callPackages ../tools/networking/openvpn {})
openvpn_24
openvpn;
openvpn3 = callPackage ../tools/networking/openvpn3 { };
@ -11546,6 +11545,8 @@ with pkgs;
rustdesk = callPackage ../applications/networking/remote/rustdesk { };
rustfilt = callPackage ../development/tools/rust/rustfilt { };
rustscan = callPackage ../tools/security/rustscan {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -35555,7 +35556,9 @@ with pkgs;
teetertorture = callPackage ../games/teetertorture { };
teeworlds = callPackage ../games/teeworlds { };
teeworlds = callPackage ../games/teeworlds {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
tengine = callPackage ../servers/http/tengine {
openssl = openssl_1_1;
@ -37687,6 +37690,8 @@ with pkgs;
nix-info = callPackage ../tools/nix/info { };
nix-info-tested = nix-info.override { doCheck = true; };
nix-init = callPackage ../tools/nix/nix-init { };
nix-index-unwrapped = callPackage ../tools/package-management/nix-index {
inherit (darwin.apple_sdk.frameworks) Security;
};