Skip to content

Commit

Permalink
Merge master into staging-next
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Jan 28, 2023
2 parents 8237712 + 6f43bc6 commit 951b517
Show file tree
Hide file tree
Showing 73 changed files with 1,039 additions and 827 deletions.
12 changes: 12 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10079,6 +10079,12 @@
githubId = 137805;
name = "Alexander Tsvyashchenko";
};
nebulka = {
email = "arapun@proton.me";
github = "nebulka1";
githubId = 121920704;
name = "Nebulka";
};
Necior = {
email = "adrian@sadlocha.eu";
github = "Necior";
Expand Down Expand Up @@ -14339,6 +14345,12 @@
githubId = 1280118;
name = "Tomislav Markovski";
};
tmarkus = {
email = "tobias@markus-regensburg.de";
github = "hesiod";
githubId = 3159881;
name = "Tobias Markus";
};
tmountain = {
email = "tinymountain@gmail.com";
github = "tmountain";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/android-studio/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ let
installPhase = ''
cp -r . $out
wrapProgram $out/bin/studio.sh \
--set-default JAVA_HOME "$out/jre" \
--set-default JAVA_HOME "$out/jbr" \
--set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/vivaldi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "5.6.2867.58";
version = "5.6.2867.62";

src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb";
sha256 = "sha256-eRHQaKztf66o9FoCNSRyXS5Ht6d51GTilNO5DxItUCw=";
sha256 = "sha256-p5okCdvEBurL1UgqLMBhCd4caPbiOA1WZrI9TC5j6og=";
};

unpackPhase = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-J+x3D7EpV/Kzp98AuhK8pqR26xhItG+JyfkHKc+2IA0=",
"hash": "sha256-jZYeMQW2DTGE/KyUJYGFPHGjFUGgfl11kE1jucZ5sH4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v4.51.0",
"rev": "v4.52.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-iL03vDNHPQTAbTRoEutRtQllFgD1wn7qFleuZ4n99q8="
"vendorHash": "sha256-/6RbqOh5/Fpn25woV/AzmkTs1qnIo+sl3fKQxCtVZHQ="
},
"azuread": {
"hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=",
Expand All @@ -130,11 +130,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-dD2o0b5JQ1bZIBFshe+JkfkO5C0a3OvUwfrO2dgIiO8=",
"hash": "sha256-eDlRnJUo561edblydjBGePJzMFRqtEqKnS+8HOhKGdA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.40.0",
"rev": "v3.41.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
Expand Down Expand Up @@ -825,13 +825,13 @@
"vendorHash": null
},
"okta": {
"hash": "sha256-+aHlFu49BxdFqrVCEIEqpg+o2i4d5F1uZipc//Qipaw=",
"hash": "sha256-wKs5XRyyCda6pljtuo8ukAQl5ZZxeDSyt0CQWe8eXqY=",
"homepage": "https://registry.terraform.io/providers/okta/okta",
"owner": "okta",
"repo": "terraform-provider-okta",
"rev": "v3.40.0",
"rev": "v3.41.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-XwQTtOsg1rktv/Oc+eTJ+Jr+BJvLEQPCaRSeXdXxWB0="
"vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4="
},
"oktaasa": {
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
Expand Down Expand Up @@ -1014,13 +1014,13 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"signalfx": {
"hash": "sha256-qzLP+IGZU5bms8zjtcUg9rApZW2+TCF7KrtqSQvr3lw=",
"hash": "sha256-UgZr2ZFN5RvB7BG+DIXK6eSvTyvaVUKoBTIQ6aAfCpY=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
"rev": "v6.20.0",
"rev": "v6.21.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-zIF5NA5kHXEr3aUleWrCYg8PZTKnrFubaRlALnbTLHQ="
"vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y="
},
"skytap": {
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
Expand All @@ -1032,11 +1032,11 @@
"vendorHash": null
},
"snowflake": {
"hash": "sha256-QikYp81omjlSckr/2oXCmAqiJlcMWuR120z86fP/zkE=",
"hash": "sha256-0nofzwxzf19T9klfzp+h3icyN4S92nPfq/HN+qaHK/E=",
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
"owner": "Snowflake-Labs",
"repo": "terraform-provider-snowflake",
"rev": "v0.55.1",
"rev": "v0.56.0",
"spdx": "MIT",
"vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU="
},
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/office/qownnotes/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "23.1.1";
version = "23.1.2";
in
stdenv.mkDerivation {
inherit pname appname version;

src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
sha256 = "sha256-BMisfFMy3kNoZHCYbGqzT9hxzVpKBUN6fSOilPw9O1w=";
sha256 = "sha256-yfsptsatmi0A+qLKHxchaLuu0WkJnUk7sjs1Pb/D6NU=";
};

nativeBuildInputs = [
Expand Down
8 changes: 4 additions & 4 deletions pkgs/applications/science/biology/ants/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk_8, Cocoa }:
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }:

stdenv.mkDerivation rec {
pname = "ANTs";
pname = "ANTs";
version = "2.4.3";

src = fetchFromGitHub {
owner = "ANTsX";
repo = "ANTs";
rev = "v${version}";
rev = "refs/tags/v${version}";
sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g=";
};

nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ itk vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];

cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];

Expand Down
19 changes: 15 additions & 4 deletions pkgs/applications/science/electronics/nanovna-saver/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,30 @@
lib,
python3,
fetchFromGitHub,
fetchpatch,
wrapQtAppsHook,
}:
python3.pkgs.buildPythonApplication rec {
pname = "nanovna-saver";
version = "0.5.3";
version = "0.5.4";

src = fetchFromGitHub {
owner = "NanoVNA-Saver";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-wKKjMcOx7NS2VAIk3OTAj7KWE1+CeAzctdgdidT+HMA=";
rev = "v${version}";
sha256 = "sha256-CLfgDQt2rOXtWwvEhlXEstPp28nFhuhiAPYL6EjZVu4=";
};

# Fix for https://github.com/NanoVNA-Saver/nanovna-saver/issues/579
# Try dropping the patch in the next release after v0.5.4
patches = [
(fetchpatch {
name = "remote-changelog-from-setup-py.patch";
url = "https://github.com/NanoVNA-Saver/${pname}/commit/d654ea0441939e4e1c599d1333b587a185394fbe.diff";
sha256 = "sha256-ifOhiWD0EYyQZRKp2W3G6crmWslca+/21APmhpfP/xE=";
})
];

nativeBuildInputs = [ wrapQtAppsHook ];

propagatedBuildInputs = with python3.pkgs; [
Expand Down Expand Up @@ -47,6 +58,6 @@ python3.pkgs.buildPythonApplication rec {
generally display and analyze the resulting data.
'';
license = licenses.gpl3Only;
maintainers = with maintainers; [ zaninime ];
maintainers = with maintainers; [ zaninime tmarkus ];
};
}
40 changes: 40 additions & 0 deletions pkgs/applications/virtualization/rvvm/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ lib, stdenv, fetchFromGitHub, SDL_compat }:

stdenv.mkDerivation rec {
pname = "rvvm";
version = "unstable-2023-01-25";

src = fetchFromGitHub {
owner = "LekKit";
repo = "RVVM";
rev = "4de27d7083db34bd074b4f056d6eb3871ccf5c10";
sha256 = "sha256-FjEcXfweL6FzA6iLxl9XnKaD4Fh/wZuRTJzZzHkc/B4=";
};

buildInputs = [ SDL_compat ];

makeFlags =
[ "BUILDDIR=out" "BINARY=rvvm" "USE_SDL=1" "GIT_COMMIT=${src.rev}" "all" "lib" ]
# work around https://github.com/NixOS/nixpkgs/issues/19098
++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto";

installPhase = ''
runHook preInstall
install -d $out/{bin,lib,include/devices}
install -m755 out/rvvm -t $out/bin
install -m755 out/librvvm.{a,so} -t $out/lib
install -m644 src/rvvmlib.h -t $out/include
install -m644 src/devices/*.h -t $out/include/devices
runHook postInstall
'';

meta = with lib; {
homepage = "https://github.com/LekKit/RVVM";
description = "The RISC-V Virtual Machine";
license = with licenses; [ gpl3 /* or */ mpl20 ];
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ nebulka ];
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

rustPlatform.buildRustPackage rec {
pname = "swayest-workstyle";
version = "1.3.0";
version = "1.3.2";

src = fetchFromGitHub {
owner = "Lyr-7D1h";
repo = "swayest_workstyle";
rev = version;
sha256 = "sha256-LciTrYbmJV0y0H6QH88vTBXbDdDSx6FQtO4J/CFLjtY=";
sha256 = "sha256-C2Nz6fBwaj+cOxIfoBu+9T+CoJ5Spc1TAJcQWdIF/+I=";
};

cargoSha256 = "sha256-34Ij3Hd1JI6d1vhv1XomFc9SFoB/6pbS39upLk+NeQM=";
cargoHash = "sha256-6pAlJmpyv2a1XCZQLOYilxJAGPbPmkEz1ynTLa0RjE0=";

doCheck = false; # No tests

Expand Down
33 changes: 18 additions & 15 deletions pkgs/data/fonts/andagii/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation'
{ lib, fetchzip }:
{ lib, stdenvNoCC, fetchzip }:

let
stdenvNoCC.mkDerivation rec {
pname = "andagii";
version = "1.0.2";
in (fetchzip {
name = "andagii-${version}";

url = "http://www.i18nguy.com/unicode/andagii.zip";
curlOpts = "--user-agent 'Mozilla/5.0'";
sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2";
src = fetchzip {
url = "http://www.i18nguy.com/unicode/andagii.zip";
curlOpts = "--user-agent 'Mozilla/5.0'";
hash = "sha256-U7wC55G8jIvMMyPcEiJQ700A7nkWdgWK1LM0F/wgDCg=";
};

installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts/truetype
cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf
runHook postInstall
'';

# There are multiple claims that the font is GPL, so I include the
# package; but I cannot find the original source, so use it on your
Expand All @@ -20,10 +29,4 @@ in (fetchzip {
license = "unknown";
platforms = platforms.all;
};
}).overrideAttrs (_: {
postFetch = ''
unzip $downloadedFile
mkdir -p $out/share/fonts/truetype
cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf
'';
})
}
46 changes: 23 additions & 23 deletions pkgs/data/fonts/andika/default.nix
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation'
{ lib, fetchzip }:
{ lib, stdenvNoCC, fetchzip }:

let
stdenvNoCC.mkDerivation rec {
pname = "andika";
version = "6.101";
name = "andika-${version}";
in
(fetchzip rec {
inherit name;

src = fetchzip {
url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip";
hash = "sha256-LghkGd/cjuXghzsU9X/YneNIdBeDEnu0ARszipANm8w=";
};

sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI=";
installPhase = ''
runHook preInstall
meta = with lib; {
homepage = "https://software.sil.org/andika";
description = "A family designed especially for literacy use taking into account the needs of beginning readers";
longDescription = ''
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 *OFL.txt *OFL-FAQ.txt *README.txt *FONTLOG.txt -t $out/share/doc/${pname}-${version}
runHook postInstall
'';

meta = with lib; {
homepage = "https://software.sil.org/andika";
description = "A family designed especially for literacy use taking into account the needs of beginning readers";
longDescription = ''
Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another.
A sans serif font is preferred by some literacy personnel for teaching people to read. Its forms are simpler and less cluttered than those of most serif fonts. For years, literacy workers have had to make do with fonts that were not really suitable for beginning readers and writers. In some cases, literacy specialists have had to tediously assemble letters from a variety of fonts in order to get all of the characters they need for their particular language project, resulting in confusing and unattractive publications. Andika addresses those issues.
'';
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.f--t ];
};
}).overrideAttrs (_: {
postFetch = ''
mkdir -p $out/share/{doc,fonts}
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
'';
})
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.f--t ];
};
}
Loading

0 comments on commit 951b517

Please sign in to comment.