Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
24182c8911
@ -1401,6 +1401,12 @@
|
||||
githubId = 37193992;
|
||||
name = "Arthur Teisseire";
|
||||
};
|
||||
arti5an = {
|
||||
email = "artis4n@outlook.com";
|
||||
github = "arti5an";
|
||||
githubId = 14922630;
|
||||
name = "Richard Smith";
|
||||
};
|
||||
artturin = {
|
||||
email = "artturin@artturin.com";
|
||||
matrix = "@artturin:matrix.org";
|
||||
@ -15645,6 +15651,8 @@
|
||||
spalf = {
|
||||
email = "tom@tombarrett.xyz";
|
||||
name = "tom barrett";
|
||||
github = "70m6";
|
||||
githubId = 105207964;
|
||||
};
|
||||
spease = {
|
||||
email = "peasteven@gmail.com";
|
||||
|
||||
@ -249,14 +249,14 @@ update /etc/fstab.
|
||||
which will be used by the boot partition.
|
||||
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mkpart primary 512MB -8GB
|
||||
# parted /dev/sda -- mkpart root ext4 512MB -8GB
|
||||
```
|
||||
|
||||
3. Next, add a *swap* partition. The size required will vary according
|
||||
to needs, here a 8GB one is created.
|
||||
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
|
||||
# parted /dev/sda -- mkpart swap linux-swap -8GB 100%
|
||||
```
|
||||
|
||||
::: {.note}
|
||||
@ -550,8 +550,8 @@ corresponding configuration Nix expression.
|
||||
### Example partition schemes for NixOS on `/dev/sda` (UEFI)
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mklabel gpt
|
||||
# parted /dev/sda -- mkpart primary 512MB -8GB
|
||||
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
|
||||
# parted /dev/sda -- mkpart root ext4 512MB -8GB
|
||||
# parted /dev/sda -- mkpart swap linux-swap -8GB 100%
|
||||
# parted /dev/sda -- mkpart ESP fat32 1MB 512MB
|
||||
# parted /dev/sda -- set 3 esp on
|
||||
```
|
||||
|
||||
@ -21,7 +21,7 @@ let
|
||||
osqueryi = pkgs.runCommand "osqueryi" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${pkgs.osquery}/bin/osqueryi $out/bin/osqueryi \
|
||||
--add-flags "--flagfile ${flagfile}"
|
||||
--add-flags "--flagfile ${flagfile} --disable-database"
|
||||
'';
|
||||
in
|
||||
{
|
||||
|
||||
@ -42,12 +42,15 @@ let
|
||||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
type = uniq (nullOr types.path);
|
||||
type = uniq (nullOr path);
|
||||
example = "/path/to/file";
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Specifies the path to a file containing the
|
||||
clear text password for the MQTT user.
|
||||
The file is securely passed to mosquitto by
|
||||
leveraging systemd credentials. No special
|
||||
permissions need to be set on this file.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -64,7 +67,7 @@ let
|
||||
};
|
||||
|
||||
hashedPasswordFile = mkOption {
|
||||
type = uniq (nullOr types.path);
|
||||
type = uniq (nullOr path);
|
||||
example = "/path/to/file";
|
||||
default = null;
|
||||
description = mdDoc ''
|
||||
@ -73,6 +76,9 @@ let
|
||||
To generate hashed password install the `mosquitto`
|
||||
package and use `mosquitto_passwd`, then remove the
|
||||
`username:` prefix from the generated file.
|
||||
The file is securely passed to mosquitto by
|
||||
leveraging systemd credentials. No special
|
||||
permissions need to be set on this file.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -102,15 +108,43 @@ let
|
||||
message = "Cannot set more than one password option for user ${n} in ${prefix}";
|
||||
}) users;
|
||||
|
||||
makePasswordFile = users: path:
|
||||
listenerScope = index: "listener-${toString index}";
|
||||
userScope = prefix: index: "${prefix}-user-${toString index}";
|
||||
credentialID = prefix: credential: "${prefix}-${credential}";
|
||||
|
||||
toScopedUsers = listenerScope: users: pipe users [
|
||||
attrNames
|
||||
(imap0 (index: user: nameValuePair user
|
||||
(users.${user} // { scope = userScope listenerScope index; })
|
||||
))
|
||||
listToAttrs
|
||||
];
|
||||
|
||||
userCredentials = user: credentials: pipe credentials [
|
||||
(filter (credential: user.${credential} != null))
|
||||
(map (credential: "${credentialID user.scope credential}:${user.${credential}}"))
|
||||
];
|
||||
usersCredentials = listenerScope: users: credentials: pipe users [
|
||||
(toScopedUsers listenerScope)
|
||||
(mapAttrsToList (_: user: userCredentials user credentials))
|
||||
concatLists
|
||||
];
|
||||
systemdCredentials = listeners: listenerCredentials: pipe listeners [
|
||||
(imap0 (index: listener: listenerCredentials (listenerScope index) listener))
|
||||
concatLists
|
||||
];
|
||||
|
||||
makePasswordFile = listenerScope: users: path:
|
||||
let
|
||||
makeLines = store: file:
|
||||
makeLines = store: file: let
|
||||
scopedUsers = toScopedUsers listenerScope users;
|
||||
in
|
||||
mapAttrsToList
|
||||
(n: u: "addLine ${escapeShellArg n} ${escapeShellArg u.${store}}")
|
||||
(filterAttrs (_: u: u.${store} != null) users)
|
||||
(name: user: ''addLine ${escapeShellArg name} "''$(systemd-creds cat ${credentialID user.scope store})"'')
|
||||
(filterAttrs (_: user: user.${store} != null) scopedUsers)
|
||||
++ mapAttrsToList
|
||||
(n: u: "addFile ${escapeShellArg n} ${escapeShellArg "${u.${file}}"}")
|
||||
(filterAttrs (_: u: u.${file} != null) users);
|
||||
(name: user: ''addFile ${escapeShellArg name} "''${CREDENTIALS_DIRECTORY}/${credentialID user.scope file}"'')
|
||||
(filterAttrs (_: user: user.${file} != null) scopedUsers);
|
||||
plainLines = makeLines "password" "passwordFile";
|
||||
hashedLines = makeLines "hashedPassword" "hashedPasswordFile";
|
||||
in
|
||||
@ -581,6 +615,19 @@ in
|
||||
ExecStart = "${cfg.package}/bin/mosquitto -c ${configFile}";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
|
||||
# Credentials
|
||||
SetCredential = let
|
||||
listenerCredentials = listenerScope: listener:
|
||||
usersCredentials listenerScope listener.users [ "password" "hashedPassword" ];
|
||||
in
|
||||
systemdCredentials cfg.listeners listenerCredentials;
|
||||
|
||||
LoadCredential = let
|
||||
listenerCredentials = listenerScope: listener:
|
||||
usersCredentials listenerScope listener.users [ "passwordFile" "hashedPasswordFile" ];
|
||||
in
|
||||
systemdCredentials cfg.listeners listenerCredentials;
|
||||
|
||||
# Hardening
|
||||
CapabilityBoundingSet = "";
|
||||
DevicePolicy = "closed";
|
||||
@ -653,7 +700,7 @@ in
|
||||
concatStringsSep
|
||||
"\n"
|
||||
(imap0
|
||||
(idx: listener: makePasswordFile listener.users "${cfg.dataDir}/passwd-${toString idx}")
|
||||
(idx: listener: makePasswordFile (listenerScope idx) listener.users "${cfg.dataDir}/passwd-${toString idx}")
|
||||
cfg.listeners);
|
||||
};
|
||||
|
||||
|
||||
@ -461,6 +461,8 @@ in {
|
||||
"d /var/lib/NetworkManager-fortisslvpn 0700 root root -"
|
||||
|
||||
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
|
||||
# ppp isn't able to mkdir that directory at runtime
|
||||
"d /run/pppd/lock 0700 root root -"
|
||||
];
|
||||
|
||||
systemd.services.NetworkManager = {
|
||||
|
||||
@ -158,6 +158,15 @@ in
|
||||
Docker package to be used in the module.
|
||||
'';
|
||||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = [ ];
|
||||
example = literalExpression "with pkgs; [ criu ]";
|
||||
description = lib.mdDoc ''
|
||||
Extra packages to add to PATH for the docker daemon process.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
@ -194,7 +203,8 @@ in
|
||||
};
|
||||
|
||||
path = [ pkgs.kmod ] ++ optional (cfg.storageDriver == "zfs") pkgs.zfs
|
||||
++ optional cfg.enableNvidia pkgs.nvidia-docker;
|
||||
++ optional cfg.enableNvidia pkgs.nvidia-docker
|
||||
++ cfg.extraPackages;
|
||||
};
|
||||
|
||||
systemd.sockets.docker = {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "16";
|
||||
version = "18";
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "netbeans";
|
||||
exec = "netbeans";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
|
||||
hash = "sha512-k+Zj6TKW0tOSYvM6V1okF4Qz62gZMETC6XG98W23Vtz3+vdiaddd8BC2DBg7p9Z1CofRq8sbwtpeTJM3FaXv0g==";
|
||||
hash = "sha256-CTWOW1vd200oZZYqDRT4wqr4v5I3AAgEcqA/qi9Ief8=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.960"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.968"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "ac2444f908bee5b5c1a13fe64e997315cea4b23c";
|
||||
sha256 = "0nv55x775lzbqa724ba2bpbkk6r7jbrgxgbir5bhyj0yz5ckl4v5";
|
||||
rev = "487261592eb9e9c31cacd08860f8894027bb1a07";
|
||||
sha256 = "002qgnh7xb9i9yqm4a3m9m7sbx1iz7ng8k5nnanlq897djs3hy0g";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
||||
2
pkgs/applications/emulators/ryujinx/deps.nix
generated
2
pkgs/applications/emulators/ryujinx/deps.nix
generated
@ -133,7 +133,7 @@
|
||||
(fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; })
|
||||
(fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; })
|
||||
(fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; })
|
||||
(fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.3-build25"; sha256 = "190gqalpkhw1zb3pvb92dxrciyn1giznl125vxxx9gsy8a6cipka"; })
|
||||
(fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; })
|
||||
(fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; })
|
||||
(fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; })
|
||||
(fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; })
|
||||
|
||||
@ -14,6 +14,8 @@ stdenv.mkDerivation {
|
||||
sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ imagemagick pkg-config wayland-scanner ];
|
||||
buildInputs = [ wayland wayland-protocols ];
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.10.4";
|
||||
version = "1.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aeO1rjKYoO6KF+oe0FKIa8D3j6G01uyC79OvUg9Qpfk=";
|
||||
hash = "sha256-mGie45sIvl8BjBB4JJF/U/OJ7naT6iWjo3l50qZvyaY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rh3S7Qy89ctsKlFz0lNNs8pZ5lHG5yB//DQzffD6eL8=";
|
||||
vendorHash = "sha256-/pNXCRHtoaJvgYsSMyYB05IKH4wG7hTlEHjuoOuifQ0=";
|
||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "weave-gitops";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sHk9ULh/792BEjPRcaeY3umx3pcLb41urrrouunm9nw=";
|
||||
sha256 = "sha256-q19oKawv7hLHMaPAIIdGLl+4N+HiXuIow8f3k9bTt3A=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ];
|
||||
|
||||
vendorSha256 = "sha256-Q9LjKgaFUx4txJlPcrG/YIbHV4hh5oWHVXIBDDgKYRg=";
|
||||
vendorHash = "sha256-EV8MDHiQBmp/mEB+ug/yALPhcqytp0W8V6IPP+nt9DA=";
|
||||
|
||||
subPackages = [ "cmd/gitops" ];
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.7.10";
|
||||
version = "3.7.11";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5wf1oQzriawhthAfHMMtZbUMvGNviBPzmnLKahRkmXQ=";
|
||||
hash = "sha256-rrxY5liF4IzuaZ3kjJ2zEUzK1p7jGbS/T/bM1HQGzbA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -45,14 +45,14 @@ let
|
||||
|
||||
pname = "slack";
|
||||
|
||||
x86_64-darwin-version = "4.32.122";
|
||||
x86_64-darwin-sha256 = "sha256-aKvMtuo3cNJsw42RNezmETsLAtl6G2yqYGOGp2Pt32U=3";
|
||||
x86_64-darwin-version = "4.33.73";
|
||||
x86_64-darwin-sha256 = "0y8plkl3pm8250xpavc91kn5b9gcdwr7bqzd3i79n48395lx11ka";
|
||||
|
||||
x86_64-linux-version = "4.32.122";
|
||||
x86_64-linux-sha256 = "sha256-ViJHG7s7xqnatNOss5mfa7GqqlHbBrLGHBzTqqo7W/w=";
|
||||
x86_64-linux-version = "4.33.73";
|
||||
x86_64-linux-sha256 = "007i8sjnm1ikjxvgw6nisj4nmv99bwk0r4sfpvc2j4w4wk68sx3m";
|
||||
|
||||
aarch64-darwin-version = "4.32.122";
|
||||
aarch64-darwin-sha256 = "sha256-j3PbH/5cKN5+vUiLvXaxyPYilt6GX6FsGo+1hlJKrls=";
|
||||
aarch64-darwin-version = "4.33.73";
|
||||
aarch64-darwin-sha256 = "15s3ss15yawb04dyzn82xmk1gs70sg2i3agsj2aw0xdx73yjl34p";
|
||||
|
||||
version = {
|
||||
x86_64-darwin = x86_64-darwin-version;
|
||||
|
||||
@ -48,23 +48,23 @@ let
|
||||
# and often with different versions. We write them on three lines
|
||||
# like this (rather than using {}) so that the updater script can
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "5.15.3.20121";
|
||||
versions.x86_64-darwin = "5.15.3.20121";
|
||||
versions.x86_64-linux = "5.15.3.4839";
|
||||
versions.aarch64-darwin = "5.15.5.20753";
|
||||
versions.x86_64-darwin = "5.15.5.20753";
|
||||
versions.x86_64-linux = "5.15.5.5603";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
|
||||
name = "zoomusInstallerFull.pkg";
|
||||
hash = "sha256-FEgLtKhjODZGuwzOWUK//TilXM3Gvka7B5E48eyrBuw=";
|
||||
hash = "sha256-yDdmr0lHmhsJpTpvw4Qr4ZUk7SfEZw/53bVL3yV+a/Q=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
|
||||
hash = "sha256-q4//skfKwAuPqPxJedVACbSQQiTKmc8J24t7mCY6c/w=";
|
||||
hash = "sha256-qZ5jiNL7I6IHwm1bZ8rgjVwwFJKPeAViQvx+qatGPug=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-4r1jayWHg+5Oerksj7DSc5xV15l7miA0a+CgPDUkpa0=";
|
||||
hash = "sha256-JIS+jxBiW/ek47iz+yCcmoCZ8+UBzEXMC1Yd7Px0ofg=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
39
pkgs/applications/networking/localproxy/default.nix
Normal file
39
pkgs/applications/networking/localproxy/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, openssl
|
||||
, protobuf3_19
|
||||
, catch2
|
||||
, boost181
|
||||
, icu
|
||||
}:
|
||||
let
|
||||
boost = boost181.override { enableStatic = true; };
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "localproxy";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-samples";
|
||||
repo = "aws-iot-securetunneling-localproxy";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ openssl protobuf3_19 catch2 boost icu ];
|
||||
|
||||
# causes redefinition of _FORTIFY_SOURCE
|
||||
hardeningDisable = [ "fortify3" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++";
|
||||
homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [spalf];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
@ -1,11 +1,12 @@
|
||||
{ spellChecking ? true
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitLab
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gtkspell3
|
||||
, gmime2
|
||||
, gmime3
|
||||
, gettext
|
||||
, intltool
|
||||
, itstool
|
||||
@ -21,21 +22,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pan";
|
||||
version = "0.146";
|
||||
version = "0.154";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
|
||||
sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o+JFUraSoQ0HDmldHvTX+X7rl2L4n4lJmI4UFZrsfkQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Take <glib.h>, <gmime.h>, "gtk-compat.h" out of extern "C"
|
||||
./move-out-of-extern-c.diff
|
||||
];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ];
|
||||
|
||||
buildInputs = [ gtk3 gmime2 libnotify gnutls ]
|
||||
buildInputs = [ gtk3 gmime3 libnotify gnutls ]
|
||||
++ lib.optional spellChecking gtkspell3
|
||||
++ lib.optionals gnomeSupport [ libsecret gcr ];
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -226,9 +226,10 @@ in
|
||||
# in the binary causing the closure size to blow up because of many unnecessary
|
||||
# dependencies to dev outputs. This behavior was patched away in nixpkgs
|
||||
# (see above), make sure these don't leak again by accident.
|
||||
disallowedRequisites = lib.concatMap
|
||||
(x: lib.optional (x?dev) x.dev)
|
||||
buildInputs;
|
||||
disallowedRequisites = lib.optionals (!kdeIntegration)
|
||||
(lib.concatMap
|
||||
(x: lib.optional (x?dev) x.dev)
|
||||
buildInputs);
|
||||
|
||||
### QT/KDE
|
||||
#
|
||||
|
||||
@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dvc/analytics.py --replace 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False'
|
||||
substituteInPlace dvc/daemon.py \
|
||||
--subst-var-by dvc "$out/bin/dcv"
|
||||
'';
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glab";
|
||||
version = "1.30.0";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mNwjyKde9xlaGVwK7oIbPGPipxKTvLwf6uMZVjL+joc=";
|
||||
hash = "sha256-K7yGRuIfYEqs4ziystxLMK+dYUZoyGlBJAmx2qmY08Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WfzN70HHLatBuV+GW2VC+5laR3rBfDOqPydyxMSmL3s=";
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "vokoscreen-ng";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vkohaupt";
|
||||
repo = "vokoscreenNG";
|
||||
rev = version;
|
||||
sha256 = "sha256-Du/Dq7AUH5CeEKYr0kxcqguAyRVI5Ame41nU3FGvG+U=";
|
||||
sha256 = "sha256-epz/KoXo84zzCD1dzclRWgeQSqrgwEtaIGvrTPuN9hw=";
|
||||
};
|
||||
|
||||
qmakeFlags = [ "src/vokoscreenNG.pro" ];
|
||||
|
||||
31
pkgs/data/icons/banana-cursor/default.nix
Normal file
31
pkgs/data/icons/banana-cursor/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "banana-cursor";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ful1e5";
|
||||
repo = "banana-cursor";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PI7381xf/GctQTnfcE0W3M3z2kqbX4VexMf17C61hT8=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/icons
|
||||
mv themes/Banana $out/share/icons
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ful1e5/banana-cursor";
|
||||
description = "The banana cursor theme";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ yrd ];
|
||||
};
|
||||
}
|
||||
@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DUSE_SYSTEM_GTEST=ON"
|
||||
"-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
"-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
|
||||
];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janet";
|
||||
version = "1.28.0";
|
||||
version = "1.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janet-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QfW17BDP+xa+Qy9FuIioe8UY6BBGsvbSyyz6GFODg5g=";
|
||||
sha256 = "sha256-waBOPrcZ1mNsvb2PrivYUmbUKv1mxD/rMFOCZXslyKA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "12.4.1";
|
||||
version = "12.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
hash = "sha256-gSdjXSffuZb6tJXeb/nOhL2bXgTePAA3/CrG3pbc85c=";
|
||||
hash = "sha256-tBAqOEeRrxbZ5fuzBvEf41ar+8oKfXynq7yaipRmECo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avro-c";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
|
||||
sha256 = "sha256-EliMTjED5/RKHgWrWD8d0Era9qEKov1z4cz1kEVTX5I=";
|
||||
sha256 = "sha256-nx+ZqXsmcS0tQ/5+ck8Z19vdXO81R4uuRqGSDfIEV/U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -296,12 +296,12 @@ let
|
||||
|
||||
nclasses = build-asdf-system {
|
||||
pname = "nclasses";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "atlas-engineer";
|
||||
repo = "nclasses";
|
||||
rev = "0.5.0";
|
||||
sha256 = "sha256-UcavZ0fCA2hkVU/CqUZfyCqJ8gXKPpXTCP0WLUIF1Ss=";
|
||||
rev = "0.6.0";
|
||||
sha256 = "sha256-JupP+TIxavUoyOPnp57FqpEjWfgKspdFoSRnV2rk5U4=";
|
||||
};
|
||||
lispLibs = [ self.nasdf super.moptilities ];
|
||||
};
|
||||
@ -330,10 +330,12 @@ let
|
||||
|
||||
nhooks = build-asdf-system {
|
||||
pname = "nhooks";
|
||||
version = "20230214-git";
|
||||
src = pkgs.fetchzip {
|
||||
url = "http://beta.quicklisp.org/archive/nhooks/2023-02-14/nhooks-20230214-git.tgz";
|
||||
sha256 = "0rapn9v942yd2snlskvlr1g22hmyhlsrclahxjsgn4pbvqc5gwyw";
|
||||
version = "1.2.1";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "atlas-engineer";
|
||||
repo = "nhooks";
|
||||
rev = "1.2.1";
|
||||
hash = "sha256-D61QHxHTceIu5mCGKf3hy53niQMfs0idEYQK1ZYn1YM=";
|
||||
};
|
||||
lispLibs = with self; [ bordeaux-threads closer-mop serapeum ];
|
||||
};
|
||||
@ -368,7 +370,7 @@ let
|
||||
|
||||
nyxt-gtk = build-asdf-system {
|
||||
pname = "nyxt";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
lispLibs = (with super; [
|
||||
alexandria
|
||||
@ -437,8 +439,8 @@ let
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "atlas-engineer";
|
||||
repo = "nyxt";
|
||||
rev = "3.4.0";
|
||||
sha256 = "sha256-o+GAMHKi+9q+EGY6SEZrxKCEO4IxdOiB4oPpJPGYO0w=";
|
||||
rev = "3.5.0";
|
||||
sha256 = "sha256-/x3S4qAvvHxUxDcs6MAuZvAtqLTQdwlH7r4zFlKIjY4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
@ -451,15 +453,17 @@ let
|
||||
pkgs.gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
# This is needed since asdf:make tries to write in the directory of the .asd file of the system it's compiling
|
||||
postConfigure = ''
|
||||
export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)//
|
||||
'';
|
||||
# This patch removes the :build-operation component from the nyxt/gi-gtk-application system.
|
||||
# This is done because if asdf:operate is used and the operation matches the system's :build-operation
|
||||
# then output translations are ignored, causing the result of the operation to be placed where
|
||||
# the .asd is located, which in this case is the nix store.
|
||||
# see: https://gitlab.common-lisp.net/asdf/asdf/-/blob/master/doc/asdf.texinfo#L2582
|
||||
patches = [ ./patches/nyxt-remove-build-operation.patch ];
|
||||
|
||||
buildScript = pkgs.writeText "build-nyxt.lisp" ''
|
||||
(load "${super.alexandria.asdfFasl}/asdf.${super.alexandria.faslExt}")
|
||||
;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:make instead
|
||||
(asdf:make :nyxt/gi-gtk-application)
|
||||
;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:operare :program-op instead
|
||||
(asdf:operate :program-op :nyxt/gi-gtk-application)
|
||||
'';
|
||||
|
||||
# TODO(kasper): use wrapGAppsHook
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/nyxt.asd b/nyxt.asd
|
||||
index ea2630ce..fdf837e4 100644
|
||||
--- a/nyxt.asd
|
||||
+++ b/nyxt.asd
|
||||
@@ -480,7 +480,6 @@ The renderer is configured from NYXT_RENDERER or `*nyxt-renderer*'."))
|
||||
:defsystem-depends-on ("nasdf")
|
||||
:class :nasdf-system
|
||||
:depends-on (nyxt/gi-gtk)
|
||||
- :build-operation "program-op"
|
||||
:build-pathname "nyxt"
|
||||
:entry-point "nyxt:entry-point")
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mm";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
@ -14,7 +14,7 @@ buildDunePackage rec {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-mm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pL1e7U5EtbI8bVum7mMHUD8QFMV4jc3YFjhTOvR43kg=";
|
||||
sha256 = "sha256-RM+vsWf2RK5dY84KcqeR/OHwO42EDycrYgfOUFpUE44=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerservice";
|
||||
version = "24.0.0";
|
||||
version = "25.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-sUp3LDVsc1DmVf4HdaXGSDeEvmAE2weSHHTxL/BwRk8=";
|
||||
hash = "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.19.0";
|
||||
version = "2.20.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EebMccj9DmrPj+/GCECLkqplq3bSmRkNqlI3gYq0qzo=";
|
||||
hash = "sha256-PUeEqed0crzfHLAHDDu4GgktMaNt11nuovfMIkz5iwk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@ in
|
||||
buildPythonPackage rec {
|
||||
pname = "playwright";
|
||||
# run ./pkgs/development/python-modules/playwright/update.sh to update
|
||||
version = "1.34.0";
|
||||
version = "1.36.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "microsoft";
|
||||
repo = "playwright-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GIxMVuSSJsRDsHDOPnJsDsTcghGYtIFpRS5u7HJd+zY=";
|
||||
hash = "sha256-/umpMkD+WEpBmw2cRb71PtOMd1sRNfwmURKdaRy4Qsc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -10,11 +10,11 @@ assert jdk != null;
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "apache-maven";
|
||||
version = "3.9.2";
|
||||
version = "3.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz";
|
||||
hash = "sha256-gJ7zIgxtF5GVwGwyTLmm002Oy6Vmxc/Y64MWe8A0EX0=";
|
||||
hash = "sha256-4eE6wMQvO2TZAMV//GUuzvaCuCVdfTVO+7tPYlGdpPE=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "litefs";
|
||||
version = "0.4.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CmWtQzoY/xY/LZL2swhYtDzPvpVOvKlhUH3plDEHrGI=";
|
||||
sha256 = "sha256-95q10NQer/KPfBVpabupvm3wuhacnqNG3lXc1pzV3Js=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1I18ITgFPpUv0mPrt1biJmQV9qd9HB23zJmnDp5WzkA=";
|
||||
vendorHash = "sha256-4e1tAAXM2EYuqe1AbN1wng/bq1BP7MSOV6woeKjc3x4=";
|
||||
|
||||
subPackages = [ "cmd/litefs" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.18.16";
|
||||
version = "0.18.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Oilz8X2tR90EfYq089NgqApoFtqNxDFs0zyxnOyS/9I=";
|
||||
hash = "sha256-OnAOomKVUIBTEgHywDSSx+ggqUl/vn/R0JdjOb3lUho=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ansible-language-server";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ansible";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5QzwDsWjuq/gMWFQEkl4sqvsqfxTOZhaFBMhjiiOZSY=";
|
||||
hash = "sha256-e6cOWoryOxWnl8q62rlGmSgwLVnoxLMwNFoGlUZw2bQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-bzffCAGn0aYVoG8IDaXd5I3x3AnGl5urX7BaBKf0tVI=";
|
||||
npmDepsHash = "sha256-Lzwj0/2fxa44DJBsgDPa43AbRxggqh881X/DFnlNLig=";
|
||||
npmBuildScript = "compile";
|
||||
|
||||
# We remove/ignore the prepare and prepack scripts because they run the
|
||||
|
||||
@ -6,11 +6,11 @@ else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dune";
|
||||
version = "3.9.1";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
|
||||
hash = "sha256-8MPOSfNsczuK7nJhHxB88G3mvEI75yYqqxuz8DwFqHg=";
|
||||
hash = "sha256-TzrL1F09zbu9qJE3L0PwVpQra5btl37FKBupqHUTSt8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.16.5";
|
||||
version = "2.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-K3GkdcUNaBTo5sMfLONQ2o7SYUNMJ45WA5FQQ3+0+RY=";
|
||||
hash = "sha256-u0Ue5padTT2hPEta0ysm7W2oR1/FMFyTZd9yuciCehU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aNXKRP7WFzscDPjZmDTbgKItNEQrRpsq+XiOuggx85w=";
|
||||
vendorHash = "sha256-ruDXfDwVmMLFsIF+YV4CryEPSeU2cEul9FfRiApII9g=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable some tests that need file system & network access.
|
||||
|
||||
@ -16,12 +16,12 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "insomnia";
|
||||
version = "2023.2.2";
|
||||
version = "2023.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
|
||||
sha256 = "sha256-XM7OLr5ety95jjlVqNuQp3rD9laoe1uC1HNP66HJe5M=";
|
||||
sha256 = "sha256-7tkd0HaJeDdCvX1t1XCHrrQ23xFrcMsy1nhJJEp6klk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -41,6 +41,11 @@ in stdenv.mkDerivation {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A digital distribution platform";
|
||||
longDescription = ''
|
||||
Steam is a video game digital distribution service and storefront from Valve.
|
||||
|
||||
To install on NixOS, please use the option `programs.steam.enable = true`.
|
||||
'';
|
||||
homepage = "https://store.steampowered.com/";
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ jagajaga jonringer ];
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icinga2${nameSuffix}";
|
||||
version = "2.13.7";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "icinga";
|
||||
repo = "icinga2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YLNzXdR54DA9araC7pxZmopAZB90j9sx4gb3hOVsu0I=";
|
||||
sha256 = "sha256-MrNfkbbmID27Ht2sDSklrPvRvCmewOuOOBIFnHJz1zE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.32.5.7328-2632c9d3a";
|
||||
version = "1.32.5.7349-8f4248874";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "sha256-Xyk73UW3LQqLpvtwvzpixKlrCJyOcDuq9oQkOd/jsLc=";
|
||||
sha256 = "18j98za5498v02asyyz2sakbl4inyxd6jsa4bjz8zm2jb1knk236";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "sha256-p2BynQfAW9FDrdy+KxcnJADwwli7jm2FXGzKjTQPfOE=";
|
||||
sha256 = "0gm9i752fbplw1l0xlrhzpif5fjiwx471hv55bwbs3ywz3hp0jnb";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "23.1.10";
|
||||
version = "23.1.13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OlRuJeLvnQeseIsOREt5Frz4zzVmGKQMYIZI4LsDn2U=";
|
||||
sha256 = "sha256-32/mj1/PeeTrtN9COh/hTL4zFcpLnsS0R2uTGpyMUNk=";
|
||||
};
|
||||
server = callPackage ./server.nix { inherit src version; };
|
||||
in
|
||||
|
||||
@ -5,13 +5,13 @@ let
|
||||
in
|
||||
buildFishPlugin rec {
|
||||
pname = "fzf.fish";
|
||||
version = "9.8";
|
||||
version = "9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PatrickF1";
|
||||
repo = "fzf.fish";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xWaMd5POCDeeFTsGtHbIvsPelIp+GZPC1X1CseCo3BA=";
|
||||
sha256 = "sha256-Aqr6+DcOS3U1R8o9Mlbxszo5/Dy9viU4KbmRGXo95R8=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ fzf fd unixtools.script procps ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "murex";
|
||||
version = "4.4.6110";
|
||||
version = "4.4.9100";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lmorg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/0g0LWzw3GbjAIFgNMNzwL8cJNMD1Jwoaaz8lE6ePgU=";
|
||||
sha256 = "sha256-3YXRjwDEJC4rZdvrgj8Hp8oD+4NN5LOUJmM/9bjwfQw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU=";
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.82.0";
|
||||
version = "0.83.0";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "nushell";
|
||||
repo = "nushell";
|
||||
rev = version;
|
||||
hash = "sha256-D/R+/60Lo2rLUA/313CTJQookqSNtbD7LnVf0vBC9Qc=";
|
||||
hash = "sha256-+/y4gtcrn6pM+LrzRQuHPACszZpYHCXMLbPlaIi4SAY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LTnBJDA2RkAP3ZCpl5enUc0PLS63EVXQyIopUwBd8OQ=";
|
||||
cargoHash = "sha256-amDSzsDeG4ABlFLlytcfJV0xA9Rl7Udb/nWEz64pWi0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nu_scripts";
|
||||
version = "unstable-2023-04-26";
|
||||
version = "unstable-2023-07-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = pname;
|
||||
rev = "724f89c330dc5b93a2fde29f732cbd5b8d73785c";
|
||||
hash = "sha256-aCLFbxVE8/hWsPNPLt2Qn8CaBkYJJLSDgpl6LYvFVYc=";
|
||||
rev = "e6adf4e0ae04f946fcc93a77e0992e2e00467e26";
|
||||
hash = "sha256-6hQEBotZyNuBL0vAzqS1C9LLMk2RMv5ZwFCcSI3aSU8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@ -23,6 +24,8 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "A place to share Nushell scripts with each other";
|
||||
homepage = "https://github.com/nushell/nu_scripts";
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "partclone";
|
||||
version = "0.3.23";
|
||||
version = "0.3.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Thomas-Tsai";
|
||||
repo = "partclone";
|
||||
rev = version;
|
||||
sha256 = "sha256-na9k26+GDdASZ37n0QtFuRDMtq338QOlXTf0X4raOJI=";
|
||||
sha256 = "sha256-EY5SL8/KITEoOWq2owxQjnemYNsjYqJLLlRVFdYPoVA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
32
pkgs/tools/filesystems/mount-zip/default.nix
Normal file
32
pkgs/tools/filesystems/mount-zip/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fuse, boost, gcc, icu, libzip, pandoc
|
||||
, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mount-zip";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "mount-zip";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-+slN5eedSddYKgiNLq4KZ5BXwvGQw9859sVfkcIBYeo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ boost gcc icu pandoc pkg-config ];
|
||||
buildInputs = [ fuse libzip ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "FUSE file system for ZIP archives";
|
||||
homepage = "https://github.com/google/mount-zip";
|
||||
longDescription = ''
|
||||
mount-zip is a tool allowing to open, explore and extract ZIP archives.
|
||||
|
||||
This project is a fork of fuse-zip.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ arti5an ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, buildDotnetModule
|
||||
, dotnetCorePackages
|
||||
, fetchFromGitHub
|
||||
, zlib
|
||||
, openssl
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, stdenv, makeWrapper, buildMaven, maven, jdk }:
|
||||
{ lib, fetchFromGitHub, makeWrapper, maven, jdk }:
|
||||
let
|
||||
mavenWithJdk = maven.override { inherit jdk; };
|
||||
in
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, git
|
||||
, gnugrep
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lib
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake
|
||||
, freeglut, ghostscriptX, imagemagick, fftw
|
||||
, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, pandoc }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, pandoc }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "didder";
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, wayland-scanner
|
||||
, libjpeg
|
||||
, libpng
|
||||
, xorg
|
||||
, libX11
|
||||
, libGL
|
||||
, libdrm
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, cairo
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchzip
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, spirv-headers
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, glslang
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchCrate
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
||||
@ -4,14 +4,12 @@
|
||||
, freetype
|
||||
, zlib
|
||||
, openssl
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, gcc-unwrapped
|
||||
, libjpeg8
|
||||
, libpng
|
||||
, fontconfig
|
||||
, stdenv
|
||||
, wkhtmltopdf
|
||||
, xar
|
||||
, xorg
|
||||
}:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit
|
||||
{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch
|
||||
, python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5
|
||||
, jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad, nixosTests }:
|
||||
let
|
||||
@ -24,7 +24,7 @@ let
|
||||
sha256 = "ExS0Cg3rs0I9IOVbZHLt8UEfk8/LmY9oAHPVVlYuTPw=";
|
||||
};
|
||||
|
||||
in clangStdenv.mkDerivation rec {
|
||||
in clangStdenv.mkDerivation {
|
||||
pname = "fcitx5-mozc";
|
||||
version = "2.26.4220.102";
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, xorg
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, ibus
|
||||
, gtk3
|
||||
, go
|
||||
}:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, ibus, gtk3, libthai }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-libthai";
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, python3
|
||||
, pkgconfig
|
||||
, wrapGAppsHook
|
||||
, gettext
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, systemd
|
||||
, runtimeShell
|
||||
, python3
|
||||
@ -43,7 +41,7 @@ let
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "keyd";
|
||||
inherit version src;
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, m17n_db
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, buildPackages, iconv, skktools }:
|
||||
{ lib, stdenv, fetchurl, iconv, skktools }:
|
||||
|
||||
let
|
||||
# kana to kanji
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "grex";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pemistahl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-of6mZ0SeiFXuXmvk64WoUNv6CLoj05K2kQpDQLMLwuY=";
|
||||
sha256 = "sha256-kbrBnpoVeXSgmIqElpfAnoSutYwsnFaxFJpRsJPUE8k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-BS9K/1CyNYFwC/zQXEWZcSCjQyWgLgcVNbuyez2q/Ak=";
|
||||
cargoSha256 = "sha256-WO8h5JUEiCpfsROQoRZj7I6em6REcJ2PfmoGN1zKRPg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hexyl";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c3CMtPLo5NfKfr2meccFuDpf0ffZ3uBw995TEB5FSTs=";
|
||||
hash = "sha256-+jmMy5Hi4EfMh/rBzBs5b+f48OZcR/Tw7IU1uTbwiCo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2pIASIJ83lFfC7do/02MxY/OOMJG7McS6O8uRMy9kVs=";
|
||||
cargoHash = "sha256-TjJ0645TRlNzduQgxYLZWz+rLFfRv12GuwXBcmNr/h8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line hex viewer";
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "Sharedown";
|
||||
version = "5.2.2";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kylon";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-kdntnzGpu1NUP6rrBaH7ASwE7XT18vHcgf39bp5A4ds=";
|
||||
sha256 = "sha256-llQt3m/qu7v5uQIfA1yxl2JZiFafk6sPgcvrIpQy/DI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
2729
pkgs/tools/networking/edgedb/Cargo.lock
generated
2729
pkgs/tools/networking/edgedb/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -19,23 +19,24 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "edgedb";
|
||||
version = "2.3.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edgedb";
|
||||
repo = "edgedb-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iL8tD6cvFVWqsQAk6HBUqdz7MJ3lT2XmExGQvdQdIWs=";
|
||||
sha256 = "sha256-6uhwuAGZ/XU+eENNo0H7hOdrDDx0fWvPVZAEOm5mdcY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"assert_cmd-1.0.1" = "sha256-0MkQG+JKrZXOn8B8q1HdyhZ1hVVb7dPbGEo/76o2YRc=";
|
||||
"edgedb-derive-0.4.0" = "sha256-pE/GchC3JDg0E4twmov86byne+rn28JpIawBbZcJHOg=";
|
||||
"edgeql-parser-0.1.0" = "sha256-e43PBHirALfrxGKi50KvE9aDAunObpXcWNBs62ssgSM=";
|
||||
"rexpect-0.3.0" = "sha256-0a//fPscEXEwv+73Ja7jRf2eRWfF6VCsck9ZZ15zgog=";
|
||||
"rustyline-8.0.0" = "sha256-FyMx2nAVaX0pc481BTlNxeR/NfNrr57FWKLS7+EjPVw=";
|
||||
"edgedb-derive-0.5.0" = "sha256-y/mN0XuJtQBtkLmbk2s7hK5joGEH5Ge6sLCD88WyL9o=";
|
||||
"indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY=";
|
||||
"rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA=";
|
||||
"edgeql-parser-0.1.0" = "sha256-Y3gXxPuR7qnTL4fu2nZIa3e20YV1fLvm2jHAng+Ke2Q=";
|
||||
"rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc=";
|
||||
"serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, nix, openssl, pkg-config, ronn, rustPlatform }:
|
||||
{ lib, fetchFromGitHub, nix, ronn, rustPlatform }:
|
||||
|
||||
let
|
||||
blake3-src = fetchFromGitHub {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, Security }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "manix";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, darwin }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixdoc";
|
||||
|
||||
@ -63,7 +63,7 @@ in
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
}).overrideAttrs (o: {
|
||||
}).overrideAttrs {
|
||||
inherit version;
|
||||
pname = "nixos-install-tools";
|
||||
})
|
||||
}
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-gitignore
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, darwin
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
};
|
||||
|
||||
# squashfuse adapted to nix from cmake experession in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake"
|
||||
appimagekit_squashfuse = squashfuse.overrideAttrs (attrs: rec {
|
||||
appimagekit_squashfuse = squashfuse.overrideAttrs rec {
|
||||
pname = "squashfuse";
|
||||
version = "unstable-2016-10-09";
|
||||
|
||||
@ -61,7 +61,7 @@ let
|
||||
cp -v ./.libs/*.a $out/lib
|
||||
cp -v ./*.h $out/include
|
||||
'';
|
||||
});
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "appimagekit";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, dysnomia, libintl, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "disnix";
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, verilog
|
||||
, verilator
|
||||
, gnumake
|
||||
, gcc
|
||||
, edalize
|
||||
, fastjsonschema
|
||||
, pyparsing
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "home-manager";
|
||||
version = "2023-05-30";
|
||||
|
||||
@ -89,4 +89,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@ -76,10 +76,10 @@ let
|
||||
aws-sdk-cpp-nix = (aws-sdk-cpp.override {
|
||||
apis = [ "s3" "transfer" ];
|
||||
customMemoryManagement = false;
|
||||
}).overrideAttrs (args: {
|
||||
}).overrideAttrs {
|
||||
# only a stripped down version is build which takes a lot less resources to build
|
||||
requiredSystemFeatures = [ ];
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
common = args:
|
||||
|
||||
@ -13,7 +13,7 @@ let
|
||||
# 3. Ansible being unable to upgrade to a later version of resolvelib
|
||||
# see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738
|
||||
packageOverrides = self: super: {
|
||||
resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec {
|
||||
resolvelib = super.resolvelib.overridePythonAttrs rec {
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sarugaku";
|
||||
@ -21,7 +21,7 @@ let
|
||||
rev = "/refs/tags/${version}";
|
||||
hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
self = python;
|
||||
};
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
let
|
||||
pkg_path = "$out/lib/ghidra";
|
||||
pname = "ghidra";
|
||||
version = "10.3.1";
|
||||
version = "10.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NationalSecurityAgency";
|
||||
repo = "Ghidra";
|
||||
rev = "Ghidra_${version}_build";
|
||||
hash = "sha256-KYZAu+15rcTkdfVQdKgAlVv3FxREUH0IIgYBb0qjdO8=";
|
||||
hash = "sha256-CVnEHtSF3DVTH+8qwUsABJq/lRkg6xulEWU+Q5C9ajo=";
|
||||
};
|
||||
|
||||
gradle = gradle_7;
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, curl
|
||||
, darwin
|
||||
, hiredis
|
||||
, iptables
|
||||
, jdk
|
||||
@ -19,7 +18,6 @@
|
||||
, libsigrok
|
||||
, libvirt
|
||||
, libxml2
|
||||
, libapparmor, libcap_ng, numactl
|
||||
, lua
|
||||
, lvm2
|
||||
, lm_sensors
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchgit, fetchpatch, makeWrapper, coreutils }:
|
||||
{ lib, stdenv, fetchgit, makeWrapper, coreutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "datefudge";
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
let
|
||||
inherit (python3Packages) python;
|
||||
pname = "honcho";
|
||||
|
||||
in
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ config
|
||||
{ lib
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, makePerlPath
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ fetchFromGitHub
|
||||
, fetchpatch
|
||||
, lib
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, withCmd ? false
|
||||
}:
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPythonApplication, pkgsBuildTarget, python, minijail }:
|
||||
{ lib, buildPythonApplication, pkgsBuildTarget, python, minijail }:
|
||||
|
||||
let
|
||||
targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, talloc
|
||||
, pkg-config
|
||||
, git
|
||||
, ncurses
|
||||
, docutils, swig, python3, coreutils, enablePython ? true }:
|
||||
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
pciutils,
|
||||
powertop,
|
||||
resholve,
|
||||
stdenv,
|
||||
util-linux,
|
||||
xorg,
|
||||
xxd,
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "2.28.0";
|
||||
version = "2.28.1";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
outputs = [ "out" "data" ];
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AalZFc2GGIA7CV3+OGEmNZEQk0OUsbfQDq8d3Z708XU=";
|
||||
hash = "sha256-40JCZo7wxI2ysquW/r+LEcC+TUdmBEHak8b3AcmNq4c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KB1mRWDYejc38tUv316MiGfmq2riNnpEMIUpjgfSasU=";
|
||||
@ -27,8 +27,9 @@ buildGoModule rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://vale.sh/";
|
||||
description = "A syntax-aware linter for prose built with speed and extensibility in mind";
|
||||
homepage = "https://vale.sh/";
|
||||
changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
|
||||
@ -10265,6 +10265,8 @@ with pkgs;
|
||||
|
||||
lmp = callPackage ../tools/security/lmp { };
|
||||
|
||||
localproxy = callPackage ../applications/networking/localproxy { };
|
||||
|
||||
localstack = with python3Packages; toPythonApplication localstack;
|
||||
|
||||
localtime = callPackage ../tools/system/localtime { };
|
||||
@ -10607,6 +10609,8 @@ with pkgs;
|
||||
|
||||
motrix = callPackage ../tools/networking/motrix { };
|
||||
|
||||
mount-zip = callPackage ../tools/filesystems/mount-zip { };
|
||||
|
||||
mpage = callPackage ../tools/text/mpage { };
|
||||
|
||||
mprime = callPackage ../tools/misc/mprime { };
|
||||
@ -28795,6 +28799,8 @@ with pkgs;
|
||||
|
||||
bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
|
||||
|
||||
banana-cursor = callPackage ../data/icons/banana-cursor { };
|
||||
|
||||
barlow = callPackage ../data/fonts/barlow { };
|
||||
|
||||
base16-schemes = callPackage ../data/themes/base16-schemes { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user