JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-02-05 06:01:18 +00:00 committed by GitHub
commit cb231fb28d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
95 changed files with 1189 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nixos/modules/programs/sway.nix
View File

@ -26,7 +26,7 @@ let
};
};
swayPackage = pkgs.sway.override {
defaultSwayPackage = pkgs.sway.override {
extraSessionCommands = cfg.extraSessionCommands;
extraOptions = cfg.extraOptions;
withBaseWrapper = cfg.wrapperFeatures.base;
@ -42,6 +42,19 @@ in {
<https://github.com/swaywm/sway/wiki> and
"man 5 sway" for more information'');
package = mkOption {
type = with types; nullOr package;
default = defaultSwayPackage;
defaultText = literalExpression "pkgs.sway";
description = lib.mdDoc ''
Sway package to use. Will override the options
'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'.
Set to <code>null</code> to not add any Sway package to your
path. This should be done if you want to use the Home Manager Sway
module to install Sway.
'';
};
wrapperFeatures = mkOption {
type = wrapperOptions;
default = { };
@ -121,16 +134,17 @@ in {
}
];
environment = {
systemPackages = [ swayPackage ] ++ cfg.extraPackages;
systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages;
# Needed for the default wallpaper:
pathsToLink = [ "/share/backgrounds/sway" ];
pathsToLink = optionals (cfg.package != null) [ "/share/backgrounds/sway" ];
etc = {
"sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config";
"sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" ''
# Import the most important environment variables into the D-Bus and systemd
# user environments (e.g. required for screen sharing and Pinentry prompts):
exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
'';
} // optionalAttrs (cfg.package != null) {
"sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config";
};
};
security.polkit.enable = true;
@ -139,7 +153,7 @@ in {
fonts.enableDefaultFonts = mkDefault true;
programs.dconf.enable = mkDefault true;
# To make a Sway session available if a display manager like SDDM is enabled:
services.xserver.displayManager.sessionPackages = [ swayPackage ];
services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ];
programs.xwayland.enable = mkDefault true;
# For screen sharing (this option only has an effect with xdg.portal.enable):
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ];

13
nixos/tests/vscodium.nix
View File

@ -33,13 +33,6 @@ let
};
enableOCR = true;
# testScriptWithTypes:55: error: Item "function" of
# "Union[Callable[[Callable[..., Any]], ContextManager[Any]], ContextManager[Any]]"
# has no attribute "__enter__"
# with codium_running:
# ^
skipTypeCheck = true;
testScript = ''
@polling_condition
def codium_running():
@ -50,10 +43,10 @@ let
machine.wait_for_unit('graphical.target')
codium_running.wait()
with codium_running:
codium_running.wait() # type: ignore[union-attr]
with codium_running: # type: ignore[union-attr]
# Wait until vscodium is visible. "File" is in the menu bar.
machine.wait_for_text('Get Started')
machine.wait_for_text('Welcome')
machine.screenshot('start_screen')
test_string = 'testfile'

4
pkgs/applications/audio/praat/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "praat";
version = "6.3.05";
version = "6.3.06";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${version}";
sha256 = "sha256-0e225cmP0CSYjRYNEXi4Oqq9o8XR2N7bNS1X5x+mQKw=";
sha256 = "sha256-KwJ8ia1yQmmG+N44ipvGCbuoR2cL03STSTKzUwlDqms=";
};
configurePhase = ''

4
pkgs/applications/blockchains/stellar-core/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "stellar-core";
version = "19.6.0";
version = "19.7.0";
src = fetchFromGitHub {
owner = "stellar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lDefmPZM8ow6t5CpNBxef+9BoT773p5UgeMhgF+em2w=";
sha256 = "sha256-VfaP4EIVsu5JTAV7AX0Ymo44/TD8eUB61CViwf6Hfqw=";
fetchSubmodules = true;
};

3
pkgs/applications/editors/vscode/generic.nix
View File

@ -135,6 +135,9 @@ let
# this fixes bundled ripgrep
chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg
# see https://github.com/gentoo/gentoo/commit/4da5959
chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper
'';
inherit meta;

12
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0mm6xa0kizgg2f6cql6jk8h83pn89h6q7rrs1kypvj3j0x6ysqsg";
x86_64-darwin = "1g9syvinj2mx292wrnrdn2znqhg17mrjqij0z1ilag5bi4xmzhcj";
aarch64-linux = "0xbq6fla0lxan08jgmsva91cbcv8rhzd7mqixrm1lsqh4h0wpssz";
aarch64-darwin = "1b4a56j256rib1997g9wwiak206axkppl124qg021vyab42x8rim";
armv7l-linux = "0gb96hi854kyh8694j9mbgl78f4y68czkwmjxhzb054l5b4adjla";
x86_64-linux = "1qayw19mb7f0gcgcvl57gpacrqsyx2jvc6s63vzbx8jmf5qnk71a";
x86_64-darwin = "02z9026kp66lx6pll46xx790jj7c7wh2ca7xim373x90k8hm4kwz";
aarch64-linux = "1izqhzvv46p05k1z2yg380ddwmar4w2pbrd0dyvkdysvp166y931";
aarch64-darwin = "1zcr653ssck4nc3vf04l6bilnjdsiqscw62g1wzbyk6s50133cx8";
armv7l-linux = "0n914rcfn2m9zsbnkd82cmw88qbpssv6jk3g8ig3wqlircbgrw0h";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.74.3.23010";
version = "1.75.0.23033";
pname = "vscodium";
executableName = "codium";

7
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -30,6 +30,7 @@
, Foundation
, testers
, imagemagick
, python3
}:
assert libXtSupport -> libX11Support;
@ -122,8 +123,10 @@ stdenv.mkDerivation rec {
done
'';
passthru.tests.version =
testers.testVersion { package = imagemagick; };
passthru.tests = {
version = testers.testVersion { package = imagemagick; };
inherit (python3.pkgs) img2pdf;
};
meta = with lib; {
homepage = "http://www.imagemagick.org/";

4
pkgs/applications/misc/klayout/default.nix
View File

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "klayout";
version = "0.28.3";
version = "0.28.4";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
hash = "sha256-keC+QLV/iEEGFDdy/Vt2pCr55qbqQzcx3HokdDi+xSU=";
hash = "sha256-6RIzgC/PA2DqO24vKu+d/+GttufUbIH+k9GZe09M0vM=";
};
postPatch = ''

2
pkgs/applications/misc/pgmodeler/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
sha256 = "sha256-Lim9iQYdmulwZEIayoBGoAmQ7rysTEEof5iXy3kfKXs=";
sha256 = "sha256-aDmaKf3iLBFD28n2u/QOf/GkgE64Birn0x3Kj5Qx2sg=";
};
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];

4
pkgs/applications/misc/thedesk/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "thedesk";
version = "24.0.7";
version = "24.0.8";
src = fetchurl {
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
sha256 = "sha256-EG5TMhYvECXahIbB25gP40iNQpStcrgaJW3ld9x02/E=";
sha256 = "sha256-nxwSJ/rQJYMNrtTWSmqcrJQwMK8zRwIG4jccVyb7OsQ=";
};
nativeBuildInputs = [

6
pkgs/applications/misc/yewtube/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "yewtube";
version = "2.9.0";
version = "2.9.2";
src = fetchFromGitHub {
owner = "iamtalhaasghar";
repo = "yewtube";
rev = "v${version}";
hash = "sha256-8GL2ZvRHtnnLZ07nQk3irJUj+XLL+pyUUA+JJPICPRA=";
rev = "refs/tags/v${version}";
hash = "sha256-5+0OaoUan9IFEqtMvpvtkfpd7IbFJhG52oROER5TY20=";
};
postPatch = ''

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

@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform;
in
buildGoModule rec {
pname = "stern";
version = "1.22.0";
version = "1.23.0";
src = fetchFromGitHub {
owner = "stern";
repo = "stern";
rev = "v${version}";
sha256 = "sha256-xO4I4fNf14ltiSnFnAhM8VYBw4JKB0RSQziSshZOFBo=";
sha256 = "sha256-tqp2H8aWPBgje1zIK673cbr+DShhTQL9VQ0dEL/he7s=";
};
vendorSha256 = "sha256-tNx1BvZBblyLavFslhqj9DCyfcgbl6HxlZ7zceK1a0w=";
vendorHash = "sha256-ud07lWHwQfAHgVenUApwrfxmTjJKVm+pOExdR9pZFxA=";
subPackages = [ "." ];

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20230128-1";
version = "20230203";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
sha256 = "sha256-wYhftShCL9XozK0c7OLijqzveDvEvv9stpw+6CQND/Y=";
sha256 = "sha256-xXIdXv2U5VpRSuJ9Kl6HMDBZGpXRYGPZFBBk9QYODtU=";
};
postPatch = ''

6
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.40";
version = "3.41";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-eU1RnLjPSAdtv+EqVnIpOLsDfBjx4WHFnHHkGZfr130=";
hash = "sha256-sNeuIcRJ249F9m7NBi5Vh4HMhWwDpNHAZsit1auVI5U=";
};
vendorHash = "sha256-tKq5QEd7f4q7q2EDNjNrlatQ7+lXF9ya9L0iTP/AXSo=";
vendorHash = "sha256-ZtHgZ0Mur102H2EvifsK3HYUQaI1dFMh/6eiJO09HBc=";
subPackages = [ "weed" ];

8
pkgs/applications/networking/warp/default.nix
View File

@ -17,14 +17,14 @@
stdenv.mkDerivation rec {
pname = "warp";
version = "0.3.2";
version = "0.4";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = "v${version}";
hash = "sha256-oKkZC9fi5xPnLTI00MnG2gMjzMZHMNFI77ztbR4KQo4=";
hash = "sha256-c8X0kedfM8DPTEQAbh8cXIfEvxG2cdUD3twVHs0/k7U";
};
postPatch = ''
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-sbyAyjxpol2SBxoLUsiPGfkP2diBPgJW0vEDHYWgmLU=";
hash = "sha256-TS/Q6T3bPjkk1bfINTR6bcPy8fnbAxbKJUrx2pYsPWY=";
};
nativeBuildInputs = [
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
description = "Fast and secure file transfer";
homepage = "https://apps.gnome.org/app/app.drey.Warp";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ dotlambda ];
maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ];
platforms = lib.platforms.linux;
};
}

6
pkgs/applications/office/treesheets/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "unstable-2023-01-23";
version = "unstable-2023-01-31";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "f676cba7f9749825744ec705ee58b9fbea47db51";
sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag=";
rev = "44206849d03c8983e41d2aeca70a06e04365d88d";
sha256 = "bUyM0zWVO7HWBiWi0mhkDlVxgqMHoFiR78XpiG8q/V4=";
};
nativeBuildInputs = [

4
pkgs/applications/science/astronomy/kstars/default.nix
View File

@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kstars";
version = "3.6.1";
version = "3.6.3";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
sha256 = "sha256-WWbtfqvGd13+a41z8/MjlchllpuhLX08nu15OlYUeuI=";
sha256 = "sha256-sve9q4iM/Y8+K64Ceby/KGx5Un5G0o5cCnIxJkXTgug=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

4
pkgs/applications/science/biology/igv/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "igv";
version = "2.15.5";
version = "2.16.0";
src = fetchzip {
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
sha256 = "sha256-AKKMtR0hU2O84mRJxxsXNCYHeW8d6t3XJpzOKKaxAWw=";
sha256 = "sha256-pfFUtPgHzTWMm3sh4un8SwSYF8HM30HbAQznxlu4Irw=";
};
installPhase = ''

3
pkgs/applications/terminal-emulators/kitty/default.nix
View File

@ -97,8 +97,7 @@ buildPythonApplication rec {
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
CGO_ENABLED = 0;
GO_FLAGS = "-trimpath";
disallowedReferences = [ go ];
GOFLAGS = "-trimpath";
configurePhase = let
goModules = (buildGoModule {

6
pkgs/build-support/fetchmavenartifact/default.nix
View File

@ -43,13 +43,15 @@ let
(lib.replaceStrings ["."] ["_"] artifactId) "-"
version
];
suffix = if isNull classifier then "" else "-${classifier}";
filename = "${artifactId}-${version}${suffix}.jar";
mkJarUrl = repoUrl:
lib.concatStringsSep "/" [
(lib.removeSuffix "/" repoUrl)
(lib.replaceStrings ["."] ["/"] groupId)
artifactId
version
"${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar"
filename
];
urls_ =
if url != "" then [url]
@ -68,7 +70,7 @@ in
# packages packages that mention this derivation in their buildInputs.
installPhase = ''
mkdir -p $out/share/java
ln -s ${jar} $out/share/java/${artifactId}-${version}.jar
ln -s ${jar} $out/share/java/${filename}
'';
# We also add a `jar` attribute that can be used to easily obtain the path
# to the downloaded jar file.

36
pkgs/data/fonts/blackout/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "blackout";
version = "2014-07-29";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "4864cfc1749590e9f78549c6e57116fe98480c0f";
hash = "sha256-UmJVmtuPQYW/w+mdnJw9Ql4R1xf/07l+/Ky1wX9WKqw=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/*.ttf
runHook postInstall
'';
meta = {
description = "A bad-ass, unholy-mother-shut-your-mouth stencil sans-serif";
longDescription = ''
Eats holes for breakfast lunch and dinner. Inspired by filling in
sans-serif newspaper headlines. Continually updated with coffee and
music. Makes your work louder than the next person’s.
Comes in three styles: Midnight (solid), 2AM (reversed), & Sunrise
(stroked).
'';
homepage = "https://www.theleagueofmoveabletype.com/blackout";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

38
pkgs/data/fonts/chunk/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "chunk";
version = "2021-03-03";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "12a243f3fb7c7a68844901023f7d95d6eaf14104";
hash = "sha256-NMkRvrUgy9yzOT3a1rN6Ch/p8Cr902CwL4G0w7jVm1E=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "An ultra-bold, ultra-awesome slab serif typeface";
longDescription = ''
Chunk is an ultra-bold slab serif typeface that is reminiscent of old
American Western woodcuts, broadsides, and newspaper headlines. Used
mainly for display, the fat block lettering is unreserved yet refined for
contemporary use.
In 2014, a new textured style was created by Tyler Finck called Chunk
Five Print. It contains the same glyphs as the original.
'';
homepage = "https://www.theleagueofmoveabletype.com/chunk";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

32
pkgs/data/fonts/fanwood/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "fanwood";
version = "2011-05-11";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "cbaaed9704e7d37d3dcdbdf0b472e9efd0e39432";
hash = "sha256-OroFhhb4RxPHkx+/8PtFnxs1GQVXMPiYTd+2vnRbIjg=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "A serif based on the work of a famous Czech-American type designer of yesteryear";
longDescription = ''
Based on work of a famous Czech-American type designer of yesteryear. The
package includes roman and italic.
'';
homepage = "https://www.theleagueofmoveabletype.com/fanwood";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

28
pkgs/data/fonts/goudy-bookletter-1911/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "goudy-bookletter-1911";
version = "2011-05-11";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "85ff5b834b4f63feb36fd2053949c19660580e48";
hash = "sha256-11axs1+SRQj+1lYTq2LYf1I65WrrvB/UnAgZkHPP1N8=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "A public domain font based on Frederic Goudy’s Kennerley Oldstyle";
homepage = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

34
pkgs/data/fonts/junction/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "junction";
version = "2014-05-29";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "fb73260e86dd301b383cf6cc9ca8e726ef806535";
hash = "sha256-Zqh23HPWGed+JkADYjYdsVNRxqJDvC9xhnqAqWZ3Eu8=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "Junction is a a humanist sans-serif font";
longDescription = ''
Junction is a a humanist sans-serif, and the first open-source type
project started by The League of Moveable Type. It has been updated
(2014) to include additional weights (light/bold) and expanded
international support.
'';
homepage = "https://www.theleagueofmoveabletype.com/junction";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

32
pkgs/data/fonts/knewave/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "knewave";
version = "2012-07-30";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "f335d5ff1f12e4acf97d4208e1c37b4d386e57fb";
hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = " A bold, painted face for the rocker within";
longDescription = ''
Knewave is bold, painted face. Get it? Git it.
'';
homepage = "https://www.theleagueofmoveabletype.com/knewave";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

39
pkgs/data/fonts/league-gothic/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib, fetchzip, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "league-gothic";
version = "1.601";
src = fetchzip {
url = "https://github.com/theleagueof/league-gothic/releases/download/${self.version}/LeagueGothic-${self.version}.tar.xz";
hash = "sha256-emkXKyQw4R0Zgg02oJsvBkqV0jmczP0tF0K2IKqJHMA=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf
runHook postInstall
'';
meta = {
description = "A revival of an old classic, Alternate Gothic #1";
longDescription = ''
League Gothic is a revival of an old classic, and one of our favorite
typefaces, Alternate Gothic #1. It was originally designed by Morris
Fuller Benton for the American Type Founders Company in 1903. The company
went bankrupt in 1993, and since the original typeface was created before
1923, the typeface is in the public domain.
We decided to make our own version, and contribute it to the Open Source
Type Movement. Thanks to a commission from the fine & patient folks over
at WND.com, it’s been revised & updated with contributions from Micah
Rich, Tyler Finck, and Dannci, who contributed extra glyphs.
'';
homepage = "https://www.theleagueofmoveabletype.com/league-gothic";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

73
pkgs/data/fonts/league-of-moveable-type/default.nix
View File

@ -1,35 +1,46 @@
{lib, stdenv, fetchurl, unzip, raleway}:
{ lib
, symlinkJoin
, the-neue-black
, blackout
, chunk
, fanwood
, goudy-bookletter-1911
, junction-font
, knewave
, league-gothic
, league-script-number-one
, league-spartan
, linden-hill
, orbitron
, ostrich-sans
, prociono
, raleway
, sniglet
, sorts-mill-goudy
}:
let
symlinkJoin {
name = "league-of-moveable-type";
# TO UPDATE:
# ./update.sh > ./fonts.nix
# we use the extended version of raleway (same license).
fonts = [raleway]
++ map fetchurl (builtins.filter (f: f.name != "raleway.zip") (import ./fonts.nix));
in
stdenv.mkDerivation rec {
baseName = "league-of-moveable-type";
version = "2016-10-15";
name="${baseName}-${version}";
srcs = fonts;
nativeBuildInputs = [ unzip ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/share/fonts/opentype
cp */*.otf $out/share/fonts/opentype
# for Raleway, where the fonts are already in /share/…
cp */share/fonts/opentype/*.otf $out/share/fonts/opentype
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1gy959qhhdwm1phbrkab9isi0dmxcy0yizzncb0k49w88mc13vd0";
paths = [
the-neue-black
blackout
chunk
fanwood
goudy-bookletter-1911
junction-font
knewave
league-gothic
league-script-number-one
league-spartan
linden-hill
orbitron
ostrich-sans
prociono
raleway
sniglet
sorts-mill-goudy
];
meta = {
description = "Font Collection by The League of Moveable Type";
@ -46,6 +57,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ bergey Profpatsch ];
maintainers = with lib.maintainers; [ bergey minijackson Profpatsch ];
};
}

82
pkgs/data/fonts/league-of-moveable-type/fonts.nix
View File

@ -1,82 +0,0 @@
[
{
url = "https://www.theleagueofmoveabletype.com/league-spartan/download";
sha256 = "1z9pff8xm58njs7whaxb3sq4vbdkxv7llwgm9nqhwshmgr52jrm1";
name = "league-spartan.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/junction/download";
sha256 = "1qbhfha012ma26n43lm1fh06i7z47wk50r8qsp09bpxc5yr4ypi7";
name = "junction.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/ostrich-sans/download";
sha256 = "11ydhbgcfhmydcnim64vb035cha14krxxrbf62426dm6bvxkphp3";
name = "ostrich-sans.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/league-gothic/download";
sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b";
name = "league-gothic.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/blackout/download";
sha256 = "1r7dihnjvy4fgvaj5m4llc9dm4cpdl1l79mhg3as16qvjgazms3p";
name = "blackout.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/knewave/download";
sha256 = "065yiakhm6h6jkmigj4pqm2qi6saph0pwb7g8s9gwkskhkk5iy57";
name = "knewave.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/fanwood/download";
sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g";
name = "fanwood.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/linden-hill/download";
sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks";
name = "linden-hill.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/league-script-number-one/download";
sha256 = "056hb02a5vydrq5q0gwzanp2zkrrv1spm8sfc5wzhyfzgwd1vc76";
name = "league-script-number-one.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/raleway/download";
sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87";
name = "raleway.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/prociono/download";
sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy";
name = "prociono.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/orbitron/download";
sha256 = "156w4j324d350pvjmzdg2w8inhhdfzrvb86rhlavgd9sxx2fykk4";
name = "orbitron.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download";
sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n";
name = "goudy-bookletter-1911.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download";
sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra";
name = "sorts-mill-goudy.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/chunk/download";
sha256 = "15mbqwz90y1n4vlj2xkc8vd56va6la5qnxhiipvcmkrng5y3931j";
name = "chunk.zip";
}
{
url = "https://www.theleagueofmoveabletype.com/sniglet/download";
sha256 = "1lhpnjm52gyhy9s2kwbsg1rd9iyrqli5q9ngp141igx4p1bgbqkc";
name = "sniglet.zip";
}
]

25
pkgs/data/fonts/league-of-moveable-type/update.sh
View File

@ -1,25 +0,0 @@
#!/usr/bin/env bash
SITE=https://www.theleagueofmoveabletype.com
# since there is no nice way to get all the fonts,
# this fetches the homepage and extracts their names from the html …
fonts=$(curl "$SITE" 2>/dev/null | \
sed -ne 's/<img.*cloudfront.*images\/\(.*\)-[[:digit:]-]\..*$/\1/p')
# build an ad-hoc nixexpr list with the files & hashes
echo "["
for f in $fonts; do
url="$SITE/$f/download"
hash=$(nix-prefetch-url --type sha256 "$url" 2>/dev/null)
cat <<EOF
{
url = "$url";
sha256 = "$hash";
name = "$f.zip";
}
EOF
done
echo "]"

35
pkgs/data/fonts/league-script-number-one/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "league-script-number-one";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "225add0b37cf8268759ba4572e02630d9fb54ecf";
hash = "sha256-Z3Zrp0Os3On0tESVical1Qh6wY1H2Hc0OPTlkbtsrCI=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "A modern, coquettish script font";
longDescription = ''
This ain’t no Lucinda. League Script #1 is a modern, coquettish script
font that sits somewhere between your high school girlfriend’s love notes
and handwritten letters from the ’20s. Designed exclusively for the
League of Moveable Type, it includes ligatures and will act as the
framework for future script designs.
'';
homepage = "https://www.theleagueofmoveabletype.com/league-script";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

40
pkgs/data/fonts/league-spartan/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib, fetchzip, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "league-spartan";
version = "2.220";
src = fetchzip {
url = "https://github.com/theleagueof/league-spartan/releases/download/${self.version}/LeagueSpartan-${self.version}.tar.xz";
hash = "sha256-dkvWRYli8vk+E0DkZ2NWCJKfSfdo4jEcGo0puQpFVVc=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf
runHook postInstall
'';
meta = {
description = "A fantastic new revival of ATF's classic Spartan, a geometric sans-serif that has no problem kicking its enemies in the chest.";
longDescription = ''
A new classic, this is a bold, modern, geometric sans-serif that has no
problem kicking its enemies in the chest.
Taking a strong influence from ATF's classic Spartan family, we're
starting our own family out with a single strong weight. We've put a few
unique touches into a beautiful, historical typeface, and made sure to
include an extensive characterset – currently totaling over 300 glyphs.
Over time, the open-source license will allow us expand League Spartan
into a full family, with multiple weights and styles, and we're starting
by releasing our first Bold style for this exciting, modern classic now.
'';
homepage = "https://www.theleagueofmoveabletype.com/league-spartan";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

32
pkgs/data/fonts/linden-hill/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "linden-hill";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "a3f7ae6c4cac1b7e5ce5269e1fcc6a2fbb9e31ee";
hash = "sha256-EjXcLjzVQeOJgLxGua8t0oMc+APOsONGGpG6VJVCgFw=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "A digital version of Frederic Goudy’s Deepdene";
longDescription = ''
Linden Hill is a digital version of Frederic Goudy’s Deepdene. The
package includes roman and italic.
'';
homepage = "https://www.theleagueofmoveabletype.com/linden-hill";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

16
pkgs/data/fonts/orbitron/default.nix
View File

@ -1,21 +1,21 @@
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation {
stdenvNoCC.mkDerivation (self: {
pname = "orbitron";
version = "20110526";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = "orbitron";
rev = "13e6a52";
repo = self.pname;
rev = "13e6a5222aa6818d81c9acd27edd701a2d744152";
hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA=";
};
installPhase = ''
runHook preInstall
install -m444 -Dt $out/share/fonts/opentype/orbitron *.otf
install -m444 -Dt $out/share/fonts/ttf/orbitron *.ttf
install -D -m444 -t $out/share/fonts/truetype $src/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
@ -43,6 +43,6 @@ stdenvNoCC.mkDerivation {
'';
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.leenaars ];
maintainers = with lib.maintainers; [ leenaars minijackson ];
};
}
})

32
pkgs/data/fonts/ostrich-sans/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "ostrich-sans";
version = "2014-04-18";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "a949d40d0576d12ba26e2a45e19c91fd0228c964";
hash = "sha256-vvTNtl+fO2zWooH1EvCmO/dPYYgCkj8Ckg5xfg1gtnw=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "A gorgeous modern sans-serif with a very long neck";
longDescription = ''
A gorgeous modern sans-serif with a very long neck. With a whole slew of
styles & weights.
'';
homepage = "https://www.theleagueofmoveabletype.com/ostrich-sans";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

34
pkgs/data/fonts/prociono/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "prociono";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "f9d9680de6d6f0c13939f23c9dd14cd7853cf844";
hash = "sha256-gC5E0Z0O2cnthoBEu+UOQLsr3/a/3/JPIx3WCPsXXtk=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "A roman serif with blackletter elements";
longDescription = ''
"Prociono" (pro-tsee-O-no) is an Esperanto word meaning either the star
Procyon or the animal species known as the raccoon. It is a roman serif
with blackletter elements.
'';
homepage = "https://www.theleagueofmoveabletype.com/prociono";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

38
pkgs/data/fonts/raleway/default.nix
View File

@ -1,44 +1,40 @@
{ lib, stdenvNoCC, fetchFromGitHub }:
{ lib, fetchzip, stdenvNoCC }:
stdenvNoCC.mkDerivation {
stdenvNoCC.mkDerivation (self: {
pname = "raleway";
version = "2016-08-30";
version = "4.101";
src = fetchFromGitHub {
owner = "impallari";
repo = "Raleway";
rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a";
hash = "sha256-mcIpE+iqG6M43I5TT95oV+5kNgphunmyxC+Jaj0JysQ=";
src = fetchzip {
url = "https://github.com/theleagueof/raleway/releases/download/${self.version}/Raleway-${self.version}.tar.xz";
hash = "sha256-itNHIMoRjiaqYAJoDNetkCquv47VAfel8MAzwsd//Ww=";
};
installPhase = ''
runHook preInstall
find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \;
install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf
runHook postInstall
'';
meta = {
description = "Raleway is an elegant sans-serif typeface family";
longDescription = ''
Initially designed by Matt McInerney as a single thin weight, it was
expanded into a 9 weight family by Pablo Impallari and Rodrigo Fuenzalida
in 2012 and iKerned by Igino Marini. In 2013 the Italics where added.
in 2012 and iKerned by Igino Marini. In 2013 the Italics where added, and
most recently — a variable version.
It is a display face and the download features both old style and lining
numerals, standard and discretionary ligatures, a pretty complete set of
diacritics, as well as a stylistic alternate inspired by more geometric
sans-serif typefaces than its neo-grotesque inspired default character
set.
It features both old style and lining numerals, standard and
discretionary ligatures, a pretty complete set of diacritics, as well as
a stylistic alternate inspired by more geometric sans-serif typefaces
than its neo-grotesque inspired default character set.
It also has a sister display family, Raleway Dots.
'';
homepage = "https://github.com/impallari/Raleway";
homepage = "https://www.theleagueofmoveabletype.com/raleway";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ Profpatsch ];
maintainers = with lib.maintainers; [ minijackson Profpatsch ];
};
}
})

33
pkgs/data/fonts/sniglet/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "sniglet";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "5c6b0860bdd0d8c4f16222e4de3918c384db17c4";
hash = "sha256-fLT2hZT9o1Ka30EB/6oWwmalhVJ+swXLRFG99yRWd2c=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "A fun rounded display face that’s great for headlines";
longDescription = ''
A rounded display face that’s great for headlines. It comes with a full
character set, so you can type in Icelandic or even French!
'';
homepage = "https://www.theleagueofmoveabletype.com/sniglet";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

36
pkgs/data/fonts/sorts-mill-goudy/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "sorts-mill-goudy";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = self.pname;
rev = "06072890c7b05f274215a24f17449655ccb2c8af";
hash = "sha256-NEfLBJatUmdUL5gJEimJHZfOd1OtI7pxTN97eWMODyM=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
meta = {
description = "A ‘revival’ of Goudy Oldstyle and Italic";
longDescription = ''
A 'revival' of Goudy Oldstyle and Italic, with features including small
capitals (in the roman only), oldstyle and lining figures, superscripts
and subscripts, fractions, ligatures, class-based kerning, case-sensitive
forms, and capital spacing. There is support for many languages using
latin scripts.
'';
homepage = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

33
pkgs/data/fonts/the-neue-black/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, fetchzip, stdenvNoCC }:
stdenvNoCC.mkDerivation (self: {
pname = "the-neue-black";
version = "1.007";
src = fetchzip {
url = "https://github.com/theleagueof/the-neue-black/releases/download/${self.version}/TheNeueBlack-${self.version}.tar.xz";
hash = "sha256-AsB6w1000xdl+pOPDXqqzQhru1T/VD0hIJ4gFec7mU4=";
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf
install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf
runHook postInstall
'';
meta = {
description = "Tré Seals’ first open-source font, a typeface based on the Chicago Freedom Movement";
longDescription = ''
The open-source release of The Neue Black is in partnership with designer
Tré Seals of Vocal Type Co. The Neue Black is a display sans serif with a
robust character set that has over 25 ligatures and various inktrap
alternates.
'';
homepage = "https://www.theleagueofmoveabletype.com/the-neue-black";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})

4
pkgs/data/fonts/vazir-fonts/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "vazir-fonts";
version = "32.0.0";
version = "33.003";
src = fetchFromGitHub {
owner = "rastikerdar";
repo = "vazir-font";
rev = "v${version}";
hash = "sha256-lkjlSW3Sfr1bJ9/IOsZl9yOVh9mYKhoV5XcLkqcQ71g=";
hash = "sha256-C1UtfrRFzz0uv/hj8e7huXe4sNd5h7ozVhirWEAyXGg=";
};
dontBuild = true;

14
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
@ -29,7 +28,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "6.2.1";
version = "6.2.2";
outputs = [ "out" "dev" ];
@ -37,18 +36,9 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = "files";
rev = version;
sha256 = "sha256-pJFeMG2aGaMkS00fSoRlMR2YSg5YzwqwaQT8G7Gk5S4=";
sha256 = "sha256-YV7fcRaLaDwa0m6zbdhayCAqeON5nqEdQ1IUtDKu5AY=";
};
patches = [
# Ensure special user directory icon used for bookmark
# https://github.com/elementary/files/pull/2106
(fetchpatch {
url = "https://github.com/elementary/files/commit/00b1c2a975aeab378ed6eb1d90c8988f82596add.patch";
sha256 = "sha256-F/Vk7dg57uBBMO4WOJ/7kKbRNMZuWZ3QfrBfEIBozbw=";
})
];
nativeBuildInputs = [
desktop-file-utils
meson

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "coordgenlibs";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "schrodinger";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u8UmJ4bu00t7qxiNZ3nL7cd+8AIC0LoICj5FNPboCTQ=";
sha256 = "sha256-casFPNbPv9mkKpzfBENW7INClypuCO1L7clLGBXvSvI=";
};
nativeBuildInputs = [ cmake ];

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

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "maeparser";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "schrodinger";
repo = "maeparser";
rev = "v${version}";
sha256 = "sha256-9KxCR/spIZzePjmZe8qihIi1hEhPvxg/9dAlYmHxZPs=";
sha256 = "sha256-+eCTOU0rqFQC87wcxgINGLsULfbIr/wKxQTkRR59JVc=";
};
nativeBuildInputs = [ cmake ];

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

@ -9,13 +9,13 @@
mkDerivation rec {
pname = "qxmpp";
version = "1.4.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "qxmpp-project";
repo = pname;
rev = "v${version}";
sha256 = "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i";
sha256 = "sha256-6iI+s+iSKK8TeocvyOxou7cF9ZXlWr5prUbPhoHOoSM=";
};
nativeBuildInputs = [

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

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "2.4.4";
version = "2.4.6";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-a7i8xBlTM3DZDZBzLe/sbMR4CNx7XMxNQ6tiMI6MoTg=";
hash = "sha256-QCPZaxVCQSckZ7qjV9wF7YqgTOFPbRy4xOQVDvReav4=";
};
nativeBuildInputs = [

1
pkgs/development/python-modules/img2pdf/default.nix
View File

@ -61,6 +61,7 @@ buildPythonPackage rec {
disabledTests = [
"test_tiff_rgb"
"test_png_gray1" # https://gitlab.mister-muffin.de/josch/img2pdf/issues/154
];
pythonImportsCheck = [ "img2pdf" ];

13
pkgs/development/python-modules/policy-sentry/default.nix
View File

@ -12,14 +12,16 @@
buildPythonPackage rec {
pname = "policy-sentry";
version = "0.12.5";
disabled = pythonOlder "3.6";
version = "0.12.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "salesforce";
repo = "policy_sentry";
rev = "refs/tags/${version}";
sha256 = "sha256-DwWX8ztqnm/KYkiarG9KXkHcVxYE6Cc285oOMz9gkqc=";
hash = "sha256-odtMbPHty3NUqz+4UAw+8dsK6AMZer41/BAX8cK5Rek=";
};
propagatedBuildInputs = [
@ -34,11 +36,14 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "policy_sentry" ];
pythonImportsCheck = [
"policy_sentry"
];
meta = with lib; {
description = "Python module for generating IAM least privilege policies";
homepage = "https://github.com/salesforce/policy_sentry";
changelog = "https://github.com/salesforce/policy_sentry/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/py-synologydsm-api/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "py-synologydsm-api";
version = "2.1.1";
version = "2.1.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mib1185";
repo = "py-synologydsm-api";
rev = "refs/tags/v${version}";
hash = "sha256-rT9KkSgIinJxTyJ40Z3VzMh23Ry9O3NFrLH4I2+NFPg=";
hash = "sha256-dugWA/Ruc/BhPBbo2bTXf225YndDl0t2vc+NeutaO58=";
};
nativeBuildInputs = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyvicare";
version = "2.24.0";
version = "2.25.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "somm15";
repo = "PyViCare";
rev = version;
sha256 = "sha256-D0N7kRTzfKCxLNtRJML+xykvsv3Mv0WHdlA05eLHl3M=";
sha256 = "sha256-OZvYl8wl8kOIOfsWVn74XFKMX/jAmtoMTIEQpAZmTeo=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.15.0";
version = "1.16.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+JAAei783S9umDSMSQq50ovYm1MCID33W6dolTxBEvU=";
sha256 = "sha256-ijw0JVU9jUhpIJQjcjgzAVPJDxD7WSZYiLV0OvOyS5g=";
};
vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg=";
vendorHash = "sha256-Hg8rMknanHQOgVLJ58QM9JOgrUYMqL7WvaHuiv9xVYw=";
doCheck = false;

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

@ -5,19 +5,19 @@
}:
buildGoModule rec {
pname = "coder";
version = "0.15.3";
version = "0.16.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-d3Cg7G1rjxEqKMsIqxZ6ZZDEMIoisDtjZMmyixZRpF4=";
hash = "sha256-3rGpyJzGkZYUEvKKDzj2I5sqrUImmmX7cXWM9UClPLY=";
};
# integration tests require network access
doCheck = false;
vendorHash = "sha256-F9r99WhL1Uv5NNVlQYpQc282BAl8bUhJI5mZZYwyEEg=";
vendorHash = "sha256-bb9jBno7elO6qKGjacpX3rxgrpJpGpTxMQtdBYjBzMk=";
nativeBuildInputs = [ installShellFiles ];

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

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "go-tools";
version = "2022.1.2";
version = "2023.1";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = version;
sha256 = "sha256-pfZv/GZxb7weD+JFGCOknhRCsx8g5puQfpY9lZ4v6Rs=";
sha256 = "sha256-RzYaaiDu78JVM8G0zJzlZcyCd+1V9KZIyIIyVib0yZc=";
};
vendorSha256 = "sha256-19uLCtKuuZoVwC4SUKvYGWi2ryqAQbcKXY1iNjIqyn8=";
vendorHash = "sha256-o9UtS6AMgRYuAkOWdktG2Kr3QDBDQTOGSlya69K2br8=";
excludedPackages = [ "website" ];

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kafkactl";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "deviceinsight";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZEXW9nqkR0yuVIY9qr1RyKVE7tSlP59Xb4JZfdAK2To=";
sha256 = "sha256-rz3cAA5iqhrCZhLc+RKZhudiMlfu3m6wWYNHAnUP/kg=";
};
vendorHash = "sha256-e7SJjDWcHPgupZujeRD3Zg6vFAudDC3V60R2B61fjGU=";
vendorHash = "sha256-Y3BPt3PsedrlCoKiKUObf6UQd+MuNiCGLpJUg94XSgA=";
doCheck = false;
meta = with lib; {

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
version = "0.19.2";
version = "0.19.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
sha256 = "sha256-foY1fcIn+jywABwEVBWctx4zwLg7k2zxkpL8UAhx6kA=";
sha256 = "sha256-c4+ebl/tWPxAlgt/N5/xalZQZGSizKp/pDcgojbjy7A=";
};
cargoHash = "sha256-WHaORWwR7PeKacaCtXjTYMTCyZ4ZFWo1smVx5ig+Z9U=";
cargoHash = "sha256-D3RjlYMD/UHfYxUMvZVSiRHOPmcLVGgsRVghoaMn9AM=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/development/tools/language-servers/millet/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.7.6";
version = "0.7.7";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
hash = "sha256-7Mv1+c8X+rZQyw3y+eGvSyqVqiSPdTj1WxoUv1mynSs=";
hash = "sha256-1GoZbeXNG00oxBdPa2yk0aOCVguwIkK6fKrlHU6mZYc=";
};
cargoHash = "sha256-0fJIp2zlZkeidTFg6jQs6S2mVHJL8flqiZtTvM0F9OQ=";
cargoHash = "sha256-arIFWJX8WQQWcJP1YpMwFy2XHU/0w+oPj1qE/IlYRF4=";
postPatch = ''
rm .cargo/config.toml

6
pkgs/development/tools/operator-sdk/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.26.0";
version = "1.27.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hIJTdTZ24+VwF1M/RvKcnQRzZga0nsjlTTUFYxZn0lo=";
hash = "sha256-rvLWM6G2kOOuFU0JuwdIjSCFNyjBNL+fOoEj+tIR190=";
};
vendorHash = "sha256-1Vz+SIrNULajDqzZt53+o9wv1zLPBvKrO28BTqS4VbM=";
vendorHash = "sha256-L+Z1k+z/XNO9OeTQVzNJd1caRip6Ti8mPfNmXJx5D5c=";
nativeBuildInputs = [
makeWrapper

5
pkgs/development/tools/pgformatter/default.nix
View File

@ -2,13 +2,13 @@
perlPackages.buildPerlPackage rec {
pname = "pgformatter";
version = "5.4";
version = "5.5";
src = fetchFromGitHub {
owner = "darold";
repo = "pgFormatter";
rev = "v${version}";
sha256 = "sha256-z90V4aKp5gIZMWQha3gHpTMtpYVsGhFtPWHiJuFt3qA=";
hash = "sha256-4KtrsckO9Q9H0yIM0877YvWaDW02CQVAQiOKD919e9w=";
};
outputs = [ "out" ];
@ -40,5 +40,6 @@ perlPackages.buildPerlPackage rec {
changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}";
maintainers = [ maintainers.marsam ];
license = [ licenses.postgresql licenses.artistic2 ];
mainProgram = "pg_format";
};
}

6
pkgs/development/tools/rust/panamax/default.nix
View File

@ -11,14 +11,14 @@
rustPlatform.buildRustPackage rec {
pname = "panamax";
version = "1.0.6";
version = "1.0.12";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw=";
sha256 = "sha256-nHAsKvNEhGDVrLx8K7xnm7TuCxaZcYwlQ6xjVRvDdSk=";
};
cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo=";
cargoSha256 = "sha256-ydZ0KM/g9k0ux7Zr4crlxnKCC9N/qPzn1wmzbTIyz7o=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/games/otto-matic/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "OttoMatic";
version = "4.0.0";
version = "4.0.1";
src = fetchFromGitHub {
owner = "jorio";
repo = pname;
rev = version;
sha256 = "sha256-eHy5yED5qrgHqKuqq1dXhmuR2PQBE5aMhSLPoydlpPk=";
sha256 = "sha256-0mqOAdAmJGxKa6yXktrbmdXkoQIliimq37iy9bCBZYg=";
fetchSubmodules = true;
};

4
pkgs/games/unciv/default.nix
View File

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
version = "4.4.6";
version = "4.4.9";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
sha256 = "sha256-I4EKYoN+36a65mcZ2UWH3Ws75Ojdmpw/6flKFmEuIk8=";
sha256 = "sha256-8OoQgiMrjYPlEjvm/9m7YkMaKyGBtNBkGavjACwY/00=";
};
dontUnpack = true;

4
pkgs/os-specific/linux/ksmbd-tools/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ksmbd-tools";
version = "3.4.6";
version = "3.4.7";
src = fetchFromGitHub {
owner = "cifsd-team";
repo = pname;
rev = version;
sha256 = "sha256-zquHhr+Zf4jR/TlVA0Zea3eZ9JjRjYXefcYIQs76gSw=";
sha256 = "sha256-uYJhjxarAqJC/aY8UUy7sjhA89LVoCG6B7/APkE0ouk=";
};
buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5;

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

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "libzbd";
version = "2.0.3";
version = "2.0.4";
src = fetchFromGitHub {
owner = "westerndigitalcorporation";
repo = "libzbd";
rev = "v${version}";
sha256 = "GoCHwuR4ylyaN/FskIqKyAPe2A2O3iFVcI3UxPlqvtk=";
sha256 = "sha256-iMQjOWsgsS+uI8mqoOXHRAV1+SIu1McUAcrsY+/zcu8=";
};
nativeBuildInputs = [

12
pkgs/servers/etcd/3.5.nix
View File

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, symlinkJoin }:
let
version = "3.5.6";
version = "3.5.7";
src = fetchFromGitHub {
owner = "etcd-io";
repo = "etcd";
rev = "v${version}";
sha256 = "sha256-KQ3N6HBgdLnS/8UprT99gH9ttsy2cgfaWSL/ILX6t1A=";
hash = "sha256-VgWY622RJ8f4yA6TRC5IvatVFw2CP5lN3QBS3Xaevbc=";
};
CGO_ENABLED = 0;
@ -25,11 +25,11 @@ let
inherit CGO_ENABLED meta src version;
vendorSha256 = "sha256-u4N8YXmnVk5flPimdE4olr/1hVZoEDEgUwXRRTlX51o=";
vendorHash = "sha256-w/aWrQF/PAWTGMFUcpHiiDef6cvLLdYP06iwBdxrGkQ=";
modRoot = "./server";
postBuild = ''
preInstall = ''
mv $GOPATH/bin/{server,etcd}
'';
@ -45,7 +45,7 @@ let
inherit CGO_ENABLED meta src version;
vendorSha256 = "sha256-J4qW2Dzpwk85XW3oWvT1F5ec/jzkcLbTC+1CMBztWRw=";
vendorHash = "sha256-Bq5vOZCflLDAhhmwSww9JCahfL/JHKa3ZT4cwNXzW90=";
modRoot = "./etcdutl";
};
@ -55,7 +55,7 @@ let
inherit CGO_ENABLED meta src version;
vendorSha256 = "sha256-+5zWXVErkFAvtkpNQtKn/jLOGUdHkXgeZWI7/RIMgMQ=";
vendorHash = "sha256-KUr0SrfuE5sh54THdvJwuMO/U6O+civ6onEPzNGqf18=";
modRoot = "./etcdctl";
};

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.2.1";
version = "2023.2.2";
components = {
"3_day_blinds" = ps: with ps; [
];

4
pkgs/servers/home-assistant/default.nix
View File

@ -271,7 +271,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.2.1";
hassVersion = "2023.2.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -289,7 +289,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-gWcq0E/k6c4YQJwLlU379kse2u4Yn6xvLZ5QnGXVTJA=";
hash = "sha256-HEL8e/2zoWPjeJL9iaCRu8aIldE3uTw9Yu9Q06Nyvz4=";
};
nativeBuildInputs = with python3.pkgs; [

4
pkgs/servers/misc/oven-media-engine/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "oven-media-engine";
version = "0.14.18";
version = "0.15.0";
src = fetchFromGitHub {
owner = "AirenSoft";
repo = "OvenMediaEngine";
rev = "v${version}";
sha256 = "sha256-M204aIFbs2VmwgZbOmkpuyqOfpom/FnKc6noEVMuZfs=";
sha256 = "sha256-xw9X6PVXl7fLQcwIQOA3s8DbXKBQ5aqZpnKPgd47gjM=";
};
sourceRoot = "source/src";

6
pkgs/servers/monitoring/mackerel-agent/default.nix
View File

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "mackerel-agent";
version = "0.74.1";
version = "0.75.0";
src = fetchFromGitHub {
owner = "mackerelio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-c1CywtgvVORkDewFB9iz99aUT5gFi5vXWddGZGLFu7o=";
sha256 = "sha256-XwyBHCx3MngLItgCZfil5k/h6DfQTO+0LN3brldceXI=";
};
nativeBuildInputs = [ makeWrapper ];
nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];
vendorHash = "sha256-281Qz57n5qAOoqLofTFv5UcLs0xVz8iyV9yxDdsuljE=";
vendorHash = "sha256-cSWyNGR1J2kk4XcaJXFEsMGx5OtyKyBoxY2FCa62x9c=";
subPackages = [ "." ];

4
pkgs/servers/monitoring/prometheus/nut-exporter.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nut-exporter";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
owner = "DRuggeri";
repo = "nut_exporter";
rev = "v${version}";
sha256 = "sha256-imO++i4bfxQnMNh+BOZRYvJAzqgehFIElpQX3NyQF+8=";
sha256 = "sha256-I44unG7eKBGxjm2HnCcm1ThlrDpDglXBork7meOOGiw=";
};
vendorHash = "sha256-ji8JlEYChPBakt5y6+zcm1l04VzZ0/fjfGFJ9p+1KHE=";

6
pkgs/servers/monitoring/telegraf/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.25.0";
version = "1.25.1";
excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
sha256 = "sha256-p+2nsJT3WHYmJ1toIwFi/a/I0//OaUoJIHmQcFHHJ/A=";
sha256 = "sha256-r+kbF4TajBkZyp0B6Tb/Y1Nm7e2zQctDYEmyn0qTqW0=";
};
vendorSha256 = "sha256-xNio3bMFopMgDwdQdtFmkp3F0iWYHVqu9T42S5KNMU8=";
vendorHash = "sha256-AlmmWjwhC5xStcwo+NW0IwC+FteL4Ttwo717VgE8IHM=";
proxyVendor = true;
ldflags = [

6
pkgs/servers/monitoring/thanos/default.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
version = "0.30.1";
version = "0.30.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
sha256 = "sha256-fCH1smkgqDqs6N3ibBob5R1wsltwC3HV1elI37nfq0g=";
sha256 = "sha256-3IkqaWMQGJssxsAF+BZphEpufR4G5E5bYJvioSO2hJ4=";
};
vendorHash = "sha256-OEOlyExgJoEUY2qygBbrxKRkh26sXDX/gAKReeA6Du4=";
vendorHash = "sha256-JtjVdr23wI5ZM5LlFApWurTTzLkLI4nzA9/bWoOrGSM=";
doCheck = false;

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

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.12.0";
version = "0.12.2";
src = fetchFromGitHub {
owner = "pocketbase";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ptp01SnVqQ+qFxX4Qsoyw9bkw+inm9gMSRqtmAcFlVE=";
sha256 = "sha256-PnbsWzuUxGhAGadKfcEWl2HzTA3L4qu3xGJWMx9N4rs=";
};
vendorHash = "sha256-8NBudXcU3cjSbo6qpGZVLtbrLedzwijwrbiTgC+OMcU=";

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

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "snappymail";
version = "2.25.0";
version = "2.25.2";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
sha256 = "sha256-obPWI6tvZx8HEWvNUw9euJav1ncbBYtXwY7SgEurkdQ=";
sha256 = "sha256-45/lE+3lbIlrrlGiZcnyqqYN61BXdBzfufQuP/6W1mk=";
};
sourceRoot = "snappymail";

6
pkgs/servers/soft-serve/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "soft-serve";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "soft-serve";
rev = "v${version}";
sha256 = "sha256-MziobrOqEUsg/XhzLChNker3OU9YAH0LmQ+i+UYoPkE=";
sha256 = "sha256-vNcM/eFz+vSEnJTgnvn7Cfx7ZDiXY9RlgU3zQlqYnss=";
};
vendorSha256 = "sha256-YmAPZtGq2wWqrmTwFOPvSZ3pXa3hUFd+TQfU+Nzhlvs=";
vendorHash = "sha256-DZlzgoQ8F3L4hErKnBD14R49pHPJy1/Ut5k004qZzUw=";
doCheck = false;

4
pkgs/servers/sql/mssql/jdbc/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mssql-jdbc";
version = "11.2.2";
version = "12.2.0";
src = fetchurl {
url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
sha256 = "sha256-MLB2R5ATVBewGaCle8NYPR1mZt2U3CCvEwf2dkBfNTI=";
sha256 = "sha256-Z0z9cDAF7TZ8IJr3Uh2xU0nK2+aNgerk5hO1kY+/wfY=";
};
dontUnpack = true;

4
pkgs/servers/web-apps/bookstack/default.nix
View File

@ -16,13 +16,13 @@ let
in package.override rec {
pname = "bookstack";
version = "23.01";
version = "23.01.1";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = pname;
rev = "v${version}";
sha256 = "0d2hqqa4x133ni8j0dijzn9653iq44ax4rly85g9kiwrjd0l17cw";
sha256 = "sha256-S4yGys1Lc2FAd3RKI4KdE9X12rsQyVcPQ+Biwwrnb0I=";
};
meta = with lib; {

4
pkgs/shells/zsh/zsh-forgit/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "zsh-forgit";
version = "23.01.0";
version = "23.02.0";
src = fetchFromGitHub {
owner = "wfxr";
repo = "forgit";
rev = version;
sha256 = "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk=";
sha256 = "sha256-PGFYw7JbuYHOVycPlYcRItElcyuKEg2cGv4wn6In5Mo=";
};
strictDeps = true;

6
pkgs/tools/admin/eksctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.127.0";
version = "0.128.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-WCkVCND3c8HYLi0UrgF3zoEykIs1/D7HgeblZETvU4M=";
sha256 = "sha256-CKtDj9Ht81i8EcpjHqluWfwkEU15a/TZd6N+jCSzIc8=";
};
vendorHash = "sha256-FBKwWApiIs0y0IZqJOJwzdBq1ihaPv8mqqSTO42ggi0=";
vendorHash = "sha256-aSXj21JNqX/cc62oFqyedmvczmudcV7RhLyWrKsdOMQ=";
doCheck = false;

6
pkgs/tools/admin/kics/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kics";
version = "1.6.8";
version = "1.6.9";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
rev = "v${version}";
sha256 = "sha256-s2M763M4Hoy8gjgkHT69pCUCsWepmt0zEyXYpGzYTn0=";
sha256 = "sha256-So6S/AyuuHpezu4FMDOXDOdJqvEexbgpmLhDnDbbUuM=";
};
vendorHash = "sha256-JWdc0BN0GRw79uhb2uubSG1bnZlTHTVrmS0Jft1ZNh8=";
vendorHash = "sha256-wFKQv/9GtXMnTP+HkmmHO0RgQ98jm1GZeIGIJiqWx1I=";
subPackages = [ "cmd/console" ];

6
pkgs/tools/misc/f2/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "f2";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "ayoisaiah";
repo = "f2";
rev = "v${version}";
sha256 = "sha256-bNcPzvjVBH7x60kNjlUILiQGG3GDmqIB5T2WP3+nZ+s=";
sha256 = "sha256-2+wp9hbPDH8RAeQNH1OYDfFlev+QTsEHixYb/luR9F0=";
};
vendorSha256 = "sha256-Cahqk+7jDMUtZq0zhBll1Tfryu2zSPBN7JKscV38360=";
vendorHash = "sha256-sOTdP+MuOH9jB3RMajeUx84pINSuWVRw5p/9lrOj6uo=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

6
pkgs/tools/misc/jfrog-cli/default.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "jfrog-cli";
version = "2.34.0";
vendorHash = "sha256-Z0ifACsdSIYevsvRD5KACFSRlvrL1jIJbrzjDFeLbEQ=";
version = "2.34.1";
vendorHash = "sha256-0C2uUq8GKM3IMjhH30Fa702uDmXbVbEDWJ6wKIWYTQw=";
src = fetchFromGitHub {
owner = "jfrog";
repo = "jfrog-cli";
rev = "v${version}";
sha256 = "sha256-SDZzbUh3wbDfzkE/5GgFstDuMYLiM8+MXRZ79jYGoaQ=";
sha256 = "sha256-7jkhr6fav7YwwFyO3m6mj2jl3RoX3sbS4YBBeMT/Go8=";
};
postInstall = ''

6
pkgs/tools/misc/krapslog/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "krapslog";
version = "0.4.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "acj";
repo = "krapslog-rs";
rev = version;
sha256 = "sha256-P/MxIehxj+FE5hvWge7Q2EwL57ObV8ibRZtmko0mphY=";
sha256 = "sha256-GSjS/6wetm3kHXdGyeenzALZ3tVi7BMM/GLS1ZhMQas=";
};
cargoSha256 = "sha256-dQDfL5yN2ufFpQCXZ5Il0Qzhb/d7FETCVJg3DOMJPWQ=";
cargoHash = "sha256-dgbi0mUI8WqqXF1VNOTbHuCKcvb4B18/1vBlJZ8Jivs=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

297
pkgs/tools/misc/opentsdb/default.nix
View File

@ -1,34 +1,299 @@
{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools
, python3, git
{ lib
, stdenv
, autoconf
, automake
, bash
, curl
, fetchFromGitHub
, fetchMavenArtifact
, fetchurl
, git
, jdk8
, makeWrapper
, nettools
, python3
}:
let jdk = jdk8; jre = jdk8.jre; in
stdenv.mkDerivation rec {
let
jdk = jdk8;
jre = jdk8.jre;
artifacts = {
apache = [
(fetchMavenArtifact {
groupId = "org.apache.commons";
artifactId = "commons-math3";
version = "3.4.1";
hash = "sha256-0QdbFKcQhwOLC/0Zjw992OSbWzUp2OLrqZ59nrhWXks=";
})
];
guava = [
(fetchMavenArtifact {
groupId = "com.google.guava";
artifactId = "guava";
version = "18.0";
hash = "sha256-1mT7/APS5c6cqypE+wHx0L+d/r7MwaRzsfnqMfefb5k=";
})
];
gwt = [
(fetchMavenArtifact {
groupId = "com.google.gwt";
artifactId = "gwt-dev";
version = "2.6.0";
hash = "sha256-4MLdI7q5fkftHTMoN7W3l5zsq1QB2R/8bF86vEqBI+A=";
})
(fetchMavenArtifact {
groupId = "com.google.gwt";
artifactId = "gwt-user";
version = "2.6.0";
hash = "sha256-HR5/aopn605inHeENNHBAqKrjkvIl9wPDM+nOwOpiEg=";
})
(fetchMavenArtifact {
groupId = "net.opentsdb";
artifactId = "opentsdb-gwt-theme";
version = "1.0.0";
hash = "sha256-JJsjcRlQmIrwpOtMweH12e/Ut5NG8R50VPiOAMMGEdc=";
})
];
hamcrest = [
(fetchMavenArtifact {
url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar";
groupId = "org.hamcrest";
artifactId = "hamcrest-core";
version = "1.3";
hash = "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=";
})
];
hbase = [
(fetchMavenArtifact {
groupId = "org.hbase";
artifactId = "asynchbase";
version = "1.8.2";
hash = "sha256-D7mKprHMW23dE0SzdNsagv3Hp2G5HUN7sKfs1nVzQF4=";
})
];
jackson = [
(fetchMavenArtifact {
groupId = "com.fasterxml.jackson.core";
artifactId = "jackson-annotations";
version = "2.9.5";
hash = "sha256-OKDkUASfZDVwrayZiIqjSA7C3jhXkKcJaQi/Q7/AhdY=";
})
(fetchMavenArtifact {
groupId = "com.fasterxml.jackson.core";
artifactId = "jackson-core";
version = "2.9.5";
hash = "sha256-or66oyWtJUVbAhScZ+YFI2en1/wc533gAO7ShKUhTqw=";
})
(fetchMavenArtifact {
groupId = "com.fasterxml.jackson.core";
artifactId = "jackson-databind";
version = "2.9.5";
hash = "sha256-D7TgecEY51LMlMFa0i5ngrDfxdwJFF9IE/s52C5oYEc=";
})
];
javacc = [
(fetchMavenArtifact {
groupId = "net.java.dev.javacc";
artifactId = "javacc";
version = "6.1.2";
hash = "sha256-7Qxclglhz+tDE4LPAVKCewEVZ0fbN5LRv5PoHjLCBKs=";
})
];
javassist = [
(fetchMavenArtifact {
groupId = "org.javassist";
artifactId = "javassist";
version = "3.21.0-GA";
hash = "sha256-eqWeAx+UGYSvB9rMbKhebcm9OkhemqJJTLwDTvoSJdA=";
})
];
jexl = [
(fetchMavenArtifact {
groupId = "commons-logging";
artifactId = "commons-logging";
version = "1.1.1";
hash = "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=";
})
(fetchMavenArtifact {
groupId = "org.apache.commons";
artifactId = "commons-jexl";
version = "2.1.1";
hash = "sha256-A8mp+uXaeM5SwL8kRnzDc1W34jGW3/SDniwP8BigEwY=";
})
];
jgrapht = [
(fetchMavenArtifact {
groupId = "org.jgrapht";
artifactId = "jgrapht-core";
version = "0.9.1";
hash = "sha256-5u8cEVaJ7aCBQrhtUkYg2mQ7bp8BNAUletB/QtxcaXg=";
})
];
junit = [
(fetchMavenArtifact {
groupId = "junit";
artifactId = "junit";
version = "4.11";
hash = "sha256-kKjhYD7spI5+h586+8lWBxUyKYXzmidPb2BwtD+dBv4=";
})
];
kryo = [
(fetchMavenArtifact {
groupId = "org.ow2.asm";
artifactId = "asm";
version = "4.0";
hash = "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=";
})
(fetchMavenArtifact {
groupId = "com.esotericsoftware.kryo";
artifactId = "kryo";
version = "2.21.1";
hash = "sha256-adEG73euU3sZBp9WUQNLZBN6Y3UAZXTAxjsuvDuy7q4=";
})
(fetchMavenArtifact {
groupId = "com.esotericsoftware.minlog";
artifactId = "minlog";
version = "1.2";
hash = "sha256-pnjLGqj10D2QHJksdXQYQdmKm8PVXa0C6E1lMVxOYPI=";
})
(fetchMavenArtifact {
groupId = "com.esotericsoftware.reflectasm";
artifactId = "reflectasm";
version = "1.07";
classifier = "shaded";
hash = "sha256-CKcOrbSydO2u/BGUwfdXBiGlGwqaoDaqFdzbe5J+fHY=";
})
];
logback = [
(fetchMavenArtifact {
groupId = "ch.qos.logback";
artifactId = "logback-classic";
version = "1.0.13";
hash = "sha256-EsGTDKkWU0IqxJ/qM/zovhsfzS0iIM6jg8R5SXbHQY8=";
})
(fetchMavenArtifact {
groupId = "ch.qos.logback";
artifactId = "logback-core";
version = "1.0.13";
hash = "sha256-7NjyT5spQShOmPFU/zND5yDLMcj0e2dVSxRXRfWW87g=";
})
];
mockito = [
(fetchMavenArtifact {
groupId = "org.mockito";
artifactId = "mockito-core";
version = "1.9.5";
hash = "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=";
})
];
netty = [
(fetchMavenArtifact {
groupId = "io.netty";
artifactId = "netty";
version = "3.10.6.Final";
hash = "sha256-h2ilD749k6iNjmAA6l1o4w9Q3JFbN2TDxYcPcMT7O0k=";
})
];
objenesis = [
(fetchMavenArtifact {
groupId = "org.objenesis";
artifactId = "objenesis";
version = "1.3";
hash = "sha256-3U7z0wkQY6T+xXjLsrvmwfkhwACRuimT3Nmv0l/5REo=";
})
];
powermock = [
(fetchMavenArtifact {
groupId = "org.powermock";
artifactId = "powermock-mockito-release-full";
version = "1.5.4";
classifier = "full";
hash = "sha256-GWXaFG/ZtPlc7uKrghQHNAPzEu2k5VGYCYTXIlbylb4=";
})
];
protobuf = [
(fetchMavenArtifact {
groupId = "com.google.protobuf";
artifactId = "protobuf-java";
version = "2.5.0";
hash = "sha256-4MHGRXXABWAXJefGoCzr+eEoXoiPdWsqHXP/qNclzHQ=";
})
];
slf4j = [
(fetchMavenArtifact {
groupId = "org.slf4j";
artifactId = "log4j-over-slf4j";
version = "1.7.7";
hash = "sha256-LjcWxCtsAm/jzd2pK7oaVZsTZjjcexj7qKQSxBiVecI=";
})
(fetchMavenArtifact {
groupId = "org.slf4j";
artifactId = "slf4j-api";
version = "1.7.7";
hash = "sha256-aZgMA4yhsTGSZWFZFhfZwl+r/Hspgor5FZfKhXDPNf4=";
})
];
suasync = [
(fetchMavenArtifact {
groupId = "com.stumbleupon";
artifactId = "async";
version = "1.4.0";
hash = "sha256-FJ1HH68JOkjNtkShjLTJ8K4NO/A/qu88ap7J7SEndrM=";
})
];
validation-api = [
(fetchMavenArtifact {
groupId = "javax.validation";
artifactId = "validation-api";
version = "1.0.0.GA";
hash = "sha256-5FnzE+vG2ySD+M6q05rwcIY2G0dPqS5A9ELo3l2Yldw=";
})
(fetchMavenArtifact {
groupId = "javax.validation";
artifactId = "validation-api";
version = "1.0.0.GA";
classifier = "sources";
hash = "sha256-o5TVKpt/4rsU8HGNKzyDCP/o836RGVYBI5jVXJ+fm1Q=";
})
];
zookeeper = [
(fetchMavenArtifact {
groupId = "org.apache.zookeeper";
artifactId = "zookeeper";
version = "3.4.6";
hash = "sha256-ijdaHvmMvA4fbp39DZbZFLdNN60AtL+Bvrd/qPNNM64=";
})
];
};
in stdenv.mkDerivation rec {
pname = "opentsdb";
version = "2.4.0";
version = "2.4.1";
src = fetchurl {
url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2";
src = fetchFromGitHub {
owner = "OpenTSDB";
repo = "opentsdb";
rev = "refs/tags/v${version}";
hash = "sha256-899m1H0UCLsI/bnSrNFnnny4MxSw3XBzf7rgDuEajDs=";
};
patches = [
(fetchpatch {
name = "CVE-2020-35476.patch";
url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch";
sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb";
})
nativeBuildInputs = [
autoconf
automake
makeWrapper
];
nativeBuildInputs = [ makeWrapper autoconf automake ];
buildInputs = [ curl jdk nettools python3 git ];
preConfigure = ''
chmod +x build-aux/fetchdep.sh.in
patchShebangs ./build-aux/
./bootstrap
'';
preBuild = lib.concatStrings (lib.mapAttrsToList (dir: lib.concatMapStrings (artifact: ''
ln -s ${artifact}/share/java/* third_party/${dir}
'')) artifacts);
postInstall = ''
wrapProgram $out/bin/tsdb \
--set JAVA_HOME "${jre}" \

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "steampipe";
version = "0.18.2";
version = "0.18.3";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
sha256 = "sha256-n/5+IVhTaME4x0KFTueo4SSBkAvXgin1VJHNEe2JnPI=";
sha256 = "sha256-FHZMnq/7y450dME5+CfF8Nkv7jEZyVkMYBXPcinFVvM=";
};
vendorHash = "sha256-W30f7QYgm+QyLDJICpjMn7mtUIziTR1igThEbv+Aa7M=";

6
pkgs/tools/networking/dnsmonster/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "dnsmonster";
version = "0.9.7";
version = "0.9.9";
src = fetchFromGitHub {
owner = "mosajjal";
repo = pname;
rev = "v${version}";
hash = "sha256-fpyx2/2P2tMx/n5pCZkUie3uU9jarRU2QVMBs8jEc6Q=";
hash = "sha256-2k/WyAM8h2P2gCLt2J9m/ZekrzCyf/LULGOQYy5bsZs=";
};
vendorSha256 = "sha256-kZkzTi3i8J6K8x+nSjGeyzEBRPeDEP6qX5KMv/weAXg=";
vendorHash = "sha256-gAjR1MoudBAx1dxGObIVPqJdfehWkKckKtwM7sTP0w4=";
buildInputs = [
libpcap

6
pkgs/tools/networking/minio-client/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2023-01-11T03-14-16Z";
version = "2023-01-28T20-29-38Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-wxI4m4RAvi2YCx+RWO9HQyn927O3PUJ/A9i/5IOtbZ8=";
sha256 = "sha256-xlhAPJvZcd4tkaIK+xflUXcFKMbQQX8QgCSD7CTiPu8=";
};
vendorHash = "sha256-Exhw9H+qayQnpT4qCaeOsmbTCmCy80UKk8ZxDuOOHcA=";
vendorHash = "sha256-fSHgwllxk10ipacOmtXXqFupEp3kuG25KIRklwmtIMU=";
subPackages = [ "." ];

4
pkgs/tools/networking/openapi-generator-cli/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
let this = stdenv.mkDerivation rec {
version = "6.2.1";
version = "6.3.0";
pname = "openapi-generator-cli";
jarfilename = "${pname}-${version}.jar";
@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
sha256 = "sha256-8shgDywj7hEj7r9H7w9A2zhmJ+dbA0DKFhgsEPQXT6k=";
sha256 = "sha256-1xTXvuxQCksCT+pj4+eHyb8fAc4YcK9Tn3xIijB7P1s=";
};
dontUnpack = true;

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pritunl-client";
version = "1.3.3420.31";
version = "1.3.3430.77";
src = fetchFromGitHub {
owner = "pritunl";
repo = "pritunl-client-electron";
rev = version;
sha256 = "sha256-FKLYpn2HeAVGN9OjLowv2BJRLZKReqXLPFvbin/jaBo=";
sha256 = "sha256-tB6BAtLIlsU7mQmJ/Ec94X2r0mmGJlefc2NkyDhQ2Ek=";
};
modRoot = "cli";

6
pkgs/tools/security/arti/default.nix
View File

@ -10,7 +10,7 @@
rustPlatform.buildRustPackage rec {
pname = "arti";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
owner = "core";
repo = "arti";
rev = "arti-v${version}";
sha256 = "sha256-fvRSx/I4SM9xWhooPPKFuRLSCYOxE+scqi6jRsGFOXo=";
sha256 = "sha256-A5enH7JqnLZ9Tte+FMpMVqq1g1JveYJbzH1Qum5In5E=";
};
cargoSha256 = "sha256-5wXeFomQs/aEbImmlyUzmYyDRXFp3qZSFOzk0g7pNEo=";
cargoHash = "sha256-LVc7CgRS57p7TUaTo8L94YArYC7eI0wegzNMcTiJrEg=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];

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

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "doppler";
version = "3.53.1";
version = "3.54.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
sha256 = "sha256-ZgXUnHYaWRBjAW/k74o93SIJJbcI3zlw5GmwXE6Ri8U=";
sha256 = "sha256-R+mvifWHyUL8qBCKKFcn4x9eDoPi4qRuGPnoRS4QlQY=";
};
vendorHash = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784=";

6
pkgs/tools/security/gotrue/supabase.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gotrue";
version = "2.42.2";
version = "2.44.0";
src = fetchFromGitHub {
owner = "supabase";
repo = pname;
rev = "v${version}";
hash = "sha256-nMSvc90oZsAbDGktvSBMWZNEAGzz/INLK5K6hawteew=";
hash = "sha256-LSA6h6hs5M80urBasVDWZSCNA3fWxjYjvbPRbHLOX0Y=";
};
vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU=";
vendorHash = "sha256-FIl30sKmdcXayK8KWGFl+N+lYExl4ibKZ2tcvelw8zo=";
ldflags = [
"-s"

8
pkgs/tools/security/gpg-tui/default.nix
View File

@ -6,6 +6,7 @@
, libgpg-error
, libxcb
, libxkbcommon
, pkg-config
, python3
, AppKit
, Foundation
@ -16,20 +17,21 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
version = "0.9.1";
version = "0.9.3";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
hash = "sha256-eUUHH6bPfYjkHo7C7GWzewTpT8je7TQK9M8mTM5v59s=";
hash = "sha256-4Xi4ePFJL56HxCkbTlu4WiCTRzLEqvfbEk/2q9QjAd8=";
};
cargoHash = "sha256-GtSvDfG9lRUirm4d6PSaOBLTHZJT2PH0Sx/9GVquX5M=";
cargoHash = "sha256-MEj7c87msMv/+D70EDWmWEHTtmQcx5DEMf2I/AXnwm8=";
nativeBuildInputs = [
gpgme # for gpgme-config
libgpg-error # for gpg-error-config
pkg-config
python3
];

81
pkgs/tools/system/s0ix-selftest-tool/default.nix Normal file
View File

@ -0,0 +1,81 @@
{
acpica-tools,
bash,
bc,
coreutils,
fetchFromGitHub,
gawk,
gnugrep,
gnused,
linuxPackages,
lib,
pciutils,
powertop,
resholve,
stdenv,
util-linux,
xorg,
xxd,
}:
resholve.mkDerivation {
pname = "s0ix-selftest-tool";
version = "unstable-2022-11-04";
src = fetchFromGitHub {
owner = "intel";
repo = "S0ixSelftestTool";
rev = "1b6db3c3470a3a74b052cb728a544199661d18ec";
hash = "sha256-w97jfdppW8kC8K8XvBntmkfntIctXDQCWmvug+H1hKA=";
};
# don't use the bundled turbostat binary
postPatch = ''
substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat'
substituteInPlace s0ix-selftest-tool.sh --replace 'sudo ' ""
'';
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool"
runHook postInstall
'';
solutions = {
default = {
scripts = ["bin/s0ix-selftest-tool"];
interpreter = lib.getExe bash;
inputs = [
acpica-tools
bc
coreutils
gawk
gnugrep
gnused
linuxPackages.turbostat
pciutils
powertop
util-linux
xorg.xset
xxd
];
execer = [
"cannot:${util-linux}/bin/dmesg"
"cannot:${powertop}/bin/powertop"
"cannot:${util-linux}/bin/rtcwake"
"cannot:${linuxPackages.turbostat}/bin/turbostat"
];
};
};
meta = with lib; {
homepage = "https://github.com/intel/S0ixSelftestTool";
description = "A tool for testing the S2idle path CPU Package C-state and S0ix failures";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [adamcstephens];
};
}

12
pkgs/tools/text/difftastic/default.nix
View File

@ -8,13 +8,13 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.43.0";
version = "0.43.1";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-YL2rKsP5FSoG1gIyxQtt9kovBAyu8Flko5RxXRQy5mQ=";
sha256 = "sha256-UI63OJukot+MH+51h/yLnimJAcy8OFan9sUbuZaJZXc=";
};
depsExtraArgs = {
@ -39,13 +39,7 @@ rustPlatform.buildRustPackage rec {
popd
'';
};
cargoSha256 = "sha256-SUNBnJP8B/HvlozcCbehL1A2/WudYE20DIPc7/fYF/k=";
checkFlags = [
# test is broken
# https://github.com/Wilfred/difftastic/issues/479
"--skip=files::tests::test_gzip_is_binary"
];
cargoSha256 = "sha256-IfwZ800PGbmzxQ0e6okieKR7A8jgt+II2j8FRDkiXfw=";
passthru.tests.version = testers.testVersion { package = difftastic; };

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

@ -1527,6 +1527,8 @@ with pkgs;
redfang = callPackage ../tools/networking/redfang { };
s0ix-selftest-tool = callPackage ../tools/system/s0ix-selftest-tool { };
scarab = callPackage ../tools/games/scarab { };
sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { };
@ -26865,6 +26867,8 @@ with pkgs;
blackbird = callPackage ../data/themes/blackbird { };
blackout = callPackage ../data/fonts/blackout { };
brise = callPackage ../data/misc/brise { };
cacert = callPackage ../data/misc/cacert { };
@ -26895,6 +26899,8 @@ with pkgs;
chonburi-font = callPackage ../data/fonts/chonburi { };
chunk = callPackage ../data/fonts/chunk { };
cldr-annotations = callPackage ../data/misc/cldr-annotations { };
clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
@ -27054,6 +27060,8 @@ with pkgs;
fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {};
fanwood = callPackage ../data/fonts/fanwood { };
fira = callPackage ../data/fonts/fira { };
fira-code = callPackage ../data/fonts/fira-code { };
@ -27106,6 +27114,8 @@ with pkgs;
go-font = callPackage ../data/fonts/go-font { };
goudy-bookletter-1911 = callPackage ../data/fonts/goudy-bookletter-1911 { };
graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { };
graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { };
@ -27197,6 +27207,8 @@ with pkgs;
joypixels = callPackage ../data/fonts/joypixels { };
junction-font = callPackage ../data/fonts/junction { };
junicode = callPackage ../data/fonts/junicode { };
julia-mono = callPackage ../data/fonts/julia-mono { };
@ -27215,6 +27227,8 @@ with pkgs;
khmeros = callPackage ../data/fonts/khmeros {};
knewave = callPackage ../data/fonts/knewave { };
kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
@ -27243,8 +27257,14 @@ with pkgs;
lato = callPackage ../data/fonts/lato {};
league-gothic = callPackage ../data/fonts/league-gothic { };
league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
league-script-number-one = callPackage ../data/fonts/league-script-number-one { };
league-spartan = callPackage ../data/fonts/league-spartan { };
ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {};
inherit (callPackages ../data/fonts/liberation-fonts { })
@ -27279,6 +27299,8 @@ with pkgs;
lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { };
linden-hill = callPackage ../data/fonts/linden-hill { };
line-awesome = callPackage ../data/fonts/line-awesome { };
linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin {};
@ -27492,6 +27514,8 @@ with pkgs;
orion = callPackage ../data/themes/orion {};
ostrich-sans = callPackage ../data/fonts/ostrich-sans { };
overpass = callPackage ../data/fonts/overpass { };
oxygenfonts = callPackage ../data/fonts/oxygenfonts { };
@ -27560,6 +27584,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
prociono = callPackage ../data/fonts/prociono { };
profont = callPackage ../data/fonts/profont { };
proggyfonts = callPackage ../data/fonts/proggyfonts { };
@ -27639,10 +27665,14 @@ with pkgs;
snap7 = callPackage ../development/libraries/snap7 {};
sniglet = callPackage ../data/fonts/sniglet { };
snowblind = callPackage ../data/themes/snowblind { };
solarc-gtk-theme = callPackage ../data/themes/solarc { };
sorts-mill-goudy = callPackage ../data/fonts/sorts-mill-goudy { };
soundfont-fluid = callPackage ../data/soundfonts/fluid { };
soundfont-generaluser = callPackage ../data/soundfonts/generaluser { };
@ -27762,6 +27792,8 @@ with pkgs;
theano = callPackage ../data/fonts/theano { };
the-neue-black = callPackage ../data/fonts/the-neue-black { };
tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme {
inherit (gnome) adwaita-icon-theme;
};
@ -31730,7 +31762,9 @@ with pkgs;
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
ncdu = callPackage ../tools/misc/ncdu { };
ncdu = callPackage ../tools/misc/ncdu {
zig = zig_0_10;
};
ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };